Skip to content

Commit de96a1e

Browse files
salkiniumsalkinium
committed
[examples] Cleanup use of unnecessary openocd.cfg
1 parent 6895798 commit de96a1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+122
-133
lines changed

‎examples/black_pill_f103/blink/openocd.cfg

-2
This file was deleted.

‎examples/black_pill_f103/blink/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
<extends>modm:black-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/black_pill_f103/blink</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:build:scons</module>
98
</modules>
9+
<collectors>
10+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
11+
</collectors>
1012
</library>

‎examples/blue_pill_f103/adns_9800/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/adns_9800/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/adns_9800</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:debug</module>
@@ -14,4 +13,7 @@
1413
<module>modm:processing:timer</module>
1514
<module>modm:build:scons</module>
1615
</modules>
16+
<collectors>
17+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
18+
</collectors>
1719
</library>

‎examples/blue_pill_f103/blink/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/blink/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/blink</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:build:scons</module>
98
</modules>
9+
<collectors>
10+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
11+
</collectors>
1012
</library>

‎examples/blue_pill_f103/can/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/can/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/can</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:debug</module>
@@ -11,4 +10,7 @@
1110
<module>modm:platform:uart:2</module>
1211
<module>modm:build:scons</module>
1312
</modules>
13+
<collectors>
14+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
15+
</collectors>
1416
</library>

‎examples/blue_pill_f103/encoder_input/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/encoder_input/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/encoder_input</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:debug</module>
@@ -15,4 +14,7 @@
1514
<module>modm:platform:timer:4</module>
1615
<module>modm:build:scons</module>
1716
</modules>
17+
<collectors>
18+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
19+
</collectors>
1820
</library>

‎examples/blue_pill_f103/encoder_input_bitbang/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/encoder_input_bitbang/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/encoder_input_bitbang</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:debug</module>
@@ -12,4 +11,7 @@
1211
<module>modm:platform:timer:2</module>
1312
<module>modm:build:scons</module>
1413
</modules>
14+
<collectors>
15+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
16+
</collectors>
1517
</library>

‎examples/blue_pill_f103/environment/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/environment/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/environment</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:debug</module>
@@ -16,4 +15,7 @@
1615
<module>modm:processing:fiber</module>
1716
<module>modm:build:scons</module>
1817
</modules>
18+
<collectors>
19+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
20+
</collectors>
1921
</library>

‎examples/blue_pill_f103/flash/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/flash/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/flash</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:platform:gpio</module>
@@ -13,4 +12,7 @@
1312
<module>modm:build:scons</module>
1413
<module>modm:build:compilation_db</module>
1514
</modules>
15+
<collectors>
16+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
17+
</collectors>
1618
</library>

‎examples/blue_pill_f103/graphics/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/graphics/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/graphics</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:build:scons</module>
98
<module>modm:driver:ili9341</module>
109
<module>modm:platform:spi:1</module>
1110
</modules>
11+
<collectors>
12+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
13+
</collectors>
1214
</library>

‎examples/blue_pill_f103/itm/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/itm/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/itm</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
<option name="modm:platform:itm:buffer.tx">250</option>
76
</options>
87
<modules>
@@ -11,4 +10,7 @@
1110
<module>modm:platform:itm</module>
1211
<module>modm:processing:timer</module>
1312
</modules>
13+
<collectors>
14+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
15+
</collectors>
1416
</library>

‎examples/blue_pill_f103/logger/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/logger/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/logger</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:debug</module>
98
<module>modm:platform:gpio</module>
109
<module>modm:platform:uart:2</module>
1110
<module>modm:build:scons</module>
1211
</modules>
12+
<collectors>
13+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
14+
</collectors>
1315
</library>

‎examples/blue_pill_f103/rtt/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/rtt/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/rtt</option>
55
<option name="modm:platform:rtt:buffer.rx">16</option>
6-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
76
</options>
87
<modules>
98
<module>modm:platform:rtt</module>
109
<module>modm:processing:timer</module>
1110
<module>modm:build:scons</module>
1211
<module>modm:debug</module>
1312
</modules>
13+
<collectors>
14+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
15+
</collectors>
1416
</library>

‎examples/blue_pill_f103/servo_pwm/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/servo_pwm/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,14 @@
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/servo_pwm</option>
55
<option name="modm:platform:rtt:buffer.tx">128</option>
6-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
76
</options>
87
<modules>
98
<module>modm:build:scons</module>
109
<module>modm:debug</module>
1110
<module>modm:platform:rtt</module>
1211
<module>modm:platform:timer:4</module>
1312
</modules>
13+
<collectors>
14+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
15+
</collectors>
1416
</library>

‎examples/blue_pill_f103/tlc594x/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/tlc594x/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,13 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/tlc594x</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:platform:spi:1</module>
98
<module>modm:driver:tlc594x</module>
109
<module>modm:build:scons</module>
1110
</modules>
11+
<collectors>
12+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
13+
</collectors>
1214
</library>

‎examples/blue_pill_f103/weight_scale_hx711/openocd.cfg

-2
This file was deleted.

‎examples/blue_pill_f103/weight_scale_hx711/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../build/blue_pill_f103/weight_scale_hx711</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:debug</module>
@@ -12,4 +11,7 @@
1211
<module>modm:build:scons</module>
1312
<module>modm:driver:hx711</module>
1413
</modules>
14+
<collectors>
15+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
16+
</collectors>
1517
</library>

‎examples/generic/blinky/project.xml

+3
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,7 @@
77
<module>modm:architecture:delay</module>
88
<module>modm:build:scons</module>
99
</modules>
10+
<collectors>
11+
<!-- <collect name="modm:build:openocd.source">interface/stlink.cfg</collect> -->
12+
</collectors>
1013
</library>

‎examples/generic/ros/can_bridge/openocd.cfg

-2
This file was deleted.

‎examples/generic/ros/can_bridge/project.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<extends>modm:blue-pill-f103</extends>
33
<options>
44
<option name="modm:build:build.path">../../../../build/generic/ros/can_bridge</option>
5-
<option name="modm:build:openocd.cfg">openocd.cfg</option>
65
</options>
76
<modules>
87
<module>modm:build:scons</module>
@@ -12,4 +11,7 @@
1211
<module>modm:platform:heap</module>
1312
<module>modm:ros</module>
1413
</modules>
14+
<collectors>
15+
<collect name="modm:build:openocd.source">interface/stlink.cfg</collect>
16+
</collectors>
1517
</library>

‎examples/generic/rtc/openocd.cfg

-2
This file was deleted.

0 commit comments

Comments
 (0)