From c73747785bd0a379af92ba59b3bb4343e96b4b4f Mon Sep 17 00:00:00 2001 From: Aleksandr Kutuzov Date: Thu, 15 Aug 2024 19:41:55 +0900 Subject: [PATCH 1/2] Debug: use proper hook for handle_exit in flipperapps --- scripts/debug/flipperapps.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/debug/flipperapps.py b/scripts/debug/flipperapps.py index 6dba89a5640..81aa43c34cf 100644 --- a/scripts/debug/flipperapps.py +++ b/scripts/debug/flipperapps.py @@ -124,7 +124,7 @@ def invoke(self, arg, from_tty): print(f"Set '{arg}' as debug info lookup path for Flipper external apps") helper.attach_to_fw() gdb.events.stop.connect(helper.handle_stop) - gdb.events.exited.connect(helper.handle_exit) + gdb.events.gdb_exiting.connect(helper.handle_exit) except gdb.error as e: print(f"Support for Flipper external apps debug is not available: {e}") From e0ab465ec42321e23c15e2f2b313e3a15c22caa5 Mon Sep 17 00:00:00 2001 From: hedger Date: Thu, 15 Aug 2024 13:43:09 +0300 Subject: [PATCH 2/2] fbt: flash firmware for `blackmagic` target --- SConstruct | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SConstruct b/SConstruct index b4c8d7b2903..12796796888 100644 --- a/SConstruct +++ b/SConstruct @@ -234,7 +234,7 @@ firmware_debug = distenv.PhonyTarget( ) distenv.Depends(firmware_debug, firmware_flash) -distenv.PhonyTarget( +firmware_blackmagic = distenv.PhonyTarget( "blackmagic", "${GDBPYCOM}", source=firmware_env["FW_ELF"], @@ -242,6 +242,7 @@ distenv.PhonyTarget( GDBREMOTE="${BLACKMAGIC_ADDR}", FBT_FAP_DEBUG_ELF_ROOT=firmware_env["FBT_FAP_DEBUG_ELF_ROOT"], ) +distenv.Depends(firmware_blackmagic, firmware_flash) # Debug alien elf debug_other_opts = [