Skip to content

Commit dfc4357

Browse files
committed
Fixes to debugging tool paths in moved templates
How do you know it works? * Built template outputs have full absolute paths.
1 parent 5c2d139 commit dfc4357

6 files changed

Lines changed: 28 additions & 18 deletions

File tree

boards/netduinoplus2/scripts/template.gdb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ define reset
88
# Reset configuration
99
monitor reset halt
1010
monitor flash probe 0
11-
load @LOCAL_TARGET_BINARY_PATH@
11+
load @CMAKE_SOURCE_DIR@/@LOCAL_TARGET_BINARY_PATH@
12+
monitor rtt server stop 2333
13+
monitor rtt setup 0x20000000 0x80000 "SEGGER RTT"
14+
monitor rtt start
15+
monitor rtt server start 2333 0
1216
end
1317

1418
define setup
15-
file @LOCAL_TARGET_BINARY_PATH@
19+
file @CMAKE_SOURCE_DIR@/@LOCAL_TARGET_BINARY_PATH@
1620
break cortex::initialize::on_startup
1721
break vendor::initialize::clocks
1822
break cortex::system::main

boards/netduinoplus2/scripts/template.jdebug

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ void OnProjectLoad(void) {
55
Project.ConfigSemihosting("ModeBKPT=2");
66
Debug.SetResetMode(RM_RESET_HALT);
77
Project.SetTraceSource("SWO");
8-
Project.SetDevice("STM32F407VE");
8+
Project.SetDevice("STM32F405RG");
99
Project.SetHostIF("USB", "");
1010
// Project.SetHostIF("IP", "192.168.0.3");
1111
Project.SetTargetIF("SWD");
12-
Project.SetTIFSpeed("20 MHz");
12+
Project.SetTIFSpeed("auto");
13+
Project.ConfigSemihosting("AllowOpenRead=1,AllowOpenWrite=1,AllowRename=1,AllowRemove=1,ModeBP=1,ModeSVC=2,TargetCmdLine=42");
1314
Project.AddSvdFile("$(InstallDir)/Config/CPU/Cortex-M4F.svd");
14-
Project.AddSvdFile("$(ProjectDir)/modules/stm32/scripts/STM32F405.svd");
15-
File.Open("$(ProjectDir)/@LOCAL_TARGET_BINARY_PATH@");
15+
Project.AddSvdFile("@CMAKE_SOURCE_DIR@/modules/stm32/scripts/STM32F405.svd");
16+
File.Open("@CMAKE_SOURCE_DIR@/@LOCAL_TARGET_BINARY_PATH@");
1617
//
1718
// User settings
1819
//

boards/nucleo_h753zi/scripts/template.gdb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
# define hookpost-connect
32
# monitor swo EnableTarget 0 0 0xFFFFFFFF 0
43
# monitor swo start 480000000 64000
@@ -9,15 +8,15 @@ define reset
98
# Reset configuration
109
monitor reset halt
1110
monitor flash probe 0
12-
load @LOCAL_TARGET_BINARY_PATH@
11+
load @CMAKE_SOURCE_DIR@/@LOCAL_TARGET_BINARY_PATH@
1312
monitor rtt server stop 2333
1413
monitor rtt setup 0x24000000 0x80000 "SEGGER RTT"
1514
monitor rtt start
1615
monitor rtt server start 2333 0
1716
end
1817

1918
define setup
20-
file @LOCAL_TARGET_BINARY_PATH@
19+
file @CMAKE_SOURCE_DIR@/@LOCAL_TARGET_BINARY_PATH@
2120
break cortex::initialize::on_startup
2221
break vendor::initialize::clocks
2322
break cortex::system::main

boards/nucleo_h753zi/scripts/template.jdebug

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,26 @@ void OnProjectLoad(void) {
22
//
33
// Dialog-generated settings
44
//
5+
Project.ConfigSemihosting("ModeBKPT=2");
56
Debug.SetResetMode(RM_RESET_HALT);
67
Project.SetTraceSource("SWO");
78
Project.SetDevice("STM32H753ZI");
89
Project.SetHostIF("USB", "");
910
// Project.SetHostIF("IP", "192.168.0.3");
1011
Project.SetTargetIF("SWD");
11-
Project.SetTIFSpeed("20 MHz");
12+
Project.SetTIFSpeed("auto");
1213
Project.ConfigSemihosting("AllowOpenRead=1,AllowOpenWrite=1,AllowRename=1,AllowRemove=1,ModeBP=1,ModeSVC=2,TargetCmdLine=42");
1314
Project.AddSvdFile("$(InstallDir)/Config/CPU/Cortex-M7F.svd");
14-
Project.AddSvdFile("$(ProjectDir)/modules/stm32/scripts/STM32H753.svd");
15-
File.Open("$(ProjectDir)/@LOCAL_TARGET_BINARY_PATH@");
15+
Project.AddSvdFile("@CMAKE_SOURCE_DIR@/modules/stm32/scripts/STM32H753.svd");
16+
File.Open("@CMAKE_SOURCE_DIR@/@LOCAL_TARGET_BINARY_PATH@");
1617
//
1718
// User settings
1819
//
1920
Edit.Preference(PREF_TIMESTAMP_FORMAT, TIMESTAMP_FORMAT_INST_CNT);
2021
Edit.SysVar(VAR_RTT_ENABLED, 1);
2122
Edit.SysVar(VAR_TARGET_POWER_ON, 1);
2223
Edit.SysVar(VAR_STARTUP_COMPLETION_POINT, "jarnax::entry_after_stack");
23-
Project.AddRTTSearchRange(0x20000000, 0x80000);
24+
Project.AddRTTSearchRange(0x24000000, 0x80000);
2425
// Breaks on major milestones in boot
2526
Break.SetOnSrc("reset_entry");
2627
Break.SetOnSrc("jarnax::entry_after_stack");

boards/stm32_f4ve_v2/scripts/template.gdb

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,15 @@ define reset
88
# Reset configuration
99
monitor reset halt
1010
monitor flash probe 0
11-
load @LOCAL_TARGET_BINARY_PATH@
11+
load @CMAKE_SOURCE_DIR@/@LOCAL_TARGET_BINARY_PATH@
12+
monitor rtt server stop 2333
13+
monitor rtt setup 0x20000000 0x80000 "SEGGER RTT"
14+
monitor rtt start
15+
monitor rtt server start 2333 0
1216
end
1317

1418
define setup
15-
file @LOCAL_TARGET_BINARY_PATH@
19+
file @CMAKE_SOURCE_DIR@/@LOCAL_TARGET_BINARY_PATH@
1620
break cortex::initialize::on_startup
1721
break vendor::initialize::clocks
1822
break cortex::system::main

boards/stm32_f4ve_v2/scripts/template.jdebug

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@ void OnProjectLoad(void) {
22
//
33
// Dialog-generated settings
44
//
5+
Project.ConfigSemihosting("ModeBKPT=2");
56
Debug.SetResetMode(RM_RESET_HALT);
67
Project.SetTraceSource("SWO");
78
Project.SetDevice("STM32F407VE");
89
Project.SetHostIF("USB", "");
910
// Project.SetHostIF("IP", "192.168.0.3");
1011
Project.SetTargetIF("SWD");
11-
Project.SetTIFSpeed("20 MHz");
12+
Project.SetTIFSpeed("auto");
1213
Project.ConfigSemihosting("AllowOpenRead=1,AllowOpenWrite=1,AllowRename=1,AllowRemove=1,ModeBP=1,ModeSVC=2,TargetCmdLine=42");
1314
Project.AddSvdFile("$(InstallDir)/Config/CPU/Cortex-M4F.svd");
14-
Project.AddSvdFile("$(ProjectDir)/modules/stm32/scripts/STM32F407.svd");
15-
File.Open("$(ProjectDir)/@LOCAL_TARGET_BINARY_PATH@");
15+
Project.AddSvdFile("@CMAKE_SOURCE_DIR@/modules/stm32/scripts/STM32F407.svd");
16+
File.Open("@CMAKE_SOURCE_DIR@/@LOCAL_TARGET_BINARY_PATH@");
1617
//
1718
// User settings
1819
//

0 commit comments

Comments
 (0)