Merge pull request #3076 from proddy/dev

3.8.3

CHANGELOG.md

@@ -71,6 +71,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - board profile `CUSTOM` can only be selected in developer mode
 - mqtt sends round values without decimals (`28` instead of `28.0`)
 
+
 ## [3.8.0] 31 December 2025
 
 ## Added

CHANGELOG_LATEST.md

@@ -9,5 +9,3 @@ For more details go to [emsesp.org](https://emsesp.org/).
 ## Fixed
 
 ## Changed
-
-

src/ESP32React/UploadFileService.cpp

@@ -4,7 +4,6 @@
 
 #include <esp_app_format.h>
 #include <esp_ota_ops.h>
-// #include <esp_partition.h>
 
 static String getFilenameExtension(const String & filename) {
     const auto pos = filename.lastIndexOf('.');
@@ -133,9 +132,10 @@ void UploadFileService::handleUpload(AsyncWebServerRequest * request, const Stri
     }
 
     if (_is_firmware || _is_filesystem) {
-        if (!request->_tempObject) { // if we haven't delt with an error, continue with the OTA update
+        if (!request->_tempObject) {
+            //continue with the OTA update
             if (Update.write(data, len) != len) {
-                emsesp::EMSESP::logger().err("Update.write failed at offset %u (chunk %u): %s",
+                emsesp::EMSESP::logger().err("OTA update failed at offset %u (chunk %u): %s",
                                              static_cast<unsigned>(Update.progress()),
                                              static_cast<unsigned>(len),
                                              Update.errorString());
@@ -144,15 +144,16 @@ void UploadFileService::handleUpload(AsyncWebServerRequest * request, const Stri
             }
             if (final) {
                 if (!Update.end(true)) {
-                    emsesp::EMSESP::logger().err("Update.end failed: %s", Update.errorString());
+                    emsesp::EMSESP::logger().err("OTA update failed: %s", Update.errorString());
-                    handleError(request, 500);
+                    handleError(request, 500); // internal error, failed
                     return;
                 }
             }
-        } else {
-            if (len && len != request->_tempFile.write(data, len)) { // stream the incoming chunk to the opened file
-                handleError(request, 507);                           // 507-Insufficient Storage
         }
+    } else {
+        // stream the incoming chunk to the opened file
+        if (len && len != request->_tempFile.write(data, len)) {
+            handleError(request, 507); // 507-Insufficient Storage
         }
     }
 }

src/emsesp_version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.8.2"
+#define EMSESP_APP_VERSION "3.8.3-dev.0"