Rolling 2021-11-23

README.md

@@ -47,7 +47,11 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 **General remark:** Beside the `firmware.bin`, typically also the content of `/html` needs to be updated!
 
+##### Rolling (2021-11-23)
 
+- Error message in log file in case camera error during startup
+- Upgrade digital CNN to v13.3.0 (added new images)
+- html: support of different port
 
 ##### 9.1.1 - External Illumination (2021-11-16)
 

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="fde0ae4";
+const char* GIT_REV="9ad1188";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
+const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-11-16 07:06";
+const char* BUILD_TIME="2021-11-23 17:39";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="fde0ae4";
+const char* GIT_REV="9ad1188";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
+const char* GIT_BRANCH="rolling";
-const char* BUILD_TIME="2021-11-16 07:05";
+const char* BUILD_TIME="2021-11-23 17:39";

sd-card/config/config.ini

@@ -20,7 +20,7 @@ FlipImageSize = false
 /config/ref1.jpg 442 142
 
 [Digits]
-Model = /config/dig1310s3q.tflite
+Model = /config/dig1330s1q.tflite
 ;LogImageLocation = /log/digit
 ;LogfileRetentionInDays = 3
 ModelInputSize = 20 32

sd-card/html/gethost.js

@@ -3,9 +3,12 @@ function gethost_Version(){
     return "1.0.0 - 20200910";
 }
 
+
 function getbasepath(){
     var host = window.location.hostname;
-    if ((host == "127.0.0.1") || (host == "localhost") || (host == ""))
+    if (((host == "127.0.0.1") || (host == "localhost") || (host == "")) 
+       && ((window.location.port == "80") || (window.location.port == "")))
+    
     {
 //        host = "http://192.168.2.219";          // jomjol interner test
 //        host = "http://192.168.178.46";          // jomjol interner test
@@ -18,6 +21,10 @@ function getbasepath(){
     {
         host = "http://" + host;
     }
+
+    if (window.location.port != "") {
+       host = host + ":" + window.location.port;
+    }
     return host;
 }
 

sd-card/html/readconfigparam.js

@@ -2,9 +2,9 @@ function readconfig_Version(){
      return "1.0.0 - 20200910";
  }
 
-var config_gesamt;
+var config_gesamt = "";
-var config_split;
+var config_split = [];
-var param;
+var param = [];
 var category;
 var ref = new Array(2);
 var NUMBERS = new Array(0);

sd-card/html/version.txt

@@ -1 +1 @@
-11.0.1
+11.1.0