Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-08 12:36:52 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bugfix for boot loop (#3175)

Browse Source 
* Add files via upload

* Add files via upload

* Add files via upload
This commit is contained in:
michael
2024-08-17 23:02:21 +02:00
committed by GitHub
parent 17fe87b349
commit 7b7544079f
8 changed files with 476 additions and 687 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
code/components/jomjol_flowcontroll/ClassFlowAlignment.cpp
View File

@@ -40,16 +40,14 @@ ClassFlowAlignment::ClassFlowAlignment(std::vector<ClassFlow *> *lfc)
SetInitialParameter(); SetInitialParameter();
ListFlowControll = lfc; ListFlowControll = lfc;
for (int i = 0; i < ListFlowControll->size(); ++i) for (int i = 0; i < ListFlowControll->size(); ++i) {
{ if (((*ListFlowControll)[i])->name().compare("ClassFlowTakeImage") == 0) {
if (((*ListFlowControll)[i])->name().compare("ClassFlowTakeImage") == 0)
{
ImageBasis = ((ClassFlowTakeImage *)(*ListFlowControll)[i])->rawImage; ImageBasis = ((ClassFlowTakeImage *)(*ListFlowControll)[i])->rawImage;
} }
} }
if (!ImageBasis) // the function take pictures does not exist --> must be created first ONLY FOR TEST PURPOSES // the function take pictures does not exist --> must be created first ONLY FOR TEST PURPOSES
{ if (!ImageBasis) {
ESP_LOGD(TAG, "CImageBasis had to be created"); ESP_LOGD(TAG, "CImageBasis had to be created");
ImageBasis = new CImageBasis("ImageBasis", namerawimage); ImageBasis = new CImageBasis("ImageBasis", namerawimage);
} }
@@ -66,8 +64,7 @@ bool ClassFlowAlignment::ReadParameter(FILE *pfile, string &aktparamgraph)
if (aktparamgraph.size() == 0) if (aktparamgraph.size() == 0)
{ {
if (!this->GetNextParagraph(pfile, aktparamgraph)) if (!this->GetNextParagraph(pfile, aktparamgraph)) {
{
return false; return false;
} }
} }
@@ -82,71 +79,66 @@ bool ClassFlowAlignment::ReadParameter(FILE *pfile, string &aktparamgraph)
{ {
splitted = ZerlegeZeile(aktparamgraph); splitted = ZerlegeZeile(aktparamgraph);
if ((toUpper(splitted[0]) == "FLIPIMAGESIZE") && (splitted.size() > 1)) if ((toUpper(splitted[0]) == "FLIPIMAGESIZE") && (splitted.size() > 1)) {
{ initialflip = alphanumericToBoolean(splitted[1]);
if (toUpper(splitted[1]) == "TRUE") }
{ else if (((toUpper(splitted[0]) == "initialrotate") || (toUpper(splitted[0]) == "INITIALROTATE")) && (splitted.size() > 1)) {
initialflip = true; if (isStringNumeric(splitted[1])) {
this->initialrotate = std::stod(splitted[1]);
} }
} }
else if (((toUpper(splitted[0]) == "initialrotate") || (toUpper(splitted[0]) == "INITIALROTATE")) && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "SEARCHFIELDX") && (splitted.size() > 1)) {
{ if (isStringNumeric(splitted[1])) {
this->initialrotate = std::stod(splitted[1]); suchex = std::stod(splitted[1]);
}
else if ((toUpper(splitted[0]) == "SEARCHFIELDX") && (splitted.size() > 1))
{
suchex = std::stod(splitted[1]);
}
else if ((toUpper(splitted[0]) == "SEARCHFIELDY") && (splitted.size() > 1))
{
suchey = std::stod(splitted[1]);
}
else if ((toUpper(splitted[0]) == "ANTIALIASING") && (splitted.size() > 1))
{
if (toUpper(splitted[1]) == "TRUE")
{
use_antialiasing = true;
} }
} }
else if ((splitted.size() == 3) && (anz_ref < 2)) else if ((toUpper(splitted[0]) == "SEARCHFIELDY") && (splitted.size() > 1)) {
{ if (isStringNumeric(splitted[1])) {
References[anz_ref].image_file = FormatFileName("/sdcard" + splitted[0]); suchey = std::stod(splitted[1]);
References[anz_ref].target_x = std::stod(splitted[1]); }
References[anz_ref].target_y = std::stod(splitted[2]); }
anz_ref++; else if ((toUpper(splitted[0]) == "ANTIALIASING") && (splitted.size() > 1)) {
use_antialiasing = alphanumericToBoolean(splitted[1]);
}
else if ((splitted.size() == 3) && (anz_ref < 2)) {
if ((isStringNumeric(splitted[1])) && (isStringNumeric(splitted[2])))
{
References[anz_ref].image_file = FormatFileName("/sdcard" + splitted[0]);
References[anz_ref].target_x = std::stod(splitted[1]);
References[anz_ref].target_y = std::stod(splitted[2]);
anz_ref++;
}
else
{
References[anz_ref].image_file = FormatFileName("/sdcard" + splitted[0]);
References[anz_ref].target_x = 10;
References[anz_ref].target_y = 10;
anz_ref++;
}
} }
else if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1)) {
{ SaveAllFiles = alphanumericToBoolean(splitted[1]);
if (toUpper(splitted[1]) == "TRUE")
{
SaveAllFiles = true;
}
} }
else if ((toUpper(splitted[0]) == "ALIGNMENTALGO") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "ALIGNMENTALGO") && (splitted.size() > 1)) {
{
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
std::string zw2 = "Alignment mode selected: " + splitted[1]; std::string zw2 = "Alignment mode selected: " + splitted[1];
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zw2); LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, zw2);
#endif #endif
if (toUpper(splitted[1]) == "HIGHACCURACY") if (toUpper(splitted[1]) == "HIGHACCURACY") {
{
alg_algo = 1; alg_algo = 1;
} }
if (toUpper(splitted[1]) == "FAST") if (toUpper(splitted[1]) == "FAST") {
{
alg_algo = 2; alg_algo = 2;
} }
if (toUpper(splitted[1]) == "OFF") if (toUpper(splitted[1]) == "OFF") {
{
// no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023 // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
alg_algo = 3; alg_algo = 3;
} }
} }
} }
for (int i = 0; i < anz_ref; ++i) for (int i = 0; i < anz_ref; ++i) {
{
References[i].search_x = suchex; References[i].search_x = suchex;
References[i].search_y = suchey; References[i].search_y = suchey;
References[i].fastalg_SAD_criteria = SAD_criteria; References[i].fastalg_SAD_criteria = SAD_criteria;
@@ -158,8 +150,7 @@ bool ClassFlowAlignment::ReadParameter(FILE *pfile, string &aktparamgraph)
} }
// no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023 // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
if (References[0].alignment_algo != 3) if (References[0].alignment_algo != 3) {
{
return LoadReferenceAlignmentValues(); return LoadReferenceAlignmentValues();
} }
@@ -179,29 +170,25 @@ string ClassFlowAlignment::getHTMLSingleStep(string host)
bool ClassFlowAlignment::doFlow(string time) bool ClassFlowAlignment::doFlow(string time)
{ {
#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
if (!AlgROI) // AlgROI needs to be allocated before ImageTMP to avoid heap fragmentation // AlgROI needs to be allocated before ImageTMP to avoid heap fragmentation
{ if (!AlgROI) {
AlgROI = (ImageData *)heap_caps_realloc(AlgROI, sizeof(ImageData), MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM); AlgROI = (ImageData *)heap_caps_realloc(AlgROI, sizeof(ImageData), MALLOC_CAP_8BIT | MALLOC_CAP_SPIRAM);
if (!AlgROI) if (!AlgROI) {
{
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlgROI"); LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlgROI");
LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow"); LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
} }
} }
if (AlgROI) if (AlgROI) {
{
ImageBasis->writeToMemoryAsJPG((ImageData *)AlgROI, 90); ImageBasis->writeToMemoryAsJPG((ImageData *)AlgROI, 90);
} }
#endif #endif
if (!ImageTMP) if (!ImageTMP) {
{
ImageTMP = new CImageBasis("tmpImage", ImageBasis); // Make sure the name does not get change, it is relevant for the PSRAM allocation! ImageTMP = new CImageBasis("tmpImage", ImageBasis); // Make sure the name does not get change, it is relevant for the PSRAM allocation!
if (!ImageTMP) if (!ImageTMP) {
{
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate tmpImage -> Exec this round aborted!"); LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate tmpImage -> Exec this round aborted!");
LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow"); LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
return false; return false;
@@ -211,8 +198,7 @@ bool ClassFlowAlignment::doFlow(string time)
delete AlignAndCutImage; delete AlignAndCutImage;
AlignAndCutImage = new CAlignAndCutImage("AlignAndCutImage", ImageBasis, ImageTMP); AlignAndCutImage = new CAlignAndCutImage("AlignAndCutImage", ImageBasis, ImageTMP);
if (!AlignAndCutImage) if (!AlignAndCutImage) {
{
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlignAndCutImage -> Exec this round aborted!"); LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Can't allocate AlignAndCutImage -> Exec this round aborted!");
LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow"); LogFile.WriteHeapInfo("ClassFlowAlignment-doFlow");
return false; return false;
@@ -220,8 +206,7 @@ bool ClassFlowAlignment::doFlow(string time)
CRotateImage rt("rawImage", AlignAndCutImage, ImageTMP, initialflip); CRotateImage rt("rawImage", AlignAndCutImage, ImageTMP, initialflip);
if (initialflip) if (initialflip) {
{
int _zw = ImageBasis->height; int _zw = ImageBasis->height;
ImageBasis->height = ImageBasis->width; ImageBasis->height = ImageBasis->width;
ImageBasis->width = _zw; ImageBasis->width = _zw;
@@ -231,38 +216,30 @@ bool ClassFlowAlignment::doFlow(string time)
ImageTMP->height = _zw; ImageTMP->height = _zw;
} }
if ((initialrotate != 0) || initialflip) if ((initialrotate != 0) || initialflip) {
{ if (use_antialiasing) {
if (use_antialiasing)
{
rt.RotateAntiAliasing(initialrotate); rt.RotateAntiAliasing(initialrotate);
} }
else else {
{
rt.Rotate(initialrotate); rt.Rotate(initialrotate);
} }
if (SaveAllFiles) if (SaveAllFiles) {
{
AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/rot.jpg")); AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/rot.jpg"));
} }
} }
// no align algo if set to 3 = off //add disable aligment algo |01.2023 // no align algo if set to 3 = off //add disable aligment algo |01.2023
if (References[0].alignment_algo != 3) if (References[0].alignment_algo != 3) {
{ if (!AlignAndCutImage->Align(&References[0], &References[1])) {
if (!AlignAndCutImage->Align(&References[0], &References[1]))
{
SaveReferenceAlignmentValues(); SaveReferenceAlignmentValues();
} }
} // no align } // no align
#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
if (AlgROI) if (AlgROI) {
{
// no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023 // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
if (References[0].alignment_algo != 3) if (References[0].alignment_algo != 3) {
{
DrawRef(ImageTMP); DrawRef(ImageTMP);
} }
@@ -272,8 +249,7 @@ bool ClassFlowAlignment::doFlow(string time)
} }
#endif #endif
if (SaveAllFiles) if (SaveAllFiles) {
{
AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/alg.jpg")); AlignAndCutImage->SaveToFile(FormatFileName("/sdcard/img_tmp/alg.jpg"));
ImageTMP->SaveToFile(FormatFileName("/sdcard/img_tmp/alg_roi.jpg")); ImageTMP->SaveToFile(FormatFileName("/sdcard/img_tmp/alg_roi.jpg"));
} }
@@ -283,8 +259,7 @@ bool ClassFlowAlignment::doFlow(string time)
ImageTMP = NULL; ImageTMP = NULL;
// no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023 // no align algo if set to 3 = off => no draw ref //add disable aligment algo |01.2023
if (References[0].alignment_algo != 3) if (References[0].alignment_algo != 3) {
{
return LoadReferenceAlignmentValues(); return LoadReferenceAlignmentValues();
} }
@@ -298,8 +273,7 @@ void ClassFlowAlignment::SaveReferenceAlignmentValues()
pFile = fopen(FileStoreRefAlignment.c_str(), "w"); pFile = fopen(FileStoreRefAlignment.c_str(), "w");
if (strlen(zwtime.c_str()) == 0) if (strlen(zwtime.c_str()) == 0) {
{
time_t rawtime; time_t rawtime;
struct tm *timeinfo; struct tm *timeinfo;
char buffer[80]; char buffer[80];
@@ -338,8 +312,9 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
pFile = fopen(FileStoreRefAlignment.c_str(), "r"); pFile = fopen(FileStoreRefAlignment.c_str(), "r");
if (pFile == NULL) if (pFile == NULL) {
return false; return false;
}
fgets(zw, 1024, pFile); fgets(zw, 1024, pFile);
ESP_LOGD(TAG, "%s", zw); ESP_LOGD(TAG, "%s", zw);
@@ -347,8 +322,7 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
fgets(zw, 1024, pFile); fgets(zw, 1024, pFile);
splitted = ZerlegeZeile(std::string(zw), " \t"); splitted = ZerlegeZeile(std::string(zw), " \t");
if (splitted.size() < 6) if (splitted.size() < 6) {
{
fclose(pFile); fclose(pFile);
return false; return false;
} }
@@ -363,8 +337,7 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
fgets(zw, 1024, pFile); fgets(zw, 1024, pFile);
splitted = ZerlegeZeile(std::string(zw)); splitted = ZerlegeZeile(std::string(zw));
if (splitted.size() < 6) if (splitted.size() < 6) {
{
fclose(pFile); fclose(pFile);
return false; return false;
} }
@@ -394,8 +367,7 @@ bool ClassFlowAlignment::LoadReferenceAlignmentValues(void)
void ClassFlowAlignment::DrawRef(CImageBasis *_zw) void ClassFlowAlignment::DrawRef(CImageBasis *_zw)
{ {
if (_zw->ImageOkay()) if (_zw->ImageOkay()) {
{
_zw->drawRect(References[0].target_x, References[0].target_y, References[0].width, References[0].height, 255, 0, 0, 2); _zw->drawRect(References[0].target_x, References[0].target_y, References[0].width, References[0].height, 255, 0, 0, 2);
_zw->drawRect(References[1].target_x, References[1].target_y, References[1].width, References[1].height, 255, 0, 0, 2); _zw->drawRect(References[1].target_x, References[1].target_y, References[1].width, References[1].height, 255, 0, 0, 2);
} }

36
code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp
View File

@@ -19,7 +19,6 @@ static const char* TAG = "CNN";
static heap_trace_record_t trace_record[NUM_RECORDS]; // This buffer must be in internal RAM static heap_trace_record_t trace_record[NUM_RECORDS]; // This buffer must be in internal RAM
#endif #endif
ClassFlowCNNGeneral::ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, t_CNNType _cnntype) : ClassFlowImage(NULL, TAG) { ClassFlowCNNGeneral::ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, t_CNNType _cnntype) : ClassFlowImage(NULL, TAG) {
string cnnmodelfile = ""; string cnnmodelfile = "";
modelxsize = 1; modelxsize = 1;
@@ -36,7 +35,6 @@ ClassFlowCNNGeneral::ClassFlowCNNGeneral(ClassFlowAlignment *_flowalign, t_CNNTy
imagesRetention = 5; imagesRetention = 5;
} }
string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution, int prev, float _before_narrow_Analog, float analogDigitalTransitionStart) { string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution, int prev, float _before_narrow_Analog, float analogDigitalTransitionStart) {
string result = ""; string result = "";
@@ -198,7 +196,6 @@ int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_pred
return result; return result;
} }
// remains only >= 9.x --> no zero crossing yet --> 2.8 --> 2, // remains only >= 9.x --> no zero crossing yet --> 2.8 --> 2,
// and from 9.7(DigitalTransitionRangeLead) 3.1 --> 2 // and from 9.7(DigitalTransitionRangeLead) 3.1 --> 2
// everything >=x.4 can be considered as current number in transition. With 9.x predecessor the current // everything >=x.4 can be considered as current number in transition. With 9.x predecessor the current
@@ -219,7 +216,6 @@ int ClassFlowCNNGeneral::PointerEvalHybridNew(float number, float number_of_pred
return result; return result;
} }
int ClassFlowCNNGeneral::PointerEvalAnalogToDigitNew(float number, float numeral_preceder, int eval_predecessors, float analogDigitalTransitionStart) { int ClassFlowCNNGeneral::PointerEvalAnalogToDigitNew(float number, float numeral_preceder, int eval_predecessors, float analogDigitalTransitionStart) {
int result; int result;
int result_after_decimal_point = ((int) floor(number * 10)) % 10; int result_after_decimal_point = ((int) floor(number * 10)) % 10;
@@ -259,7 +255,6 @@ int ClassFlowCNNGeneral::PointerEvalAnalogToDigitNew(float number, float numeral
return result; return result;
} }
int ClassFlowCNNGeneral::PointerEvalAnalogNew(float number, int numeral_preceder) { int ClassFlowCNNGeneral::PointerEvalAnalogNew(float number, int numeral_preceder) {
float number_min, number_max; float number_min, number_max;
int result; int result;
@@ -296,7 +291,6 @@ int ClassFlowCNNGeneral::PointerEvalAnalogNew(float number, int numeral_preceder
return result; return result;
} }
bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) { bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
std::vector<string> splitted; std::vector<string> splitted;
@@ -322,7 +316,6 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
return true; return true;
} }
while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph)) { while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph)) {
splitted = ZerlegeZeile(aktparamgraph); splitted = ZerlegeZeile(aktparamgraph);
if ((toUpper(splitted[0]) == "ROIIMAGESLOCATION") && (splitted.size() > 1)) { if ((toUpper(splitted[0]) == "ROIIMAGESLOCATION") && (splitted.size() > 1)) {
@@ -336,7 +329,9 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
} }
if ((toUpper(splitted[0]) == "ROIIMAGESRETENTION") && (splitted.size() > 1)) { if ((toUpper(splitted[0]) == "ROIIMAGESRETENTION") && (splitted.size() > 1)) {
this->imagesRetention = std::stoi(splitted[1]); if (isStringNumeric(splitted[1])) {
this->imagesRetention = std::stoi(splitted[1]);
}
} }
if ((toUpper(splitted[0]) == "MODEL") && (splitted.size() > 1)) { if ((toUpper(splitted[0]) == "MODEL") && (splitted.size() > 1)) {
@@ -344,7 +339,9 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
} }
if ((toUpper(splitted[0]) == "CNNGOODTHRESHOLD") && (splitted.size() > 1)) { if ((toUpper(splitted[0]) == "CNNGOODTHRESHOLD") && (splitted.size() > 1)) {
CNNGoodThreshold = std::stof(splitted[1]); if (isStringNumeric(splitted[1])) {
CNNGoodThreshold = std::stof(splitted[1]);
}
} }
if (splitted.size() >= 5) { if (splitted.size() >= 5) {
@@ -366,9 +363,7 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
} }
if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1)) { if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1)) {
if (toUpper(splitted[1]) == "TRUE") { SaveAllFiles = alphanumericToBoolean(splitted[1]);
SaveAllFiles = true;
}
} }
} }
@@ -378,7 +373,6 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
return false; return false;
} }
for (int _ana = 0; _ana < GENERAL.size(); ++_ana) { for (int _ana = 0; _ana < GENERAL.size(); ++_ana) {
for (int i = 0; i < GENERAL[_ana]->ROI.size(); ++i) { for (int i = 0; i < GENERAL[_ana]->ROI.size(); ++i) {
GENERAL[_ana]->ROI[i]->image = new CImageBasis("ROI " + GENERAL[_ana]->ROI[i]->name, GENERAL[_ana]->ROI[i]->image = new CImageBasis("ROI " + GENERAL[_ana]->ROI[i]->name,
@@ -391,7 +385,6 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph) {
return true; return true;
} }
general* ClassFlowCNNGeneral::FindGENERAL(string _name_number) { general* ClassFlowCNNGeneral::FindGENERAL(string _name_number) {
for (int i = 0; i < GENERAL.size(); ++i) { for (int i = 0; i < GENERAL.size(); ++i) {
if (GENERAL[i]->name == _name_number) { if (GENERAL[i]->name == _name_number) {
@@ -402,7 +395,6 @@ general* ClassFlowCNNGeneral::FindGENERAL(string _name_number) {
return NULL; return NULL;
} }
general* ClassFlowCNNGeneral::GetGENERAL(string _name, bool _create = true) { general* ClassFlowCNNGeneral::GetGENERAL(string _name, bool _create = true) {
string _analog, _roi; string _analog, _roi;
int _pospunkt = _name.find_first_of("."); int _pospunkt = _name.find_first_of(".");
@@ -445,7 +437,6 @@ general* ClassFlowCNNGeneral::GetGENERAL(string _name, bool _create = true) {
return _ret; return _ret;
} }
string ClassFlowCNNGeneral::getHTMLSingleStep(string host) { string ClassFlowCNNGeneral::getHTMLSingleStep(string host) {
string result, zw; string result, zw;
std::vector<HTMLInfo*> htmlinfo; std::vector<HTMLInfo*> htmlinfo;
@@ -469,7 +460,6 @@ string ClassFlowCNNGeneral::getHTMLSingleStep(string host) {
return result; return result;
} }
bool ClassFlowCNNGeneral::doFlow(string time) { bool ClassFlowCNNGeneral::doFlow(string time) {
#ifdef HEAP_TRACING_CLASS_FLOW_CNN_GENERAL_DO_ALING_AND_CUT #ifdef HEAP_TRACING_CLASS_FLOW_CNN_GENERAL_DO_ALING_AND_CUT
//register a buffer to record the memory trace //register a buffer to record the memory trace
@@ -500,7 +490,6 @@ bool ClassFlowCNNGeneral::doFlow(string time) {
return true; return true;
} }
bool ClassFlowCNNGeneral::doAlignAndCut(string time) { bool ClassFlowCNNGeneral::doAlignAndCut(string time) {
if (disabled) { if (disabled) {
return true; return true;
@@ -537,7 +526,6 @@ bool ClassFlowCNNGeneral::doAlignAndCut(string time) {
return true; return true;
} }
void ClassFlowCNNGeneral::DrawROI(CImageBasis *_zw) { void ClassFlowCNNGeneral::DrawROI(CImageBasis *_zw) {
if (_zw->ImageOkay()) { if (_zw->ImageOkay()) {
if (CNNType == Analogue || CNNType == Analogue100) { if (CNNType == Analogue || CNNType == Analogue100) {
@@ -564,7 +552,6 @@ void ClassFlowCNNGeneral::DrawROI(CImageBasis *_zw) {
} }
} }
bool ClassFlowCNNGeneral::getNetworkParameter() { bool ClassFlowCNNGeneral::getNetworkParameter() {
if (disabled) { if (disabled) {
return true; return true;
@@ -637,7 +624,6 @@ bool ClassFlowCNNGeneral::getNetworkParameter() {
return true; return true;
} }
bool ClassFlowCNNGeneral::doNeuralNetwork(string time) { bool ClassFlowCNNGeneral::doNeuralNetwork(string time) {
if (disabled) { if (disabled) {
return true; return true;
@@ -842,7 +828,6 @@ bool ClassFlowCNNGeneral::doNeuralNetwork(string time) {
return true; return true;
} }
bool ClassFlowCNNGeneral::isExtendedResolution(int _number) { bool ClassFlowCNNGeneral::isExtendedResolution(int _number) {
if (CNNType == Digital) { if (CNNType == Digital) {
return false; return false;
@@ -851,7 +836,6 @@ bool ClassFlowCNNGeneral::isExtendedResolution(int _number) {
return true; return true;
} }
std::vector<HTMLInfo*> ClassFlowCNNGeneral::GetHTMLInfo() { std::vector<HTMLInfo*> ClassFlowCNNGeneral::GetHTMLInfo() {
std::vector<HTMLInfo*> result; std::vector<HTMLInfo*> result;
@@ -894,12 +878,10 @@ std::vector<HTMLInfo*> ClassFlowCNNGeneral::GetHTMLInfo() {
return result; return result;
} }
int ClassFlowCNNGeneral::getNumberGENERAL() { int ClassFlowCNNGeneral::getNumberGENERAL() {
return GENERAL.size(); return GENERAL.size();
} }
string ClassFlowCNNGeneral::getNameGENERAL(int _analog) { string ClassFlowCNNGeneral::getNameGENERAL(int _analog) {
if (_analog < GENERAL.size()) { if (_analog < GENERAL.size()) {
return GENERAL[_analog]->name; return GENERAL[_analog]->name;
@@ -908,7 +890,6 @@ string ClassFlowCNNGeneral::getNameGENERAL(int _analog) {
return "GENERAL DOES NOT EXIST"; return "GENERAL DOES NOT EXIST";
} }
general* ClassFlowCNNGeneral::GetGENERAL(int _analog) { general* ClassFlowCNNGeneral::GetGENERAL(int _analog) {
if (_analog < GENERAL.size()) { if (_analog < GENERAL.size()) {
return GENERAL[_analog]; return GENERAL[_analog];
@@ -917,7 +898,6 @@ general* ClassFlowCNNGeneral::GetGENERAL(int _analog) {
return NULL; return NULL;
} }
void ClassFlowCNNGeneral::UpdateNameNumbers(std::vector<std::string> *_name_numbers) { void ClassFlowCNNGeneral::UpdateNameNumbers(std::vector<std::string> *_name_numbers) {
for (int _dig = 0; _dig < GENERAL.size(); _dig++) { for (int _dig = 0; _dig < GENERAL.size(); _dig++) {
std::string _name = GENERAL[_dig]->name; std::string _name = GENERAL[_dig]->name;
@@ -934,7 +914,6 @@ void ClassFlowCNNGeneral::UpdateNameNumbers(std::vector<std::string> *_name_numb
} }
} }
string ClassFlowCNNGeneral::getReadoutRawString(int _analog) string ClassFlowCNNGeneral::getReadoutRawString(int _analog)
{ {
string rt = ""; string rt = "";
@@ -963,4 +942,3 @@ string ClassFlowCNNGeneral::getReadoutRawString(int _analog)
} }
return rt; return rt;
} }

333
code/components/jomjol_flowcontroll/ClassFlowControll.cpp
View File

@@ -32,7 +32,6 @@ static const char* TAG = "FLOWCTRL";
//#define DEBUG_DETAIL_ON //#define DEBUG_DETAIL_ON
std::string ClassFlowControll::doSingleStep(std::string _stepname, std::string _host){ std::string ClassFlowControll::doSingleStep(std::string _stepname, std::string _host){
std::string _classname = ""; std::string _classname = "";
std::string result = ""; std::string result = "";
@@ -68,8 +67,11 @@ std::string ClassFlowControll::doSingleStep(std::string _stepname, std::string _
for (int i = 0; i < FlowControll.size(); ++i) for (int i = 0; i < FlowControll.size(); ++i)
if (FlowControll[i]->name().compare(_classname) == 0){ if (FlowControll[i]->name().compare(_classname) == 0){
if (!(FlowControll[i]->name().compare("ClassFlowTakeImage") == 0)) // if it is a TakeImage, the image does not need to be included, this happens automatically with the html query. if (!(FlowControll[i]->name().compare("ClassFlowTakeImage") == 0)) {
// if it is a TakeImage, the image does not need to be included, this happens automatically with the html query.
FlowControll[i]->doFlow(""); FlowControll[i]->doFlow("");
}
result = FlowControll[i]->getHTMLSingleStep(_host); result = FlowControll[i]->getHTMLSingleStep(_host);
} }
@@ -78,36 +80,46 @@ std::string ClassFlowControll::doSingleStep(std::string _stepname, std::string _
return result; return result;
} }
std::string ClassFlowControll::TranslateAktstatus(std::string _input) std::string ClassFlowControll::TranslateAktstatus(std::string _input)
{ {
if (_input.compare("ClassFlowTakeImage") == 0) if (_input.compare("ClassFlowTakeImage") == 0) {
return ("Take Image"); return ("Take Image");
if (_input.compare("ClassFlowAlignment") == 0) }
if (_input.compare("ClassFlowAlignment") == 0) {
return ("Aligning"); return ("Aligning");
if (_input.compare("ClassFlowCNNGeneral") == 0) }
if (_input.compare("ClassFlowCNNGeneral") == 0) {
return ("Digitalization of ROIs"); return ("Digitalization of ROIs");
}
#ifdef ENABLE_MQTT #ifdef ENABLE_MQTT
if (_input.compare("ClassFlowMQTT") == 0) if (_input.compare("ClassFlowMQTT") == 0) {
return ("Sending MQTT"); return ("Sending MQTT");
}
#endif //ENABLE_MQTT #endif //ENABLE_MQTT
#ifdef ENABLE_INFLUXDB #ifdef ENABLE_INFLUXDB
if (_input.compare("ClassFlowInfluxDB") == 0) if (_input.compare("ClassFlowInfluxDB") == 0) {
return ("Sending InfluxDB"); return ("Sending InfluxDB");
if (_input.compare("ClassFlowInfluxDBv2") == 0) }
if (_input.compare("ClassFlowInfluxDBv2") == 0) {
return ("Sending InfluxDBv2"); return ("Sending InfluxDBv2");
}
#endif //ENABLE_INFLUXDB #endif //ENABLE_INFLUXDB
if (_input.compare("ClassFlowPostProcessing") == 0)
if (_input.compare("ClassFlowPostProcessing") == 0) {
return ("Post-Processing"); return ("Post-Processing");
}
return "Unkown Status"; return "Unkown Status";
} }
std::vector<HTMLInfo*> ClassFlowControll::GetAllDigital() std::vector<HTMLInfo*> ClassFlowControll::GetAllDigital()
{ {
if (flowdigit) if (flowdigit) {
{
ESP_LOGD(TAG, "ClassFlowControll::GetAllDigital - flowdigit != NULL"); ESP_LOGD(TAG, "ClassFlowControll::GetAllDigital - flowdigit != NULL");
return flowdigit->GetHTMLInfo(); return flowdigit->GetHTMLInfo();
} }
@@ -116,65 +128,63 @@ std::vector<HTMLInfo*> ClassFlowControll::GetAllDigital()
return empty; return empty;
} }
std::vector<HTMLInfo*> ClassFlowControll::GetAllAnalog() std::vector<HTMLInfo*> ClassFlowControll::GetAllAnalog()
{ {
if (flowanalog) if (flowanalog) {
return flowanalog->GetHTMLInfo(); return flowanalog->GetHTMLInfo();
}
std::vector<HTMLInfo*> empty; std::vector<HTMLInfo*> empty;
return empty; return empty;
} }
t_CNNType ClassFlowControll::GetTypeDigital() t_CNNType ClassFlowControll::GetTypeDigital()
{ {
if (flowdigit) if (flowdigit) {
return flowdigit->getCNNType(); return flowdigit->getCNNType();
}
return t_CNNType::None; return t_CNNType::None;
} }
t_CNNType ClassFlowControll::GetTypeAnalog() t_CNNType ClassFlowControll::GetTypeAnalog()
{ {
if (flowanalog) if (flowanalog) {
return flowanalog->getCNNType(); return flowanalog->getCNNType();
}
return t_CNNType::None; return t_CNNType::None;
} }
#ifdef ALGROI_LOAD_FROM_MEM_AS_JPG #ifdef ALGROI_LOAD_FROM_MEM_AS_JPG
void ClassFlowControll::DigitalDrawROI(CImageBasis *_zw) void ClassFlowControll::DigitalDrawROI(CImageBasis *_zw)
{ {
if (flowdigit) if (flowdigit) {
flowdigit->DrawROI(_zw); flowdigit->DrawROI(_zw);
}
} }
void ClassFlowControll::AnalogDrawROI(CImageBasis *_zw) void ClassFlowControll::AnalogDrawROI(CImageBasis *_zw)
{ {
if (flowanalog) if (flowanalog) {
flowanalog->DrawROI(_zw); flowanalog->DrawROI(_zw);
}
} }
#endif #endif
#ifdef ENABLE_MQTT #ifdef ENABLE_MQTT
bool ClassFlowControll::StartMQTTService() bool ClassFlowControll::StartMQTTService()
{ {
/* Start the MQTT service */ /* Start the MQTT service */
for (int i = 0; i < FlowControll.size(); ++i) { for (int i = 0; i < FlowControll.size(); ++i) {
if (FlowControll[i]->name().compare("ClassFlowMQTT") == 0) { if (FlowControll[i]->name().compare("ClassFlowMQTT") == 0) {
return ((ClassFlowMQTT*) (FlowControll[i]))->Start(AutoInterval); return ((ClassFlowMQTT*) (FlowControll[i]))->Start(AutoInterval);
} }
} }
return false; return false;
} }
#endif //ENABLE_MQTT #endif //ENABLE_MQTT
void ClassFlowControll::SetInitialParameter(void) void ClassFlowControll::SetInitialParameter(void)
{ {
AutoStart = false; AutoStart = false;
@@ -189,7 +199,6 @@ void ClassFlowControll::SetInitialParameter(void)
aktstatusWithTime = aktstatus; aktstatusWithTime = aktstatus;
} }
bool ClassFlowControll::getIsAutoStart(void) bool ClassFlowControll::getIsAutoStart(void)
{ {
return AutoStart; return AutoStart;
@@ -201,69 +210,77 @@ void ClassFlowControll::setAutoStartInterval(long &_interval)
_interval = AutoInterval * 60 * 1000; // AutoInterval: minutes -> ms _interval = AutoInterval * 60 * 1000; // AutoInterval: minutes -> ms
} }
ClassFlow* ClassFlowControll::CreateClassFlow(std::string _type) ClassFlow* ClassFlowControll::CreateClassFlow(std::string _type)
{ {
ClassFlow* cfc = NULL; ClassFlow* cfc = NULL;
_type = trim(_type); _type = trim(_type);
if (toUpper(_type).compare("[TAKEIMAGE]") == 0) if (toUpper(_type).compare("[TAKEIMAGE]") == 0) {
{
cfc = new ClassFlowTakeImage(&FlowControll); cfc = new ClassFlowTakeImage(&FlowControll);
flowtakeimage = (ClassFlowTakeImage*) cfc; flowtakeimage = (ClassFlowTakeImage*) cfc;
} }
if (toUpper(_type).compare("[ALIGNMENT]") == 0)
{ if (toUpper(_type).compare("[ALIGNMENT]") == 0) {
cfc = new ClassFlowAlignment(&FlowControll); cfc = new ClassFlowAlignment(&FlowControll);
flowalignment = (ClassFlowAlignment*) cfc; flowalignment = (ClassFlowAlignment*) cfc;
} }
if (toUpper(_type).compare("[ANALOG]") == 0)
{ if (toUpper(_type).compare("[ANALOG]") == 0) {
cfc = new ClassFlowCNNGeneral(flowalignment); cfc = new ClassFlowCNNGeneral(flowalignment);
flowanalog = (ClassFlowCNNGeneral*) cfc; flowanalog = (ClassFlowCNNGeneral*) cfc;
} }
if (toUpper(_type).compare(0, 7, "[DIGITS") == 0)
{ if (toUpper(_type).compare(0, 7, "[DIGITS") == 0) {
cfc = new ClassFlowCNNGeneral(flowalignment); cfc = new ClassFlowCNNGeneral(flowalignment);
flowdigit = (ClassFlowCNNGeneral*) cfc; flowdigit = (ClassFlowCNNGeneral*) cfc;
} }
#ifdef ENABLE_MQTT #ifdef ENABLE_MQTT
if (toUpper(_type).compare("[MQTT]") == 0) if (toUpper(_type).compare("[MQTT]") == 0) {
cfc = new ClassFlowMQTT(&FlowControll); cfc = new ClassFlowMQTT(&FlowControll);
}
#endif //ENABLE_MQTT #endif //ENABLE_MQTT
#ifdef ENABLE_INFLUXDB #ifdef ENABLE_INFLUXDB
if (toUpper(_type).compare("[INFLUXDB]") == 0) if (toUpper(_type).compare("[INFLUXDB]") == 0) {
cfc = new ClassFlowInfluxDB(&FlowControll); cfc = new ClassFlowInfluxDB(&FlowControll);
if (toUpper(_type).compare("[INFLUXDBV2]") == 0) }
if (toUpper(_type).compare("[INFLUXDBV2]") == 0) {
cfc = new ClassFlowInfluxDBv2(&FlowControll); cfc = new ClassFlowInfluxDBv2(&FlowControll);
}
#endif //ENABLE_INFLUXDB #endif //ENABLE_INFLUXDB
if (toUpper(_type).compare("[POSTPROCESSING]") == 0) if (toUpper(_type).compare("[POSTPROCESSING]") == 0) {
{
cfc = new ClassFlowPostProcessing(&FlowControll, flowanalog, flowdigit); cfc = new ClassFlowPostProcessing(&FlowControll, flowanalog, flowdigit);
flowpostprocessing = (ClassFlowPostProcessing*) cfc; flowpostprocessing = (ClassFlowPostProcessing*) cfc;
} }
if (cfc) // Attached only if it is not [AutoTimer], because this is for FlowControll if (cfc) {
// Attached only if it is not [AutoTimer], because this is for FlowControll
FlowControll.push_back(cfc); FlowControll.push_back(cfc);
}
if (toUpper(_type).compare("[AUTOTIMER]") == 0) if (toUpper(_type).compare("[AUTOTIMER]") == 0) {
cfc = this; cfc = this;
}
if (toUpper(_type).compare("[DATALOGGING]") == 0) if (toUpper(_type).compare("[DATALOGGING]") == 0) {
cfc = this; cfc = this;
}
if (toUpper(_type).compare("[DEBUG]") == 0) if (toUpper(_type).compare("[DEBUG]") == 0) {
cfc = this; cfc = this;
}
if (toUpper(_type).compare("[SYSTEM]") == 0) if (toUpper(_type).compare("[SYSTEM]") == 0) {
cfc = this; cfc = this;
}
return cfc; return cfc;
} }
void ClassFlowControll::InitFlow(std::string config) void ClassFlowControll::InitFlow(std::string config)
{ {
aktstatus = "Initialization"; aktstatus = "Initialization";
@@ -284,62 +301,55 @@ void ClassFlowControll::InitFlow(std::string config)
line = ""; line = "";
char zw[1024]; char zw[1024];
if (pFile != NULL)
{ if (pFile != NULL) {
fgets(zw, 1024, pFile); fgets(zw, 1024, pFile);
ESP_LOGD(TAG, "%s", zw); ESP_LOGD(TAG, "%s", zw);
line = std::string(zw); line = std::string(zw);
} }
while ((line.size() > 0) && !(feof(pFile))) while ((line.size() > 0) && !(feof(pFile))) {
{
cfc = CreateClassFlow(line); cfc = CreateClassFlow(line);
// printf("Name: %s\n", cfc->name().c_str()); // printf("Name: %s\n", cfc->name().c_str());
if (cfc)
{ if (cfc) {
ESP_LOGD(TAG, "Start ReadParameter (%s)", line.c_str()); ESP_LOGD(TAG, "Start ReadParameter (%s)", line.c_str());
cfc->ReadParameter(pFile, line); cfc->ReadParameter(pFile, line);
} }
else else {
{
line = ""; line = "";
if (fgets(zw, 1024, pFile) && !feof(pFile))
{ if (fgets(zw, 1024, pFile) && !feof(pFile)) {
ESP_LOGD(TAG, "Read: %s", zw); ESP_LOGD(TAG, "Read: %s", zw);
line = std::string(zw); line = std::string(zw);
} }
} }
} }
fclose(pFile); fclose(pFile);
} }
std::string* ClassFlowControll::getActStatusWithTime() std::string* ClassFlowControll::getActStatusWithTime()
{ {
return &aktstatusWithTime; return &aktstatusWithTime;
} }
std::string* ClassFlowControll::getActStatus() std::string* ClassFlowControll::getActStatus()
{ {
return &aktstatus; return &aktstatus;
} }
void ClassFlowControll::setActStatus(std::string _aktstatus) void ClassFlowControll::setActStatus(std::string _aktstatus)
{ {
aktstatus = _aktstatus; aktstatus = _aktstatus;
aktstatusWithTime = aktstatus; aktstatusWithTime = aktstatus;
} }
void ClassFlowControll::doFlowTakeImageOnly(string time) void ClassFlowControll::doFlowTakeImageOnly(string time)
{ {
std::string zw_time; std::string zw_time;
for (int i = 0; i < FlowControll.size(); ++i) for (int i = 0; i < FlowControll.size(); ++i) {
{
if (FlowControll[i]->name() == "ClassFlowTakeImage") { if (FlowControll[i]->name() == "ClassFlowTakeImage") {
zw_time = getCurrentTimeString("%H:%M:%S"); zw_time = getCurrentTimeString("%H:%M:%S");
aktstatus = TranslateAktstatus(FlowControll[i]->name()); aktstatus = TranslateAktstatus(FlowControll[i]->name());
@@ -353,7 +363,6 @@ void ClassFlowControll::doFlowTakeImageOnly(string time)
} }
} }
bool ClassFlowControll::doFlow(string time) bool ClassFlowControll::doFlow(string time)
{ {
bool result = true; bool result = true;
@@ -373,8 +382,7 @@ bool ClassFlowControll::doFlow(string time)
//checkNtpStatus(0); //checkNtpStatus(0);
for (int i = 0; i < FlowControll.size(); ++i) for (int i = 0; i < FlowControll.size(); ++i) {
{
zw_time = getCurrentTimeString("%H:%M:%S"); zw_time = getCurrentTimeString("%H:%M:%S");
aktstatus = TranslateAktstatus(FlowControll[i]->name()); aktstatus = TranslateAktstatus(FlowControll[i]->name());
aktstatusWithTime = aktstatus + " (" + zw_time + ")"; aktstatusWithTime = aktstatus + " (" + zw_time + ")";
@@ -391,7 +399,7 @@ bool ClassFlowControll::doFlow(string time)
if (!FlowControll[i]->doFlow(time)){ if (!FlowControll[i]->doFlow(time)){
repeat++; repeat++;
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Fehler im vorheriger Schritt - wird zum " + to_string(repeat) + ". Mal wiederholt"); LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Fehler im vorheriger Schritt - wird zum " + to_string(repeat) + ". Mal wiederholt");
if (i) i -= 1; // vPrevious step must be repeated (probably take pictures) if (i) { i -= 1; } // vPrevious step must be repeated (probably take pictures)
result = false; result = false;
if (repeat > 5) { if (repeat > 5) {
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Wiederholung 5x nicht erfolgreich --> reboot"); LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "Wiederholung 5x nicht erfolgreich --> reboot");
@@ -399,8 +407,7 @@ bool ClassFlowControll::doFlow(string time)
//Step was repeated 5x --> reboot //Step was repeated 5x --> reboot
} }
} }
else else {
{
result = true; result = true;
} }
@@ -424,27 +431,29 @@ bool ClassFlowControll::doFlow(string time)
string ClassFlowControll::getReadoutAll(int _type) string ClassFlowControll::getReadoutAll(int _type)
{ {
std::string out = ""; std::string out = "";
if (flowpostprocessing)
{ if (flowpostprocessing) {
std::vector<NumberPost*> *numbers = flowpostprocessing->GetNumbers(); std::vector<NumberPost*> *numbers = flowpostprocessing->GetNumbers();
for (int i = 0; i < (*numbers).size(); ++i) for (int i = 0; i < (*numbers).size(); ++i) {
{
out = out + (*numbers)[i]->name + "\t"; out = out + (*numbers)[i]->name + "\t";
switch (_type) { switch (_type) {
case READOUT_TYPE_VALUE: case READOUT_TYPE_VALUE:
out = out + (*numbers)[i]->ReturnValue; out = out + (*numbers)[i]->ReturnValue;
break; break;
case READOUT_TYPE_PREVALUE: case READOUT_TYPE_PREVALUE:
if (flowpostprocessing->PreValueUse) if (flowpostprocessing->PreValueUse) {
{ if ((*numbers)[i]->PreValueOkay) {
if ((*numbers)[i]->PreValueOkay)
out = out + (*numbers)[i]->ReturnPreValue; out = out + (*numbers)[i]->ReturnPreValue;
else }
out = out + "PreValue too old"; else {
out = out + "PreValue too old";
}
} }
else else {
out = out + "PreValue deactivated"; out = out + "PreValue deactivated";
}
break; break;
case READOUT_TYPE_RAWVALUE: case READOUT_TYPE_RAWVALUE:
out = out + (*numbers)[i]->ReturnRawValue; out = out + (*numbers)[i]->ReturnRawValue;
@@ -453,8 +462,10 @@ string ClassFlowControll::getReadoutAll(int _type)
out = out + (*numbers)[i]->ErrorMessageText; out = out + (*numbers)[i]->ErrorMessageText;
break; break;
} }
if (i < (*numbers).size()-1)
if (i < (*numbers).size()-1) {
out = out + "\r\n"; out = out + "\r\n";
}
} }
// ESP_LOGD(TAG, "OUT: %s", out.c_str()); // ESP_LOGD(TAG, "OUT: %s", out.c_str());
} }
@@ -462,28 +473,24 @@ string ClassFlowControll::getReadoutAll(int _type)
return out; return out;
} }
string ClassFlowControll::getReadout(bool _rawvalue = false, bool _noerror = false, int _number = 0) string ClassFlowControll::getReadout(bool _rawvalue = false, bool _noerror = false, int _number = 0)
{ {
if (flowpostprocessing) if (flowpostprocessing) {
return flowpostprocessing->getReadoutParam(_rawvalue, _noerror, _number); return flowpostprocessing->getReadoutParam(_rawvalue, _noerror, _number);
}
return std::string(""); return std::string("");
} }
string ClassFlowControll::GetPrevalue(std::string _number) string ClassFlowControll::GetPrevalue(std::string _number)
{ {
if (flowpostprocessing) if (flowpostprocessing) {
{
return flowpostprocessing->GetPreValue(_number); return flowpostprocessing->GetPreValue(_number);
} }
return std::string(""); return std::string("");
} }
bool ClassFlowControll::UpdatePrevalue(std::string _newvalue, std::string _numbers, bool _extern) bool ClassFlowControll::UpdatePrevalue(std::string _newvalue, std::string _numbers, bool _extern)
{ {
double newvalueAsDouble; double newvalueAsDouble;
@@ -504,10 +511,12 @@ bool ClassFlowControll::UpdatePrevalue(std::string _newvalue, std::string _numbe
} }
if (flowpostprocessing) { if (flowpostprocessing) {
if (flowpostprocessing->SetPreValue(newvalueAsDouble, _numbers, _extern)) if (flowpostprocessing->SetPreValue(newvalueAsDouble, _numbers, _extern)) {
return true; return true;
else }
else {
return false; return false;
}
} }
else { else {
LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "UpdatePrevalue: ERROR - Class Post-Processing not initialized"); LogFile.WriteToFile(ESP_LOG_ERROR, TAG, "UpdatePrevalue: ERROR - Class Post-Processing not initialized");
@@ -515,93 +524,85 @@ bool ClassFlowControll::UpdatePrevalue(std::string _newvalue, std::string _numbe
} }
} }
bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph) bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph)
{ {
std::vector<string> splitted; std::vector<string> splitted;
aktparamgraph = trim(aktparamgraph); aktparamgraph = trim(aktparamgraph);
if (aktparamgraph.size() == 0) if (aktparamgraph.size() == 0) {
if (!this->GetNextParagraph(pfile, aktparamgraph)) if (!this->GetNextParagraph(pfile, aktparamgraph)) {
return false; return false;
}
}
if ((toUpper(aktparamgraph).compare("[AUTOTIMER]") != 0) && (toUpper(aktparamgraph).compare("[DEBUG]") != 0) && if ((toUpper(aktparamgraph).compare("[AUTOTIMER]") != 0) && (toUpper(aktparamgraph).compare("[DEBUG]") != 0) &&
(toUpper(aktparamgraph).compare("[SYSTEM]") != 0 && (toUpper(aktparamgraph).compare("[DATALOGGING]") != 0))) // Paragraph passt nicht zu Debug oder DataLogging (toUpper(aktparamgraph).compare("[SYSTEM]") != 0 && (toUpper(aktparamgraph).compare("[DATALOGGING]") != 0))) {
// Paragraph passt nicht zu Debug oder DataLogging
return false; return false;
}
while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph)) while (this->getNextLine(pfile, &aktparamgraph) && !this->isNewParagraph(aktparamgraph)) {
{
splitted = ZerlegeZeile(aktparamgraph, " ="); splitted = ZerlegeZeile(aktparamgraph, " =");
if ((toUpper(splitted[0]) == "AUTOSTART") && (splitted.size() > 1))
{ if ((toUpper(splitted[0]) == "AUTOSTART") && (splitted.size() > 1)) {
if (toUpper(splitted[1]) == "TRUE") AutoStart = alphanumericToBoolean(splitted[1]);
}
if ((toUpper(splitted[0]) == "INTERVAL") && (splitted.size() > 1)) {
if (isStringNumeric(splitted[1]))
{ {
AutoStart = true; AutoInterval = std::stof(splitted[1]);
} }
} }
if ((toUpper(splitted[0]) == "INTERVAL") && (splitted.size() > 1)) if ((toUpper(splitted[0]) == "DATALOGACTIVE") && (splitted.size() > 1)) {
{ LogFile.SetDataLogToSD(alphanumericToBoolean(splitted[1]));
AutoInterval = std::stof(splitted[1]);
} }
if ((toUpper(splitted[0]) == "DATALOGACTIVE") && (splitted.size() > 1)) if ((toUpper(splitted[0]) == "DATAFILESRETENTION") && (splitted.size() > 1)) {
{ if (isStringNumeric(splitted[1]))
if (toUpper(splitted[1]) == "TRUE")
{ {
LogFile.SetDataLogToSD(true); LogFile.SetDataLogRetention(std::stoi(splitted[1]));
}
else {
LogFile.SetDataLogToSD(false);
} }
} }
if ((toUpper(splitted[0]) == "DATAFILESRETENTION") && (splitted.size() > 1)) if ((toUpper(splitted[0]) == "LOGLEVEL") && (splitted.size() > 1)) {
{
LogFile.SetDataLogRetention(std::stoi(splitted[1]));
}
if ((toUpper(splitted[0]) == "LOGLEVEL") && (splitted.size() > 1))
{
/* matches esp_log_level_t */ /* matches esp_log_level_t */
if ((toUpper(splitted[1]) == "TRUE") || (toUpper(splitted[1]) == "2")) if ((toUpper(splitted[1]) == "TRUE") || (toUpper(splitted[1]) == "2")) {
{
LogFile.setLogLevel(ESP_LOG_WARN); LogFile.setLogLevel(ESP_LOG_WARN);
} }
else if ((toUpper(splitted[1]) == "FALSE") || (toUpper(splitted[1]) == "0") || (toUpper(splitted[1]) == "1")) else if ((toUpper(splitted[1]) == "FALSE") || (toUpper(splitted[1]) == "0") || (toUpper(splitted[1]) == "1")) {
{
LogFile.setLogLevel(ESP_LOG_ERROR); LogFile.setLogLevel(ESP_LOG_ERROR);
} }
else if (toUpper(splitted[1]) == "3") else if (toUpper(splitted[1]) == "3") {
{
LogFile.setLogLevel(ESP_LOG_INFO); LogFile.setLogLevel(ESP_LOG_INFO);
} }
else if (toUpper(splitted[1]) == "4") else if (toUpper(splitted[1]) == "4") {
{
LogFile.setLogLevel(ESP_LOG_DEBUG); LogFile.setLogLevel(ESP_LOG_DEBUG);
} }
/* If system reboot was not triggered by user and reboot was caused by execption -> keep log level to DEBUG */ /* If system reboot was not triggered by user and reboot was caused by execption -> keep log level to DEBUG */
if (!getIsPlannedReboot() && (esp_reset_reason() == ESP_RST_PANIC)) if (!getIsPlannedReboot() && (esp_reset_reason() == ESP_RST_PANIC)) {
LogFile.setLogLevel(ESP_LOG_DEBUG); LogFile.setLogLevel(ESP_LOG_DEBUG);
}
} }
if ((toUpper(splitted[0]) == "LOGFILESRETENTION") && (splitted.size() > 1))
{ if ((toUpper(splitted[0]) == "LOGFILESRETENTION") && (splitted.size() > 1)) {
LogFile.SetLogFileRetention(std::stoi(splitted[1])); if (isStringNumeric(splitted[1]))
{
LogFile.SetLogFileRetention(std::stoi(splitted[1]));
}
} }
/* TimeServer and TimeZone got already read from the config, see setupTime () */ /* TimeServer and TimeZone got already read from the config, see setupTime () */
#if (defined WLAN_USE_ROAMING_BY_SCANNING || (defined WLAN_USE_MESH_ROAMING && defined WLAN_USE_MESH_ROAMING_ACTIVATE_CLIENT_TRIGGERED_QUERIES)) #if (defined WLAN_USE_ROAMING_BY_SCANNING || (defined WLAN_USE_MESH_ROAMING && defined WLAN_USE_MESH_ROAMING_ACTIVATE_CLIENT_TRIGGERED_QUERIES))
if ((toUpper(splitted[0]) == "RSSITHRESHOLD") && (splitted.size() > 1)) if ((toUpper(splitted[0]) == "RSSITHRESHOLD") && (splitted.size() > 1)) {
{
int RSSIThresholdTMP = atoi(splitted[1].c_str()); int RSSIThresholdTMP = atoi(splitted[1].c_str());
RSSIThresholdTMP = min(0, max(-100, RSSIThresholdTMP)); // Verify input limits (-100 - 0) RSSIThresholdTMP = min(0, max(-100, RSSIThresholdTMP)); // Verify input limits (-100 - 0)
if (ChangeRSSIThreshold(WLAN_CONFIG_FILE, RSSIThresholdTMP)) if (ChangeRSSIThreshold(WLAN_CONFIG_FILE, RSSIThresholdTMP)) {
{
// reboot necessary so that the new wlan.ini is also used !!! // reboot necessary so that the new wlan.ini is also used !!!
fclose(pfile); fclose(pfile);
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Rebooting to activate new RSSITHRESHOLD ..."); LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Rebooting to activate new RSSITHRESHOLD ...");
@@ -610,10 +611,8 @@ bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph)
} }
#endif #endif
if ((toUpper(splitted[0]) == "HOSTNAME") && (splitted.size() > 1)) if ((toUpper(splitted[0]) == "HOSTNAME") && (splitted.size() > 1)) {
{ if (ChangeHostName(WLAN_CONFIG_FILE, splitted[1])) {
if (ChangeHostName(WLAN_CONFIG_FILE, splitted[1]))
{
// reboot necessary so that the new wlan.ini is also used !!! // reboot necessary so that the new wlan.ini is also used !!!
fclose(pfile); fclose(pfile);
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Rebooting to activate new HOSTNAME..."); LogFile.WriteToFile(ESP_LOG_WARN, TAG, "Rebooting to activate new HOSTNAME...");
@@ -621,23 +620,19 @@ bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph)
} }
} }
if ((toUpper(splitted[0]) == "SETUPMODE") && (splitted.size() > 1)) if ((toUpper(splitted[0]) == "SETUPMODE") && (splitted.size() > 1)) {
{ SetupModeActive = alphanumericToBoolean(splitted[1]);
if (toUpper(splitted[1]) == "TRUE")
{
SetupModeActive = true;
}
} }
} }
return true; return true;
} }
int ClassFlowControll::CleanTempFolder() { int ClassFlowControll::CleanTempFolder() {
const char* folderPath = "/sdcard/img_tmp"; const char* folderPath = "/sdcard/img_tmp";
ESP_LOGD(TAG, "Clean up temporary folder to avoid damage of sdcard sectors: %s", folderPath); ESP_LOGD(TAG, "Clean up temporary folder to avoid damage of sdcard sectors: %s", folderPath);
DIR *dir = opendir(folderPath); DIR *dir = opendir(folderPath);
if (!dir) { if (!dir) {
ESP_LOGE(TAG, "Failed to stat dir: %s", folderPath); ESP_LOGE(TAG, "Failed to stat dir: %s", folderPath);
return -1; return -1;
@@ -645,31 +640,33 @@ int ClassFlowControll::CleanTempFolder() {
struct dirent *entry; struct dirent *entry;
int deleted = 0; int deleted = 0;
while ((entry = readdir(dir)) != NULL) { while ((entry = readdir(dir)) != NULL) {
std::string path = string(folderPath) + "/" + entry->d_name; std::string path = string(folderPath) + "/" + entry->d_name;
if (entry->d_type == DT_REG) { if (entry->d_type == DT_REG) {
if (unlink(path.c_str()) == 0) { if (unlink(path.c_str()) == 0) {
deleted ++; deleted ++;
} else { }
ESP_LOGE(TAG, "can't delete file: %s", path.c_str()); else {
} ESP_LOGE(TAG, "can't delete file: %s", path.c_str());
} else if (entry->d_type == DT_DIR) { }
deleted += removeFolder(path.c_str(), TAG); }
} else if (entry->d_type == DT_DIR) {
deleted += removeFolder(path.c_str(), TAG);
}
} }
closedir(dir); closedir(dir);
ESP_LOGD(TAG, "%d files deleted", deleted); ESP_LOGD(TAG, "%d files deleted", deleted);
return 0; return 0;
} }
esp_err_t ClassFlowControll::SendRawJPG(httpd_req_t *req) esp_err_t ClassFlowControll::SendRawJPG(httpd_req_t *req)
{ {
return flowtakeimage != NULL ? flowtakeimage->SendRawJPG(req) : ESP_FAIL; return flowtakeimage != NULL ? flowtakeimage->SendRawJPG(req) : ESP_FAIL;
} }
esp_err_t ClassFlowControll::GetJPGStream(std::string _fn, httpd_req_t *req) esp_err_t ClassFlowControll::GetJPGStream(std::string _fn, httpd_req_t *req)
{ {
ESP_LOGD(TAG, "ClassFlowControll::GetJPGStream %s", _fn.c_str()); ESP_LOGD(TAG, "ClassFlowControll::GetJPGStream %s", _fn.c_str());
@@ -901,13 +898,11 @@ esp_err_t ClassFlowControll::GetJPGStream(std::string _fn, httpd_req_t *req)
return result; return result;
} }
string ClassFlowControll::getNumbersName() string ClassFlowControll::getNumbersName()
{ {
return flowpostprocessing->getNumbersName(); return flowpostprocessing->getNumbersName();
} }
string ClassFlowControll::getJSON() string ClassFlowControll::getJSON()
{ {
return flowpostprocessing->GetJSON(); return flowpostprocessing->GetJSON();

53
code/components/jomjol_flowcontroll/ClassFlowPostProcessing.cpp
View File

@@ -344,11 +344,7 @@ void ClassFlowPostProcessing::handleDecimalExtendedResolution(string _decsep, st
} }
for (int j = 0; j < NUMBERS.size(); ++j) { for (int j = 0; j < NUMBERS.size(); ++j) {
bool _zwdc = false; bool _zwdc = alphanumericToBoolean(_value);
if (toUpper(_value) == "TRUE") {
_zwdc = true;
}
// Set to default first (if nothing else is set) // Set to default first (if nothing else is set)
if ((_digit == "default") || (NUMBERS[j]->name == _digit)) { if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
@@ -371,7 +367,10 @@ void ClassFlowPostProcessing::handleDecimalSeparator(string _decsep, string _val
for (int j = 0; j < NUMBERS.size(); ++j) { for (int j = 0; j < NUMBERS.size(); ++j) {
int _zwdc = 0; int _zwdc = 0;
_zwdc = stoi(_value);
if (isStringNumeric(_value)) {
_zwdc = std::stoi(_value);
}
// Set to default first (if nothing else is set) // Set to default first (if nothing else is set)
if ((_digit == "default") || (NUMBERS[j]->name == _digit)) { if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
@@ -397,7 +396,10 @@ void ClassFlowPostProcessing::handleAnalogDigitalTransitionStart(string _decsep,
for (int j = 0; j < NUMBERS.size(); ++j) { for (int j = 0; j < NUMBERS.size(); ++j) {
float _zwdc = 9.2; float _zwdc = 9.2;
_zwdc = stof(_value);
if (isStringNumeric(_value)) {
_zwdc = std::stof(_value);
}
// Set to default first (if nothing else is set) // Set to default first (if nothing else is set)
if ((_digit == "default") || (NUMBERS[j]->name == _digit)) { if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
@@ -420,15 +422,11 @@ void ClassFlowPostProcessing::handleAllowNegativeRate(string _decsep, string _va
} }
for (int j = 0; j < NUMBERS.size(); ++j) { for (int j = 0; j < NUMBERS.size(); ++j) {
bool _rt = false; bool _zwdc = alphanumericToBoolean(_value);
if (toUpper(_value) == "TRUE") {
_rt = true;
}
// Set to default first (if nothing else is set) // Set to default first (if nothing else is set)
if ((_digit == "default") || (NUMBERS[j]->name == _digit)) { if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
NUMBERS[j]->AllowNegativeRates = _rt; NUMBERS[j]->AllowNegativeRates = _zwdc;
} }
} }
} }
@@ -446,15 +444,15 @@ void ClassFlowPostProcessing::handleMaxRateType(string _decsep, string _value) {
} }
for (int j = 0; j < NUMBERS.size(); ++j) { for (int j = 0; j < NUMBERS.size(); ++j) {
t_RateType _rt = AbsoluteChange; t_RateType _zwdc = AbsoluteChange;
if (toUpper(_value) == "RATECHANGE") { if (toUpper(_value) == "RATECHANGE") {
_rt = RateChange; _zwdc = RateChange;
} }
// Set to default first (if nothing else is set) // Set to default first (if nothing else is set)
if ((_digit == "default") || (NUMBERS[j]->name == _digit)) { if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
NUMBERS[j]->RateType = _rt; NUMBERS[j]->RateType = _zwdc;
} }
} }
} }
@@ -473,7 +471,10 @@ void ClassFlowPostProcessing::handleMaxRateValue(string _decsep, string _value)
for (int j = 0; j < NUMBERS.size(); ++j) { for (int j = 0; j < NUMBERS.size(); ++j) {
float _zwdc = 1; float _zwdc = 1;
_zwdc = stof(_value);
if (isStringNumeric(_value)) {
_zwdc = std::stof(_value);
}
// Set to default first (if nothing else is set) // Set to default first (if nothing else is set)
if ((_digit == "default") || (NUMBERS[j]->name == _digit)) { if ((_digit == "default") || (NUMBERS[j]->name == _digit)) {
@@ -527,13 +528,11 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
} }
if ((toUpper(_param) == "PREVALUEUSE") && (splitted.size() > 1)) { if ((toUpper(_param) == "PREVALUEUSE") && (splitted.size() > 1)) {
if (toUpper(splitted[1]) == "TRUE") { PreValueUse = alphanumericToBoolean(splitted[1]);
PreValueUse = true;
}
} }
if ((toUpper(_param) == "CHECKDIGITINCREASECONSISTENCY") && (splitted.size() > 1)) { if ((toUpper(_param) == "CHECKDIGITINCREASECONSISTENCY") && (splitted.size() > 1)) {
if (toUpper(splitted[1]) == "TRUE") { if (alphanumericToBoolean(splitted[1])) {
for (_n = 0; _n < NUMBERS.size(); ++_n) { for (_n = 0; _n < NUMBERS.size(); ++_n) {
NUMBERS[_n]->checkDigitIncreaseConsistency = true; NUMBERS[_n]->checkDigitIncreaseConsistency = true;
} }
@@ -545,19 +544,17 @@ bool ClassFlowPostProcessing::ReadParameter(FILE* pfile, string& aktparamgraph)
} }
if ((toUpper(_param) == "ERRORMESSAGE") && (splitted.size() > 1)) { if ((toUpper(_param) == "ERRORMESSAGE") && (splitted.size() > 1)) {
if (toUpper(splitted[1]) == "TRUE") { ErrorMessage = alphanumericToBoolean(splitted[1]);
ErrorMessage = true;
}
} }
if ((toUpper(_param) == "IGNORELEADINGNAN") && (splitted.size() > 1)) { if ((toUpper(_param) == "IGNORELEADINGNAN") && (splitted.size() > 1)) {
if (toUpper(splitted[1]) == "TRUE") { IgnoreLeadingNaN = alphanumericToBoolean(splitted[1]);
IgnoreLeadingNaN = true;
}
} }
if ((toUpper(_param) == "PREVALUEAGESTARTUP") && (splitted.size() > 1)) { if ((toUpper(_param) == "PREVALUEAGESTARTUP") && (splitted.size() > 1)) {
PreValueAgeStartup = std::stoi(splitted[1]); if (isStringNumeric(splitted[1])) {
PreValueAgeStartup = std::stoi(splitted[1]);
}
} }
} }

235
code/components/jomjol_flowcontroll/ClassFlowTakeImage.cpp
View File

@@ -96,31 +96,30 @@ bool ClassFlowTakeImage::ReadParameter(FILE *pfile, string &aktparamgraph)
else if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "RAWIMAGESRETENTION") && (splitted.size() > 1))
{ {
this->imagesRetention = std::stod(splitted[1]); if (isStringNumeric(splitted[1]))
{
this->imagesRetention = std::stod(splitted[1]);
}
} }
else if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "SAVEALLFILES") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.SaveAllFiles = alphanumericToBoolean(splitted[1]);
{
CCstatus.SaveAllFiles = 1;
}
else
{
CCstatus.SaveAllFiles = 0;
}
} }
else if ((toUpper(splitted[0]) == "WAITBEFORETAKINGPICTURE") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "WAITBEFORETAKINGPICTURE") && (splitted.size() > 1))
{ {
int _WaitBeforePicture = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
if (_WaitBeforePicture != 0)
{ {
CCstatus.WaitBeforePicture = _WaitBeforePicture; int _WaitBeforePicture = std::stoi(splitted[1]);
} if (_WaitBeforePicture != 0)
else {
{ CCstatus.WaitBeforePicture = _WaitBeforePicture;
CCstatus.WaitBeforePicture = 2; }
else
{
CCstatus.WaitBeforePicture = 2;
}
} }
} }
@@ -159,59 +158,52 @@ bool ClassFlowTakeImage::ReadParameter(FILE *pfile, string &aktparamgraph)
else if ((toUpper(splitted[0]) == "CAMQUALITY") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMQUALITY") && (splitted.size() > 1))
{ {
int _ImageQuality = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
if ((_ImageQuality >= 0) && (_ImageQuality <= 63))
{ {
CCstatus.ImageQuality = _ImageQuality; int _ImageQuality = std::stoi(splitted[1]);
CCstatus.ImageQuality = clipInt(_ImageQuality, 63, 6);
} }
} }
else if ((toUpper(splitted[0]) == "CAMBRIGHTNESS") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMBRIGHTNESS") && (splitted.size() > 1))
{ {
int _ImageBrightness = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
if ((_ImageBrightness >= -2) && (_ImageBrightness <= 2))
{ {
CCstatus.ImageBrightness = _ImageBrightness; int _ImageBrightness = std::stoi(splitted[1]);
CCstatus.ImageBrightness = clipInt(_ImageBrightness, 2, -2);
} }
} }
else if ((toUpper(splitted[0]) == "CAMCONTRAST") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMCONTRAST") && (splitted.size() > 1))
{ {
int _ImageContrast = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
if ((_ImageContrast >= -2) && (_ImageContrast <= 2))
{ {
CCstatus.ImageContrast = _ImageContrast; int _ImageContrast = std::stoi(splitted[1]);
CCstatus.ImageContrast = clipInt(_ImageContrast, 2, -2);
} }
} }
else if ((toUpper(splitted[0]) == "CAMSATURATION") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMSATURATION") && (splitted.size() > 1))
{ {
int _ImageSaturation = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
if ((_ImageSaturation >= -2) && (_ImageSaturation <= 2))
{ {
CCstatus.ImageSaturation = _ImageSaturation; int _ImageSaturation = std::stoi(splitted[1]);
CCstatus.ImageSaturation = clipInt(_ImageSaturation, 2, -2);
} }
} }
else if ((toUpper(splitted[0]) == "CAMSHARPNESS") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMSHARPNESS") && (splitted.size() > 1))
{ {
int _ImageSharpness = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
if ((_ImageSharpness >= -2) && (_ImageSharpness <= 2))
{ {
CCstatus.ImageSharpness = _ImageSharpness; int _ImageSharpness = std::stoi(splitted[1]);
CCstatus.ImageSharpness = clipInt(_ImageSharpness, 2, -2);
} }
} }
else if ((toUpper(splitted[0]) == "CAMAUTOSHARPNESS") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMAUTOSHARPNESS") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageAutoSharpness = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageAutoSharpness = 1;
}
else
{
CCstatus.ImageAutoSharpness = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMSPECIALEFFECT") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMSPECIALEFFECT") && (splitted.size() > 1))
@@ -274,223 +266,136 @@ bool ClassFlowTakeImage::ReadParameter(FILE *pfile, string &aktparamgraph)
else if ((toUpper(splitted[0]) == "CAMAWB") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMAWB") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageAwb = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageAwb = 1;
}
else
{
CCstatus.ImageAwb = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMAWBGAIN") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMAWBGAIN") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageAwbGain = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageAwbGain = 1;
}
else
{
CCstatus.ImageAwbGain = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMAEC") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMAEC") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageAec = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageAec = 1;
}
else
{
CCstatus.ImageAec = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMAEC2") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMAEC2") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageAec2 = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageAec2 = 1;
}
else
{
CCstatus.ImageAec2 = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMAELEVEL") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMAELEVEL") && (splitted.size() > 1))
{ {
int _ImageAeLevel = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
if ((_ImageAeLevel >= -2) && (_ImageAeLevel <= 2))
{ {
CCstatus.ImageAeLevel = _ImageAeLevel; int _ImageAeLevel = std::stoi(splitted[1]);
CCstatus.ImageAeLevel = clipInt(_ImageAeLevel, 2, -2);
} }
} }
else if ((toUpper(splitted[0]) == "CAMAECVALUE") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMAECVALUE") && (splitted.size() > 1))
{ {
int _ImageAecValue = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
if ((_ImageAecValue >= 0) && (_ImageAecValue <= 1200))
{ {
CCstatus.ImageAecValue = _ImageAecValue; int _ImageAecValue = std::stoi(splitted[1]);
CCstatus.ImageAecValue = clipInt(_ImageAecValue, 1200, 0);
} }
} }
else if ((toUpper(splitted[0]) == "CAMAGC") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMAGC") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageAgc = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageAgc = 1;
}
else
{
CCstatus.ImageAgc = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMAGCGAIN") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMAGCGAIN") && (splitted.size() > 1))
{ {
int _ImageAgcGain = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
if ((_ImageAgcGain >= 0) && (_ImageAgcGain <= 30))
{ {
CCstatus.ImageAgcGain = _ImageAgcGain; int _ImageAgcGain = std::stoi(splitted[1]);
CCstatus.ImageAgcGain = clipInt(_ImageAgcGain, 30, 0);
} }
} }
else if ((toUpper(splitted[0]) == "CAMBPC") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMBPC") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageBpc = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageBpc = 1;
}
else
{
CCstatus.ImageBpc = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMWPC") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMWPC") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageWpc = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageWpc = 1;
}
else
{
CCstatus.ImageWpc = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMRAWGMA") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMRAWGMA") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageRawGma = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageRawGma = 1;
}
else
{
CCstatus.ImageRawGma = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMLENC") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMLENC") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageLenc = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageLenc = 1;
}
else
{
CCstatus.ImageLenc = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMHMIRROR") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMHMIRROR") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageHmirror = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageHmirror = 1;
}
else
{
CCstatus.ImageHmirror = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMVFLIP") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMVFLIP") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageVflip = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageVflip = 1;
}
else
{
CCstatus.ImageVflip = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMDCW") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMDCW") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageDcw = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageDcw = 1;
}
else
{
CCstatus.ImageDcw = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMZOOM") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMZOOM") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.ImageZoomEnabled = alphanumericToBoolean(splitted[1]);
{
CCstatus.ImageZoomEnabled = 1;
}
else
{
CCstatus.ImageZoomEnabled = 0;
}
} }
else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETX") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETX") && (splitted.size() > 1))
{ {
CCstatus.ImageZoomOffsetX = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
{
CCstatus.ImageZoomOffsetX = std::stoi(splitted[1]);
}
} }
else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETY") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMZOOMOFFSETY") && (splitted.size() > 1))
{ {
CCstatus.ImageZoomOffsetY = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
{
CCstatus.ImageZoomOffsetY = std::stoi(splitted[1]);
}
} }
else if ((toUpper(splitted[0]) == "CAMZOOMSIZE") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "CAMZOOMSIZE") && (splitted.size() > 1))
{ {
int _ImageZoomSize = std::stoi(splitted[1]); if (isStringNumeric(splitted[1]))
if (_ImageZoomSize >= 0)
{ {
CCstatus.ImageZoomSize = _ImageZoomSize; CCstatus.ImageZoomSize = std::stoi(splitted[1]);
} }
} }
else if ((toUpper(splitted[0]) == "LEDINTENSITY") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "LEDINTENSITY") && (splitted.size() > 1))
{ {
float ledintensity = std::stof(splitted[1]); if (isStringNumeric(splitted[1]))
Camera.SetLEDIntensity(ledintensity); {
float ledintensity = std::stof(splitted[1]);
Camera.SetLEDIntensity(ledintensity);
}
} }
else if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1)) else if ((toUpper(splitted[0]) == "DEMO") && (splitted.size() > 1))
{ {
if (toUpper(splitted[1]) == "TRUE") CCstatus.DemoMode = alphanumericToBoolean(splitted[1]);
if (CCstatus.DemoMode == true)
{ {
CCstatus.DemoMode = true;
Camera.useDemoMode(); Camera.useDemoMode();
} }
else
{
CCstatus.DemoMode = false;
}
} }
} }

307
code/components/jomjol_flowcontroll/MainFlowControl.cpp
View File

@@ -551,7 +551,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
bool _noerror = false; bool _noerror = false;
bool _all = false; bool _all = false;
std::string _type = "value"; std::string _type = "value";
string zw; std::string zw;
ESP_LOGD(TAG, "handler water counter uri: %s", req->uri); ESP_LOGD(TAG, "handler water counter uri: %s", req->uri);
@@ -629,12 +629,12 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
} }
std::string *status = flowctrl.getActStatus(); std::string *status = flowctrl.getActStatus();
string query = std::string(_query); std::string query = std::string(_query);
// ESP_LOGD(TAG, "Query: %s, query.c_str()); // ESP_LOGD(TAG, "Query: %s, query.c_str());
if (query.find("full") != std::string::npos) if (query.find("full") != std::string::npos)
{ {
string txt; std::string txt;
txt = "<body style=\"font-family: arial\">"; txt = "<body style=\"font-family: arial\">";
if ((countRounds <= 1) && (*status != std::string("Flow finished"))) if ((countRounds <= 1) && (*status != std::string("Flow finished")))
@@ -659,7 +659,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
if (query.find("full") != std::string::npos) if (query.find("full") != std::string::npos)
{ {
string txt, zw; std::string txt, zw;
if ((countRounds <= 1) && (*status != std::string("Flow finished"))) if ((countRounds <= 1) && (*status != std::string("Flow finished")))
{ {
@@ -686,7 +686,7 @@ esp_err_t handler_wasserzaehler(httpd_req_t *req)
} }
else else
{ {
zw = to_string((int)htmlinfodig[i]->val); zw = std::to_string((int)htmlinfodig[i]->val);
} }
txt += "<td style=\"width: 100px\"><h4>" + zw + "</h4><p><img src=\"/img_tmp/" + htmlinfodig[i]->filename + "\"></p></td>\n"; txt += "<td style=\"width: 100px\"><h4>" + zw + "</h4><p><img src=\"/img_tmp/" + htmlinfodig[i]->filename + "\"></p></td>\n";
@@ -783,7 +783,7 @@ esp_err_t handler_editflow(httpd_req_t *req)
char _query[200]; char _query[200];
char _valuechar[30]; char _valuechar[30];
string _task; std::string _task;
if (httpd_req_get_url_query_str(req, _query, 200) == ESP_OK) if (httpd_req_get_url_query_str(req, _query, 200) == ESP_OK)
{ {
@@ -792,7 +792,7 @@ esp_err_t handler_editflow(httpd_req_t *req)
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "task is found: %s", _valuechar); ESP_LOGD(TAG, "task is found: %s", _valuechar);
#endif #endif
_task = string(_valuechar); _task = std::string(_valuechar);
} }
} }
@@ -816,12 +816,12 @@ esp_err_t handler_editflow(httpd_req_t *req)
if (_task.compare("copy") == 0) if (_task.compare("copy") == 0)
{ {
string in, out, zw; std::string in, out, zw;
httpd_query_key_value(_query, "in", _valuechar, 30); httpd_query_key_value(_query, "in", _valuechar, 30);
in = string(_valuechar); in = std::string(_valuechar);
httpd_query_key_value(_query, "out", _valuechar, 30); httpd_query_key_value(_query, "out", _valuechar, 30);
out = string(_valuechar); out = std::string(_valuechar);
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "in: %s", in.c_str()); ESP_LOGD(TAG, "in: %s", in.c_str());
@@ -839,31 +839,43 @@ esp_err_t handler_editflow(httpd_req_t *req)
if (_task.compare("cutref") == 0) if (_task.compare("cutref") == 0)
{ {
string in, out, zw; std::string in, out, zw;
int x, y, dx, dy; int x = 0, y = 0, dx = 20, dy = 20;
bool enhance = false; bool enhance = false;
httpd_query_key_value(_query, "in", _valuechar, 30); httpd_query_key_value(_query, "in", _valuechar, 30);
in = string(_valuechar); in = std::string(_valuechar);
httpd_query_key_value(_query, "out", _valuechar, 30); httpd_query_key_value(_query, "out", _valuechar, 30);
out = string(_valuechar); out = std::string(_valuechar);
httpd_query_key_value(_query, "x", _valuechar, 30); httpd_query_key_value(_query, "x", _valuechar, 30);
string _x = string(_valuechar); std::string _x = std::string(_valuechar);
x = stoi(_x); if (isStringNumeric(_x))
{
x = std::stoi(_x);
}
httpd_query_key_value(_query, "y", _valuechar, 30); httpd_query_key_value(_query, "y", _valuechar, 30);
string _y = string(_valuechar); std::string _y = std::string(_valuechar);
y = stoi(_y); if (isStringNumeric(_y))
{
y = std::stoi(_y);
}
httpd_query_key_value(_query, "dx", _valuechar, 30); httpd_query_key_value(_query, "dx", _valuechar, 30);
string _dx = string(_valuechar); std::string _dx = std::string(_valuechar);
dx = stoi(_dx); if (isStringNumeric(_dx))
{
dx = std::stoi(_dx);
}
httpd_query_key_value(_query, "dy", _valuechar, 30); httpd_query_key_value(_query, "dy", _valuechar, 30);
string _dy = string(_valuechar); std::string _dy = std::string(_valuechar);
dy = stoi(_dy); if (isStringNumeric(_dy))
{
dy = std::stoi(_dy);
}
#ifdef DEBUG_DETAIL_ON #ifdef DEBUG_DETAIL_ON
ESP_LOGD(TAG, "in: %s", in.c_str()); ESP_LOGD(TAG, "in: %s", in.c_str());
@@ -876,7 +888,7 @@ esp_err_t handler_editflow(httpd_req_t *req)
if (httpd_query_key_value(_query, "enhance", _valuechar, 10) == ESP_OK) if (httpd_query_key_value(_query, "enhance", _valuechar, 10) == ESP_OK)
{ {
string _enhance = string(_valuechar); string _enhance = std::string(_valuechar);
if (_enhance.compare("true") == 0) if (_enhance.compare("true") == 0)
{ {
@@ -887,7 +899,7 @@ esp_err_t handler_editflow(httpd_req_t *req)
in = "/sdcard" + in; in = "/sdcard" + in;
out = "/sdcard" + out; out = "/sdcard" + out;
string out2 = out.substr(0, out.length() - 4) + "_org.jpg"; std::string out2 = out.substr(0, out.length() - 4) + "_org.jpg";
if ((flowctrl.SetupModeActive || (*flowctrl.getActStatus() == std::string("Flow finished"))) && psram_init_shared_memory_for_take_image_step()) if ((flowctrl.SetupModeActive || (*flowctrl.getActStatus() == std::string("Flow finished"))) && psram_init_shared_memory_for_take_image_step())
{ {
@@ -939,295 +951,236 @@ esp_err_t handler_editflow(httpd_req_t *req)
if (httpd_query_key_value(_query, "waitb", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "waitb", _valuechar, 30) == ESP_OK)
{ {
int _waitb = std::stoi(_valuechar); std::string _waitb = std::string(_valuechar);
if (_waitb != 0) if (isStringNumeric(_waitb))
{ {
CFstatus.WaitBeforePicture = _waitb; CFstatus.WaitBeforePicture = std::stoi(_valuechar);
} }
} }
if (httpd_query_key_value(_query, "qual", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "qual", _valuechar, 30) == ESP_OK)
{ {
int _qual = std::stoi(_valuechar); std::string _qual = std::string(_valuechar);
if ((_qual >= 0) && (_qual <= 63)) if (isStringNumeric(_qual))
{ {
CFstatus.ImageQuality = _qual; int _qual_ = std::stoi(_valuechar);
CFstatus.ImageQuality = clipInt(_qual_, 63, 6);
} }
} }
if (httpd_query_key_value(_query, "bri", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "bri", _valuechar, 30) == ESP_OK)
{ {
int _bri = std::stoi(_valuechar); std::string _bri = std::string(_valuechar);
if ((_bri >= -2) && (_bri <= 2)) if (isStringNumeric(_bri))
{ {
CFstatus.ImageBrightness = _bri; int _bri_ = std::stoi(_valuechar);
CFstatus.ImageBrightness = clipInt(_bri_, 2, -2);
} }
} }
if (httpd_query_key_value(_query, "con", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "con", _valuechar, 30) == ESP_OK)
{ {
int _con = std::stoi(_valuechar); std::string _con = std::string(_valuechar);
if ((_con >= -2) && (_con <= 2)) if (isStringNumeric(_con))
{ {
CFstatus.ImageContrast = _con; int _con_ = std::stoi(_valuechar);
CFstatus.ImageContrast = clipInt(_con_, 2, -2);
} }
} }
if (httpd_query_key_value(_query, "sat", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "sat", _valuechar, 30) == ESP_OK)
{ {
int _sat = std::stoi(_valuechar); std::string _sat = std::string(_valuechar);
if ((_sat >= -2) && (_sat <= 2)) if (isStringNumeric(_sat))
{ {
CFstatus.ImageSaturation = _sat; int _sat_ = std::stoi(_valuechar);
CFstatus.ImageSaturation = clipInt(_sat_, 2, -2);
} }
} }
if (httpd_query_key_value(_query, "shp", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "shp", _valuechar, 30) == ESP_OK)
{ {
int _shp = std::stoi(_valuechar); std::string _shp = std::string(_valuechar);
if ((_shp >= -2) && (_shp <= 2)) if (isStringNumeric(_shp))
{ {
CFstatus.ImageSharpness = _shp; int _shp_ = std::stoi(_valuechar);
CFstatus.ImageSaturation = clipInt(_shp_, 2, -2);
} }
} }
if (httpd_query_key_value(_query, "ashp", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "ashp", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _ashp = std::string(_valuechar);
{ CFstatus.ImageAutoSharpness = alphanumericToBoolean(_ashp);
CFstatus.ImageAutoSharpness = 1;
}
else
{
CFstatus.ImageAutoSharpness = 0;
}
} }
if (httpd_query_key_value(_query, "spe", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "spe", _valuechar, 30) == ESP_OK)
{ {
int _spe = std::stoi(_valuechar); std::string _spe = std::string(_valuechar);
if ((_spe >= 0) && (_spe <= 6)) if (isStringNumeric(_spe))
{ {
CFstatus.ImageSpecialEffect = _spe; int _spe_ = std::stoi(_valuechar);
CFstatus.ImageSpecialEffect = clipInt(_spe_, 6, 0);
} }
} }
if (httpd_query_key_value(_query, "wbm", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "wbm", _valuechar, 30) == ESP_OK)
{ {
int _wbm = std::stoi(_valuechar); std::string _wbm = std::string(_valuechar);
if ((_wbm >= 0) && (_wbm <= 4)) if (isStringNumeric(_wbm))
{ {
CFstatus.ImageWbMode = _wbm; int _wbm_ = std::stoi(_valuechar);
CFstatus.ImageWbMode = clipInt(_wbm_, 4, 0);
} }
} }
if (httpd_query_key_value(_query, "awb", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "awb", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _awb = std::string(_valuechar);
{ CFstatus.ImageAwb = alphanumericToBoolean(_awb);
CFstatus.ImageAwb = 1;
}
else
{
CFstatus.ImageAwb = 0;
}
} }
if (httpd_query_key_value(_query, "awbg", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "awbg", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _awbg = std::string(_valuechar);
{ CFstatus.ImageAwbGain = alphanumericToBoolean(_awbg);
CFstatus.ImageAwbGain = 1;
}
else
{
CFstatus.ImageAwbGain = 0;
}
} }
if (httpd_query_key_value(_query, "aec", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "aec", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _aec = std::string(_valuechar);
{ CFstatus.ImageAec = alphanumericToBoolean(_aec);
CFstatus.ImageAec = 1;
}
else
{
CFstatus.ImageAec = 0;
}
} }
if (httpd_query_key_value(_query, "aec2", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "aec2", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _aec2 = std::string(_valuechar);
{ CFstatus.ImageAec2 = alphanumericToBoolean(_aec2);
CFstatus.ImageAec2 = 1;
}
else
{
CFstatus.ImageAec2 = 0;
}
} }
if (httpd_query_key_value(_query, "ael", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "ael", _valuechar, 30) == ESP_OK)
{ {
int _ael = std::stoi(_valuechar); std::string _ael = std::string(_valuechar);
if ((_ael >= -2) && (_ael <= 2)) if (isStringNumeric(_ael))
{ {
CFstatus.ImageAeLevel = _ael; int _ael_ = std::stoi(_valuechar);
CFstatus.ImageAeLevel = clipInt(_ael_, 2, -2);
} }
} }
if (httpd_query_key_value(_query, "aecv", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "aecv", _valuechar, 30) == ESP_OK)
{ {
int _aecv = std::stoi(_valuechar); std::string _aecv = std::string(_valuechar);
if ((_aecv >= 0) && (_aecv <= 1200)) if (isStringNumeric(_aecv))
{ {
CFstatus.ImageAecValue = _aecv; int _aecv_ = std::stoi(_valuechar);
CFstatus.ImageAecValue = clipInt(_aecv_, 1200, 0);
} }
} }
if (httpd_query_key_value(_query, "agc", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "agc", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _agc = std::string(_valuechar);
{ CFstatus.ImageAgc = alphanumericToBoolean(_agc);
CFstatus.ImageAgc = 1;
}
else
{
CFstatus.ImageAgc = 0;
}
} }
if (httpd_query_key_value(_query, "agcg", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "agcg", _valuechar, 30) == ESP_OK)
{ {
int _agcg = std::stoi(_valuechar); std::string _agcg = std::string(_valuechar);
if ((_agcg >= 0) && (_agcg <= 30)) if (isStringNumeric(_agcg))
{ {
CFstatus.ImageAgcGain = _agcg; int _agcg_ = std::stoi(_valuechar);
CFstatus.ImageAgcGain = clipInt(_agcg_, 30, 0);
} }
} }
if (httpd_query_key_value(_query, "bpc", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "bpc", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _bpc = std::string(_valuechar);
{ CFstatus.ImageBpc = alphanumericToBoolean(_bpc);
CFstatus.ImageBpc = 1;
}
else
{
CFstatus.ImageBpc = 0;
}
} }
if (httpd_query_key_value(_query, "wpc", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "wpc", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _wpc = std::string(_valuechar);
{ CFstatus.ImageWpc = alphanumericToBoolean(_wpc);
CFstatus.ImageWpc = 1;
}
else
{
CFstatus.ImageWpc = 0;
}
} }
if (httpd_query_key_value(_query, "rgma", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "rgma", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _rgma = std::string(_valuechar);
{ CFstatus.ImageRawGma = alphanumericToBoolean(_rgma);
CFstatus.ImageRawGma = 1;
}
else
{
CFstatus.ImageRawGma = 0;
}
} }
if (httpd_query_key_value(_query, "lenc", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "lenc", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _lenc = std::string(_valuechar);
{ CFstatus.ImageLenc = alphanumericToBoolean(_lenc);
CFstatus.ImageLenc = 1;
}
else
{
CFstatus.ImageLenc = 0;
}
} }
if (httpd_query_key_value(_query, "mirror", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "mirror", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _mirror = std::string(_valuechar);
{ CFstatus.ImageHmirror = alphanumericToBoolean(_mirror);
CFstatus.ImageHmirror = 1;
}
else
{
CFstatus.ImageHmirror = 0;
}
} }
if (httpd_query_key_value(_query, "flip", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "flip", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _flip = std::string(_valuechar);
{ CFstatus.ImageVflip = alphanumericToBoolean(_flip);
CFstatus.ImageVflip = 1;
}
else
{
CFstatus.ImageVflip = 0;
}
} }
if (httpd_query_key_value(_query, "dcw", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "dcw", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _dcw = std::string(_valuechar);
{ CFstatus.ImageDcw = alphanumericToBoolean(_dcw);
CFstatus.ImageDcw = 1;
}
else
{
CFstatus.ImageDcw = 0;
}
} }
if (httpd_query_key_value(_query, "zoom", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "zoom", _valuechar, 30) == ESP_OK)
{ {
if (std::stoi(_valuechar) != 0) std::string _zoom = std::string(_valuechar);
{ CFstatus.ImageZoomEnabled = alphanumericToBoolean(_zoom);
CFstatus.ImageZoomEnabled = 1;
}
else
{
CFstatus.ImageZoomEnabled = 0;
}
} }
if (httpd_query_key_value(_query, "zoomx", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "zoomx", _valuechar, 30) == ESP_OK)
{ {
CFstatus.ImageZoomOffsetX = std::stoi(_valuechar); std::string _zoomx = std::string(_valuechar);
if (isStringNumeric(_zoomx))
{
int _ImageZoomOffsetX = std::stoi(_valuechar);
CFstatus.ImageZoomOffsetX = clipInt(_ImageZoomOffsetX, 960, -960);
}
} }
if (httpd_query_key_value(_query, "zoomy", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "zoomy", _valuechar, 30) == ESP_OK)
{ {
CFstatus.ImageZoomOffsetY = std::stoi(_valuechar); std::string _zoomy = std::string(_valuechar);
if (isStringNumeric(_zoomy))
{
int _ImageZoomOffsetY = std::stoi(_valuechar);
CFstatus.ImageZoomOffsetY = clipInt(_ImageZoomOffsetY, 720, -720);
}
} }
if (httpd_query_key_value(_query, "zooms", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "zooms", _valuechar, 30) == ESP_OK)
{ {
int _ImageZoomSize = std::stoi(_valuechar); std::string _zooms = std::string(_valuechar);
if (_ImageZoomSize >= 0) if (isStringNumeric(_zooms))
{ {
CFstatus.ImageZoomSize = _ImageZoomSize; int _ImageZoomSize = std::stoi(_valuechar);
CFstatus.ImageZoomSize = clipInt(_ImageZoomSize, 29, 0);
} }
} }
if (httpd_query_key_value(_query, "ledi", _valuechar, 30) == ESP_OK) if (httpd_query_key_value(_query, "ledi", _valuechar, 30) == ESP_OK)
{ {
float _ImageLedIntensity = std::stof(_valuechar); std::string _ledi = std::string(_valuechar);
Camera.SetLEDIntensity(_ImageLedIntensity); if (isStringNumeric(_ledi))
CFstatus.ImageLedIntensity = CCstatus.ImageLedIntensity; {
float _ImageLedIntensity = std::stof(_valuechar);
Camera.SetLEDIntensity(_ImageLedIntensity);
CFstatus.ImageLedIntensity = CCstatus.ImageLedIntensity;
}
} }
if (_task.compare("cam_settings") == 0) if (_task.compare("cam_settings") == 0)

2
code/include/defines.h
View File

@@ -105,7 +105,7 @@
#define LOGFILE_LAST_PART_BYTES 80 * 1024 // 80 kBytes // Size of partial log file to return #define LOGFILE_LAST_PART_BYTES 80 * 1024 // 80 kBytes // Size of partial log file to return
#define SERVER_FILER_SCRATCH_BUFSIZE 4096 #define SERVER_FILER_SCRATCH_BUFSIZE 4096
#define SERVER_HELPER_SCRATCH_BUFSIZE 8192 #define SERVER_HELPER_SCRATCH_BUFSIZE 4096
#define SERVER_OTA_SCRATCH_BUFSIZE 1024 #define SERVER_OTA_SCRATCH_BUFSIZE 1024

31
code/main/main.cpp
View File

@@ -11,10 +11,13 @@
#include "esp_chip_info.h" #include "esp_chip_info.h"
// SD-Card //////////////////// // SD-Card ////////////////////
#include "sdcard_init.h"
#include "esp_vfs_fat.h" #include "esp_vfs_fat.h"
#include "ffconf.h" #include "ffconf.h"
#include "driver/sdmmc_host.h" #include "driver/sdmmc_host.h"
#if (ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(5, 1, 2))
#include "sdcard_init.h"
#endif
/////////////////////////////// ///////////////////////////////
#include "ClassLogFile.h" #include "ClassLogFile.h"
@@ -91,10 +94,10 @@ static const char *TAG = "MAIN";
#define MOUNT_POINT "/sdcard" #define MOUNT_POINT "/sdcard"
bool Init_NVS_SDCard() bool Init_NVS_SDCard()
{ {
esp_err_t ret = nvs_flash_init(); esp_err_t ret = nvs_flash_init();
if (ret == ESP_ERR_NVS_NO_FREE_PAGES) { if (ret == ESP_ERR_NVS_NO_FREE_PAGES) {
ESP_ERROR_CHECK(nvs_flash_erase()); ESP_ERROR_CHECK(nvs_flash_erase());
ret = nvs_flash_init(); ret = nvs_flash_init();
@@ -144,7 +147,11 @@ bool Init_NVS_SDCard()
// Note: esp_vfs_fat_sdmmc_mount is an all-in-one convenience function. // Note: esp_vfs_fat_sdmmc_mount is an all-in-one convenience function.
// Please check its source code and implement error recovery when developing // Please check its source code and implement error recovery when developing
// production applications. // production applications.
#if (ESP_IDF_VERSION <= ESP_IDF_VERSION_VAL(5, 1, 2))
ret = esp_vfs_fat_sdmmc_mount_mh(mount_point, &host, &slot_config, &mount_config, &card); ret = esp_vfs_fat_sdmmc_mount_mh(mount_point, &host, &slot_config, &mount_config, &card);
#else
ret = esp_vfs_fat_sdmmc_mount(mount_point, &host, &slot_config, &mount_config, &card);
#endif
if (ret != ESP_OK) { if (ret != ESP_OK) {
if (ret == ESP_FAIL) { if (ret == ESP_FAIL) {
@@ -167,7 +174,6 @@ bool Init_NVS_SDCard()
return true; return true;
} }
extern "C" void app_main(void) extern "C" void app_main(void)
{ {
//#ifdef CONFIG_HEAP_TRACING_STANDALONE //#ifdef CONFIG_HEAP_TRACING_STANDALONE
@@ -191,7 +197,6 @@ extern "C" void app_main(void)
// ******************************************** // ********************************************
ESP_LOGI(TAG, "\n\n\n\n================ Start app_main ================="); ESP_LOGI(TAG, "\n\n\n\n================ Start app_main =================");
// Init SD card // Init SD card
// ******************************************** // ********************************************
if (!Init_NVS_SDCard()) if (!Init_NVS_SDCard())
@@ -212,7 +217,6 @@ extern "C" void app_main(void)
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "==================== Start ======================"); LogFile.WriteToFile(ESP_LOG_INFO, TAG, "==================== Start ======================");
LogFile.WriteToFile(ESP_LOG_INFO, TAG, "================================================="); LogFile.WriteToFile(ESP_LOG_INFO, TAG, "=================================================");
// Init external PSRAM // Init external PSRAM
// ******************************************** // ********************************************
esp_err_t PSRAMStatus = esp_psram_init(); esp_err_t PSRAMStatus = esp_psram_init();
@@ -261,7 +265,6 @@ extern "C" void app_main(void)
ESP_LOGD(TAG, "After camera initialization: sleep for: %ldms", (long) xDelay * CONFIG_FREERTOS_HZ/portTICK_PERIOD_MS); ESP_LOGD(TAG, "After camera initialization: sleep for: %ldms", (long) xDelay * CONFIG_FREERTOS_HZ/portTICK_PERIOD_MS);
vTaskDelay( xDelay ); vTaskDelay( xDelay );
// Check camera init // Check camera init
// ******************************************** // ********************************************
if (camStatus != ESP_OK) { // Camera init failed, retry to init if (camStatus != ESP_OK) { // Camera init failed, retry to init
@@ -310,7 +313,6 @@ extern "C" void app_main(void)
} }
} }
// SD card: basic R/W check // SD card: basic R/W check
// ******************************************** // ********************************************
int iSDCardStatus = SDCardCheckRW(); int iSDCardStatus = SDCardCheckRW();
@@ -335,12 +337,10 @@ extern "C" void app_main(void)
// ******************************************** // ********************************************
setupTime(); // NTP time service: Status of time synchronization will be checked after every round (server_tflite.cpp) setupTime(); // NTP time service: Status of time synchronization will be checked after every round (server_tflite.cpp)
// Set CPU Frequency // Set CPU Frequency
// ******************************************** // ********************************************
setCpuFrequency(); setCpuFrequency();
// SD card: Create further mandatory directories (if not already existing) // SD card: Create further mandatory directories (if not already existing)
// Correct creation of these folders will be checked with function "SDCardCheckFolderFilePresence" // Correct creation of these folders will be checked with function "SDCardCheckFolderFilePresence"
// ******************************************** // ********************************************
@@ -432,7 +432,6 @@ extern "C" void app_main(void)
ESP_LOGD(TAG, "main: sleep for: %ldms", (long) xDelay * CONFIG_FREERTOS_HZ/portTICK_PERIOD_MS); ESP_LOGD(TAG, "main: sleep for: %ldms", (long) xDelay * CONFIG_FREERTOS_HZ/portTICK_PERIOD_MS);
vTaskDelay( xDelay ); vTaskDelay( xDelay );
// manual reset the time // manual reset the time
// ******************************************** // ********************************************
if (!time_manual_reset_sync()) if (!time_manual_reset_sync())
@@ -440,8 +439,6 @@ extern "C" void app_main(void)
LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Manual Time Sync failed during startup" ); LogFile.WriteToFile(ESP_LOG_DEBUG, TAG, "Manual Time Sync failed during startup" );
} }
// Set log level for wifi component to WARN level (default: INFO; only relevant for serial console) // Set log level for wifi component to WARN level (default: INFO; only relevant for serial console)
// ******************************************** // ********************************************
esp_log_level_set("wifi", ESP_LOG_WARN); esp_log_level_set("wifi", ESP_LOG_WARN);
@@ -465,8 +462,6 @@ extern "C" void app_main(void)
#endif #endif
#endif #endif
// Print Device info // Print Device info
// ******************************************** // ********************************************
esp_chip_info_t chipInfo; esp_chip_info_t chipInfo;
@@ -522,7 +517,6 @@ extern "C" void app_main(void)
} }
} }
void migrateConfiguration(void) { void migrateConfiguration(void) {
bool migrated = false; bool migrated = false;
@@ -705,7 +699,6 @@ void migrateConfiguration(void) {
} }
} }
std::vector<std::string> splitString(const std::string& str) { std::vector<std::string> splitString(const std::string& str) {
std::vector<std::string> tokens; std::vector<std::string> tokens;
@@ -719,8 +712,6 @@ std::vector<std::string> splitString(const std::string& str) {
return tokens; return tokens;
} }
/*bool replace_all(std::string& s, std::string const& toReplace, std::string const& replaceWith) { /*bool replace_all(std::string& s, std::string const& toReplace, std::string const& replaceWith) {
std::string buf; std::string buf;
std::size_t pos = 0; std::size_t pos = 0;
@@ -748,11 +739,10 @@ std::vector<std::string> splitString(const std::string& str) {
return found; return found;
}*/ }*/
bool setCpuFrequency(void) { bool setCpuFrequency(void) {
ConfigFile configFile = ConfigFile(CONFIG_FILE); ConfigFile configFile = ConfigFile(CONFIG_FILE);
string cpuFrequency = "160"; string cpuFrequency = "160";
esp_pm_config_esp32_t pm_config; esp_pm_config_t pm_config;
if (!configFile.ConfigFileExists()){ if (!configFile.ConfigFileExists()){
LogFile.WriteToFile(ESP_LOG_WARN, TAG, "No ConfigFile defined - exit setCpuFrequency()!"); LogFile.WriteToFile(ESP_LOG_WARN, TAG, "No ConfigFile defined - exit setCpuFrequency()!");
@@ -764,7 +754,6 @@ bool setCpuFrequency(void) {
bool disabledLine = false; bool disabledLine = false;
bool eof = false; bool eof = false;
/* Load config from config file */ /* Load config from config file */
while ((!configFile.GetNextParagraph(line, disabledLine, eof) || while ((!configFile.GetNextParagraph(line, disabledLine, eof) ||
(line.compare("[System]") != 0)) && !eof) {} (line.compare("[System]") != 0)) && !eof) {}