Compare commits
	
		
			29 Commits
		
	
	
		
			v1.3.29
			...
			a184903b66
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| a184903b66 | |||
| af1640383d | |||
| c00e54b145 | |||
| f6c92c686b | |||
| b8db01529b | |||
| 55db6d76ab | |||
| a18749a1ff | |||
| 1811fd9159 | |||
| b550760427 | |||
| c5033acadc | |||
| 7de4189c83 | |||
| f43f2a15b2 | |||
| 858192c6cb | |||
| e2bd39922d | |||
| c86cc7173e | |||
| 16362e66a3 | |||
| 48d9ba8f71 | |||
| e2bea5a0c3 | |||
| 3e11f65188 | |||
| df59c42c8a | |||
| abe1d7c930 | |||
| ca614c3cc4 | |||
| 5153374093 | |||
| 66db4d7a85 | |||
| 90e71922b1 | |||
| e8e5c0bd3d | |||
| 7e53e1ccb0 | |||
| e49e812b13 | |||
| b1e0fcfadf | 
							
								
								
									
										8
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										8
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -40,8 +40,10 @@ jobs: | |||||||
|         # Copy firmware binary |         # Copy firmware binary | ||||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin |         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin | ||||||
|          |          | ||||||
|         # Create SPIFFS binary |         # Create SPIFFS binary with minimal ESP32 image header | ||||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin |         echo -ne '\xE9\x01\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||||
|  |         # Append the actual SPIFFS data | ||||||
|  |         cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||||
|          |          | ||||||
|         # Create full binary |         # Create full binary | ||||||
|         (cd .pio/build/esp32dev &&  |         (cd .pio/build/esp32dev &&  | ||||||
| @@ -54,7 +56,7 @@ jobs: | |||||||
|           0x1000 bootloader.bin \ |           0x1000 bootloader.bin \ | ||||||
|           0x8000 partitions.bin \ |           0x8000 partitions.bin \ | ||||||
|           0x10000 firmware.bin \ |           0x10000 firmware.bin \ | ||||||
|           0x390000 spiffs.bin) |           0x3D0000 spiffs.bin) | ||||||
|          |          | ||||||
|         # Verify file sizes |         # Verify file sizes | ||||||
|         echo "File sizes:" |         echo "File sizes:" | ||||||
|   | |||||||
							
								
								
									
										30
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										30
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -35,28 +35,6 @@ jobs: | |||||||
|         sudo apt-get update |         sudo apt-get update | ||||||
|         sudo apt-get install xxd |         sudo apt-get install xxd | ||||||
|      |      | ||||||
|     - name: Check for Data changes |  | ||||||
|       id: check_data |  | ||||||
|       run: | |  | ||||||
|         git fetch --unshallow || true |  | ||||||
|         CHANGED_FILES=$(git diff --name-only HEAD^..HEAD) |  | ||||||
|         if echo "$CHANGED_FILES" | grep -q "^data/"; then |  | ||||||
|           echo "DATA_CHANGED=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "DATA_CHANGED=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|  |  | ||||||
|     - name: Check for SPIFFS changes |  | ||||||
|       id: check_spiffs |  | ||||||
|       run: | |  | ||||||
|         git fetch --unshallow || true |  | ||||||
|         CHANGED_FILES=$(git diff --name-only HEAD^..HEAD) |  | ||||||
|         if echo "$CHANGED_FILES" | grep -q "^data/\|^html/"; then |  | ||||||
|           echo "SPIFFS_CHANGED=true" >> $GITHUB_OUTPUT |  | ||||||
|         else |  | ||||||
|           echo "SPIFFS_CHANGED=false" >> $GITHUB_OUTPUT |  | ||||||
|         fi |  | ||||||
|      |  | ||||||
|     - name: Build Firmware |     - name: Build Firmware | ||||||
|       run: | |       run: | | ||||||
|         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) |         VERSION=$(grep '^version = ' platformio.ini | cut -d'"' -f2) | ||||||
| @@ -69,8 +47,10 @@ jobs: | |||||||
|         # Copy firmware binary |         # Copy firmware binary | ||||||
|         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin |         cp .pio/build/esp32dev/firmware.bin .pio/build/esp32dev/upgrade_filaman_firmware_v${VERSION}.bin | ||||||
|          |          | ||||||
|         # Always create SPIFFS binary |         # Create SPIFFS binary with minimal ESP32 image header | ||||||
|         cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin |         echo -ne '\xE9\x01\x00\x00\x00\x00\x00\x00\x00\x30\x00\x00\x00\x00\x00\x00' > .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||||
|  |         # Append the actual SPIFFS data | ||||||
|  |         cat .pio/build/esp32dev/spiffs.bin >> .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin | ||||||
|          |          | ||||||
|         # Create full binary (always) |         # Create full binary (always) | ||||||
|         (cd .pio/build/esp32dev &&  |         (cd .pio/build/esp32dev &&  | ||||||
| @@ -83,7 +63,7 @@ jobs: | |||||||
|           0x1000 bootloader.bin \ |           0x1000 bootloader.bin \ | ||||||
|           0x8000 partitions.bin \ |           0x8000 partitions.bin \ | ||||||
|           0x10000 firmware.bin \ |           0x10000 firmware.bin \ | ||||||
|           0x390000 spiffs.bin) |           0x3D0000 spiffs.bin) | ||||||
|          |          | ||||||
|         # Verify file sizes |         # Verify file sizes | ||||||
|         echo "File sizes:" |         echo "File sizes:" | ||||||
|   | |||||||
							
								
								
									
										56
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										56
									
								
								CHANGELOG.md
									
									
									
									
									
								
							| @@ -1,5 +1,61 @@ | |||||||
| # Changelog | # Changelog | ||||||
|  |  | ||||||
|  | ## [1.3.38] - 2025-02-22 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.38 | ||||||
|  | - workflow: update SPIFFS binary creation with minimal ESP32 image header | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.37] - 2025-02-22 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.37 | ||||||
|  | - workflow: update ESP32-WROOM image header for SPIFFS binary creation | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.36] - 2025-02-22 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.36 | ||||||
|  | - partition: update SPIFFS binary header and offsets in workflow files | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.35] - 2025-02-22 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.35 | ||||||
|  | - partition: update SPIFFS binary header and offsets in workflow files | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.34] - 2025-02-22 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.34 | ||||||
|  | - partition: update SPIFFS binary creation and offsets in workflow files | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.33] - 2025-02-22 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.33 | ||||||
|  | - partition: update spiffs offset and app sizes in partition files | ||||||
|  | - partition: update spiffs offset in partition files | ||||||
|  | - partition: update app sizes and offsets in partitions.csv | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.32] - 2025-02-22 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.32 | ||||||
|  | - workflow: update magic byte for SPIFFS binary creation | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.31] - 2025-02-22 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.31 | ||||||
|  | - workflow: remove unnecessary data and SPIFFS change checks from release workflows | ||||||
|  |  | ||||||
|  |  | ||||||
|  | ## [1.3.30] - 2025-02-22 | ||||||
|  | ### Changed | ||||||
|  | - update webpages for version v1.3.30 | ||||||
|  | - workflow: update Gitea and GitHub release workflows to create SPIFFS binary with magic byte | ||||||
|  |  | ||||||
|  |  | ||||||
| ## [1.3.29] - 2025-02-21 | ## [1.3.29] - 2025-02-21 | ||||||
| ### Changed | ### Changed | ||||||
| - update webpages for version v1.3.29 | - update webpages for version v1.3.29 | ||||||
|   | |||||||
| @@ -167,12 +167,12 @@ | |||||||
|             } |             } | ||||||
|  |  | ||||||
|             // Validate file name pattern |             // Validate file name pattern | ||||||
|             if (updateType === 'firmware' && !file.name.startsWith('filaman_')) { |             if (updateType === 'firmware' && !file.name.startsWith('upgrade_filaman_firmware_')) { | ||||||
|                 alert('Please select a valid firmware file (filaman_*.bin)'); |                 alert('Please select a valid firmware file (upgrade_filaman_firmware_*.bin)'); | ||||||
|                 return; |                 return; | ||||||
|             } |             } | ||||||
|             if (updateType === 'webpage' && !file.name.startsWith('webpage_')) { |             if (updateType === 'webpage' && !file.name.startsWith('upgrade_filaman_website_')) { | ||||||
|                 alert('Please select a valid webpage file (webpage_*.bin)'); |                 alert('Please select a valid webpage file (upgrade_filaman_website_*.bin)'); | ||||||
|                 return; |                 return; | ||||||
|             } |             } | ||||||
|              |              | ||||||
| @@ -202,6 +202,16 @@ | |||||||
|                     let response = this.responseText; |                     let response = this.responseText; | ||||||
|                     try { |                     try { | ||||||
|                         const jsonResponse = JSON.parse(response); |                         const jsonResponse = JSON.parse(response); | ||||||
|  |                          | ||||||
|  |                         // Handle progress updates | ||||||
|  |                         if (jsonResponse.progress !== undefined) { | ||||||
|  |                             const percent = jsonResponse.progress; | ||||||
|  |                             progress.style.width = percent + '%'; | ||||||
|  |                             progress.textContent = Math.round(percent) + '%'; | ||||||
|  |                             return; | ||||||
|  |                         } | ||||||
|  |                          | ||||||
|  |                         // Handle success/error messages | ||||||
|                         response = jsonResponse.message; |                         response = jsonResponse.message; | ||||||
|                          |                          | ||||||
|                         if (jsonResponse.restart) { |                         if (jsonResponse.restart) { | ||||||
| @@ -218,12 +228,9 @@ | |||||||
|                             }, 1000); |                             }, 1000); | ||||||
|                         } |                         } | ||||||
|                     } catch (e) { |                     } catch (e) { | ||||||
|                         if (!isNaN(response)) { |                         console.error('JSON parse error:', e); | ||||||
|                             const percent = parseInt(response); |                         status.textContent = 'Update failed: Invalid response from server'; | ||||||
|                             progress.style.width = percent + '%'; |                         status.classList.add('error'); | ||||||
|                             progress.textContent = percent + '%'; |  | ||||||
|                             return; |  | ||||||
|                         } |  | ||||||
|                     } |                     } | ||||||
|                      |                      | ||||||
|                     status.textContent = response; |                     status.textContent = response; | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| # Name,   Type, SubType,    Offset,   Size,     Flags | # Name,   Type, SubType,    Offset,   Size,     Flags | ||||||
| nvs,      data, nvs,       0x9000,   0x5000, | nvs,      data, nvs,       0x9000,   0x5000, | ||||||
| otadata,  data, ota,       0xe000,   0x2000, | otadata,  data, ota,       0xe000,   0x2000, | ||||||
| app0,     app,  ota_0,     0x10000,  0x180000, | app0,     app,  ota_0,     0x10000,  0x1E0000, | ||||||
| app1,     app,  ota_1,     0x190000, 0x180000, | app1,     app,  ota_1,     0x1F0000, 0x1E0000, | ||||||
| spiffs,   data, spiffs,    0x310000, 0xE0000, | spiffs,   data, spiffs,    0x3D0000, 0x30000, | ||||||
| 
 | 
| @@ -9,7 +9,7 @@ | |||||||
| ; https://docs.platformio.org/page/projectconf.html | ; https://docs.platformio.org/page/projectconf.html | ||||||
|  |  | ||||||
| [common] | [common] | ||||||
| version = "1.3.29" | version = "1.3.38" | ||||||
|  |  | ||||||
| #test | #test | ||||||
|  |  | ||||||
| @@ -54,12 +54,8 @@ build_flags = | |||||||
|     -DCONFIG_ARDUHAL_LOG_COLORS=1 |     -DCONFIG_ARDUHAL_LOG_COLORS=1 | ||||||
|     -DOTA_DEBUG=1 |     -DOTA_DEBUG=1 | ||||||
|     -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1 |     -DCONFIG_OPTIMIZATION_LEVEL_DEBUG=1 | ||||||
|     -DCONFIG_ESP32_PANIC_PRINT_REBOOT |  | ||||||
|     -DBOOT_APP_PARTITION_OTA_0=1 |     -DBOOT_APP_PARTITION_OTA_0=1 | ||||||
|     -DCONFIG_LOG_DEFAULT_LEVEL=3 |  | ||||||
|     -DCONFIG_LWIP_TCP_MSL=60000 |     -DCONFIG_LWIP_TCP_MSL=60000 | ||||||
|     -DCONFIG_LWIP_TCP_WND_DEFAULT=8192 |  | ||||||
|     -DCONFIG_LWIP_TCP_SND_BUF_DEFAULT=4096 |  | ||||||
|     -DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=4096 |     -DCONFIG_LWIP_TCP_RCV_BUF_DEFAULT=4096 | ||||||
|     -DCONFIG_LWIP_MAX_ACTIVE_TCP=16 |     -DCONFIG_LWIP_MAX_ACTIVE_TCP=16 | ||||||
|      |      | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user