[avr] Move ::clock:f_cpu option to ::core:f_cpu

salkinium · salkinium · commit 1d07308a43e1 · 2020-04-05T19:47:03.000+02:00
This makes the :platform:clock module optional as it should be.
diff --git a/examples/avr/1-wire/ds18b20/project.xml b/examples/avr/1-wire/ds18b20/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/1-wire/ds18b20</option>
   </options>
   <modules>
diff --git a/examples/avr/adc/basic/project.xml b/examples/avr/adc/basic/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/adc/basic</option>
   </options>
   <modules>
diff --git a/examples/avr/adc/oversample/project.xml b/examples/avr/adc/oversample/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/adc/oversample</option>
   </options>
   <modules>
diff --git a/examples/avr/app_can2usb/project.xml b/examples/avr/app_can2usb/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">at90can128-16au</option>
-    <option name="modm:platform:clock:f_cpu">16000000</option>
+    <option name="modm:platform:core:f_cpu">16000000</option>
     <option name="modm:build:build.path">../../../build/avr/app_can2usb</option>
   </options>
   <modules>
diff --git a/examples/avr/block_device_mirror/project.xml b/examples/avr/block_device_mirror/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../build/avr/block_device_mirror</option>
     <option name="modm:io:with_printf">True</option>
   </options>
diff --git a/examples/avr/can/mcp2515/project.xml b/examples/avr/can/mcp2515/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/can/mcp2515</option>
     <option name="modm:io:with_printf">True</option>
   </options>
diff --git a/examples/avr/can/mcp2515_uart/project.xml b/examples/avr/can/mcp2515_uart/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/can/mcp2515_uart</option>
     <option name="modm:io:with_printf">True</option>
   </options>
diff --git a/examples/avr/display/dogm128/benchmark/project.xml b/examples/avr/display/dogm128/benchmark/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core: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>
   </options>
diff --git a/examples/avr/display/dogm128/caged_ball/project.xml b/examples/avr/display/dogm128/caged_ball/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../../build/avr/display/dogm128/caged_ball</option>
   </options>
   <modules>
diff --git a/examples/avr/display/dogm128/draw/project.xml b/examples/avr/display/dogm128/draw/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../../build/avr/display/dogm128/draw</option>
   </options>
   <modules>
diff --git a/examples/avr/display/dogm128/image/project.xml b/examples/avr/display/dogm128/image/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core: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>
   </options>
diff --git a/examples/avr/display/dogm128/text/project.xml b/examples/avr/display/dogm128/text/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../../build/avr/display/dogm128/text</option>
   </options>
   <modules>
diff --git a/examples/avr/display/dogm128/touch/project.xml b/examples/avr/display/dogm128/touch/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../../build/avr/display/dogm128/touch</option>
   </options>
   <modules>
diff --git a/examples/avr/display/dogm132/project.xml b/examples/avr/display/dogm132/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/display/dogm132</option>
   </options>
   <modules>
diff --git a/examples/avr/display/dogm163/project.xml b/examples/avr/display/dogm163/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">16000000</option>
+    <option name="modm:platform:core:f_cpu">16000000</option>
     <option name="modm:build:build.path">../../../../build/avr/display/dogm163</option>
   </options>
   <modules>
diff --git a/examples/avr/display/hd44780/project.xml b/examples/avr/display/hd44780/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/display/hd44780</option>
   </options>
   <modules>
diff --git a/examples/avr/display/siemens_s65/project.xml b/examples/avr/display/siemens_s65/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">16000000</option>
+    <option name="modm:platform:core:f_cpu">16000000</option>
     <option name="modm:build:build.path">../../../../build/avr/display/siemens_s65</option>
   </options>
   <modules>
diff --git a/examples/avr/flash/project.xml b/examples/avr/flash/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega328p-au</option>
-    <option name="modm:platform:clock:f_cpu">1000000</option>
+    <option name="modm:platform:core:f_cpu">1000000</option>
     <option name="modm:build:build.path">../../../build/avr/flash</option>
   </options>
   <modules>
diff --git a/examples/avr/gpio/basic/project.xml b/examples/avr/gpio/basic/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">attiny85v-10mu</option>
-    <option name="modm:platform:clock:f_cpu">8000000</option>
+    <option name="modm:platform:core:f_cpu">8000000</option>
     <option name="modm:build:build.path">../../../../build/avr/gpio/basic</option>
   </options>
   <modules>
diff --git a/examples/avr/gpio/blinking/project.xml b/examples/avr/gpio/blinking/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega328p-au</option>
-    <option name="modm:platform:clock:f_cpu">1000000</option>
+    <option name="modm:platform:core:f_cpu">1000000</option>
     <option name="modm:build:build.path">../../../../build/avr/gpio/blinking</option>
   </options>
   <modules>
diff --git a/examples/avr/gpio/button_group/project.xml b/examples/avr/gpio/button_group/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/gpio/button_group</option>
   </options>
   <modules>
diff --git a/examples/avr/logger/project.xml b/examples/avr/logger/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../build/avr/logger</option>
   </options>
   <modules>
diff --git a/examples/avr/protothread/project.xml b/examples/avr/protothread/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../build/avr/protothread</option>
   </options>
   <modules>
diff --git a/examples/avr/pwm/pca9685/project.xml b/examples/avr/pwm/pca9685/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega168p-20au</option>
-    <option name="modm:platform:clock:f_cpu">8000000</option>
+    <option name="modm:platform:core:f_cpu">8000000</option>
     <option name="modm:build:build.path">../../../../build/avr/pwm/pca9685</option>
   </options>
   <modules>
diff --git a/examples/avr/sab/master/project.xml b/examples/avr/sab/master/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/sab/master</option>
   </options>
   <modules>
diff --git a/examples/avr/sab/slave/project.xml b/examples/avr/sab/slave/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/sab/slave</option>
   </options>
   <modules>
diff --git a/examples/avr/timeout/project.xml b/examples/avr/timeout/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../build/avr/timeout</option>
   </options>
   <modules>
diff --git a/examples/avr/uart/basic/project.xml b/examples/avr/uart/basic/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644pa-au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/uart/basic</option>
   </options>
   <modules>
diff --git a/examples/avr/uart/basic_mega8/project.xml b/examples/avr/uart/basic_mega8/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega8-16au</option>
-    <option name="modm:platform:clock:f_cpu">1000000</option>
+    <option name="modm:platform:core:f_cpu">1000000</option>
     <option name="modm:build:build.path">../../../../build/avr/uart/basic_mega8</option>
   </options>
   <modules>
diff --git a/examples/avr/uart/extended/project.xml b/examples/avr/uart/extended/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core:f_cpu">14745600</option>
     <option name="modm:build:build.path">../../../../build/avr/uart/extended</option>
   </options>
   <modules>
diff --git a/examples/avr/xpcc/receiver/project.xml b/examples/avr/xpcc/receiver/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core: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>
     <option name="modm::xpcc:generator:container">receiver</option>
diff --git a/examples/avr/xpcc/sender/project.xml b/examples/avr/xpcc/sender/project.xml
@@ -1,7 +1,7 @@
 <library>
   <options>
     <option name="modm:target">atmega644-20au</option>
-    <option name="modm:platform:clock:f_cpu">14745600</option>
+    <option name="modm:platform:core: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>
     <option name="modm::xpcc:generator:container">sender</option>
diff --git a/src/modm/board/al_avreb_can/board.xml b/src/modm/board/al_avreb_can/board.xml
@@ -7,7 +7,7 @@
 
   <options>
     <option name="modm:target">at90can128-16au</option>
-    <option name="modm:platform:clock:f_cpu">16000000</option>
+    <option name="modm:platform:core:f_cpu">16000000</option>
   </options>
   <modules>
     <module>modm:board:al-avreb-can</module>
diff --git a/src/modm/board/arduino_nano/board.xml b/src/modm/board/arduino_nano/board.xml
@@ -7,7 +7,7 @@
 
   <options>
     <option name="modm:target">atmega328p-au</option>
-    <option name="modm:platform:clock:f_cpu">16000000</option>
+    <option name="modm:platform:core:f_cpu">16000000</option>
   </options>
   <modules>
     <module>modm:board:arduino-nano</module>
diff --git a/src/modm/board/arduino_uno/board.xml b/src/modm/board/arduino_uno/board.xml
@@ -7,7 +7,7 @@
 
   <options>
     <option name="modm:target">atmega328p-au</option>
-    <option name="modm:platform:clock:f_cpu">16000000</option>
+    <option name="modm:platform:core:f_cpu">16000000</option>
   </options>
   <modules>
     <module>modm:board:arduino-uno</module>
diff --git a/src/modm/platform/clock/common/module.lb b/src/modm/platform/clock/common/module.lb
@@ -20,19 +20,11 @@ def prepare(module, options):
         module.depends(
             ":architecture:atomic",
             ":architecture:clock")
-
-        module.add_option(
-            NumericOption(
-                name="f_cpu",
-                description="CPU clock frequency",
-                minimum=1,
-                maximum=32000000))
     return True
 
 def build(env):
     env.outbasepath = "modm/src/modm/platform/clock"
     env.copy("common.hpp")
 
     if env[":target"].has_driver("clock:avr"):
-        env.collect(":build:cppdefines", "F_CPU={}".format(env["f_cpu"]))
         env.copy("static.hpp")
diff --git a/src/modm/platform/core/avr/module.lb b/src/modm/platform/core/avr/module.lb
@@ -25,6 +25,13 @@ def prepare(module, options):
     if not options[":target"].has_driver("core:avr*"):
         return False
 
+    module.add_option(
+        NumericOption(
+            name="f_cpu",
+            description="CPU clock frequency",
+            minimum=1,
+            maximum=32000000))
+
     module.depends(
         ":architecture:interrupt",
         ":architecture:assert",
@@ -82,5 +89,6 @@ def build(env):
     for suffix in {"v", "f", "l", "rc"}:
         mmcu = mmcu[:-2] + mmcu[-2:].replace(suffix, "")
     env.collect(":build:archflags","-mmcu={}".format(mmcu))
+    env.collect(":build:cppdefines", "F_CPU={}".format(env["f_cpu"]))
 
 
diff --git a/test/all/avr.xml b/test/all/avr.xml
@@ -7,7 +7,7 @@
   </repositories>
 
   <options>
-    <option name="modm:platform:clock:f_cpu">8000000</option>
+    <option name="modm:platform:core:f_cpu">8000000</option>
     <option name="modm:build:scons:cache_dir">$cache</option>
   </options>
   <modules>
diff --git a/tools/scripts/docs_modm_io_generator.py b/tools/scripts/docs_modm_io_generator.py
@@ -144,7 +144,7 @@ def create_target(argument):
 
         options = ["modm:target={0}".format(device)]
         if device.startswith("at"):
-            options.append("modm:platform:clock:f_cpu=16000000")
+            options.append("modm:platform:core:f_cpu=16000000")
         builder = lbuild.api.Builder(options=options)
         builder.load([Path(modm_path) / "repo.lb", Path(modm_path) / "test/repo.lb"])
         modules = sorted(builder.parser.modules.keys())
