pioduino/platform-espressif32
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Process app offset in debug mode

Browse Source
This commit is contained in:
Valerii Koval
2022-04-20 22:20:13 +03:00
parent c74e09e69a
commit eff0222cd1
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
builder/frameworks/arduino.py
+1
View File
@@ -41,3 +41,4 @@ elif "espidf" not in env.subst("$PIOFRAMEWORK"):
SConscript( SConscript(
join(DefaultEnvironment().PioPlatform().get_package_dir( join(DefaultEnvironment().PioPlatform().get_package_dir(
"framework-arduinoespressif32"), "tools", "platformio-build.py")) "framework-arduinoespressif32"), "tools", "platformio-build.py"))
env["IDE_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")})
builder/main.py
+5 -6
View File
@@ -212,7 +212,8 @@ env.Replace(
ESP32_FS_IMAGE_NAME=env.get( ESP32_FS_IMAGE_NAME=env.get(
"ESP32_FS_IMAGE_NAME", env.get("ESP32_SPIFFS_IMAGE_NAME", filesystem) "ESP32_FS_IMAGE_NAME", env.get("ESP32_SPIFFS_IMAGE_NAME", filesystem)
), ),
ESP32_APP_OFFSET="0x10000",
ESP32_APP_OFFSET=board.get("upload.offset_address", "0x10000"),
PROGSUFFIX=".elf" PROGSUFFIX=".elf"
) )
@@ -368,11 +369,9 @@ elif upload_protocol == "esptool":
"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", board.get("upload.flash_size", "detect"), "--flash_size", board.get("upload.flash_size", "detect")
board.get("upload.offset_address", "$ESP32_APP_OFFSET"),
"$SOURCE"
], ],
UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS' UPLOADCMD='"$PYTHONEXE" "$UPLOADER" $UPLOADERFLAGS $ESP32_APP_OFFSET $SOURCE'
) )
for image in env.get("FLASH_EXTRA_IMAGES", []): for image in env.get("FLASH_EXTRA_IMAGES", []):
env.Append(UPLOADERFLAGS=[image[0], env.subst(image[1])]) env.Append(UPLOADERFLAGS=[image[0], env.subst(image[1])])
@@ -439,7 +438,7 @@ elif upload_protocol in debug_tools:
% ( % (
"$FS_START" "$FS_START"
if "uploadfs" in COMMAND_LINE_TARGETS if "uploadfs" in COMMAND_LINE_TARGETS
else board.get("upload.offset_address", "$ESP32_APP_OFFSET") else "$ESP32_APP_OFFSET"
), ),
] ]
) )