Merge branch 'rolling'

Author: jomjol

README.md

@@ -47,8 +47,9 @@ In other cases you can contact the developer via email: <img src="https://raw.gi
 
 
 
-##### 8.0.2 - Multi Meter Support (2021-07-23
+##### 8.0.3 - Multi Meter Support (2021-07-25)
 
+* NEW 8.0.3: bug fix: reboot during `config.ini` handling, html error
 * NEW 8.0.2: saving roundes prevalue, bug fix html server
 * NEW 8.0.1: bug fix html handling of parameter `FixedExposure` and `ImageSize`
 * Dual / multi meter support (more than 1 number to be recognized)

code/components/jomjol_fileserver_ota/server_file.cpp

@@ -486,10 +486,10 @@ static esp_err_t upload_post_handler(httpd_req_t *req)
     int start_fn = strlen(((struct file_server_data *)req->user_ctx)->base_path);
     printf("Directory: %s, start_fn: %d, found: %d\n", directory.c_str(), start_fn, found);
 	directory = directory.substr(start_fn, found - start_fn + 1);
-    printf("Directory danach: %s\n", directory.c_str());    
+    printf("Directory danach 1: %s\n", directory.c_str());    
 
     directory = "/fileserver" + directory;
-    printf("Directory danach: %s\n", directory.c_str());   
+    printf("Directory danach 2: %s\n", directory.c_str());   
 
     /* Redirect onto root to see the updated file list */
     httpd_resp_set_status(req, "303 See Other");
@@ -500,11 +500,13 @@ static esp_err_t upload_post_handler(httpd_req_t *req)
     httpd_resp_set_hdr(req, "Location", directory.c_str());
     httpd_resp_sendstr(req, "File uploaded successfully");
 
+/*
     if (strcmp(filepath, CONFIG_FILE) == 0) {
-        printf("New config foung. Reload handler.");
+        printf("New config found. Reload handler.");
         gpio_handler_deinit();
         MQTTdestroy();
     }
+*/
 
     return ESP_OK;
 }
@@ -606,10 +608,10 @@ static esp_err_t delete_post_handler(httpd_req_t *req)
         int start_fn = strlen(((struct file_server_data *)req->user_ctx)->base_path);
         printf("Directory: %s, start_fn: %d, found: %d\n", directory.c_str(), start_fn, found);
         directory = directory.substr(start_fn, found - start_fn + 1);
-        printf("Directory danach: %s\n", directory.c_str());    
+        printf("Directory danach 3: %s\n", directory.c_str());    
 
         directory = "/fileserver" + directory;
-        printf("Directory danach: %s\n", directory.c_str());   
+        printf("Directory danach 4: %s\n", directory.c_str());   
     }
 
 

code/main/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="9ae8d0a";
+const char* GIT_REV="104b725";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-07-23 20:49";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-07-25 18:05";

code/main/version.h

@@ -13,7 +13,7 @@ extern "C"
 #include "Helper.h"
 #include <fstream>
 
-const char* GIT_BASE_BRANCH = "master - v8.0.2 - 2021-07-23";
+const char* GIT_BASE_BRANCH = "master - v8.0.3 - 2021-07-25";
 
 
 const char* git_base_branch(void)

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="9ae8d0a";
+const char* GIT_REV="104b725";
 const char* GIT_TAG="";
-const char* GIT_BRANCH="master";
-const char* BUILD_TIME="2021-07-23 20:49";
+const char* GIT_BRANCH="rolling";
+const char* BUILD_TIME="2021-07-25 18:05";

firmware/bootloader.bin

@@ -367,9 +367,6 @@ <h4><input type="checkbox" id="Category_Analog_enabled" value="1"  onclick = 'Up
 			</td>
 		</tr>
 
-
-		ExtendedResolution
-
 		<tr class="expert"  id="ex10">
 			<td width="20px"  style="padding-left: 40px;"> </td>
 			<td> <class id="Analog_ModelInputSize_text" style="color:black;">ModelInputSize</class> </td>

firmware/firmware.bin

@@ -1 +1 @@
-9.5.1
+9.5.2