Rolling 20220831

README.md

@@ -42,6 +42,17 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 ##### Rolling (2022-08-31)
 
+- **ATTENTION**: 
+  - first update the 'firmware.bin' and ensure that the new version is running
+
+  - Only afterwards update the 'html.zip'
+  
+  - Otherwise the downwards compatibility of the new counter clockwise feature is not given and you end in a reboot loop, that needs manual flashing!
+  
+- Implements Counter Clockwise Analog Pointers  (many thanks to **[adellafave](https://github.com/adellafave)**)
+  - you can activate it via check box in the graphical configuration
+
+- HTML: adds CPU Temp , RSSI to status (many thanks to **[adellafave](https://github.com/adellafave)**)
 - WebUI improvements (many thanks to @**[caco3](https://github.com/caco3)**)
 
 ##### Rolling (2022-08-30)

code/components/jomjol_fileserver_ota/server_help.cpp

@@ -43,6 +43,7 @@ esp_err_t send_file(httpd_req_t *req, std::string filename)
     }
 
     ESP_LOGI(TAG, "Sending file : %s ...", filename.c_str());
+//    httpd_resp_set_hdr(req, "Access-Control-Allow-Origin", "*");
     set_content_type_from_file(req, filename.c_str());
 
     /* Retrieve the pointer to scratch buffer for temporary storage */

code/components/jomjol_flowcontroll/ClassFlowCNNGeneral.cpp

@@ -439,7 +439,11 @@ bool ClassFlowCNNGeneral::ReadParameter(FILE* pfile, string& aktparamgraph)
             neuroi->posy = std::stoi(zerlegt[2]);
             neuroi->deltax = std::stoi(zerlegt[3]);
             neuroi->deltay = std::stoi(zerlegt[4]);
-            neuroi->CCW = toUpper(zerlegt[5]) == "TRUE";
+            neuroi->CCW = false;
+            if (zerlegt.size() >= 6)
+            {
+                neuroi->CCW = toUpper(zerlegt[5]) == "TRUE";
+            }
             neuroi->result_float = -1;
             neuroi->image = NULL;
             neuroi->image_org = NULL;

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="6db01e6";
+const char* GIT_REV="5a31543";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2022-08-31 19:38";
+const char* BUILD_TIME="2022-08-31 21:56";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="6db01e6";
+const char* GIT_REV="5a31543";
 const char* GIT_TAG="";
 const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2022-08-31 19:38";
+const char* BUILD_TIME="2022-08-31 21:56";

sd-card/html/edit_analog.html

@@ -254,7 +254,10 @@ function changeCCW(){
     ROIInfo = getROIInfo("analog", _number);
     aktindex = parseInt(document.getElementById("index").value);
 
-    ROIInfo[aktindex]["CCW"] = document.getElementById("CCW").checked;
+    if (document.getElementById("CCW").checked)
+        ROIInfo[aktindex]["CCW"] = "true";
+    else
+        ROIInfo[aktindex]["CCW"] = "false";
 	UpdateROIs();
 }
 

sd-card/html/gethost.js

@@ -13,7 +13,7 @@ function getbasepath(){
     {
 //        host = "http://192.168.2.219";          // jomjol interner test
 //        host = "http://192.168.178.46";          // jomjol interner test
-        host = "http://192.168.178.44";          // jomjol interner Real
+        host = "http://192.168.178.62";          // jomjol interner Real
 //        host = "http://192.168.43.191";
 //        host = ".";                           // jomjol interner localhost   
 

sd-card/html/readconfigparam.js

@@ -86,8 +86,6 @@ function ParseConfig() {
      ParamAddValue(param, catname, "CNNGoodThreshold", 1); 
      ParamAddValue(param, catname, "LogImageLocation");
      ParamAddValue(param, catname, "LogfileRetentionInDays");
-//     ParamAddValue(param, catname, "ModelInputSize", 2); 
-         
 
      var catname = "Analog";
      category[catname] = new Object(); 
@@ -97,7 +95,6 @@ function ParseConfig() {
      ParamAddValue(param, catname, "Model");
      ParamAddValue(param, catname, "LogImageLocation");
      ParamAddValue(param, catname, "LogfileRetentionInDays");
-//     ParamAddValue(param, catname, "ModelInputSize", 2);
 
      var catname = "PostProcessing";
      category[catname] = new Object(); 
@@ -236,9 +233,9 @@ function ParseConfigParamAll(_aktline, _catname){
           let [isCom, input] = isCommented(_input);
           var linesplit = ZerlegeZeile(input);
           ParamExtractValueAll(param, linesplit, _catname, _aktline, isCom);
-          if (!isCom && (linesplit.length == 6) && (_catname == 'Digits'))
+          if (!isCom && (linesplit.length >= 5) && (_catname == 'Digits'))
                ExtractROIs(input, "digit");
-          if (!isCom && (linesplit.length == 6) && (_catname == 'Analog'))
+          if (!isCom && (linesplit.length >= 5) && (_catname == 'Analog'))
                ExtractROIs(input, "analog");
           if (!isCom && (linesplit.length == 3) && (_catname == 'Alignment'))
           {
@@ -486,7 +483,9 @@ function ExtractROIs(_aktline, _type){
      abc["dx"] = linesplit[3];
      abc["dy"] = linesplit[4];
      abc["ar"] = parseFloat(linesplit[3]) / parseFloat(linesplit[4]);
-     abc["CCW"] = linesplit[5];
+     abc["CCW"] = "false";
+     if (linesplit.length >= 6)
+          abc["CCW"] = linesplit[5];
 }
 
 

sd-card/html/version.txt

@@ -1 +1 @@
-16.2.0
+16.3.1