Properly propagate additional data to configure debug session
- Add extra data to "projenv" as well so that the extra data it can be overridden after the BuildProgram routine - Use the new INTEGRATION_EXTRA_DATA env variable instead of IDE_EXTRA_DATA
This commit is contained in:
@@ -41,4 +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")})
|
env["INTEGRATION_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")})
|
||||||
|
|||||||
@@ -1470,4 +1470,4 @@ env.Replace(
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Propagate application offset to debug configurations
|
# Propagate application offset to debug configurations
|
||||||
env["IDE_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")})
|
env["INTEGRATION_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")})
|
||||||
|
|||||||
@@ -169,6 +169,9 @@ filesystem = board.get("build.filesystem", "spiffs")
|
|||||||
if mcu == "esp32c3":
|
if mcu == "esp32c3":
|
||||||
toolchain_arch = "riscv32-esp"
|
toolchain_arch = "riscv32-esp"
|
||||||
|
|
||||||
|
if "INTEGRATION_EXTRA_DATA" not in env:
|
||||||
|
env["INTEGRATION_EXTRA_DATA"] = {}
|
||||||
|
|
||||||
env.Replace(
|
env.Replace(
|
||||||
__get_board_boot_mode=_get_board_boot_mode,
|
__get_board_boot_mode=_get_board_boot_mode,
|
||||||
__get_board_f_flash=_get_board_f_flash,
|
__get_board_f_flash=_get_board_f_flash,
|
||||||
@@ -501,6 +504,13 @@ if any("-Wl,-T" in f for f in env.get("LINKFLAGS", [])):
|
|||||||
print("Warning! '-Wl,-T' option for specifying linker scripts is deprecated. "
|
print("Warning! '-Wl,-T' option for specifying linker scripts is deprecated. "
|
||||||
"Please use 'board_build.ldscript' option in your 'platformio.ini' file.")
|
"Please use 'board_build.ldscript' option in your 'platformio.ini' file.")
|
||||||
|
|
||||||
|
#
|
||||||
|
# A temporary workaround to propagate additional data to the debug configuration routine
|
||||||
|
#
|
||||||
|
|
||||||
|
Import("projenv")
|
||||||
|
projenv["INTEGRATION_EXTRA_DATA"] = env.get("INTEGRATION_EXTRA_DATA")
|
||||||
|
|
||||||
#
|
#
|
||||||
# Default targets
|
# Default targets
|
||||||
#
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user