[ext] Update modm-devices with extended identifiers

modm-io · Oct 20, 2019 · c566ba9 · c566ba9
1 parent 4d41c63
commit c566ba9
Show file tree

Hide file tree

Showing 109 changed files with 168 additions and 127 deletions.
diff --git a/README.md b/README.md
@@ -70,7 +70,7 @@ git clone --recurse-submodules https://github.com/modm-io/modm.git
 
 ## Targets
 
-modm can generate code for <!--avrcount-->78<!--/avrcount--> AVR and <!--stmcount-->1158<!--/stmcount-->
+modm can generate code for <!--avrcount-->530<!--/avrcount--> AVR and <!--stmcount-->1857<!--/stmcount-->
 STM32 devices, however, there are different levels of support and testing.
 
 <center>

diff --git a/examples/avr/1-wire/ds18b20/project.xml b/examples/avr/1-wire/ds18b20/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/1-wire/ds18b20</option>
   </options>

diff --git a/examples/avr/adc/basic/project.xml b/examples/avr/adc/basic/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/adc/basic</option>
   </options>

diff --git a/examples/avr/adc/oversample/project.xml b/examples/avr/adc/oversample/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/adc/oversample</option>
   </options>

diff --git a/examples/avr/app_can2usb/project.xml b/examples/avr/app_can2usb/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">at90can128</option>
+    <option name="modm:target">at90can128-16au</option>
     <option name="modm:platform:clock:f_cpu">16000000</option>
     <option name="modm:build:build.path">../../../build/avr/app_can2usb</option>
   </options>

diff --git a/examples/avr/block_device_mirror/project.xml b/examples/avr/block_device_mirror/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../build/avr/block_device_mirror</option>
     <option name="modm:io:with_printf">True</option>

diff --git a/examples/avr/can/mcp2515/project.xml b/examples/avr/can/mcp2515/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/can/mcp2515</option>
     <option name="modm:io:with_printf">True</option>

diff --git a/examples/avr/can/mcp2515_uart/project.xml b/examples/avr/can/mcp2515_uart/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/can/mcp2515_uart</option>
     <option name="modm:io:with_printf">True</option>

diff --git a/examples/avr/display/dogm128/benchmark/project.xml b/examples/avr/display/dogm128/benchmark/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../../build/avr/display/dogm128/benchmark</option>
     <option name="modm:build:scons:image.source">images</option>

diff --git a/examples/avr/display/dogm128/caged_ball/project.xml b/examples/avr/display/dogm128/caged_ball/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../../build/avr/display/dogm128/caged_ball</option>
   </options>

diff --git a/examples/avr/display/dogm128/draw/project.xml b/examples/avr/display/dogm128/draw/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../../build/avr/display/dogm128/draw</option>
   </options>

diff --git a/examples/avr/display/dogm128/image/project.xml b/examples/avr/display/dogm128/image/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../../build/avr/display/dogm128/image</option>
     <option name="modm:build:scons:image.source">images</option>

diff --git a/examples/avr/display/dogm128/text/project.xml b/examples/avr/display/dogm128/text/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../../build/avr/display/dogm128/text</option>
   </options>

diff --git a/examples/avr/display/dogm128/touch/project.xml b/examples/avr/display/dogm128/touch/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../../build/avr/display/dogm128/touch</option>
   </options>

diff --git a/examples/avr/display/dogm132/project.xml b/examples/avr/display/dogm132/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/display/dogm132</option>
   </options>

diff --git a/examples/avr/display/dogm163/project.xml b/examples/avr/display/dogm163/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">16000000</option>
     <option name="modm:build:build.path">../../../../build/avr/display/dogm163</option>
   </options>

diff --git a/examples/avr/display/hd44780/project.xml b/examples/avr/display/hd44780/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/display/hd44780</option>
   </options>

diff --git a/examples/avr/display/siemens_s65/project.xml b/examples/avr/display/siemens_s65/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">16000000</option>
     <option name="modm:build:build.path">../../../../build/avr/display/siemens_s65</option>
   </options>

diff --git a/examples/avr/flash/project.xml b/examples/avr/flash/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega328p</option>
+    <option name="modm:target">atmega328p-au</option>
     <option name="modm:platform:clock:f_cpu">1000000</option>
     <option name="modm:build:build.path">../../../build/avr/flash</option>
   </options>

diff --git a/examples/avr/gpio/basic/project.xml b/examples/avr/gpio/basic/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">attiny85</option>
+    <option name="modm:target">attiny85v-10mu</option>
     <option name="modm:platform:clock:f_cpu">8000000</option>
     <option name="modm:build:build.path">../../../../build/avr/gpio/basic</option>
   </options>

diff --git a/examples/avr/gpio/blinking/project.xml b/examples/avr/gpio/blinking/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega328p</option>
+    <option name="modm:target">atmega328p-au</option>
     <option name="modm:platform:clock:f_cpu">1000000</option>
     <option name="modm:build:build.path">../../../../build/avr/gpio/blinking</option>
   </options>

diff --git a/examples/avr/gpio/button_group/project.xml b/examples/avr/gpio/button_group/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/gpio/button_group</option>
   </options>

diff --git a/examples/avr/logger/project.xml b/examples/avr/logger/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../build/avr/logger</option>
   </options>

diff --git a/examples/avr/protothread/project.xml b/examples/avr/protothread/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../build/avr/protothread</option>
   </options>

diff --git a/examples/avr/pwm/pca9685/project.xml b/examples/avr/pwm/pca9685/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega168p</option>
+    <option name="modm:target">atmega168p-20au</option>
     <option name="modm:platform:clock:f_cpu">8000000</option>
     <option name="modm:build:build.path">../../../../build/avr/pwm/pca9685</option>
   </options>

diff --git a/examples/avr/sab/master/project.xml b/examples/avr/sab/master/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/sab/master</option>
   </options>

diff --git a/examples/avr/sab/slave/project.xml b/examples/avr/sab/slave/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/sab/slave</option>
   </options>

diff --git a/examples/avr/timeout/project.xml b/examples/avr/timeout/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../build/avr/timeout</option>
   </options>

diff --git a/examples/avr/uart/basic/project.xml b/examples/avr/uart/basic/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644pa</option>
+    <option name="modm:target">atmega644pa-au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/uart/basic</option>
   </options>

diff --git a/examples/avr/uart/basic_mega8/project.xml b/examples/avr/uart/basic_mega8/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega8</option>
+    <option name="modm:target">atmega8-16au</option>
     <option name="modm:platform:clock:f_cpu">1000000</option>
     <option name="modm:build:build.path">../../../../build/avr/uart/basic_mega8</option>
   </options>

diff --git a/examples/avr/uart/extended/project.xml b/examples/avr/uart/extended/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/uart/extended</option>
   </options>

diff --git a/examples/avr/xpcc/receiver/project.xml b/examples/avr/xpcc/receiver/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/xpcc/receiver</option>
     <option name="modm::xpcc:generator:source">../../../xpcc/xml/communication.xml</option>

diff --git a/examples/avr/xpcc/sender/project.xml b/examples/avr/xpcc/sender/project.xml
@@ -1,6 +1,6 @@
 <library>
   <options>
-    <option name="modm:target">atmega644</option>
+    <option name="modm:target">atmega644-20au</option>
     <option name="modm:platform:clock:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/xpcc/sender</option>
     <option name="modm::xpcc:generator:source">../../../xpcc/xml/communication.xml</option>

diff --git a/examples/generic/i2c_multiplex/project.xml b/examples/generic/i2c_multiplex/project.xml
@@ -2,8 +2,8 @@
 <library>
   <extends>../../../src/modm/board/nucleo_f303k8/board.xml</extends>
   <options>
-    <option name=":target">stm32f303k8t</option>
-    <!-- <option name=":target">stm32f103c8t</option> -->
+    <option name=":target">stm32f303k8t6</option>
+    <!-- <option name=":target">stm32f103c8t6</option> -->
     <option name=":platform:uart:2:buffer.tx">2048</option>
     <option name=":platform:uart:2:buffer.rx">2048</option>
     <option name=":build:build.path">../../../build/generic/i2c_multiplex</option>

diff --git a/examples/nucleo_f103rb/undefined_irq/main.cpp b/examples/nucleo_f103rb/undefined_irq/main.cpp
@@ -27,6 +27,7 @@ MODM_ISR(EXTI3)
 // MODM_ISR(EXTI4)
 // { MODM_LOG_DEBUG << "EXTI4 called!" << modm::endl; }
 
+[[maybe_unused]]
 static modm::Abandonment
 core_assertion_handler(const char * module,
 					   const char * /*location*/,

diff --git a/ext/modm-devices b/ext/modm-devices
diff --git a/src/modm/board/al_avreb_can/board.xml b/src/modm/board/al_avreb_can/board.xml
@@ -6,7 +6,7 @@
   </repositories>
 
   <options>
-    <option name="modm:target">at90can128</option>
+    <option name="modm:target">at90can128-16au</option>
     <option name="modm:platform:clock:f_cpu">16000000</option>
   </options>
   <modules>

diff --git a/src/modm/board/al_avreb_can/module.lb b/src/modm/board/al_avreb_can/module.lb
@@ -20,7 +20,7 @@ https://www.alvidi.de/products/DE/AVR_Entwicklungsboards/avr_modul_avreb_can.php
 """
 
 def prepare(module, options):
-    if options[":target"].partname != "at90can128":
+    if not options[":target"].partname.startswith("at90can128"):
         return False
 
     module.depends(

diff --git a/src/modm/board/arduino_nano/board.xml b/src/modm/board/arduino_nano/board.xml
@@ -6,7 +6,7 @@
   </repositories>
 
   <options>
-    <option name="modm:target">atmega328p</option>
+    <option name="modm:target">atmega328p-au</option>
     <option name="modm:platform:clock:f_cpu">16000000</option>
   </options>
   <modules>

diff --git a/src/modm/board/arduino_nano/module.lb b/src/modm/board/arduino_nano/module.lb
@@ -16,7 +16,7 @@ def init(module):
     module.description = "Arduino NANO"
 
 def prepare(module, options):
-    if options[":target"].partname != "atmega328p":
+    if not options[":target"].partname.startswith("atmega328p"):
         return False
 
     module.depends(

diff --git a/src/modm/board/arduino_uno/board.xml b/src/modm/board/arduino_uno/board.xml
@@ -6,7 +6,7 @@
   </repositories>
 
   <options>
-    <option name="modm:target">atmega328p</option>
+    <option name="modm:target">atmega328p-au</option>
     <option name="modm:platform:clock:f_cpu">16000000</option>
   </options>
   <modules>

diff --git a/src/modm/board/arduino_uno/module.lb b/src/modm/board/arduino_uno/module.lb
@@ -16,7 +16,7 @@ def init(module):
     module.description = "Arduino UNO"
 
 def prepare(module, options):
-    if options[":target"].partname != "atmega328p":
+    if not options[":target"].partname.startswith("atmega328p"):
         return False
 
     module.depends(

diff --git a/src/modm/board/black_pill/board.xml b/src/modm/board/black_pill/board.xml
@@ -6,7 +6,7 @@
   </repositories>
 
   <options>
-    <option name="modm:target">stm32f103c8t</option>
+    <option name="modm:target">stm32f103c8t6</option>
   </options>
   <modules>
     <module>modm:board:black-pill</module>

diff --git a/src/modm/board/black_pill/module.lb b/src/modm/board/black_pill/module.lb
@@ -55,7 +55,7 @@ Then include this file in your build options like so:
 """
 
 def prepare(module, options):
-    if options[":target"].partname != "stm32f103c8t":
+    if not options[":target"].partname.startswith("stm32f103c8t"):
         return False
 
     module.depends(

diff --git a/src/modm/board/blue_pill/board.xml b/src/modm/board/blue_pill/board.xml
@@ -6,7 +6,7 @@
   </repositories>
 
   <options>
-    <option name="modm:target">stm32f103c8t</option>
+    <option name="modm:target">stm32f103c8t6</option>
   </options>
   <modules>
     <module>modm:board:blue-pill</module>

diff --git a/src/modm/board/blue_pill/module.lb b/src/modm/board/blue_pill/module.lb
@@ -55,7 +55,7 @@ Then include this file in your build options like so:
 """
 
 def prepare(module, options):
-    if options[":target"].partname != "stm32f103c8t":
+    if not options[":target"].partname.startswith("stm32f103c8t"):
         return False
 
     module.depends(

diff --git a/src/modm/board/disco_f051r8/board.xml b/src/modm/board/disco_f051r8/board.xml
@@ -6,7 +6,7 @@
   </repositories>
 
   <options>
-    <option name="modm:target">stm32f051r8t</option>
+    <option name="modm:target">stm32f051r8t6</option>
   </options>
   <modules>
     <module>modm:board:disco-f051r8</module>

diff --git a/src/modm/board/disco_f051r8/module.lb b/src/modm/board/disco_f051r8/module.lb
@@ -20,7 +20,7 @@ def init(module):
 """
 
 def prepare(module, options):
-    if options[":target"].partname != "stm32f051r8t":
+    if not options[":target"].partname.startswith("stm32f051r8t"):
         return False
 
     module.depends(