[examples] Consistent naming for all pill boards

modm-io · Mar 26, 2021 · 774c06f · 774c06f
1 parent a7d3a17
commit 774c06f
Show file tree

Hide file tree

Showing 47 changed files with 41 additions and 43 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -89,7 +89,7 @@ jobs:
       - name: Examples STM32F1 Series
         if: always()
         run: |
-          (cd examples && ../tools/scripts/examples_compile.py stm32f1_discovery nucleo_f103rb olimexino_stm32 stm32f103c8t6_blue_pill stm32f103c8t6_black_pill)
+          (cd examples && ../tools/scripts/examples_compile.py stm32f1_discovery nucleo_f103rb olimexino_stm32 blue_pill_f103 black_pill_f103)
       - name: Examples STM32F3 Series
         if: always()
         run: |
@@ -143,7 +143,7 @@ jobs:
       - name: Examples STM32F4 Without Discovery Board
         if: always()
         run: |
-          (cd examples && ../tools/scripts/examples_compile.py nucleo_f401re nucleo_f411re nucleo_f429zi nucleo_f446re stm32f411ccu_mini_f401 stm32f411ceu_mini_f411 stm32f407vet6_devebox stm32_f4ve)
+          (cd examples && ../tools/scripts/examples_compile.py nucleo_f401re nucleo_f411re nucleo_f429zi nucleo_f446re black_pill_f401 black_pill_f411 stm32f407vet6_devebox stm32_f4ve)
 
   avr-examples:
     runs-on: ubuntu-20.04

diff --git a/...s/stm32f103c8t6_black_pill/blink/main.cpp → examples/black_pill_f103/blink/main.cpp b/...s/stm32f103c8t6_black_pill/blink/main.cpp → examples/black_pill_f103/blink/main.cpp
diff --git a/...tm32f103c8t6_black_pill/blink/openocd.cfg → examples/black_pill_f103/blink/openocd.cfg b/...tm32f103c8t6_black_pill/blink/openocd.cfg → examples/black_pill_f103/blink/openocd.cfg
diff --git a/...stm32f103c8t6_blue_pill/blink/project.xml → examples/black_pill_f103/blink/project.xml b/...stm32f103c8t6_blue_pill/blink/project.xml → examples/black_pill_f103/blink/project.xml
@@ -1,7 +1,7 @@
 <library>
-  <extends>modm:blue-pill</extends>
+  <extends>modm:black-pill-f103</extends>
   <options>
-    <option name="modm:build:build.path">../../../build/stm32f103c8t6_blue_pill/blink</option>
+    <option name="modm:build:build.path">../../../build/black_pill_f103/blink</option>
     <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>

diff --git a/...les/stm32f401ccu_mini_f401/blink/main.cpp → examples/black_pill_f401/blink/main.cpp b/...les/stm32f401ccu_mini_f401/blink/main.cpp → examples/black_pill_f401/blink/main.cpp
@@ -25,11 +25,9 @@ main()
 {
 	Board::initialize();
 
-	LedGreen::set();
-
 	while (true)
 	{
-		LedGreen::toggle();
+		Led::toggle();
 		modm::delay(Button::read() ? 100ms : 500ms);
 	}
 

diff --git a/examples/black_pill_f401/blink/project.xml b/examples/black_pill_f401/blink/project.xml
@@ -0,0 +1,9 @@
+<library>
+  <extends>modm:black-pill-f401</extends>
+  <options>
+    <option name="modm:build:build.path">../../../build/black_pill_f401/blink</option>
+  </options>
+  <modules>
+    <module>modm:build:scons</module>
+  </modules>
+</library>
diff --git a/...les/stm32f411ceu_mini_f411/blink/main.cpp → examples/black_pill_f411/blink/main.cpp b/...les/stm32f411ceu_mini_f411/blink/main.cpp → examples/black_pill_f411/blink/main.cpp
diff --git a/examples/black_pill_f411/blink/project.xml b/examples/black_pill_f411/blink/project.xml
@@ -0,0 +1,9 @@
+<library>
+  <extends>modm:black-pill-f411</extends>
+  <options>
+    <option name="modm:build:build.path">../../../build/black_pill_f411/blink</option>
+  </options>
+  <modules>
+    <module>modm:build:scons</module>
+  </modules>
+</library>
diff --git a/.../stm32f411ceu_mini_f411/usbfatfs/main.cpp → examples/black_pill_f411/usbfatfs/main.cpp b/.../stm32f411ceu_mini_f411/usbfatfs/main.cpp → examples/black_pill_f411/usbfatfs/main.cpp
diff --git a/...m32f411ceu_mini_f411/usbfatfs/project.xml → ...ples/black_pill_f411/usbfatfs/project.xml b/...m32f411ceu_mini_f411/usbfatfs/project.xml → ...ples/black_pill_f411/usbfatfs/project.xml
@@ -1,7 +1,7 @@
 <library>
-  <extends>modm:mini-f411</extends>
+  <extends>modm:black-pill-f411</extends>
   <options>
-    <option name="modm:build:build.path">../../../build/stm32f411ceu_mini_f411/usb_fatfs</option>
+    <option name="modm:build:build.path">../../../build/black_pill_f411/usb_fatfs</option>
     <option name="modm:tinyusb:config">device.msc, device.cdc</option>
   </options>
   <modules>

diff --git a/...m32f411ceu_mini_f411/usbfatfs/ramdisk.cpp → ...ples/black_pill_f411/usbfatfs/ramdisk.cpp b/...m32f411ceu_mini_f411/usbfatfs/ramdisk.cpp → ...ples/black_pill_f411/usbfatfs/ramdisk.cpp
diff --git a/...tm32f103c8t6_blue_pill/adns_9800/main.cpp → examples/blue_pill_f103/adns_9800/main.cpp b/...tm32f103c8t6_blue_pill/adns_9800/main.cpp → examples/blue_pill_f103/adns_9800/main.cpp
diff --git a/...2f103c8t6_blue_pill/adns_9800/openocd.cfg → ...ples/blue_pill_f103/adns_9800/openocd.cfg b/...2f103c8t6_blue_pill/adns_9800/openocd.cfg → ...ples/blue_pill_f103/adns_9800/openocd.cfg
diff --git a/...2f103c8t6_blue_pill/adns_9800/project.xml → ...ples/blue_pill_f103/adns_9800/project.xml b/...2f103c8t6_blue_pill/adns_9800/project.xml → ...ples/blue_pill_f103/adns_9800/project.xml
@@ -1,7 +1,7 @@
 <library>
-  <extends>modm:blue-pill</extends>
+  <extends>modm:blue-pill-f103</extends>
   <options>
-    <option name="modm:build:build.path">../../../build/stm32f103c8t6_blue_pill/adns_9800</option>
+    <option name="modm:build:build.path">../../../build/blue_pill_f103/adns_9800</option>
     <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>

diff --git a/...es/stm32f103c8t6_blue_pill/blink/main.cpp → examples/blue_pill_f103/blink/main.cpp b/...es/stm32f103c8t6_blue_pill/blink/main.cpp → examples/blue_pill_f103/blink/main.cpp
diff --git a/...stm32f103c8t6_blue_pill/blink/openocd.cfg → examples/blue_pill_f103/blink/openocd.cfg b/...stm32f103c8t6_blue_pill/blink/openocd.cfg → examples/blue_pill_f103/blink/openocd.cfg
diff --git a/...tm32f103c8t6_black_pill/blink/project.xml → examples/blue_pill_f103/blink/project.xml b/...tm32f103c8t6_black_pill/blink/project.xml → examples/blue_pill_f103/blink/project.xml
@@ -1,7 +1,7 @@
 <library>
-  <extends>modm:black-pill</extends>
+  <extends>modm:blue-pill-f103</extends>
   <options>
-    <option name="modm:build:build.path">../../../build/stm32f103c8t6_black_pill/blink</option>
+    <option name="modm:build:build.path">../../../build/blue_pill_f103/blink</option>
     <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>

diff --git a/...ples/stm32f103c8t6_blue_pill/can/main.cpp → examples/blue_pill_f103/can/main.cpp b/...ples/stm32f103c8t6_blue_pill/can/main.cpp → examples/blue_pill_f103/can/main.cpp
diff --git a/...s/stm32f103c8t6_blue_pill/can/openocd.cfg → examples/blue_pill_f103/can/openocd.cfg b/...s/stm32f103c8t6_blue_pill/can/openocd.cfg → examples/blue_pill_f103/can/openocd.cfg
diff --git a/...s/stm32f103c8t6_blue_pill/can/project.xml → examples/blue_pill_f103/can/project.xml b/...s/stm32f103c8t6_blue_pill/can/project.xml → examples/blue_pill_f103/can/project.xml
@@ -1,7 +1,7 @@
 <library>
-  <extends>modm:blue-pill</extends>
+  <extends>modm:blue-pill-f103</extends>
   <options>
-    <option name="modm:build:build.path">../../../build/stm32f103c8t6_blue_pill/can</option>
+    <option name="modm:build:build.path">../../../build/blue_pill_f103/can</option>
     <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>

diff --git a/...03c8t6_blue_pill/environment/hardware.hpp → ...s/blue_pill_f103/environment/hardware.hpp b/...03c8t6_blue_pill/environment/hardware.hpp → ...s/blue_pill_f103/environment/hardware.hpp
diff --git a/...tm32f103c8t6_blue_pill/environment/log.py → examples/blue_pill_f103/environment/log.py b/...tm32f103c8t6_blue_pill/environment/log.py → examples/blue_pill_f103/environment/log.py
diff --git a/...32f103c8t6_blue_pill/environment/main.cpp → examples/blue_pill_f103/environment/main.cpp b/...32f103c8t6_blue_pill/environment/main.cpp → examples/blue_pill_f103/environment/main.cpp
diff --git a/...103c8t6_blue_pill/environment/openocd.cfg → ...es/blue_pill_f103/environment/openocd.cfg b/...103c8t6_blue_pill/environment/openocd.cfg → ...es/blue_pill_f103/environment/openocd.cfg
diff --git a/...03c8t6_blue_pill/environment/plot.gnuplot → ...s/blue_pill_f103/environment/plot.gnuplot b/...03c8t6_blue_pill/environment/plot.gnuplot → ...s/blue_pill_f103/environment/plot.gnuplot
diff --git a/...103c8t6_blue_pill/environment/project.xml → ...es/blue_pill_f103/environment/project.xml b/...103c8t6_blue_pill/environment/project.xml → ...es/blue_pill_f103/environment/project.xml
@@ -1,7 +1,7 @@
 <library>
-  <extends>modm:blue-pill</extends>
+  <extends>modm:blue-pill-f103</extends>
   <options>
-    <option name="modm:build:build.path">../../../build/stm32f103c8t6_blue_pill/environment</option>
+    <option name="modm:build:build.path">../../../build/blue_pill_f103/environment</option>
     <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>

diff --git a/...t6_blue_pill/environment/thread_blink.cpp → ...ue_pill_f103/environment/thread_blink.cpp b/...t6_blue_pill/environment/thread_blink.cpp → ...ue_pill_f103/environment/thread_blink.cpp
diff --git a/...t6_blue_pill/environment/thread_blink.hpp → ...ue_pill_f103/environment/thread_blink.hpp b/...t6_blue_pill/environment/thread_blink.hpp → ...ue_pill_f103/environment/thread_blink.hpp
diff --git a/...6_blue_pill/environment/thread_bme280.cpp → ...e_pill_f103/environment/thread_bme280.cpp b/...6_blue_pill/environment/thread_bme280.cpp → ...e_pill_f103/environment/thread_bme280.cpp
diff --git a/...6_blue_pill/environment/thread_bme280.hpp → ...e_pill_f103/environment/thread_bme280.hpp b/...6_blue_pill/environment/thread_bme280.hpp → ...e_pill_f103/environment/thread_bme280.hpp
diff --git a/...6_blue_pill/environment/thread_bmp180.cpp → ...e_pill_f103/environment/thread_bmp180.cpp b/...6_blue_pill/environment/thread_bmp180.cpp → ...e_pill_f103/environment/thread_bmp180.cpp
diff --git a/...6_blue_pill/environment/thread_bmp180.hpp → ...e_pill_f103/environment/thread_bmp180.hpp b/...6_blue_pill/environment/thread_bmp180.hpp → ...e_pill_f103/environment/thread_bmp180.hpp
diff --git a/...103c8t6_blue_pill/environment/threads.hpp → ...es/blue_pill_f103/environment/threads.hpp b/...103c8t6_blue_pill/environment/threads.hpp → ...es/blue_pill_f103/environment/threads.hpp
diff --git a/...stm32f103c8t6_blue_pill/graphics/main.cpp → examples/blue_pill_f103/graphics/main.cpp b/...stm32f103c8t6_blue_pill/graphics/main.cpp → examples/blue_pill_f103/graphics/main.cpp
diff --git a/...32f103c8t6_blue_pill/graphics/openocd.cfg → examples/blue_pill_f103/graphics/openocd.cfg b/...32f103c8t6_blue_pill/graphics/openocd.cfg → examples/blue_pill_f103/graphics/openocd.cfg
diff --git a/...32f103c8t6_blue_pill/graphics/project.xml → examples/blue_pill_f103/graphics/project.xml b/...32f103c8t6_blue_pill/graphics/project.xml → examples/blue_pill_f103/graphics/project.xml
@@ -1,7 +1,7 @@
 <library>
-  <extends>modm:blue-pill</extends>
+  <extends>modm:blue-pill-f103</extends>
   <options>
-    <option name="modm:build:build.path">../../../build/stm32f103c8t6_blue_pill/graphics</option>
+    <option name="modm:build:build.path">../../../build/blue_pill_f103/graphics</option>
     <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>

diff --git a/...s/stm32f103c8t6_blue_pill/logger/main.cpp → examples/blue_pill_f103/logger/main.cpp b/...s/stm32f103c8t6_blue_pill/logger/main.cpp → examples/blue_pill_f103/logger/main.cpp
diff --git a/...tm32f103c8t6_blue_pill/logger/openocd.cfg → examples/blue_pill_f103/logger/openocd.cfg b/...tm32f103c8t6_blue_pill/logger/openocd.cfg → examples/blue_pill_f103/logger/openocd.cfg
diff --git a/...tm32f103c8t6_blue_pill/logger/project.xml → examples/blue_pill_f103/logger/project.xml b/...tm32f103c8t6_blue_pill/logger/project.xml → examples/blue_pill_f103/logger/project.xml
@@ -1,7 +1,7 @@
 <library>
-  <extends>modm:blue-pill</extends>
+  <extends>modm:blue-pill-f103</extends>
   <options>
-    <option name="modm:build:build.path">../../../build/stm32f103c8t6_blue_pill/logger</option>
+    <option name="modm:build:build.path">../../../build/blue_pill_f103/logger</option>
     <option name="modm:build:openocd.cfg">openocd.cfg</option>
   </options>
   <modules>

diff --git a/.../stm32f103c8t6_blue_pill/tlc594x/main.cpp → examples/blue_pill_f103/tlc594x/main.cpp b/.../stm32f103c8t6_blue_pill/tlc594x/main.cpp → examples/blue_pill_f103/tlc594x/main.cpp
diff --git a/...m32f103c8t6_blue_pill/tlc594x/openocd.cfg → examples/blue_pill_f103/tlc594x/openocd.cfg b/...m32f103c8t6_blue_pill/tlc594x/openocd.cfg → examples/blue_pill_f103/tlc594x/openocd.cfg
diff --git a/...m32f103c8t6_blue_pill/tlc594x/project.xml → examples/blue_pill_f103/tlc594x/project.xml b/...m32f103c8t6_blue_pill/tlc594x/project.xml → examples/blue_pill_f103/tlc594x/project.xml
@@ -1,7 +1,7 @@
 <library>
-	<extends>modm:blue-pill</extends>
+	<extends>modm:blue-pill-f103</extends>
 	<options>
-		<option name="modm:build:build.path">../../../build/stm32f103c8t6_blue_pill/tlc594x</option>
+		<option name="modm:build:build.path">../../../build/blue_pill_f103/tlc594x</option>
 		<option name="modm:build:openocd.cfg">openocd.cfg</option>
 	</options>
 	<modules>

diff --git a/...8t6_blue_pill/weight_scale_hx711/main.cpp → ...lue_pill_f103/weight_scale_hx711/main.cpp b/...8t6_blue_pill/weight_scale_hx711/main.cpp → ...lue_pill_f103/weight_scale_hx711/main.cpp
diff --git a/..._blue_pill/weight_scale_hx711/openocd.cfg → ..._pill_f103/weight_scale_hx711/openocd.cfg b/..._blue_pill/weight_scale_hx711/openocd.cfg → ..._pill_f103/weight_scale_hx711/openocd.cfg
diff --git a/..._blue_pill/weight_scale_hx711/project.xml → ..._pill_f103/weight_scale_hx711/project.xml b/..._blue_pill/weight_scale_hx711/project.xml → ..._pill_f103/weight_scale_hx711/project.xml
@@ -1,7 +1,7 @@
 <library>
-  <extends>modm:blue-pill</extends>
+  <extends>modm:blue-pill-f103</extends>
   <options>
-    <option name="modm:build:build.path">../../../build/stm32f103c8t6_blue_pill/weight_scale_hx711</option>
+    <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>

diff --git a/examples/stm32f401ccu_mini_f401/blink/project.xml b/examples/stm32f401ccu_mini_f401/blink/project.xml
diff --git a/examples/stm32f411ceu_mini_f411/blink/project.xml b/examples/stm32f411ceu_mini_f411/blink/project.xml