Skip to content

Commit 189093d

Browse files
authored
Merge pull request #862 from haverland/rolling
Version 1.0 of digital and analog categorical models
2 parents aaad952 + 34eb89b commit 189093d

File tree

5 files changed

+6
-2
lines changed

5 files changed

+6
-2
lines changed

.DS_Store

0 Bytes
Binary file not shown.

code/components/jomjol_fileserver_ota/server_file.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ esp_err_t get_tflite_file_handler(httpd_req_t *req)
9696
printf("File: %s\t", _filename.c_str());
9797

9898
_fileext = _filename;
99-
pos = _fileext.find(".");
99+
pos = _fileext.find_last_of(".");
100100
if (pos != std::string::npos)
101101
_fileext = _fileext.erase(0, pos + 1);
102102

code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,8 @@ string ClassFlowCNNGeneral::getReadout(int _analog = 0, bool _extendedResolution
113113
{
114114
prev = -1;
115115
result = "N" + result;
116+
if (debugdetailgeneral) LogFile.WriteToFile("ClassFlowCNNGeneral::getReadout(result_float<0 /'N') result_float=" + std::to_string(GENERAL[_analog]->ROI[i]->result_float));
117+
116118
}
117119
}
118120
return result;
@@ -205,7 +207,8 @@ int ClassFlowCNNGeneral::ZeigerEvalHybrid(float zahl, float zahl_vorgaenger, int
205207
return (ergebnis_vorkomma - 1 + 10) % 10;
206208
}
207209
}
208-
210+
if (debugdetailgeneral) LogFile.WriteToFile("ClassFlowCNNGeneral::ZeigerEvalHybrid(return -1) zahl=" + std::to_string(zahl)
211+
+ ", zahl_vorgaenger=" + std::to_string(zahl_vorgaenger) + ", eval_vorgaenger=" + std::to_string(eval_vorgaenger));
209212
return -1;
210213

211214
/*
@@ -575,6 +578,7 @@ bool ClassFlowCNNGeneral::getNetworkParameter()
575578
}
576579
break;
577580
default:
581+
LogFile.WriteToFile("ERROR ERROR ERROR - tflite passt nicht zur Firmware - ERROR ERROR ERROR (outout_dimension=" + std::to_string(_anzoutputdimensions) + ")");
578582
printf("ERROR ERROR ERROR - tflite passt nicht zur Firmware - ERROR ERROR ERROR\n");
579583
}
580584
}
129 KB
Binary file not shown.
221 KB
Binary file not shown.

0 commit comments

Comments
 (0)