Просмотр исходного кода

Merge pull request #862 from haverland/rolling

Version 1.0 of digital and analog categorical models
jomjol 3 лет назад
Родитель
Сommit
189093d548

+ 1 - 1
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);
 

+ 5 - 1
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");
         }
     }

BIN
sd-card/config/ana_i32s100dr-v1.0-q.tflite


BIN
sd-card/config/dig-s1d-md-v1.0-q.tflite