Начало Каталог Помощ
Вход
dyadmisha
/
AI-on-the-edge-device
огледало от https://github.com/jomjol/AI-on-the-edge-device
1
0
Разклонения 0
Файлове Задачи 0 Уики
Преглед на файлове

rolling 20210707

jomjol преди 4 години
родител
e24ba68fec
ревизия
08b0b254f2
променени са 15 файла, в които са добавени 55 реда и са изтрити 11 реда
Обединен изглед Покажи статистика за разликите
  1. 6 1
      README.md
  2. 2 1
      code/main/server_main.cpp
  3. 2 2
      code/main/version.cpp
  4. 2 2
      code/version.cpp
  5. BIN
      firmware/bootloader.bin
  6. BIN
      firmware/firmware.bin
  7. BIN
      firmware/html.zip
  8. 1 1
      sd-card/config/config.ini
  9. BIN
      sd-card/config/dig1040s1q.tflite
  10. 20 0
      sd-card/html/edit_analog.html
  11. 18 0
      sd-card/html/edit_digits.html
  12. 1 1
      sd-card/html/explain_3.html
  13. 1 1
      sd-card/html/explain_4.html
  14. 1 1
      sd-card/html/gethost.js
  15. 1 1
      sd-card/html/version.txt

+ 6 - 1
README.md
Целия файл 

@@ -47,7 +47,12 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
 
 
 
 
-##### Rolling - (2021-07-05)
 
+##### Rolling - (2021-07-07)
 
+
 
+* Updated server configuration (avoid server blocking in case too many connections in parallel)
 
+* HTML: update ROI definition (show all ROIs)
 
+
 
+Rolling - (2021-07-05)
 
 
 
 * Update jquery, inital config.ini
 
 * Update jquery, inital config.ini

+ 2 - 1
code/main/server_main.cpp
Целия файл 

@@ -403,7 +403,8 @@ httpd_handle_t start_webserver(void)
 
     config.global_transport_ctx = NULL;                   
     config.global_transport_ctx = NULL;                   
     config.global_transport_ctx_free_fn = NULL;           
     config.global_transport_ctx_free_fn = NULL;           
     config.open_fn = NULL;                                
     config.open_fn = NULL;                                
-    config.close_fn = NULL;                               
+    config.close_fn = NULL;     
+    config.lru_purge_enable = true;             // neu, um schlechte Serverbindung zu verhindern                          
 //    config.uri_match_fn = NULL;                            
 //    config.uri_match_fn = NULL;                            
     config.uri_match_fn = httpd_uri_match_wildcard;
 
     config.uri_match_fn = httpd_uri_match_wildcard;

+ 2 - 2
code/main/version.cpp
Целия файл 

@@ -1,4 +1,4 @@
 
-const char* GIT_REV="894c7f6";
 
+const char* GIT_REV="e24ba68";
 
 const char* GIT_TAG="";
 
 const char* GIT_TAG="";
 
 const char* GIT_BRANCH="rolling";
 
 const char* GIT_BRANCH="rolling";
 
-const char* BUILD_TIME="2021-07-04 10:15";
 
+const char* BUILD_TIME="2021-07-07 21:50";

+ 2 - 2
code/version.cpp
Целия файл 

@@ -1,4 +1,4 @@
 
-const char* GIT_REV="894c7f6";
 
+const char* GIT_REV="e24ba68";
 
 const char* GIT_TAG="";
 
 const char* GIT_TAG="";
 
 const char* GIT_BRANCH="rolling";
 
 const char* GIT_BRANCH="rolling";
 
-const char* BUILD_TIME="2021-07-04 10:15";
 
+const char* BUILD_TIME="2021-07-07 21:50";

BIN
firmware/bootloader.bin
Целия файл


BIN
firmware/firmware.bin
Целия файл


BIN
firmware/html.zip
Целия файл


+ 1 - 1
sd-card/config/config.ini
Целия файл 

@@ -20,7 +20,7 @@ AlignmentAlgo = Default
 
 /config/ref1.jpg 442 142
 
 /config/ref1.jpg 442 142
 
 
 
 [Digits]
 
 [Digits]
 
-Model = /config/dig1030s1q.tflite
 
+Model = /config/dig1040s1q.tflite
 
 ;LogImageLocation = /log/digit
 
 ;LogImageLocation = /log/digit
 
 ;LogfileRetentionInDays = 3
 
 ;LogfileRetentionInDays = 3
 
 ModelInputSize = 20 32
 
 ModelInputSize = 20 32

BIN
sd-card/config/dig1040s1q.tflite
Целия файл


+ 20 - 0
sd-card/html/edit_analog.html
Целия файл 

@@ -447,6 +447,26 @@ function removeNumber(){
 
         context.drawImage(imageObj, 0, 0);
 
         context.drawImage(imageObj, 0, 0);
 
         if (document.getElementById("Category_Analog_enabled").checked)
 
         if (document.getElementById("Category_Analog_enabled").checked)
 
         {
 
         {
 
+            var sel = document.getElementById("index");
 
+            var _number = sel.selectedIndex;
 
+            for (var _nb = 0; _nb < ROIInfo.length; _nb++)
 
+            {
 
+                if (_nb != _number)
 
+                {
 
+                    lw = 1;
 
+                    context.lineWidth = lw;
 
+                    context.strokeStyle = "#990000";
 
+                    var x0 = parseInt(ROIInfo[_nb].x) - parseInt(lw/2);
 
+                    var y0 = parseInt(ROIInfo[_nb].y) - parseInt(lw/2);
 
+                    var dx = parseInt(ROIInfo[_nb].dx) + parseInt(lw);
 
+                    var dy = parseInt(ROIInfo[_nb].dy) + parseInt(lw);
 
+                    context.strokeRect(x0, y0, dx, dy);
 
+                }
 
+
 
+            }
 
+
 
+
 
+
 
             lw = 4
 
             lw = 4
 
             context.lineWidth = lw;
 
             context.lineWidth = lw;
 
             context.strokeStyle = "#FF0000";
 
             context.strokeStyle = "#FF0000";

+ 18 - 0
sd-card/html/edit_digits.html
Целия файл 

@@ -439,6 +439,24 @@ function draw() {
 
         context.drawImage(imageObj, 0, 0);
 
         context.drawImage(imageObj, 0, 0);
 
         if (document.getElementById("Category_Digits_enabled").checked)
 
         if (document.getElementById("Category_Digits_enabled").checked)
 
         {
 
         {
 
+            var sel = document.getElementById("index");
 
+            var _number = sel.selectedIndex;
 
+            for (var _nb = 0; _nb < ROIInfo.length; _nb++)
 
+            {
 
+                if (_nb != _number)
 
+                {
 
+                    lw = 2;
 
+                    context.lineWidth = lw;
 
+                    context.strokeStyle = "#990000";
 
+                    var x0 = parseInt(ROIInfo[_nb].x) - parseInt(lw/2);
 
+                    var y0 = parseInt(ROIInfo[_nb].y) - parseInt(lw/2);
 
+                    var dx = parseInt(ROIInfo[_nb].dx) + parseInt(lw);
 
+                    var dy = parseInt(ROIInfo[_nb].dy) + parseInt(lw);
 
+                    context.strokeRect(x0, y0, dx, dy);
 
+                }
 
+
 
+            }
 
+
 
             lw = 4
 
             lw = 4
 
             context.lineWidth = lw;
 
             context.lineWidth = lw;
 
             context.strokeStyle = "#FF0000";
 
             context.strokeStyle = "#FF0000";

+ 1 - 1
sd-card/html/explain_3.html
Целия файл 

@@ -22,7 +22,7 @@ p {font-size: 1em;}
 
 <body style="font-family: arial">
 
 <body style="font-family: arial">
 
 
 
 <h4>Define Digits</h4>
 
 <h4>Define Digits</h4>
 
-Here you define your digits you want to read.
 
+Here you define your digits you want to read. If you have more than one number on the reading you can define several numbers with the <b>"Number"</b> selector. There you can also define new numbers.
 
 <p>
 
 <p>
 
     With the drop down menue <b>"ROI x"</b> you can change between the different digits. Mark them with the mouse or the coordinates.
 
     With the drop down menue <b>"ROI x"</b> you can change between the different digits. Mark them with the mouse or the coordinates.
 
     <br>
 
     <br>

+ 1 - 1
sd-card/html/explain_4.html
Целия файл 

@@ -22,7 +22,7 @@ p {font-size: 1em;}
 
 <body style="font-family: arial">
 
 <body style="font-family: arial">
 
 
 
 <h4>Define Digits</h4>
 
 <h4>Define Digits</h4>
 
-Here you define your analog counters you want to read. If you do not have analog counters delete all ROIs.
 
+Here you define your analog counters you want to read. If you have more than one number on the reading you can define several numbers with the <b>"Number"</b> selector. There you can also define new numbers. If you do not have analog counters delete all ROIs.
 
 <p>
 
 <p>
 
     With the drop down menue <b>"ROI x"</b> you can change between the different counters. Mark them with the mouse or the coordinates.
 
     With the drop down menue <b>"ROI x"</b> you can change between the different counters. Mark them with the mouse or the coordinates.
 
     <br>
 
     <br>

+ 1 - 1
sd-card/html/gethost.js
Целия файл 

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

+ 1 - 1
sd-card/html/version.txt
Целия файл 

@@ -1 +1 @@
 
-9.1.0
 
+9.2.0