mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not abort compile when safeboot firmware can not be downloaded (#21684) 

* Message when dl of safeboot failed
* check for safeboot
This commit is contained in:
Jason2866 2024-06-23 15:01:07 +02:00 committed by GitHub
parent 25f17d7141
commit 17ea732753
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 73 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
pio-tools/post_esp32.py
View File

@ -181,18 +181,30 @@ def esp32_fetch_safeboot_bin(tasmota_platform):
safeboot_fw_name = join(variants_dir, tasmota_platform + "-safeboot.bin") safeboot_fw_name = join(variants_dir, tasmota_platform + "-safeboot.bin")
if(exists(safeboot_fw_name)): if(exists(safeboot_fw_name)):
print("safeboot binary already in place.") print("safeboot binary already in place.")
return return True
print("Will download safeboot binary from URL:") print("Will download safeboot binary from URL:")
print(safeboot_fw_url) print(safeboot_fw_url)
response = requests.get(safeboot_fw_url) try:
open(safeboot_fw_name, "wb").write(response.content) response = requests.get(safeboot_fw_url)
print("safeboot binary written to variants dir.") open(safeboot_fw_name, "wb").write(response.content)
print("safeboot binary written to variants dir.")
return True
except:
print(Fore.RED + "Download of safeboot binary failed. Please check your Internet connection.")
print(Fore.RED + "Creation of " + tasmota_platform + "-factory.bin not possible")
print(Fore.YELLOW + "Without Internet " + Fore.GREEN + tasmota_platform + "-safeboot.bin" + Fore.YELLOW + " needs to be compiled before " + Fore.GREEN + tasmota_platform)
return False
def esp32_copy_new_safeboot_bin(tasmota_platform,new_local_safeboot_fw): def esp32_copy_new_safeboot_bin(tasmota_platform,new_local_safeboot_fw):
print("Copy new local safeboot firmware to variants dir -> using it for further flashing operations") print("Copy new local safeboot firmware to variants dir -> using it for further flashing operations")
safeboot_fw_name = join(variants_dir, tasmota_platform + "-safeboot.bin") safeboot_fw_name = join(variants_dir, tasmota_platform + "-safeboot.bin")
if os.path.exists(variants_dir): if os.path.exists(variants_dir):
shutil.copy(new_local_safeboot_fw, safeboot_fw_name) try:
shutil.copy(new_local_safeboot_fw, safeboot_fw_name)
return True
except:
return False
def esp32_create_combined_bin(source, target, env): def esp32_create_combined_bin(source, target, env):
#print("Generating combined binary for serial flashing") #print("Generating combined binary for serial flashing")
@ -235,69 +247,70 @@ def esp32_create_combined_bin(source, target, env):
if not os.path.exists(variants_dir): if not os.path.exists(variants_dir):
os.makedirs(variants_dir) os.makedirs(variants_dir)
if "safeboot" in firmware_name: if "safeboot" in firmware_name:
esp32_copy_new_safeboot_bin(tasmota_platform,firmware_name) s_flag = esp32_copy_new_safeboot_bin(tasmota_platform,firmware_name)
else: else:
esp32_fetch_safeboot_bin(tasmota_platform) s_flag = esp32_fetch_safeboot_bin(tasmota_platform)
flash_size = env.BoardConfig().get("upload.flash_size", "4MB") if s_flag: # check if safeboot firmware is existing
flash_mode = env["__get_board_flash_mode"](env) flash_size = env.BoardConfig().get("upload.flash_size", "4MB")
flash_freq = env["__get_board_f_flash"](env) flash_mode = env["__get_board_flash_mode"](env)
flash_freq = env["__get_board_f_flash"](env)
cmd = [ cmd = [
"--chip", "--chip",
chip, chip,
"merge_bin", "merge_bin",
"-o", "-o",
new_file_name, new_file_name,
"--flash_mode", "--flash_mode",
flash_mode, flash_mode,
"--flash_freq", "--flash_freq",
flash_freq, flash_freq,
"--flash_size", "--flash_size",
flash_size, flash_size,
] ]
print(" Offset | File") print(" Offset | File")
for section in sections: for section in sections:
sect_adr, sect_file = section.split(" ", 1) sect_adr, sect_file = section.split(" ", 1)
print(f" - {sect_adr} | {sect_file}") print(f" - {sect_adr} | {sect_file}")
cmd += [sect_adr, sect_file] cmd += [sect_adr, sect_file]
# "main" firmware to app0 - mandatory, except we just built a new safeboot bin locally # "main" firmware to app0 - mandatory, except we just built a new safeboot bin locally
if "safeboot" not in firmware_name: if ("safeboot" not in firmware_name):
print(f" - {hex(app_offset)} | {firmware_name}") print(f" - {hex(app_offset)} | {firmware_name}")
cmd += [hex(app_offset), firmware_name] cmd += [hex(app_offset), firmware_name]
else: else:
print("Upload new safeboot binary only") print("Upload new safeboot binary only")
upload_protocol = env.subst("$UPLOAD_PROTOCOL") upload_protocol = env.subst("$UPLOAD_PROTOCOL")
if(upload_protocol == "esptool") and (fs_offset != -1): if(upload_protocol == "esptool") and (fs_offset != -1):
fs_bin = join(env.subst("$BUILD_DIR"),"littlefs.bin") fs_bin = join(env.subst("$BUILD_DIR"),"littlefs.bin")
if exists(fs_bin): if exists(fs_bin):
before_reset = env.BoardConfig().get("upload.before_reset", "default_reset") before_reset = env.BoardConfig().get("upload.before_reset", "default_reset")
after_reset = env.BoardConfig().get("upload.after_reset", "hard_reset") after_reset = env.BoardConfig().get("upload.after_reset", "hard_reset")
print(f" - {hex(fs_offset)}| {fs_bin}") print(f" - {hex(fs_offset)}| {fs_bin}")
cmd += [hex(fs_offset), fs_bin] cmd += [hex(fs_offset), fs_bin]
env.Replace( env.Replace(
UPLOADERFLAGS=[ UPLOADERFLAGS=[
"--chip", chip, "--chip", chip,
"--port", '"$UPLOAD_PORT"', "--port", '"$UPLOAD_PORT"',
"--baud", "$UPLOAD_SPEED", "--baud", "$UPLOAD_SPEED",
"--before", before_reset, "--before", before_reset,
"--after", after_reset, "--after", after_reset,
"write_flash", "-z", "write_flash", "-z",
"--flash_mode", "${__get_board_flash_mode(__env__)}", "--flash_mode", "${__get_board_flash_mode(__env__)}",
"--flash_freq", "${__get_board_f_flash(__env__)}", "--flash_freq", "${__get_board_f_flash(__env__)}",
"--flash_size", flash_size "--flash_size", flash_size
], ],
UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS ' + " ".join(cmd[7:]) UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS ' + " ".join(cmd[7:])
) )
print("Will use custom upload command for flashing operation to add file system defined for this build target.") print("Will use custom upload command for flashing operation to add file system defined for this build target.")
if("safeboot" not in firmware_name): if("safeboot" not in firmware_name):
#print('Using esptool.py arguments: %s' % ' '.join(cmd)) #print('Using esptool.py arguments: %s' % ' '.join(cmd))
esptool.main(cmd) esptool.main(cmd)
env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin) env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)