mirror of
https://github.com/jomjol/AI-on-the-edge-device.git
synced 2025-12-07 12:06:58 +03:00
* Create dig-cont_0640_s3_q.tflite * Update edit_reference.html (#2924) Zoom-Einstellungen ausblenden, wenn zoom deaktiviert ist * Update edit_config_template.html (#2925) Zoom-Einstellungen ausblenden, wenn zoom deaktiviert ist + Kameraeinstellungen nicht nur in der config.ini speichern, sondern auch setzen * The parameter "negative" is processed on the MCU * Renamed menu entry Alignment -> References * renamed model file to make naming consistent * Fix test (#2933) * always reset change absolute (#2956) * Create dig-class11_1701_s2.tflite * Update tflite * Update tflite * Camera settings (#3029) * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Fix minor typo and harmonize spaces (#3030) * Update edit_digits.html * Update edit_analog.html * Update overview.html * Update edit_reference.html --------- Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> * Source code formatting, ClassFlowPostProcessing.cpp * fix edit_config_template.html Unfortunately, I didn't take out some entries from other experiments because I overlooked/forgot them^^ * fix readconfigparam.js Unfortunately, I didn't take out some entries from other experiments because I overlooked/forgot them^^ * fix edit_config_template.html TakeImage_CamZoomMode_value1 was replaced by TakeImage_CamZoomSize_value1, but not deleted. This caused problems when saving the camera settings. * Update info.html function loadWLANSSID() was present three times * Update overview.html CamFrameSize is no longer needed/used for zoom * Update reply-bot.yaml * homeassistant service discovery: derive node_id when using nested topics (#3088) * derive correct node_id for homeassistant service discovery in nested topics (fixes #1792) * explicit use of std::string * move nodeId creation to separate function add unit-tests * add documentation about node_id generation for Home Assistant MQTT Service Discovery * add Prometheus/OpenMetrics exporter (#3081) * add prometheus endpoint * refine metrics implementation * move metrics generator to ClassFlowControll * add more metrics align prefix * add more metrics clean up * refine documentation * revert dependencies change * sanitize labels * create separate module for openmetrics * move openmetrics to separate folder * clean up * add basic unit-tests * work with const numbers add replaceAll for string replacement avoid opening std namespace adapt unit-tests * Update code/main/server_main.cpp --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Typo * update platformIO to 6.7.0 (ESP IDF 5.2.1) (#3098) * update to platformio/espressif32 @ 6.7.0 * remove unused getReadout() as it throws errors (error: 'virtual std::string ClassFlow::getReadout()' was hidden). --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update reply-bot.yaml (#3107) * Fix actions-label-commenter * Update Helper.cpp * Update Helper.h * Update Helper.cpp * Update readconfigparam.js fix for: In the selected field the value '1' in the section 'TakeImage' in the field 'CamGainceiling' is invalid. PLEASE CHECK BEFORE SAVING! * proposal for renaming and documentation (#3115) * Update server_camera.cpp Fix building with -D DEBUG_DETAIL_ON better alternative to: https://github.com/jomjol/AI-on-the-edge-device/pull/3160 * Update ClassFlowPostProcessing.cpp * Update ClassFlowAlignment.cpp * Fix building with `-D DEBUG_DETAIL_ON` (#3160) Building with `-D DEBUG_DETAIL_ON` has been broken since #3029. Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Handle empty prevalue.ini gracefully (#3162) Fixes #2149. * Bugfix for boot loop (#3175) * Add files via upload * Add files via upload * Add files via upload * Delete param-docs/parameter-pages/TakeImage/Aec2.md has been replaced by CamAec2.md * Delete param-docs/parameter-pages/TakeImage/AutoExposureLevel.md has been replaced by CamAeLevel.md * Delete param-docs/parameter-pages/TakeImage/Brightness.md has been replaced by CamBrightness.md * Delete param-docs/parameter-pages/TakeImage/Contrast.md has been replaced by CamContrast.md * Delete param-docs/parameter-pages/TakeImage/Grayscale.md has been replaced by CamSpecialEffect.md * Delete param-docs/parameter-pages/TakeImage/Negative.md has been replaced by CamSpecialEffect.md * Delete param-docs/parameter-pages/TakeImage/Saturation.md has been replaced by CamSaturation.md * Delete param-docs/parameter-pages/TakeImage/Sharpness.md has been replaced by CamSharpness.md * Delete param-docs/parameter-pages/TakeImage/ImageQuality.md has been replaced by CamQuality.md * Delete param-docs/parameter-pages/TakeImage/Zoom.md has been replaced by CamZoom.md * Delete param-docs/parameter-pages/TakeImage/ZoomMode.md has been replaced by CamZoomSize.md * Delete param-docs/parameter-pages/TakeImage/ZoomOffsetX.md has been replaced by CamZoomOffsetX.md * Delete param-docs/parameter-pages/TakeImage/ZoomOffsetY.md has been replaced by CamZoomOffsetY.md * Delete param-docs/parameter-pages/TakeImage/ImageSize.md has been replaced by CamZoomSize.md * Delete param-docs/parameter-pages/TakeImage/FixedExposure.md has been replaced by CamAec.md * Delete param-docs/parameter-pages/Alignment/FlipImageSize.md has been replaced by CamVflip.md * Delete param-docs/parameter-pages/Alignment/InitialMirror.md has been replaced by CamHmirror.md * CamParameter documentation update https://github.com/jomjol/AI-on-the-edge-device/issues/3185 * typo * add Webhook #3148 (#3163) * WIP add Webhook * fix config html for webhook add tooltips for webhook * webhook: fix not enabling webhook * send webhook as json * Update ApiKey.md * webhook: fix only sending last "Number" * webhook JSON is now closer to the data log in CSV format * webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Bugfix for time stamp (#3180) * Update ClassFlowPostProcessing.cpp * Update ClassFlowDefineTypes.h * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update ClassFlowPostProcessing.cpp * Update interface_webhook.cpp * Update readconfigcommon.js fix for: The same message("Image Contrast got enhanced") came up with "Update Marker" and "Enhance Image Contrast". * fix svg favicon The svg one got added in33893eb566but does not work on Firefox * Update platformIO to 6.8.1 (Contains ESP IDF 5.3) (#3196) * Update platformIO to 6.8.1 (ESP IDF 5.3) * removed now redundant typedef * updated IDF manifest hash * Add files via upload so it should work now * Update server_main.cpp --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: michael <Heinrich-Tuning@web.de> * Update MainFlowControl.cpp * Add support for OV5640 camera (#3063) * Add support for OV5640 camera * clean up sharpness handling * limit sharpness range to -2 and +2 * refactor * Fix OV3660 sharpness handling * refactor sharpness handling * fix OV3660 zoom mode * reinstate aspect ratio via imageSize * Changed OV5640 full frame size to match datasheet * various fixes * add denoise config and general clean up * fix line endings to LF * Support enabling red blue swap via web interface * update jpeg quality limits * remove color swap config; color swap workaround dependent on vflip * fix missing commit * fix gain ceiling * Update cam vflip param page * fix typo: camdenoise, not camsdenoise * fix compile errors * Update MainFlowControl.cpp * Add rate threshold parameter (#3195) * still needs to be tested https://github.com/jomjol/AI-on-the-edge-device/issues/3143 * Update ClassFlowPostProcessing.cpp code formatting * Update ClassFlowDefineTypes.h code formatting * Update ClassFlowPostProcessing.h code formatting * Update edit_config_template.html * fix * Update config.ini * Update edit_config_template.html * Updated param doc * Rename parameters * Update edit_config_template.html * Update NUMBER.ChangeRateThreshold.md * Update NUMBER.ChangeRateThreshold.md --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Update main.cpp * Update config.ini Adjusted camera settings to make the image brighter. * Update readconfigparam.js Adjusted camera settings to make the image brighter. * add optional ImageUpload for Webhook (#3174) * WIP add Webhook * fix config html for webhook add tooltips for webhook * webhook: fix not enabling webhook * send webhook as json * Update ApiKey.md * webhook: fix only sending last "Number" * webhook JSON is now closer to the data log in CSV format * webhook: add img upload * webhoop added config for imgupload * webhook html fixes * webhook: drop timeStampTimeUTC and switch from timeStamp to lastvalue like lokal csv to fix no timestamp on error * add checkbox for Webhook_UploadImg * Update sd-card/html/edit_config_template.html * Update edit_config_template.html * Update edit_config_template.html * Update edit_config_template.html * added a long timestamp to both webhook requests --------- Co-authored-by: CaCO3 <caco3@ruinelli.ch> * Add files via upload (#3207) * Update ClassFlowPostProcessing.cpp deleted some unnecessary double entries RateType renamed to MaxRateType * Update ClassFlowDefineTypes.h RateType renamed to MaxRateType * Update text on recognition page * Update digital CNN * add a Delay between the WiFi reconnections (#3068) * add a Delay between the WiFi reconnections * log the delay between the WiFi reconnections move the delay after the log * cleanup * cleanup * cleanup * Update edit_alignment.html * cleanup * cleanup * Update platformIO to 6.9.0 (Contains ESP IDF 5.3.1) * Handle crash on corrupted model (#3220) * Upgrade esp-tflite-micro to 1.3.1 * Added log message to hint in case it crashes on loading a corrupted model --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * new dig-class100-173-s2-q on 23.800 images (#3257) * new dig-class100-173-s2-q on 23.800 images * platformio/espressif32 @ 6.8.1 for esp32cam-dev * Revert "platformio/espressif32 @ 6.8.1 for esp32cam-dev" This reverts commitcc9297d483. * not using platformio 6.1.16 * Revert "not using platformio 6.1.16" This reverts commitef18e4fae7. * moved number edit box styles into new file edit_style.css (#3262) changed input[type=number] from 60px to 3em, to show 3 digits with current font size. * added note about only TLS 1.2 is supported (#3213) * Renamed digital to digit (#3219) * renamed Digital to Digit * added param migration * Update .github/label-commenter-config.yaml * renamed AnalogDigitTransition* to AnalogToDigitTransition* --------- Co-authored-by: CaCO3 <caco@ruinelli.ch> * Update Changelog.md * Update Changelog.md --------- Co-authored-by: jomjol <30766535+jomjol@users.noreply.github.com> Co-authored-by: michael <Heinrich-Tuning@web.de> Co-authored-by: Frank Haverland <fspapaping@googlemail.com> Co-authored-by: kub3let <95883234+kub3let@users.noreply.github.com> Co-authored-by: Marco H <myxor@users.noreply.github.com> Co-authored-by: Henry Thasler <henrythasler@users.noreply.github.com> Co-authored-by: CaCO3 <caco@ruinelli.ch> Co-authored-by: Sebastian Lövdahl <slovdahl@hibox.fi> Co-authored-by: Raphael Hehl <raphael@rhehl.de> Co-authored-by: jasaw <jasaw@dius.com.au> Co-authored-by: Francesco Carnielli <hex7c0@gmail.com> Co-authored-by: kalwados <kalwados@gmx.de>
620 lines
19 KiB
C++
620 lines
19 KiB
C++
#include <iostream>
|
|
#include <string>
|
|
#include <vector>
|
|
#include <regex>
|
|
|
|
#include "ClassFlowTakeImage.h"
|
|
#include "Helper.h"
|
|
#include "ClassLogFile.h"
|
|
|
|
#include "CImageBasis.h"
|
|
#include "ClassControllCamera.h"
|
|
#include "MainFlowControl.h"
|
|
|
|
#include "esp_wifi.h"
|
|
#include "esp_log.h"
|
|
#include "../../include/defines.h"
|
|
#include "psram.h"
|
|
|
|
#include <time.h>
|
|
|
|
// #define DEBUG_DETAIL_ON
|
|
// #define WIFITURNOFF
|
|
|
|
static const char *TAG = "TAKEIMAGE";
|
|
|
|
esp_err_t ClassFlowTakeImage::camera_capture(void)
|
|
{
|
|
string nm = namerawimage;
|
|
Camera.CaptureToFile(nm);
|
|
time(&TimeImageTaken);
|
|
localtime(&TimeImageTaken);
|
|
|
|
return ESP_OK;
|
|
}
|
|
|
|
void ClassFlowTakeImage::takePictureWithFlash(int flash_duration)
|
|
{
|
|
// in case the image is flipped, it must be reset here //
|
|
rawImage->width = CCstatus.ImageWidth;
|
|
rawImage->height = CCstatus.ImageHeight;
|
|
|
|
ESP_LOGD(TAG, "flash_duration: %d", flash_duration);
|
|
|
|
Camera.CaptureToBasisImage(rawImage, flash_duration);
|
|
|
|
time(&TimeImageTaken);
|
|
localtime(&TimeImageTaken);
|
|
|
|
if (CCstatus.SaveAllFiles)
|
|
{
|
|
rawImage->SaveToFile(namerawimage);
|
|
}
|
|
}
|
|
|
|
void ClassFlowTakeImage::SetInitialParameter(void)
|
|
{
|
|
TimeImageTaken = 0;
|
|
rawImage = NULL;
|
|
disabled = false;
|
|
namerawimage = "/sdcard/img_tmp/raw.jpg";
|
|
}
|
|
|
|
// auslesen der Kameraeinstellungen aus der config.ini
|
|
// wird beim Start aufgerufen
|
|
bool ClassFlowTakeImage::ReadParameter(FILE *pfile, string &aktparamgraph)
|
|
{
|
|
Camera.getSensorDatenToCCstatus(); // Kamera >>> CCstatus
|
|
|
|
std::vector<string> splitted;
|
|
|
|
aktparamgraph = trim(aktparamgraph);
|
|
|
|
if (aktparamgraph.size() == 0)
|
|
{
|
|
if (!this->GetNextParagraph(pfile, aktparamgraph))
|
|
{
|
|
return false;
|
|
}
|
|
}
|
|
|
|
if (aktparamgraph.compare("[TakeImage]") != 0)
|
|
{
|
|
// Paragraph does not fit TakeImage
|
|
return false;
|
|
}
|
|
|
|
while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
|
|
{
|
|
splitted = ZerlegeZeile(aktparamgraph);
|
|
|
|
if ((toUpper(splitted[0]) == "RAWIMAGESLOCATION") && (splitted.size() > 1))
|
|
{
|
|
imagesLocation = "/sdcard" + splitted[1];
|
|
isLogImage = true;
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
this->imagesRetention = std::stod(splitted[1]);
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.SaveAllFiles = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "WAITBEFORETAKINGPICTURE") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _WaitBeforePicture = std::stoi(splitted[1]);
|
|
if (_WaitBeforePicture != 0)
|
|
{
|
|
CCstatus.WaitBeforePicture = _WaitBeforePicture;
|
|
}
|
|
else
|
|
{
|
|
CCstatus.WaitBeforePicture = 2;
|
|
}
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMGAINCEILING") && (splitted.size() > 1))
|
|
{
|
|
std::string _ImageGainceiling = toUpper(splitted[1]);
|
|
|
|
if (isStringNumeric(_ImageGainceiling))
|
|
{
|
|
int _ImageGainceiling_ = std::stoi(_ImageGainceiling);
|
|
switch (_ImageGainceiling_)
|
|
{
|
|
case 1:
|
|
CFstatus.ImageGainceiling = GAINCEILING_4X;
|
|
break;
|
|
case 2:
|
|
CFstatus.ImageGainceiling = GAINCEILING_8X;
|
|
break;
|
|
case 3:
|
|
CFstatus.ImageGainceiling = GAINCEILING_16X;
|
|
break;
|
|
case 4:
|
|
CFstatus.ImageGainceiling = GAINCEILING_32X;
|
|
break;
|
|
case 5:
|
|
CFstatus.ImageGainceiling = GAINCEILING_64X;
|
|
break;
|
|
case 6:
|
|
CFstatus.ImageGainceiling = GAINCEILING_128X;
|
|
break;
|
|
default:
|
|
CFstatus.ImageGainceiling = GAINCEILING_2X;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
if (_ImageGainceiling == "X4")
|
|
{
|
|
CCstatus.ImageGainceiling = GAINCEILING_4X;
|
|
}
|
|
else if (_ImageGainceiling == "X8")
|
|
{
|
|
CCstatus.ImageGainceiling = GAINCEILING_8X;
|
|
}
|
|
else if (_ImageGainceiling == "X16")
|
|
{
|
|
CCstatus.ImageGainceiling = GAINCEILING_16X;
|
|
}
|
|
else if (_ImageGainceiling == "X32")
|
|
{
|
|
CCstatus.ImageGainceiling = GAINCEILING_32X;
|
|
}
|
|
else if (_ImageGainceiling == "X64")
|
|
{
|
|
CCstatus.ImageGainceiling = GAINCEILING_64X;
|
|
}
|
|
else if (_ImageGainceiling == "X128")
|
|
{
|
|
CCstatus.ImageGainceiling = GAINCEILING_128X;
|
|
}
|
|
else
|
|
{
|
|
CCstatus.ImageGainceiling = GAINCEILING_2X;
|
|
}
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMQUALITY") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageQuality = std::stoi(splitted[1]);
|
|
CCstatus.ImageQuality = clipInt(_ImageQuality, 63, 6);
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMBRIGHTNESS") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageBrightness = std::stoi(splitted[1]);
|
|
CCstatus.ImageBrightness = clipInt(_ImageBrightness, 2, -2);
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMCONTRAST") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageContrast = std::stoi(splitted[1]);
|
|
CCstatus.ImageContrast = clipInt(_ImageContrast, 2, -2);
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMSATURATION") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageSaturation = std::stoi(splitted[1]);
|
|
CCstatus.ImageSaturation = clipInt(_ImageSaturation, 2, -2);
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMSHARPNESS") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageSharpness = std::stoi(splitted[1]);
|
|
if (CCstatus.CamSensor_id == OV2640_PID)
|
|
{
|
|
CCstatus.ImageSharpness = clipInt(_ImageSharpness, 2, -2);
|
|
}
|
|
else
|
|
{
|
|
CCstatus.ImageSharpness = clipInt(_ImageSharpness, 3, -3);
|
|
}
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMAUTOSHARPNESS") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageAutoSharpness = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMSPECIALEFFECT") && (splitted.size() > 1))
|
|
{
|
|
std::string _ImageSpecialEffect = toUpper(splitted[1]);
|
|
|
|
if (isStringNumeric(_ImageSpecialEffect))
|
|
{
|
|
int _ImageSpecialEffect_ = std::stoi(_ImageSpecialEffect);
|
|
CFstatus.ImageSpecialEffect = clipInt(_ImageSpecialEffect_, 6, 0);
|
|
}
|
|
else
|
|
{
|
|
if (_ImageSpecialEffect == "NEGATIVE")
|
|
{
|
|
CCstatus.ImageSpecialEffect = 1;
|
|
}
|
|
else if (_ImageSpecialEffect == "GRAYSCALE")
|
|
{
|
|
CCstatus.ImageSpecialEffect = 2;
|
|
}
|
|
else if (_ImageSpecialEffect == "RED")
|
|
{
|
|
CCstatus.ImageSpecialEffect = 3;
|
|
}
|
|
else if (_ImageSpecialEffect == "GREEN")
|
|
{
|
|
CCstatus.ImageSpecialEffect = 4;
|
|
}
|
|
else if (_ImageSpecialEffect == "BLUE")
|
|
{
|
|
CCstatus.ImageSpecialEffect = 5;
|
|
}
|
|
else if (_ImageSpecialEffect == "RETRO")
|
|
{
|
|
CCstatus.ImageSpecialEffect = 6;
|
|
}
|
|
else
|
|
{
|
|
CCstatus.ImageSpecialEffect = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMWBMODE") && (splitted.size() > 1))
|
|
{
|
|
std::string _ImageWbMode = toUpper(splitted[1]);
|
|
|
|
if (isStringNumeric(_ImageWbMode))
|
|
{
|
|
int _ImageWbMode_ = std::stoi(_ImageWbMode);
|
|
CFstatus.ImageWbMode = clipInt(_ImageWbMode_, 4, 0);
|
|
}
|
|
else
|
|
{
|
|
if (_ImageWbMode == "SUNNY")
|
|
{
|
|
CCstatus.ImageWbMode = 1;
|
|
}
|
|
else if (_ImageWbMode == "CLOUDY")
|
|
{
|
|
CCstatus.ImageWbMode = 2;
|
|
}
|
|
else if (_ImageWbMode == "OFFICE")
|
|
{
|
|
CCstatus.ImageWbMode = 3;
|
|
}
|
|
else if (_ImageWbMode == "HOME")
|
|
{
|
|
CCstatus.ImageWbMode = 4;
|
|
}
|
|
else
|
|
{
|
|
CCstatus.ImageWbMode = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMAWB") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageAwb = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMAWBGAIN") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageAwbGain = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMAEC") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageAec = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMAEC2") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageAec2 = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMAELEVEL") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageAeLevel = std::stoi(splitted[1]);
|
|
if (CCstatus.CamSensor_id == OV2640_PID)
|
|
{
|
|
CCstatus.ImageAeLevel = clipInt(_ImageAeLevel, 2, -2);
|
|
}
|
|
else
|
|
{
|
|
CCstatus.ImageAeLevel = clipInt(_ImageAeLevel, 5, -5);
|
|
}
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMAECVALUE") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageAecValue = std::stoi(splitted[1]);
|
|
CCstatus.ImageAecValue = clipInt(_ImageAecValue, 1200, 0);
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMAGC") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageAgc = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMAGCGAIN") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageAgcGain = std::stoi(splitted[1]);
|
|
CCstatus.ImageAgcGain = clipInt(_ImageAgcGain, 30, 0);
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMBPC") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageBpc = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMWPC") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageWpc = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMRAWGMA") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageRawGma = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMLENC") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageLenc = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMHMIRROR") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageHmirror = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMVFLIP") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageVflip = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMDCW") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageDcw = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMDENOISE") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageDenoiseLevel = std::stoi(splitted[1]);
|
|
if (CCstatus.CamSensor_id == OV2640_PID)
|
|
{
|
|
CCstatus.ImageDenoiseLevel = 0;
|
|
}
|
|
else
|
|
{
|
|
CCstatus.ImageDenoiseLevel = clipInt(_ImageDenoiseLevel, 8, 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMZOOM") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.ImageZoomEnabled = alphanumericToBoolean(splitted[1]);
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETX") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageZoomOffsetX = std::stoi(splitted[1]);
|
|
if (CCstatus.CamSensor_id == OV2640_PID)
|
|
{
|
|
CCstatus.ImageZoomOffsetX = clipInt(_ImageZoomOffsetX, 480, -480);
|
|
}
|
|
else if (CCstatus.CamSensor_id == OV3660_PID)
|
|
{
|
|
CCstatus.ImageZoomOffsetX = clipInt(_ImageZoomOffsetX, 704, -704);
|
|
}
|
|
else if (CCstatus.CamSensor_id == OV5640_PID)
|
|
{
|
|
CCstatus.ImageZoomOffsetX = clipInt(_ImageZoomOffsetX, 960, -960);
|
|
}
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETY") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageZoomOffsetY = std::stoi(splitted[1]);
|
|
if (CCstatus.CamSensor_id == OV2640_PID)
|
|
{
|
|
CCstatus.ImageZoomOffsetY = clipInt(_ImageZoomOffsetY, 360, -360);
|
|
}
|
|
else if (CCstatus.CamSensor_id == OV3660_PID)
|
|
{
|
|
CCstatus.ImageZoomOffsetY = clipInt(_ImageZoomOffsetY, 528, -528);
|
|
}
|
|
else if (CCstatus.CamSensor_id == OV5640_PID)
|
|
{
|
|
CCstatus.ImageZoomOffsetY = clipInt(_ImageZoomOffsetY, 720, -720);
|
|
}
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "CAMZOOMSIZE") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
int _ImageZoomSize = std::stoi(splitted[1]);
|
|
if (CCstatus.CamSensor_id == OV2640_PID)
|
|
{
|
|
CCstatus.ImageZoomSize = clipInt(_ImageZoomSize, 29, 0);
|
|
}
|
|
else if (CCstatus.CamSensor_id == OV3660_PID)
|
|
{
|
|
CCstatus.ImageZoomSize = clipInt(_ImageZoomSize, 43, 0);
|
|
}
|
|
else if (CCstatus.CamSensor_id == OV5640_PID)
|
|
{
|
|
CCstatus.ImageZoomSize = clipInt(_ImageZoomSize, 59, 0);
|
|
}
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "LEDINTENSITY") && (splitted.size() > 1))
|
|
{
|
|
if (isStringNumeric(splitted[1]))
|
|
{
|
|
float ledintensity = std::stof(splitted[1]);
|
|
Camera.SetLEDIntensity(ledintensity);
|
|
}
|
|
}
|
|
|
|
else if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1))
|
|
{
|
|
CCstatus.DemoMode = alphanumericToBoolean(splitted[1]);
|
|
if (CCstatus.DemoMode == true)
|
|
{
|
|
Camera.useDemoMode();
|
|
}
|
|
}
|
|
}
|
|
|
|
Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
|
|
Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize, CCstatus.ImageVflip);
|
|
|
|
rawImage = new CImageBasis("rawImage");
|
|
rawImage->CreateEmptyImage(CCstatus.ImageWidth, CCstatus.ImageHeight, 3);
|
|
|
|
return true;
|
|
}
|
|
|
|
ClassFlowTakeImage::ClassFlowTakeImage(std::vector<ClassFlow *> *lfc) : ClassFlowImage(lfc, TAG)
|
|
{
|
|
imagesLocation = "/log/source";
|
|
imagesRetention = 5;
|
|
SetInitialParameter();
|
|
}
|
|
|
|
string ClassFlowTakeImage::getHTMLSingleStep(string host)
|
|
{
|
|
string result;
|
|
result = "Raw Image: <br>\n<img src=\"" + host + "/img_tmp/raw.jpg\">\n";
|
|
return result;
|
|
}
|
|
|
|
// wird bei jeder Auswertrunde aufgerufen
|
|
bool ClassFlowTakeImage::doFlow(string zwtime)
|
|
{
|
|
psram_init_shared_memory_for_take_image_step();
|
|
|
|
string logPath = CreateLogFolder(zwtime);
|
|
|
|
int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - Before takePictureWithFlash");
|
|
#endif
|
|
|
|
#ifdef WIFITURNOFF
|
|
esp_wifi_stop(); // to save power usage and
|
|
#endif
|
|
|
|
// wenn die Kameraeinstellungen durch Erstellen eines neuen Referenzbildes verändert wurden, müssen sie neu gesetzt werden
|
|
if (CFstatus.changedCameraSettings)
|
|
{
|
|
Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
|
|
Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize, CCstatus.ImageVflip);
|
|
CFstatus.changedCameraSettings = false;
|
|
}
|
|
|
|
takePictureWithFlash(flash_duration);
|
|
|
|
#ifdef WIFITURNOFF
|
|
esp_wifi_start();
|
|
#endif
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After takePictureWithFlash");
|
|
#endif
|
|
|
|
LogImage(logPath, "raw", NULL, NULL, zwtime, rawImage);
|
|
|
|
RemoveOldLogs();
|
|
|
|
#ifdef DEBUG_DETAIL_ON
|
|
LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - After RemoveOldLogs");
|
|
#endif
|
|
|
|
psram_deinit_shared_memory_for_take_image_step();
|
|
|
|
return true;
|
|
}
|
|
|
|
esp_err_t ClassFlowTakeImage::SendRawJPG(httpd_req_t *req)
|
|
{
|
|
int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
|
|
time(&TimeImageTaken);
|
|
localtime(&TimeImageTaken);
|
|
|
|
return Camera.CaptureToHTTP(req, flash_duration);
|
|
}
|
|
|
|
ImageData *ClassFlowTakeImage::SendRawImage(void)
|
|
{
|
|
CImageBasis *zw = new CImageBasis("SendRawImage", rawImage);
|
|
ImageData *id;
|
|
int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
|
|
Camera.CaptureToBasisImage(zw, flash_duration);
|
|
time(&TimeImageTaken);
|
|
localtime(&TimeImageTaken);
|
|
|
|
id = zw->writeToMemoryAsJPG();
|
|
delete zw;
|
|
return id;
|
|
}
|
|
|
|
time_t ClassFlowTakeImage::getTimeImageTaken(void)
|
|
{
|
|
return TimeImageTaken;
|
|
}
|
|
|
|
ClassFlowTakeImage::~ClassFlowTakeImage(void)
|
|
{
|
|
delete rawImage;
|
|
}
|