Compare commits
	
		
			7 Commits
		
	
	
		
			v1.0.7
			...
			b696a79f4b
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| b696a79f4b | |||
| 61ed765d87 | |||
| 2703689e4e | |||
| b24c50722f | |||
| 3ec23a9f79 | |||
| 75fe6b55ad | |||
| fa2f980312 | 
							
								
								
									
										2
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -44,6 +44,8 @@ jobs: | ||||
|           --flash_freq 40m \ | ||||
|           --flash_size 4MB \ | ||||
|           -o .pio/build/esp32dev/filaman.bin \ | ||||
|           0x1000 .pio/build/esp32dev/bootloader.bin \ | ||||
|           0x8000 .pio/build/esp32dev/partitions.bin \ | ||||
|           0x10000 .pio/build/esp32dev/firmware.bin \ | ||||
|           0x290000 .pio/build/esp32dev/spiffs.bin | ||||
|      | ||||
|   | ||||
| @@ -1,5 +1,10 @@ | ||||
| # Changelog | ||||
|  | ||||
| ## [1.1.0] - 2025-02-16 | ||||
| ### Fixed | ||||
| - correct version number in nav bar | ||||
|  | ||||
|  | ||||
| ## [1.0.5] - 2025-02-16 | ||||
| ### Added | ||||
| - update version to 1.0.5 and enhance changelog update process with automatic git push | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
|         <div style="display: flex; align-items: center; gap: 2rem;"> | ||||
|             <img src="/logo.png" alt="FilaMan Logo" class="logo"> | ||||
|             <div class="logo-text"> | ||||
|                 <h1>FilaMan<span class="version">v1.0.2</span></h1> | ||||
|                 <h1>FilaMan<span class="version">v1.0.9</span></h1> | ||||
|                 <h4>Filament Management Tool</h4> | ||||
|             </div> | ||||
|         </div> | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| # Name,   Type, SubType, Offset,  Size, Flags | ||||
| nvs,      data, nvs,     0x9000,  0x5000, | ||||
| otadata,  data, ota,     0xe000,  0x2000, | ||||
| app0,     app,  ota_0,   0x10000, 0x280000, | ||||
| spiffs,   data, spiffs,  0x290000,0x170000, | ||||
| # Name,   Type, SubType, Offset,   Size,     Flags | ||||
| nvs,      data, nvs,     0x9000,   0x5000, | ||||
| otadata,  data, ota,     0xe000,   0x2000, | ||||
| app0,     app,  ota_0,   0x10000,  0x280000, | ||||
| spiffs,   data, spiffs,  0x290000, 0x170000, | ||||
| 
 | 
| @@ -9,7 +9,7 @@ | ||||
| ; https://docs.platformio.org/page/projectconf.html | ||||
|  | ||||
| [common] | ||||
| version = "1.0.7" | ||||
| version = "1.1.0" | ||||
|  | ||||
| [env:esp32dev] | ||||
| platform = espressif32 | ||||
| @@ -32,9 +32,12 @@ lib_deps = | ||||
|      | ||||
| ; Enable SPIFFS upload | ||||
| board_build.filesystem = spiffs | ||||
| board_build.spiffs.partition = 2M | ||||
| board_build.spiffs.upload_size = 2M | ||||
| ; Update partition settings | ||||
| board_build.partitions = partitions.csv | ||||
| board_upload.flash_size = 4MB | ||||
| ; Remove these as they're now defined in partitions.csv | ||||
| ; board_build.spiffs.partition = 2M | ||||
| ; board_build.spiffs.upload_size = 2M | ||||
|  | ||||
| build_flags =  | ||||
|     -Os | ||||
| @@ -45,8 +48,8 @@ build_flags = | ||||
|     '-D VERSION="${common.version}"' | ||||
|  | ||||
| extra_scripts =  | ||||
|     pre:scripts/combine_html.py | ||||
|     pre:scripts/pre_build.py | ||||
|     pre:scripts/combine_html.py | ||||
|     pre:scripts/pre_spiffs.py | ||||
|     pre:scripts/gzip_files.py | ||||
|     pre:scripts/extra_script.py | ||||
|   | ||||
| @@ -13,6 +13,9 @@ def copy_file(input_file, output_file): | ||||
|     shutil.copy2(input_file, output_file) | ||||
|  | ||||
| def should_compress(file): | ||||
|      # Skip compression for spoolman.html | ||||
|     if file == 'spoolman.html': | ||||
|         return False | ||||
|     # Komprimiere nur bestimmte Dateitypen | ||||
|     return file.endswith(('.js', '.png', '.css', '.html')) | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user