Merge pull request #165 from jomjol/rolling

Update to v6.5.0
jomjol · Mar 25, 2021 · 7bc4e63 · 7bc4e63
2 parents 97ecbc7 + ad40150
commit 7bc4e63
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 42 deletions.
diff --git a/README.md b/README.md
@@ -41,6 +41,12 @@ If you would like to support the developer with a cup of coffee you can do that
 
 
 
+##### 6.5.0 Image Processing in Memory - (2021-03-25)
+
+* Upgrade digital CNN to v8.2.0  (added new type of digits)
+* Supporting alignment structures in ROI definition
+* Bug fixing: definition of  hostname in `config.ini`
+
 ##### 6.4.0 Image Processing in Memory - (2021-03-20)
 
 * Additional alignment marks for settings the ROIs (analog and digit)

diff --git a/code/components/connect_wlan/connect_wlan.cpp b/code/components/connect_wlan/connect_wlan.cpp
@@ -292,11 +292,14 @@ bool ChangeHostName(std::string fn, std::string _newhostname)
 
     for (int i = 0; i < neuesfile.size(); ++i)
     {
+        printf(neuesfile[i].c_str());
         fputs(neuesfile[i].c_str(), pFile);
     }
 
     fclose(pFile);
 
+    printf("*** Update hostname done ***\n");
+
     return true;
 }
 

diff --git a/code/components/jomjol_fileserver_ota/server_ota.h b/code/components/jomjol_fileserver_ota/server_ota.h
@@ -9,4 +9,5 @@ static const char *TAGPARTOTA = "server_ota";
 void register_server_ota_sdcard_uri(httpd_handle_t server);
 void CheckOTAUpdate();
 void doReboot();
+void hard_restart();
 
diff --git a/code/components/jomjol_flowcontroll/ClassFlowControll.cpp b/code/components/jomjol_flowcontroll/ClassFlowControll.cpp
@@ -382,6 +382,9 @@ bool ClassFlowControll::ReadParameter(FILE* pfile, string& aktparamgraph)
             {
                 // reboot notwendig damit die neue wlan.ini auch benutzt wird !!!
                 fclose(pfile);
+                printf("do reboot\n");
+                esp_restart();
+                hard_restart();                   
                 doReboot();
             }
         }

diff --git a/code/main/version.cpp b/code/main/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="3b3d924";
+const char* GIT_REV="c6ae989";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-03-17 22:46";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-03-25 20:40";
diff --git a/code/main/version.h b/code/main/version.h
@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v6.3.1 - 2020-03-16";
+const char* GIT_BASE_BRANCH = "master - v6.5.0 - 2020-03-25";
 
 
 const char* git_base_branch(void)

diff --git a/code/version.cpp b/code/version.cpp
@@ -1,4 +1,4 @@
-const char* GIT_REV="3b3d924";
+const char* GIT_REV="c6ae989";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-03-17 22:46";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-03-25 20:40";
diff --git a/firmware/bootloader.bin b/firmware/bootloader.bin
diff --git a/firmware/firmware.bin b/firmware/firmware.bin
diff --git a/firmware/html.zip b/firmware/html.zip
diff --git a/sd-card/config/config.ini b/sd-card/config/config.ini
@@ -17,7 +17,7 @@ InitialMirror= false
 AlignmentAlgo = Default
 
 [Digits]
-Model = /config/dig0811s1.tflite
+Model = /config/dig0820s2q.tflite
 ;LogImageLocation = /log/digit
 ;LogfileRetentionInDays = 3
 ModelInputSize = 20 32

diff --git a/sd-card/config/dig0820s2q.tflite b/sd-card/config/dig0820s2q.tflite
diff --git a/sd-card/html/edit_config_param.html b/sd-card/html/edit_config_param.html
diff --git a/sd-card/html/gethost.js b/sd-card/html/gethost.js
@@ -9,7 +9,7 @@ function getbasepath(){
     {
 //        host = "http://192.168.2.118";          // jomjol interner test
 //        host = "http://192.168.178.26";          // jomjol interner test
-        host = "http://192.168.178.22";          // jomjol interner Real
+        host = "http://192.168.178.26";          // jomjol interner Real
 //        host = ".";                           // jomjol interner localhost   
 
     }

diff --git a/sd-card/html/readconfigcommon.js b/sd-card/html/readconfigcommon.js
@@ -172,6 +172,7 @@ function loadConfig(_basepath) {
           xhttp.open("GET", url, false);
           xhttp.send();
           config_gesamt = xhttp.responseText;
+          config_gesamt = config_gesamt.replace("InitalRotate", "InitialRotate");         // Korrigiere Schreibfehler in config.ini !!!!!
      }
      catch (error)
      {

diff --git a/sd-card/html/version.txt b/sd-card/html/version.txt
@@ -1 +1 @@
-6.4.0
+6.4.1