diff --git a/.DS_Store b/.DS_Store index 7911e3f4..fc1b6309 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/code/components/jomjol_fileserver_ota/server_file.cpp b/code/components/jomjol_fileserver_ota/server_file.cpp index ca7d17ee..e435ee4d 100644 --- a/code/components/jomjol_fileserver_ota/server_file.cpp +++ b/code/components/jomjol_fileserver_ota/server_file.cpp @@ -96,7 +96,7 @@ esp_err_t get_tflite_file_handler(httpd_req_t *req) printf("File: %s\t", _filename.c_str()); _fileext = _filename; - pos = _fileext.find("."); + pos = _fileext.find_last_of("."); if (pos != std::string::npos) _fileext = _fileext.erase(0, pos + 1); diff --git a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp index a3d47753..7c67db53 100644 --- a/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp +++ b/code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp @@ -113,6 +113,8 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution { prev = -1; result = "N" + result; + if (debugdetailgeneral) LogFile.WriteToFile("ClassFlowCNNGeneral::getReadout(result_float<0 /'N') result_float=" + std::to_string(GENERAL[_analog]->ROI[i]->result_float)); + } } return result; @@ -205,7 +207,8 @@ int ClassFlowCNNGeneral::ZeigerEvalHybrid(float zahl, float zahl_vorgaenger, int return (ergebnis_vorkomma - 1 + 10) % 10; } } - + if (debugdetailgeneral) LogFile.WriteToFile("ClassFlowCNNGeneral::ZeigerEvalHybrid(return -1) zahl=" + std::to_string(zahl) + + ", zahl_vorgaenger=" + std::to_string(zahl_vorgaenger) + ", eval_vorgaenger=" + std::to_string(eval_vorgaenger)); return -1; /* @@ -575,6 +578,7 @@ bool ClassFlowCNNGeneral::getNetworkParameter() } break; default: + LogFile.WriteToFile("ERROR ERROR ERROR - tflite passt nicht zur Firmware - ERROR ERROR ERROR (outout_dimension=" + std::to_string(_anzoutputdimensions) + ")"); printf("ERROR ERROR ERROR - tflite passt nicht zur Firmware - ERROR ERROR ERROR\n"); } } diff --git a/sd-card/config/ana_i32s100dr-v1.0-q.tflite b/sd-card/config/ana_i32s100dr-v1.0-q.tflite new file mode 100644 index 00000000..dc1fdd41 Binary files /dev/null and b/sd-card/config/ana_i32s100dr-v1.0-q.tflite differ diff --git a/sd-card/config/dig-s1d-md-v1.0-q.tflite b/sd-card/config/dig-s1d-md-v1.0-q.tflite new file mode 100644 index 00000000..3a0de4c9 Binary files /dev/null and b/sd-card/config/dig-s1d-md-v1.0-q.tflite differ