[examples] Cleanup use of unnecessary openocd.cfg

modm-io · Dec 31, 2024 · 6921ab4 · 6921ab4
1 parent 01c03e2
commit 6921ab4
Show file tree

Hide file tree

Showing 53 changed files with 122 additions and 133 deletions.
diff --git a/examples/black_pill_f103/blink/openocd.cfg b/examples/black_pill_f103/blink/openocd.cfg
diff --git a/examples/black_pill_f103/blink/project.xml b/examples/black_pill_f103/blink/project.xml
@@ -2,9 +2,11 @@
   <extends>modm:black-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/black_pill_f103/blink</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:build:scons</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/adns_9800/openocd.cfg b/examples/blue_pill_f103/adns_9800/openocd.cfg
diff --git a/examples/blue_pill_f103/adns_9800/project.xml b/examples/blue_pill_f103/adns_9800/project.xml
@@ -2,7 +2,6 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/adns_9800</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:debug</module>
@@ -14,4 +13,7 @@
     <module>modm:processing:timer</module>
     <module>modm:build:scons</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/blink/openocd.cfg b/examples/blue_pill_f103/blink/openocd.cfg
diff --git a/examples/blue_pill_f103/blink/project.xml b/examples/blue_pill_f103/blink/project.xml
@@ -2,9 +2,11 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/blink</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:build:scons</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/can/openocd.cfg b/examples/blue_pill_f103/can/openocd.cfg
diff --git a/examples/blue_pill_f103/can/project.xml b/examples/blue_pill_f103/can/project.xml
@@ -2,7 +2,6 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/can</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:debug</module>
@@ -11,4 +10,7 @@
     <module>modm:platform:uart:2</module>
     <module>modm:build:scons</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/encoder_input/openocd.cfg b/examples/blue_pill_f103/encoder_input/openocd.cfg
diff --git a/examples/blue_pill_f103/encoder_input/project.xml b/examples/blue_pill_f103/encoder_input/project.xml
@@ -2,7 +2,6 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/encoder_input</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
   	<module>modm:debug</module>
@@ -15,4 +14,7 @@
 		<module>modm:platform:timer:4</module>
 		<module>modm:build:scons</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/encoder_input_bitbang/openocd.cfg b/examples/blue_pill_f103/encoder_input_bitbang/openocd.cfg
diff --git a/examples/blue_pill_f103/encoder_input_bitbang/project.xml b/examples/blue_pill_f103/encoder_input_bitbang/project.xml
@@ -2,7 +2,6 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/encoder_input_bitbang</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
   	<module>modm:debug</module>
@@ -12,4 +11,7 @@
 		<module>modm:platform:timer:2</module>
 		<module>modm:build:scons</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/environment/openocd.cfg b/examples/blue_pill_f103/environment/openocd.cfg
diff --git a/examples/blue_pill_f103/environment/project.xml b/examples/blue_pill_f103/environment/project.xml
@@ -2,7 +2,6 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/environment</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:debug</module>
@@ -16,4 +15,7 @@
     <module>modm:processing:fiber</module>
     <module>modm:build:scons</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/flash/openocd.cfg b/examples/blue_pill_f103/flash/openocd.cfg
diff --git a/examples/blue_pill_f103/flash/project.xml b/examples/blue_pill_f103/flash/project.xml
@@ -2,7 +2,6 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/flash</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:platform:gpio</module>
@@ -13,4 +12,7 @@
     <module>modm:build:scons</module>
     <module>modm:build:compilation_db</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/graphics/openocd.cfg b/examples/blue_pill_f103/graphics/openocd.cfg
diff --git a/examples/blue_pill_f103/graphics/project.xml b/examples/blue_pill_f103/graphics/project.xml
@@ -2,11 +2,13 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/graphics</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:build:scons</module>
     <module>modm:driver:ili9341</module>
     <module>modm:platform:spi:1</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/itm/openocd.cfg b/examples/blue_pill_f103/itm/openocd.cfg
diff --git a/examples/blue_pill_f103/itm/project.xml b/examples/blue_pill_f103/itm/project.xml
@@ -2,7 +2,6 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/itm</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
     <option name="modm:platform:itm:buffer.tx">250</option>
   </options>
   <modules>
@@ -11,4 +10,7 @@
     <module>modm:platform:itm</module>
     <module>modm:processing:timer</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/logger/openocd.cfg b/examples/blue_pill_f103/logger/openocd.cfg
diff --git a/examples/blue_pill_f103/logger/project.xml b/examples/blue_pill_f103/logger/project.xml
@@ -2,12 +2,14 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/logger</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:debug</module>
     <module>modm:platform:gpio</module>
     <module>modm:platform:uart:2</module>
     <module>modm:build:scons</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/rtt/openocd.cfg b/examples/blue_pill_f103/rtt/openocd.cfg
diff --git a/examples/blue_pill_f103/rtt/project.xml b/examples/blue_pill_f103/rtt/project.xml
@@ -3,12 +3,14 @@
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/rtt</option>
     <option name="modm:platform:rtt:buffer.rx">16</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:platform:rtt</module>
     <module>modm:processing:timer</module>
     <module>modm:build:scons</module>
     <module>modm:debug</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/servo_pwm/openocd.cfg b/examples/blue_pill_f103/servo_pwm/openocd.cfg
diff --git a/examples/blue_pill_f103/servo_pwm/project.xml b/examples/blue_pill_f103/servo_pwm/project.xml
@@ -3,12 +3,14 @@
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/servo_pwm</option>
     <option name="modm:platform:rtt:buffer.tx">128</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:build:scons</module>
     <module>modm:debug</module>
     <module>modm:platform:rtt</module>
     <module>modm:platform:timer:4</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/tlc594x/openocd.cfg b/examples/blue_pill_f103/tlc594x/openocd.cfg
diff --git a/examples/blue_pill_f103/tlc594x/project.xml b/examples/blue_pill_f103/tlc594x/project.xml
@@ -2,11 +2,13 @@
 	<extends>modm:blue-pill-f103</extends>
 	<options>
 		<option name="modm:build:build.path">../../../build/blue_pill_f103/tlc594x</option>
-		<option name="modm:build:openocd.cfg">openocd.cfg</option>
 	</options>
 	<modules>
 		<module>modm:platform:spi:1</module>
 		<module>modm:driver:tlc594x</module>
 		<module>modm:build:scons</module>
 	</modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/blue_pill_f103/weight_scale_hx711/openocd.cfg b/examples/blue_pill_f103/weight_scale_hx711/openocd.cfg
diff --git a/examples/blue_pill_f103/weight_scale_hx711/project.xml b/examples/blue_pill_f103/weight_scale_hx711/project.xml
@@ -2,7 +2,6 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../build/blue_pill_f103/weight_scale_hx711</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:debug</module>
@@ -12,4 +11,7 @@
     <module>modm:build:scons</module>
     <module>modm:driver:hx711</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/generic/blinky/project.xml b/examples/generic/blinky/project.xml
@@ -7,4 +7,7 @@
     <module>modm:architecture:delay</module>
     <module>modm:build:scons</module>
   </modules>
+  <collectors>
+    <!-- <collect name="modm:build:openocd.source">interface/stlink.cfg</collect> -->
+  </collectors>
 </library>
diff --git a/examples/generic/ros/can_bridge/openocd.cfg b/examples/generic/ros/can_bridge/openocd.cfg
diff --git a/examples/generic/ros/can_bridge/project.xml b/examples/generic/ros/can_bridge/project.xml
@@ -2,7 +2,6 @@
   <extends>modm:blue-pill-f103</extends>
   <options>
     <option name="modm:build:build.path">../../../../build/generic/ros/can_bridge</option>
-    <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>
     <module>modm:build:scons</module>
@@ -12,4 +11,7 @@
     <module>modm:platform:heap</module>
     <module>modm:ros</module>
   </modules>
+  <collectors>
+    <collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
+  </collectors>
 </library>
diff --git a/examples/generic/rtc/openocd.cfg b/examples/generic/rtc/openocd.cfg