Merge pull request #862 from haverland/rolling

Version 1.0 of digital and analog categorical models
This commit is contained in:
jomjol
2022-07-18 20:33:02 +02:00
committed by GitHub
5 changed files with 6 additions and 2 deletions

BIN
.DS_Store vendored

Binary file not shown.

View File

@@ -96,7 +96,7 @@ esp_err_t get_tflite_file_handler(httpd_req_t *req)
printf("File: %s\t", _filename.c_str()); printf("File: %s\t", _filename.c_str());
_fileext = _filename; _fileext = _filename;
pos = _fileext.find("."); pos = _fileext.find_last_of(".");
if (pos != std::string::npos) if (pos != std::string::npos)
_fileext = _fileext.erase(0, pos + 1); _fileext = _fileext.erase(0, pos + 1);

View File

@@ -113,6 +113,8 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution
{ {
prev = -1; prev = -1;
result = "N" + result; 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; return result;
@@ -205,7 +207,8 @@ int ClassFlowCNNGeneral::ZeigerEvalHybrid(float zahl, float zahl_vorgaenger, int
return (ergebnis_vorkomma - 1 + 10) % 10; 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; return -1;
/* /*
@@ -575,6 +578,7 @@ bool ClassFlowCNNGeneral::getNetworkParameter()
} }
break; break;
default: 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"); printf("ERROR ERROR ERROR - tflite passt nicht zur Firmware - ERROR ERROR ERROR\n");
} }
} }

Binary file not shown.

Binary file not shown.