This commit is contained in:
michael
2026-01-17 02:49:32 +01:00
parent a1ccda2e88
commit 4905663933
283 changed files with 32074 additions and 15759 deletions

View File

@@ -1,3 +1,5 @@
#include "defines.h"
#include <iostream>
#include <string>
#include <vector>
@@ -13,20 +15,16 @@
#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);
std::string file_name = NameRawImage;
Camera.capture_to_file(file_name);
time(&TimeImageTaken);
localtime(&TimeImageTaken);
@@ -38,17 +36,22 @@ 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;
if (Camera.CamTempImage)
{
rawImage->width = CFstatus.ImageWidth;
rawImage->height = CFstatus.ImageHeight;
}
ESP_LOGD(TAG, "flash_duration: %d", flash_duration);
Camera.CaptureToBasisImage(rawImage, flash_duration);
Camera.capture_to_basis_image(rawImage, flash_duration);
time(&TimeImageTaken);
localtime(&TimeImageTaken);
if (CCstatus.SaveAllFiles)
if (Camera.SaveAllFiles)
{
rawImage->SaveToFile(namerawimage);
rawImage->SaveToFile(NameRawImage);
}
}
@@ -56,466 +59,447 @@ void ClassFlowTakeImage::SetInitialParameter(void)
{
TimeImageTaken = 0;
rawImage = NULL;
NameRawImage = "/sdcard/img_tmp/raw.jpg";
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)
bool ClassFlowTakeImage::ReadParameter(FILE *pFile, std::string &aktparamgraph)
{
Camera.getSensorDatenToCCstatus(); // Kamera >>> CCstatus
std::vector<string> splitted;
aktparamgraph = trim(aktparamgraph);
aktparamgraph = trim_string_left_right(aktparamgraph);
if (aktparamgraph.size() == 0)
{
if (!this->GetNextParagraph(pfile, aktparamgraph))
if (!GetNextParagraph(pFile, aktparamgraph))
{
return false;
}
}
if (aktparamgraph.compare("[TakeImage]") != 0)
if ((to_upper(aktparamgraph).compare("[TAKEIMAGE]") != 0) && (to_upper(aktparamgraph).compare(";[TAKEIMAGE]") != 0))
{
// Paragraph does not fit TakeImage
return false;
}
while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph))
Camera.get_sensor_controll_config(&CCstatus); // Kamera >>> CCstatus
std::vector<std::string> splitted;
while (getNextLine(pFile, &aktparamgraph) && !isNewParagraph(aktparamgraph))
{
splitted = ZerlegeZeile(aktparamgraph);
splitted = split_line(aktparamgraph);
if ((toUpper(splitted[0]) == "RAWIMAGESLOCATION") && (splitted.size() > 1))
if (splitted.size() > 1)
{
imagesLocation = "/sdcard" + splitted[1];
isLogImage = true;
}
std::string _param = to_upper(splitted[0]);
else if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1))
{
if (isStringNumeric(splitted[1]))
if (_param == "RAWIMAGESLOCATION")
{
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]))
imagesLocation = "/sdcard" + splitted[1];
isLogImage = true;
}
else if (_param == "RAWIMAGESRETENTION")
{
int _WaitBeforePicture = std::stoi(splitted[1]);
if (_WaitBeforePicture != 0)
if (is_string_numeric(splitted[1]))
{
CCstatus.WaitBeforePicture = _WaitBeforePicture;
imagesRetention = std::stod(splitted[1]);
}
}
else if (_param == "SAVEALLFILES")
{
Camera.SaveAllFiles = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "WAITBEFORETAKINGPICTURE")
{
if (is_string_numeric(splitted[1]))
{
int _WaitBeforePicture = std::stoi(splitted[1]);
if (_WaitBeforePicture != 0)
{
CCstatus.WaitBeforePicture = _WaitBeforePicture;
}
else
{
CCstatus.WaitBeforePicture = 2;
}
}
}
else if (_param == "CAMXCLKFREQMHZ")
{
if (is_string_numeric(splitted[1]))
{
int _CamXclkFreqMhz = std::stoi(splitted[1]);
CCstatus.CamXclkFreqMhz = clip_int(_CamXclkFreqMhz, 20, 1);
}
}
else if (_param == "CAMGAINCEILING")
{
std::string _ImageGainceiling = to_upper(splitted[1]);
if (is_string_numeric(_ImageGainceiling))
{
int _ImageGainceiling_ = std::stoi(_ImageGainceiling);
switch (_ImageGainceiling_)
{
case 1:
CCstatus.ImageGainceiling = GAINCEILING_4X;
break;
case 2:
CCstatus.ImageGainceiling = GAINCEILING_8X;
break;
case 3:
CCstatus.ImageGainceiling = GAINCEILING_16X;
break;
case 4:
CCstatus.ImageGainceiling = GAINCEILING_32X;
break;
case 5:
CCstatus.ImageGainceiling = GAINCEILING_64X;
break;
case 6:
CCstatus.ImageGainceiling = GAINCEILING_128X;
break;
default:
CCstatus.ImageGainceiling = GAINCEILING_2X;
}
}
else
{
CCstatus.WaitBeforePicture = 2;
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]) == "CAMGAINCEILING") && (splitted.size() > 1))
{
std::string _ImageGainceiling = toUpper(splitted[1]);
if (isStringNumeric(_ImageGainceiling))
else if (_param == "CAMQUALITY")
{
int _ImageGainceiling_ = std::stoi(_ImageGainceiling);
switch (_ImageGainceiling_)
if (is_string_numeric(splitted[1]))
{
case 1:
CCstatus.ImageGainceiling = GAINCEILING_4X;
break;
case 2:
CCstatus.ImageGainceiling = GAINCEILING_8X;
break;
case 3:
CCstatus.ImageGainceiling = GAINCEILING_16X;
break;
case 4:
CCstatus.ImageGainceiling = GAINCEILING_32X;
break;
case 5:
CCstatus.ImageGainceiling = GAINCEILING_64X;
break;
case 6:
CCstatus.ImageGainceiling = GAINCEILING_128X;
break;
default:
CCstatus.ImageGainceiling = GAINCEILING_2X;
int _ImageQuality = std::stoi(splitted[1]);
CCstatus.ImageQuality = clip_int(_ImageQuality, 63, 6);
}
}
else
else if (_param == "CAMBRIGHTNESS")
{
if (_ImageGainceiling == "X4")
if (is_string_numeric(splitted[1]))
{
CCstatus.ImageGainceiling = GAINCEILING_4X;
int _ImageBrightness = std::stoi(splitted[1]);
CCstatus.ImageBrightness = clip_int(_ImageBrightness, 2, -2);
}
else if (_ImageGainceiling == "X8")
}
else if (_param == "CAMCONTRAST")
{
if (is_string_numeric(splitted[1]))
{
CCstatus.ImageGainceiling = GAINCEILING_8X;
int _ImageContrast = std::stoi(splitted[1]);
CCstatus.ImageContrast = clip_int(_ImageContrast, 2, -2);
}
else if (_ImageGainceiling == "X16")
}
else if (_param == "CAMSATURATION")
{
if (is_string_numeric(splitted[1]))
{
CCstatus.ImageGainceiling = GAINCEILING_16X;
int _ImageSaturation = std::stoi(splitted[1]);
CCstatus.ImageSaturation = clip_int(_ImageSaturation, 2, -2);
}
else if (_ImageGainceiling == "X32")
}
else if (_param == "CAMSHARPNESS")
{
if (is_string_numeric(splitted[1]))
{
CCstatus.ImageGainceiling = GAINCEILING_32X;
int _ImageSharpness = std::stoi(splitted[1]);
if (Camera.CamSensorId == OV2640_PID)
{
CCstatus.ImageSharpness = clip_int(_ImageSharpness, 2, -2);
}
else
{
CCstatus.ImageSharpness = clip_int(_ImageSharpness, 3, -3);
}
}
else if (_ImageGainceiling == "X64")
}
else if (_param == "CAMAUTOSHARPNESS")
{
CCstatus.ImageAutoSharpness = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMSPECIALEFFECT")
{
std::string _ImageSpecialEffect = to_upper(splitted[1]);
if (is_string_numeric(_ImageSpecialEffect))
{
CCstatus.ImageGainceiling = GAINCEILING_64X;
}
else if (_ImageGainceiling == "X128")
{
CCstatus.ImageGainceiling = GAINCEILING_128X;
int _ImageSpecialEffect_ = std::stoi(_ImageSpecialEffect);
CCstatus.ImageSpecialEffect = clip_int(_ImageSpecialEffect_, 6, 0);
}
else
{
CCstatus.ImageGainceiling = GAINCEILING_2X;
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]) == "CAMQUALITY") && (splitted.size() > 1))
{
if (isStringNumeric(splitted[1]))
else if (_param == "CAMWBMODE")
{
int _ImageQuality = std::stoi(splitted[1]);
CCstatus.ImageQuality = clipInt(_ImageQuality, 63, 6);
}
}
std::string _ImageWbMode = to_upper(splitted[1]);
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)
if (is_string_numeric(_ImageWbMode))
{
CCstatus.ImageSharpness = clipInt(_ImageSharpness, 2, -2);
int _ImageWbMode_ = std::stoi(_ImageWbMode);
CCstatus.ImageWbMode = clip_int(_ImageWbMode_, 4, 0);
}
else
{
CCstatus.ImageSharpness = clipInt(_ImageSharpness, 3, -3);
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]) == "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))
else if (_param == "CAMAWB")
{
int _ImageSpecialEffect_ = std::stoi(_ImageSpecialEffect);
CCstatus.ImageSpecialEffect = clipInt(_ImageSpecialEffect_, 6, 0);
CCstatus.ImageAwb = alphanumeric_to_boolean(splitted[1]);
}
else
else if (_param == "CAMAWBGAIN")
{
if (_ImageSpecialEffect == "NEGATIVE")
CCstatus.ImageAwbGain = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMAEC")
{
CCstatus.ImageAec = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMAEC2")
{
CCstatus.ImageAec2 = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMAELEVEL")
{
if (is_string_numeric(splitted[1]))
{
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;
int _ImageAeLevel = std::stoi(splitted[1]);
if (Camera.CamSensorId == OV2640_PID)
{
CCstatus.ImageAeLevel = clip_int(_ImageAeLevel, 2, -2);
}
else
{
CCstatus.ImageAeLevel = clip_int(_ImageAeLevel, 5, -5);
}
}
}
}
else if ((toUpper(splitted[0]) == "CAMWBMODE") && (splitted.size() > 1))
{
std::string _ImageWbMode = toUpper(splitted[1]);
if (isStringNumeric(_ImageWbMode))
else if (_param == "CAMAECVALUE")
{
int _ImageWbMode_ = std::stoi(_ImageWbMode);
CCstatus.ImageWbMode = clipInt(_ImageWbMode_, 4, 0);
}
else
{
if (_ImageWbMode == "SUNNY")
if (is_string_numeric(splitted[1]))
{
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;
int _ImageAecValue = std::stoi(splitted[1]);
CCstatus.ImageAecValue = clip_int(_ImageAecValue, 1200, 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]))
else if (_param == "CAMAGC")
{
int _ImageAeLevel = std::stoi(splitted[1]);
if (CCstatus.CamSensor_id == OV2640_PID)
CCstatus.ImageAgc = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMAGCGAIN")
{
if (is_string_numeric(splitted[1]))
{
CCstatus.ImageAeLevel = clipInt(_ImageAeLevel, 2, -2);
}
else
{
CCstatus.ImageAeLevel = clipInt(_ImageAeLevel, 5, -5);
int _ImageAgcGain = std::stoi(splitted[1]);
CCstatus.ImageAgcGain = clip_int(_ImageAgcGain, 30, 0);
}
}
}
else if ((toUpper(splitted[0]) == "CAMAECVALUE") && (splitted.size() > 1))
{
if (isStringNumeric(splitted[1]))
else if (_param == "CAMBPC")
{
int _ImageAecValue = std::stoi(splitted[1]);
CCstatus.ImageAecValue = clipInt(_ImageAecValue, 1200, 0);
CCstatus.ImageBpc = alphanumeric_to_boolean(splitted[1]);
}
}
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]))
else if (_param == "CAMWPC")
{
int _ImageAgcGain = std::stoi(splitted[1]);
CCstatus.ImageAgcGain = clipInt(_ImageAgcGain, 30, 0);
CCstatus.ImageWpc = alphanumeric_to_boolean(splitted[1]);
}
}
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]))
else if (_param == "CAMRAWGMA")
{
int _ImageDenoiseLevel = std::stoi(splitted[1]);
if (CCstatus.CamSensor_id == OV2640_PID)
CCstatus.ImageRawGma = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMLENC")
{
CCstatus.ImageLenc = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMHMIRROR")
{
CCstatus.ImageHmirror = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMVFLIP")
{
CCstatus.ImageVflip = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMDCW")
{
CCstatus.ImageDcw = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMDENOISE")
{
if (is_string_numeric(splitted[1]))
{
CCstatus.ImageDenoiseLevel = 0;
}
else
{
CCstatus.ImageDenoiseLevel = clipInt(_ImageDenoiseLevel, 8, 0);
int _ImageDenoiseLevel = std::stoi(splitted[1]);
if (Camera.CamSensorId == OV2640_PID)
{
CCstatus.ImageDenoiseLevel = 0;
}
else
{
CCstatus.ImageDenoiseLevel = clip_int(_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]))
else if (_param == "CAMZOOM")
{
int _ImageZoomOffsetX = std::stoi(splitted[1]);
if (CCstatus.CamSensor_id == OV2640_PID)
CCstatus.ImageZoomEnabled = alphanumeric_to_boolean(splitted[1]);
}
else if (_param == "CAMZOOMOFFSETX")
{
if (is_string_numeric(splitted[1]))
{
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);
int _ImageZoomOffsetX = std::stoi(splitted[1]);
if (Camera.CamSensorId == OV2640_PID)
{
CCstatus.ImageZoomOffsetX = clip_int(_ImageZoomOffsetX, 480, -480);
}
else if (Camera.CamSensorId == OV3660_PID)
{
CCstatus.ImageZoomOffsetX = clip_int(_ImageZoomOffsetX, 704, -704);
}
else if (Camera.CamSensorId == OV5640_PID)
{
CCstatus.ImageZoomOffsetX = clip_int(_ImageZoomOffsetX, 960, -960);
}
}
}
}
else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETY") && (splitted.size() > 1))
{
if (isStringNumeric(splitted[1]))
else if (_param == "CAMZOOMOFFSETY")
{
int _ImageZoomOffsetY = std::stoi(splitted[1]);
if (CCstatus.CamSensor_id == OV2640_PID)
if (is_string_numeric(splitted[1]))
{
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);
int _ImageZoomOffsetY = std::stoi(splitted[1]);
if (Camera.CamSensorId == OV2640_PID)
{
CCstatus.ImageZoomOffsetY = clip_int(_ImageZoomOffsetY, 360, -360);
}
else if (Camera.CamSensorId == OV3660_PID)
{
CCstatus.ImageZoomOffsetY = clip_int(_ImageZoomOffsetY, 528, -528);
}
else if (Camera.CamSensorId == OV5640_PID)
{
CCstatus.ImageZoomOffsetY = clip_int(_ImageZoomOffsetY, 720, -720);
}
}
}
}
else if ((toUpper(splitted[0]) == "CAMZOOMSIZE") && (splitted.size() > 1))
{
if (isStringNumeric(splitted[1]))
else if (_param == "CAMZOOMSIZE")
{
int _ImageZoomSize = std::stoi(splitted[1]);
if (CCstatus.CamSensor_id == OV2640_PID)
if (is_string_numeric(splitted[1]))
{
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);
int _ImageZoomSize = std::stoi(splitted[1]);
if (Camera.CamSensorId == OV2640_PID)
{
CCstatus.ImageZoomSize = clip_int(_ImageZoomSize, 29, 0);
}
else if (Camera.CamSensorId == OV3660_PID)
{
CCstatus.ImageZoomSize = clip_int(_ImageZoomSize, 43, 0);
}
else if (Camera.CamSensorId == OV5640_PID)
{
CCstatus.ImageZoomSize = clip_int(_ImageZoomSize, 59, 0);
}
}
}
}
else if ((toUpper(splitted[0]) == "LEDINTENSITY") && (splitted.size() > 1))
{
if (isStringNumeric(splitted[1]))
else if (_param == "LEDINTENSITY")
{
int ledintensity = std::stoi(splitted[1]);
CCstatus.ImageLedIntensity = Camera.SetLEDIntensity(ledintensity);
if (is_string_numeric(splitted[1]))
{
int ledintensity = std::stoi(splitted[1]);
CCstatus.ImageLedIntensity = Camera.set_led_intensity(ledintensity);
}
}
}
else if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1))
{
CCstatus.DemoMode = alphanumericToBoolean(splitted[1]);
if (CCstatus.DemoMode == true)
else if (_param == "DEMO")
{
Camera.useDemoMode();
Camera.DemoMode = alphanumeric_to_boolean(splitted[1]);
if (Camera.DemoMode == true)
{
Camera.use_demo_mode();
}
}
}
}
Camera.setSensorDatenFromCCstatus(); // CCstatus >>> Kamera
Camera.SetQualityZoomSize(CCstatus.ImageQuality, CCstatus.ImageFrameSize, CCstatus.ImageZoomEnabled, CCstatus.ImageZoomOffsetX, CCstatus.ImageZoomOffsetY, CCstatus.ImageZoomSize, CCstatus.ImageVflip);
Camera.set_sensor_controll_config(&CCstatus); // CCstatus >>> Kamera
Camera.set_quality_zoom_size(&CCstatus);
Camera.changedCameraSettings = false;
Camera.CamTempImage = false;
rawImage = new CImageBasis("rawImage");
rawImage->CreateEmptyImage(CCstatus.ImageWidth, CCstatus.ImageHeight, 3);
@@ -530,57 +514,39 @@ ClassFlowTakeImage::ClassFlowTakeImage(std::vector<ClassFlow *> *lfc) : ClassFlo
SetInitialParameter();
}
string ClassFlowTakeImage::getHTMLSingleStep(string host)
std::string ClassFlowTakeImage::getHTMLSingleStep(std::string host)
{
string result;
std::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)
bool ClassFlowTakeImage::doFlow(std::string zwtime)
{
psram_init_shared_memory_for_take_image_step();
string logPath = CreateLogFolder(zwtime);
std::string logPath = CreateLogFolder(zwtime);
int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
#ifdef DEBUG_DETAIL_ON
LogFile.WriteHeapInfo("ClassFlowTakeImage::doFlow - Before takePictureWithFlash");
#endif
if (Camera.CamTempImage)
{
flash_duration = (int)(CFstatus.WaitBeforePicture * 1000);
}
#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);
Camera.LedIntensity = CCstatus.ImageLedIntensity;
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;
@@ -589,18 +555,29 @@ bool ClassFlowTakeImage::doFlow(string zwtime)
esp_err_t ClassFlowTakeImage::SendRawJPG(httpd_req_t *req)
{
int flash_duration = (int)(CCstatus.WaitBeforePicture * 1000);
if (Camera.CamTempImage)
{
flash_duration = (int)(CFstatus.WaitBeforePicture * 1000);
}
time(&TimeImageTaken);
localtime(&TimeImageTaken);
return Camera.CaptureToHTTP(req, flash_duration);
return Camera.capture_to_http(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);
if (Camera.CamTempImage)
{
flash_duration = (int)(CFstatus.WaitBeforePicture * 1000);
}
Camera.capture_to_basis_image(zw, flash_duration);
time(&TimeImageTaken);
localtime(&TimeImageTaken);