Safeboot show correct flash partition size (#21366)

This commit is contained in:
Jason2866 2024-05-05 22:17:10 +02:00 committed by GitHub
parent f83c58fa0e
commit 918020202d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 0 deletions

View File

@ -5,6 +5,7 @@ import shutil
import pathlib import pathlib
import tasmotapiolib import tasmotapiolib
from os.path import join from os.path import join
from colorama import Fore, Back, Style
def bin_map_copy(source, target, env): def bin_map_copy(source, target, env):
@ -17,6 +18,13 @@ def bin_map_copy(source, target, env):
firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin") firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
if env["PIOPLATFORM"] == "espressif32": if env["PIOPLATFORM"] == "espressif32":
if("safeboot" in firmware_name):
SAFEBOOT_SIZE = firsttarget.stat().st_size
if SAFEBOOT_SIZE > 851967:
print(Fore.RED + "!!! Tasmota safeboot size is too big with {} bytes. Max size is 851967 bytes !!! ".format(
SAFEBOOT_SIZE
)
)
if("safeboot" not in firmware_name): if("safeboot" not in firmware_name):
factory_tmp = pathlib.Path(firsttarget).with_suffix("") factory_tmp = pathlib.Path(firsttarget).with_suffix("")
factory = factory_tmp.with_suffix(factory_tmp.suffix + ".factory.bin") factory = factory_tmp.with_suffix(factory_tmp.suffix + ".factory.bin")

View File

@ -29,6 +29,7 @@ custom_files_upload = no_files
[env:tasmota32-safeboot] [env:tasmota32-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32_solo1 board = esp32_solo1
board_build.app_partition_name = safeboot
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFRAMEWORK_ARDUINO_SOLO1 -DFRAMEWORK_ARDUINO_SOLO1
-DFIRMWARE_SAFEBOOT -DFIRMWARE_SAFEBOOT
@ -39,6 +40,7 @@ lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32solo1-safeboot] [env:tasmota32solo1-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32_solo1 board = esp32_solo1
board_build.app_partition_name = safeboot
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_SAFEBOOT -DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32solo1-safeboot.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32solo1-safeboot.bin"'
@ -48,6 +50,7 @@ lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32s2-safeboot] [env:tasmota32s2-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32s2 board = esp32s2
board_build.app_partition_name = safeboot
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_SAFEBOOT -DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2-safeboot.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2-safeboot.bin"'
@ -57,6 +60,7 @@ lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32s2cdc-safeboot] [env:tasmota32s2cdc-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32s2cdc board = esp32s2cdc
board_build.app_partition_name = safeboot
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_SAFEBOOT -DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2cdc-safeboot.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2cdc-safeboot.bin"'
@ -66,6 +70,7 @@ lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32c2-safeboot] [env:tasmota32c2-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32c2 board = esp32c2
board_build.app_partition_name = safeboot
build_unflags = ${env:tasmota32_base.build_unflags} build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align -mtarget-align
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
@ -77,6 +82,7 @@ lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32c3-safeboot] [env:tasmota32c3-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32c3 board = esp32c3
board_build.app_partition_name = safeboot
build_unflags = ${env:tasmota32_base.build_unflags} build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align -mtarget-align
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
@ -88,6 +94,7 @@ lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32c3ser-safeboot] [env:tasmota32c3ser-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32c3ser board = esp32c3ser
board_build.app_partition_name = safeboot
build_unflags = ${env:tasmota32_base.build_unflags} build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align -mtarget-align
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
@ -99,6 +106,7 @@ lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32s3-safeboot] [env:tasmota32s3-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32s3-qio_qspi board = esp32s3-qio_qspi
board_build.app_partition_name = safeboot
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_SAFEBOOT -DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3-safeboot.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3-safeboot.bin"'
@ -108,6 +116,7 @@ lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32c6-safeboot] [env:tasmota32c6-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32c6 board = esp32c6
board_build.app_partition_name = safeboot
build_unflags = ${env:tasmota32_base.build_unflags} build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align -mtarget-align
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
@ -119,6 +128,7 @@ lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32c6ser-safeboot] [env:tasmota32c6ser-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32c6ser board = esp32c6ser
board_build.app_partition_name = safeboot
build_unflags = ${env:tasmota32_base.build_unflags} build_unflags = ${env:tasmota32_base.build_unflags}
-mtarget-align -mtarget-align
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
@ -130,6 +140,7 @@ lib_ignore = ${safeboot_flags.lib_ignore}
[env:tasmota32s3ser-safeboot] [env:tasmota32s3ser-safeboot]
extends = env:tasmota32_base extends = env:tasmota32_base
board = esp32s3ser-qio_qspi board = esp32s3ser-qio_qspi
board_build.app_partition_name = safeboot
build_flags = ${env:tasmota32_base.build_flags} build_flags = ${env:tasmota32_base.build_flags}
-DFIRMWARE_SAFEBOOT -DFIRMWARE_SAFEBOOT
-DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3ser-safeboot.bin"' -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3ser-safeboot.bin"'