Compare commits
	
		
			3 Commits
		
	
	
		
			v1.2.58
			...
			8f8322e629
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 8f8322e629 | |||
| 1e386c49af | |||
| 3070d75d07 | 
| @@ -1,5 +1,13 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## [1.2.59] - 2025-02-20 | ||||||
|  | ### Added | ||||||
|  | - update version to 1.2.59 and enhance OTA upload handling | ||||||
|  |  | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version 1.2.59 | ||||||
|  |  | ||||||
|  |  | ||||||
| ## [1.2.58] - 2025-02-20 | ## [1.2.58] - 2025-02-20 | ||||||
| ### Added | ### Added | ||||||
| - update version to 1.2.58 in HTML files and platformio configuration | - update version to 1.2.58 in HTML files and platformio configuration | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -12,7 +12,7 @@ | |||||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> |         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> |             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||||
|             <div class="logo-text"> |             <div class="logo-text"> | ||||||
|                 <h1>FilaMan<span class="version">v1.2.58</span></h1> |                 <h1>FilaMan<span class="version">v1.2.59</span></h1> | ||||||
|                 <h4>Filament Management Tool</h4> |                 <h4>Filament Management Tool</h4> | ||||||
|             </div> |             </div> | ||||||
|         </div> |         </div> | ||||||
|   | |||||||
| @@ -9,7 +9,7 @@ | |||||||
| ; https://docs.platformio.org/page/projectconf.html | ; https://docs.platformio.org/page/projectconf.html | ||||||
|  |  | ||||||
| [common] | [common] | ||||||
| version = "1.2.58" | version = "1.2.59" | ||||||
|  |  | ||||||
| [env:esp32dev] | [env:esp32dev] | ||||||
| platform = espressif32 | platform = espressif32 | ||||||
|   | |||||||
							
								
								
									
										10
									
								
								src/ota.cpp
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								src/ota.cpp
									
									
									
									
									
								
							| @@ -16,15 +16,19 @@ void handleOTAUpload(AsyncWebServerRequest *request, String filename, size_t ind | |||||||
|             return; |             return; | ||||||
|         } |         } | ||||||
|  |  | ||||||
|         if (!Update.begin(contentLength)) { |         // Determine if this is a full image (firmware + SPIFFS) or just firmware | ||||||
|  |         bool isFullImage = (contentLength > 0x3D0000); // SPIFFS starts at 0x3D0000 | ||||||
|  |  | ||||||
|  |         if (!Update.begin(contentLength, isFullImage ? U_FLASH : U_SPIFFS)) { | ||||||
|             Serial.printf("Not enough space: %u required\n", contentLength); |             Serial.printf("Not enough space: %u required\n", contentLength); | ||||||
|             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}"); |             request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Not enough space available\"}"); | ||||||
|             return; |             return; | ||||||
|         } |         } | ||||||
|          |          | ||||||
|         Serial.println("Update started"); |         Serial.println(isFullImage ? "Full image update started" : "Firmware update started"); | ||||||
|     } |     } | ||||||
|  |      | ||||||
|  |     // Write chunk to flash | ||||||
|     if (Update.write(data, len) != len) { |     if (Update.write(data, len) != len) { | ||||||
|         Update.printError(Serial); |         Update.printError(Serial); | ||||||
|         request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}"); |         request->send(400, "application/json", "{\"status\":\"error\",\"message\":\"Error writing update\"}"); | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user