Compare commits
	
		
			20 Commits
		
	
	
		
			v1.3.29
			...
			c5033acadc
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| c5033acadc | |||
| 7de4189c83 | |||
| f43f2a15b2 | |||
| 858192c6cb | |||
| e2bd39922d | |||
| c86cc7173e | |||
| 16362e66a3 | |||
| 48d9ba8f71 | |||
| e2bea5a0c3 | |||
| 3e11f65188 | |||
| df59c42c8a | |||
| abe1d7c930 | |||
| ca614c3cc4 | |||
| 5153374093 | |||
| 66db4d7a85 | |||
| 90e71922b1 | |||
| e8e5c0bd3d | |||
| 7e53e1ccb0 | |||
| e49e812b13 | |||
| b1e0fcfadf | 
							
								
								
									
										9
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										9
									
								
								.github/workflows/gitea-release.yml
									
									
									
									
										vendored
									
									
								
							@@ -40,8 +40,11 @@ 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 ESP32 image header
 | 
				
			||||||
        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
 | 
					        # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz, chip revision v3.1)
 | 
				
			||||||
 | 
					        echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x60\x00\x00\x03\x01\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 +57,7 @@ jobs:
 | 
				
			|||||||
          0x1000 bootloader.bin \
 | 
					          0x1000 bootloader.bin \
 | 
				
			||||||
          0x8000 partitions.bin \
 | 
					          0x8000 partitions.bin \
 | 
				
			||||||
          0x10000 firmware.bin \
 | 
					          0x10000 firmware.bin \
 | 
				
			||||||
          0x390000 spiffs.bin)
 | 
					          0x410000 spiffs.bin)
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Verify file sizes
 | 
					        # Verify file sizes
 | 
				
			||||||
        echo "File sizes:"
 | 
					        echo "File sizes:"
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										31
									
								
								.github/workflows/github-release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										31
									
								
								.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,11 @@ 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 ESP32 image header
 | 
				
			||||||
        cp .pio/build/esp32dev/spiffs.bin .pio/build/esp32dev/upgrade_filaman_website_v${VERSION}.bin
 | 
					        # Create 16-byte ESP32 image header: (magic byte 0xE9, segment count 0x01, SPI mode DIO, SPI speed 40MHz, chip revision v3.1)
 | 
				
			||||||
 | 
					        echo -ne '\xE9\x01\x00\x00\x46\x97\x00\x00\x00\x60\x00\x00\x03\x01\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 +64,7 @@ jobs:
 | 
				
			|||||||
          0x1000 bootloader.bin \
 | 
					          0x1000 bootloader.bin \
 | 
				
			||||||
          0x8000 partitions.bin \
 | 
					          0x8000 partitions.bin \
 | 
				
			||||||
          0x10000 firmware.bin \
 | 
					          0x10000 firmware.bin \
 | 
				
			||||||
          0x390000 spiffs.bin)
 | 
					          0x410000 spiffs.bin)
 | 
				
			||||||
        
 | 
					        
 | 
				
			||||||
        # Verify file sizes
 | 
					        # Verify file sizes
 | 
				
			||||||
        echo "File sizes:"
 | 
					        echo "File sizes:"
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										38
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										38
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,5 +1,43 @@
 | 
				
			|||||||
# Changelog
 | 
					# Changelog
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					## [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;
 | 
				
			||||||
            }
 | 
					            }
 | 
				
			||||||
            
 | 
					            
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -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,  0x200000,
 | 
				
			||||||
app1,     app,  ota_1,     0x190000, 0x180000,
 | 
					app1,     app,  ota_1,     0x210000, 0x200000,
 | 
				
			||||||
spiffs,   data, spiffs,    0x310000, 0xE0000,
 | 
					spiffs,   data, spiffs,    0x410000, 0x60000,
 | 
				
			||||||
		
		
			
  | 
@@ -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.35"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#test
 | 
					#test
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user