Browse Source
			
			
			Merge pull request #373 from sVnsation/1m-flash
			
				add support for 1M flash size
			
			
				pull/374/head
			
			
		 
		
			
				
					
						 Lukas Pusch
					
					3 years ago
						Lukas Pusch
					
					3 years ago
					
						
							committed by
							
								 GitHub
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 4AEE18F83AFDEB23
						
					
				
			
		
		
		
	
		
			
				 4 changed files with 
30 additions and 
2 deletions
			 
			
		 
		
			
				- 
					
					
					 
					.github/workflows/compile_development.yml
				
- 
					
					
					 
					.github/workflows/compile_esp8266.yml
				
- 
					
					
					 
					tools/esp8266/platformio.ini
				
- 
					
					
					 
					tools/esp8266/scripts/getVersion.py
				
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -41,7 +41,7 @@ jobs: | 
			
		
	
		
			
				
					|  |  |  |       working-directory: tools/esp8266/html | 
			
		
	
		
			
				
					|  |  |  |       run: python convert.py | 
			
		
	
		
			
				
					|  |  |  |     - name: Run PlatformIO | 
			
		
	
		
			
				
					|  |  |  |       run: pio run -d tools/esp8266 --environment esp8266-release --environment esp32-wroom32-release | 
			
		
	
		
			
				
					|  |  |  |       run: pio run -d tools/esp8266 --environment esp8266-release --environment esp8266-1m-release --environment esp32-wroom32-release | 
			
		
	
		
			
				
					|  |  |  |     - name: rename-binary-files | 
			
		
	
		
			
				
					|  |  |  |       id: rename-binary-files | 
			
		
	
		
			
				
					|  |  |  |       working-directory: tools/esp8266/scripts | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -42,7 +42,7 @@ jobs: | 
			
		
	
		
			
				
					|  |  |  |       working-directory: tools/esp8266/html | 
			
		
	
		
			
				
					|  |  |  |       run: python convert.py | 
			
		
	
		
			
				
					|  |  |  |     - name: Run PlatformIO | 
			
		
	
		
			
				
					|  |  |  |       run: pio run -d tools/esp8266 --environment esp8266-release --environment esp32-wroom32-release | 
			
		
	
		
			
				
					|  |  |  |       run: pio run -d tools/esp8266 --environment esp8266-release --environment esp8266-1m-release --environment esp32-wroom32-release | 
			
		
	
		
			
				
					|  |  |  |     - name: rename-binary-files | 
			
		
	
		
			
				
					|  |  |  |       id: rename-binary-files | 
			
		
	
		
			
				
					|  |  |  |       working-directory: tools/esp8266/scripts | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -63,6 +63,29 @@ monitor_filters = | 
			
		
	
		
			
				
					|  |  |  | 	;default   ; Remove typical terminal control codes from input | 
			
		
	
		
			
				
					|  |  |  | 	time      ; Add timestamp with milliseconds for each new line | 
			
		
	
		
			
				
					|  |  |  |     log2file  ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory | 
			
		
	
		
			
				
					|  |  |  |      | 
			
		
	
		
			
				
					|  |  |  | [env:esp8266-1m-release] | 
			
		
	
		
			
				
					|  |  |  | platform = espressif8266 | 
			
		
	
		
			
				
					|  |  |  | board = esp8285 | 
			
		
	
		
			
				
					|  |  |  | board_build.ldscript = eagle.flash.1m64.ld | 
			
		
	
		
			
				
					|  |  |  | board_build.f_cpu = 80000000L | 
			
		
	
		
			
				
					|  |  |  | build_flags = -D RELEASE | 
			
		
	
		
			
				
					|  |  |  | monitor_filters = | 
			
		
	
		
			
				
					|  |  |  | 	;default   ; Remove typical terminal control codes from input | 
			
		
	
		
			
				
					|  |  |  | 	time      ; Add timestamp with milliseconds for each new line | 
			
		
	
		
			
				
					|  |  |  |     ;log2file  ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | [env:esp8266-1m-debug] | 
			
		
	
		
			
				
					|  |  |  | platform = espressif8266 | 
			
		
	
		
			
				
					|  |  |  | board = esp8285 | 
			
		
	
		
			
				
					|  |  |  | board_build.ldscript = eagle.flash.1m64.ld | 
			
		
	
		
			
				
					|  |  |  | board_build.f_cpu = 80000000L | 
			
		
	
		
			
				
					|  |  |  | build_flags = -DDEBUG_LEVEL=DBG_DEBUG -DDEBUG_ESP_CORE -DDEBUG_ESP_WIFI -DDEBUG_ESP_HTTP_CLIENT -DDEBUG_ESP_HTTP_SERVER -DDEBUG_ESP_OOM -DDEBUG_ESP_PORT=Serial | 
			
		
	
		
			
				
					|  |  |  | build_type = debug | 
			
		
	
		
			
				
					|  |  |  | monitor_filters = | 
			
		
	
		
			
				
					|  |  |  | 	;default   ; Remove typical terminal control codes from input | 
			
		
	
		
			
				
					|  |  |  | 	time      ; Add timestamp with milliseconds for each new line | 
			
		
	
		
			
				
					|  |  |  |     log2file  ; Log data to a file “platformio-device-monitor-*.log” located in the current working directory | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | [env:esp32-wroom32-release] | 
			
		
	
		
			
				
					|  |  |  | platform = espressif32 | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -24,6 +24,11 @@ def readVersion(path, infile): | 
			
		
	
		
			
				
					|  |  |  |     src = path + ".pio/build/esp8266-release/firmware.bin" | 
			
		
	
		
			
				
					|  |  |  |     dst = path + ".pio/build/out/" + versionout | 
			
		
	
		
			
				
					|  |  |  |     os.rename(src, dst) | 
			
		
	
		
			
				
					|  |  |  |      | 
			
		
	
		
			
				
					|  |  |  |     versionout = version[:-1] + "_esp8266_1m_" + sha + ".bin" | 
			
		
	
		
			
				
					|  |  |  |     src = path + ".pio/build/esp8266-1m-release/firmware.bin" | 
			
		
	
		
			
				
					|  |  |  |     dst = path + ".pio/build/out/" + versionout | 
			
		
	
		
			
				
					|  |  |  |     os.rename(src, dst) | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |     versionout = version[:-1] + "_esp32_" + sha + ".bin" | 
			
		
	
		
			
				
					|  |  |  |     src = path + ".pio/build/esp32-wroom32-release/firmware.bin" | 
			
		
	
	
		
			
				
					|  |  | 
 |