Rolling - 20210725

README.md

@@ -45,9 +45,12 @@ 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-07-25)
 
+* Bug fix: reboot during update `config.ini`
+* based on v8.0.2
 
-##### 8.0.2 - Multi Meter Support (2021-07-23
+##### 8.0.2 - Multi Meter Support (2021-07-23)
 
 * NEW 8.0.2: saving roundes prevalue, bug fix html server
 * NEW 8.0.1: bug fix html handling of parameter `FixedExposure` and `ImageSize`

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="eaaa856";
 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 13:14";

code/version.cpp

@@ -1,4 +1,4 @@
-const char* GIT_REV="9ae8d0a";
+const char* GIT_REV="eaaa856";
 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 13:14";