[modm-devices] Refactor data access

Author: salkinium

README.md

@@ -70,7 +70,7 @@ git clone --recurse-submodules https://github.com/modm-io/modm.git
 
 ## Targets
 
-modm can generate code for <!--avrcount-->530<!--/avrcount--> AVR and <!--stmcount-->1959<!--/stmcount-->
+modm can generate code for <!--avrcount-->506<!--/avrcount--> AVR and <!--stmcount-->1959<!--/stmcount-->
 STM32 devices, however, there are different levels of support and testing.
 
 <center>

ext/arm/core.lb

@@ -29,7 +29,6 @@ def build(env):
     env.copy("cmsis/CMSIS/Core/Include/cmsis_gcc.h", "cmsis_gcc.h")
     if core != "0": # 0+ has MPU support though!
         env.copy("cmsis/CMSIS/Core/Include/mpu_armv7.h", "mpu_armv7.h")
-    print(core)
     if core == "7":
         env.copy("cmsis/CMSIS/Core/Include/cachel1_armv7.h", "cachel1_armv7.h")
 

ext/modm-devices

@@ -24,7 +24,7 @@ from os.path import normpath
 
 # Check for miminum required lbuild version
 import lbuild
-min_lbuild_version = "1.13.2"
+min_lbuild_version = "1.13.4"
 if StrictVersion(getattr(lbuild, "__version__", "0.1.0")) < StrictVersion(min_lbuild_version):
     print("modm requires at least lbuild v{}, please upgrade!\n"
           "    pip3 install -U lbuild".format(min_lbuild_version))
@@ -234,6 +234,14 @@ def init(repo):
     repo.add_filter("modm.ord", lambda letter: ord(letter[0].lower()) - ord("a"))
     repo.add_filter("modm.chr", lambda num: chr(num + ord("A")))
 
+    # Global filters for naming things
+    def fmt_str(s):
+        return "".join(p.capitalize() for p in str(s).split("_"))
+    def fmt_driver(d):
+        return fmt_str(d.get("driver", "")) + fmt_str(d.get("instance", ""))
+    repo.add_filter("modm.fmt", fmt_str)
+    repo.add_filter("modm.fmt.driver", fmt_driver)
+
     # Compute the available data from modm-devices
     devices = DevicesCache()
     try:

repo.lb

@@ -11,6 +11,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 # -----------------------------------------------------------------------------
 
+import copy
+
 def common_vector_table_location(env):
     return env.get(":platform:cortex-m:vector_table_location", "rom")
 
@@ -72,7 +74,7 @@ def common_memories(env):
     :returns: dictionary of memory properties
     """
     device = env[":target"]
-    memories = listify(device.get_driver("core")["memory"])
+    memories = copy.deepcopy(listify(device.get_driver("core")["memory"]))
 
     # Convert from string to int and add offsets
     flash_offset = env.get(":platform:cortex-m:linkerscript.flash_offset", 0)

src/modm/platform/core/cortex/module.lb

@@ -35,10 +35,10 @@ def build(env):
 
 def post_build(env):
     properties = env.query("::cortex-m:linkerscript")
-    target = env[":target"].identifier
+    device = env[":target"]
     properties["with_crashcatcher"] = env.has_module(":crashcatcher")
 
-    if target.family in ["l4"]: # FIXME!
+    if device.identifier.family in ["l4"]: # FIXME!
         properties["regions"].remove("sram2")
     if "backup" in properties["regions"]:
         properties["regions"].remove("backup")
@@ -69,3 +69,9 @@ def post_build(env):
     env.substitutions = properties
     env.outbasepath = "modm/link"
     env.template("linkerscript/stm32_{}.ld.in".format(linkerscript), "linkerscript.ld")
+
+    # Generate a list of all on-device peripherals
+    peripherals = uniquify(map(env.filter("modm.fmt.driver"), device.peripherals))
+    env.substitutions = {"peripherals": peripherals}
+    env.outbasepath = "modm/src/modm/platform/core"
+    env.template("peripherals.hpp.in")

src/modm/platform/core/stm32/module.lb

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Niklas Hauser
+ * Copyright (c) 2019-2020, Niklas Hauser
  *
  * This file is part of the modm project.
  *
@@ -9,22 +9,20 @@
  */
 // ----------------------------------------------------------------------------
 
-#ifndef MODM_STM32_PERIPHERALS_HPP
-#define MODM_STM32_PERIPHERALS_HPP
+#pragma once
 
 namespace modm::platform
 {
 
+/// @ingroup modm_platform_core
 enum class
 Peripheral
 {
 	BitBang,
-%% for per in all_peripherals
+%% for per in peripherals
 	{{ per }},
 %% endfor
 	Syscfg = Sys,
 };
 
 }
-
-#endif // MODM_STM32_PERIPHERALS_HPP

src/modm/platform/gpio/stm32/peripherals.hpp.in renamed to src/modm/platform/core/stm32/peripherals.hpp.in

@@ -15,10 +15,7 @@
 #include "define.h"
 #include <modm/architecture/interface/gpio.hpp>
 
-namespace modm
-{
-
-namespace platform
+namespace modm::platform
 {
 
 /// @ingroup modm_platform_gpio
@@ -95,7 +92,7 @@ protected:
 template< class Pin >
 class GpioOpenDrain : public Pin
 {
-	static Gpio::InputType inputType;
+	static inline Gpio::InputType inputType{Gpio::InputType::Floating};
 	static_assert(Pin::direction == modm::Gpio::Direction::InOut, "Pin must inherit from modm::GpioIO");
 public:
 	using Output = GpioOpenDrain<typename Pin::IO>;
@@ -143,12 +140,6 @@ public:
 	}
 };
 
-}	// namespace platform
-
 }	// namespace modm
 
-template< class Pin >
-modm::platform::Gpio::InputType
-modm::platform::GpioOpenDrain<Pin>::inputType(modm::platform::Gpio::InputType::Floating);
-
 #endif	// MODM_AVR_GPIO_BASE_HPP

src/modm/platform/gpio/at90_tiny_mega/base.hpp.in

@@ -26,7 +26,7 @@ struct Gpio
 	enum class
 	InputType
 	{
-%% if target["family"] in ["f1"]
+%% if target.family in ["f1"]
 		Floating = 0x4,	///< floating on input
 		PullUp = 0x9,	///< pull-up on input
 		PullDown = 0x8,	///< pull-down on input
@@ -41,7 +41,7 @@ struct Gpio
 	OutputType
 	{
 		PushPull = 0x0,		///< push-pull on output
-%% if target["family"] in ["f1"]
+%% if target.family in ["f1"]
 		OpenDrain = 0x4,	///< open-drain on output
 %% else
 		OpenDrain = 0x1,	///< open-drain on output
@@ -51,14 +51,14 @@ struct Gpio
 	enum class
 	OutputSpeed
 	{
-%% if target["family"] in ["f1"]
+%% if target.family in ["f1"]
 		Low    = 0x2,
 		Medium = 0x1,
 		High   = 0x3,
 		MHz2   = Low,
 		MHz10  = Medium,
 		MHz50  = High,
-%% elif target["family"] in ["f0", "f3"]
+%% elif target.family in ["f0", "f3"]
 		Low    = 0,
 		Medium = 0x1,
 		High   = 0x3,
@@ -99,15 +99,15 @@ struct Gpio
 	Signal
 	{
 		BitBang,
-%% for signal in all_signals
-		{{ signal }},
+%% for signal in signal_names
+		{{ signal | modm.fmt }},
 %% endfor
 	};
 	/// @endcond
 
 protected:
 	/// @cond
-%% if target["family"] not in ["f1"]
+%% if target.family not in ["f1"]
 	/// I/O Direction Mode values for this specific pin.
 	enum class
 	Mode

src/modm/platform/gpio/stm32/base.hpp.in

@@ -34,9 +34,9 @@ static constexpr uint8_t lmb(uint32_t value)
 } // namespace detail
 
 // specializations
-%% for remap in driver.remap
+%% for remap in signal_remap
 	%% set reg = "MAPR" if (remap["position"] | int) < 32 else "MAPR2"
-	%% set per = remap | formatPeripheral
+	%% set per = remap | modm.fmt.driver
 template< template<Peripheral _> class... Signals >
 struct GpioConnector<Peripheral::{{ per }}, Signals...>
 {
@@ -51,14 +51,14 @@ struct GpioConnector<Peripheral::{{ per }}, Signals...>
 	{
 		using namespace detail_gpio_connector;
 		static constexpr uint32_t id = detail::GpioSignalConnect<Peripheral::{{ per }}, Signals...>::id;
-		static_assert((id == uint32_t(-1)) || {% for group in remap.group %}(lmb(id) == {{group.id}}UL){% if not loop.last %} || {% else %},{% endif %}{% endfor %}
+		static_assert((id == uint32_t(-1)) || {% for group in remap.group %}(lmb(id) == {{group.id}}ul){% if not loop.last %} || {% else %},{% endif %}{% endfor %}
 					  "This pin set contains conflicting remap groups!\nAvailable groups for {{per}} are:\n"
 	%% for line in group_map | printSignalMap(per)
 					  "{{line}}\n"
 	%% endfor
 			);
 		if (id != uint32_t(-1)) {
-			AFIO->{{reg}} = (AFIO->{{reg}} & ~({{ remap["mask"] }}UL << {{ (remap["position"] | int) % 32 }})) | (lmb(id) << {{ (remap["position"] | int) % 32 }});
+			AFIO->{{reg}} = (AFIO->{{reg}} & ~({{ remap.mask }}ul << {{ (remap.position | int) % 32 }})) | (lmb(id) << {{ (remap.position | int) % 32 }});
 		}
 		detail::GpioSignalConnect<Peripheral::{{ per }}, Signals...>::connect();
 	}