From 0ce68b1b6ba1966d33017976e792e1bd23049825 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Sun, 8 Aug 2021 13:35:17 +0200 Subject: [PATCH] Fixes #12837 With the new toolchain used with IDF 4.4 the MAP file is in a different folder and the name has changed (from firmware.map to Tasmota.map). Now name-firmware.py is searching for both- --- pio-tools/name-firmware.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pio-tools/name-firmware.py b/pio-tools/name-firmware.py index 1c79056de..e82857d1e 100644 --- a/pio-tools/name-firmware.py +++ b/pio-tools/name-firmware.py @@ -6,7 +6,7 @@ OUTPUT_DIR = "build_output{}".format(os.path.sep) def bin_map_copy(source, target, env): variant = str(target[0]).split(os.path.sep)[2] - + # check if output directories exist and create if necessary if not os.path.isdir(OUTPUT_DIR): os.mkdir(OUTPUT_DIR) @@ -27,8 +27,13 @@ def bin_map_copy(source, target, env): # copy firmware.bin to firmware/.bin shutil.copy(str(target[0]), bin_file) - # copy firmware.map to map/.map + # move firmware.map to map/.map if os.path.isfile("firmware.map"): shutil.move("firmware.map", map_file) + map_new_loc = str(target[0]).split(os.path.sep)[0] + os.path.sep + str(target[0]).split(os.path.sep)[1] + os.path.sep + str(target[0]).split(os.path.sep)[2] + os.path.sep + "Tasmota.map" + # move Tasmota.map to map/.map + if os.path.isfile(map_new_loc): + shutil.move(map_new_loc, map_file) + env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", [bin_map_copy])