[modm-devices] Remove use of device.properties

Author: salkinium

docs/src/how-modm-works.md

@@ -56,7 +56,7 @@ def prepare(module, options):
 
 def build(env):
     device = env[":target"]
-    env.substitutions = device.properties
+    env.substitutions = device.get_driver("uart")
     env.outbasepath = "src/modm/platform/uart"
     for instance in device.get_driver("uart:stm32*")["instance"]:
         env.template("uart.hpp.in", "uart_{}.hpp".format(instance))

src/modm/platform/adc/stm32f3/module.lb

@@ -27,7 +27,7 @@ class Instance(Module):
         device = env[":target"]
         driver = device.get_driver("adc")
 
-        properties = device.properties
+        properties = {}
         properties["target"] = target = device.identifier
         instance_id = int(self.instance)
         properties["id"] = instance_id
@@ -151,12 +151,4 @@ def prepare(module, options):
     return True
 
 def build(env):
-    device = env[":target"]
-    driver = device.get_driver("adc")
-
-    properties = device.properties
-    properties["target"] = device.identifier
-    properties["driver"] = driver
-
-    env.substitutions = properties
-    env.outbasepath = "modm/src/modm/platform/adc"
+    pass

src/modm/platform/can/lpc/module.lb

@@ -38,13 +38,10 @@ def prepare(module, options):
 
 def build(env):
     device = env[":target"]
-    driver = device.get_driver("can")
-
-    properties = device.properties
-    properties["target"] = target = device.identifier
-    properties["driver"] = driver
-
-    env.substitutions = properties
+    env.substitutions = {
+        "target": device.identifier,
+        "driver": device.get_driver("can"),
+    }
     env.outbasepath = "modm/src/modm/platform/can"
 
     env.template("c_can.cpp.in")

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

@@ -76,16 +76,17 @@ can_map = {
     },
 }
 
-def get_substitutions(instance, device, env):
-    target = device.identifier
-    driver = device.get_driver("can")
+def get_substitutions(env, instance):
+    target = env["target"].identifier
+    driver = env["target"].get_driver("can")
     instances = map(lambda i: int(i), driver["instance"]) if "instance" in driver else (0,)
 
-    cm = can_map[target["family"]]
+    cm = can_map[target.family]
     is_single = (cm[instance].type == CanType.Single) or (cm[instance].associated_instance not in instances)
     other = cm[instance].associated_instance
 
     subs = {
+        "target": target,
         "id": "" if instance == 0 else str(instance),
         "own_instance": cm[instance].register,
         "other_instance": cm[other].register if other in cm else None,
@@ -109,15 +110,7 @@ class Instance(Module):
         return True
 
     def build(self, env):
-        device = env[":target"]
-        driver = device.get_driver("can")
-
-        properties = device.properties
-        properties["target"] = target = device.identifier
-        properties["driver"] = driver
-        properties.update(get_substitutions(self.instance, device, env))
-
-        env.substitutions = properties
+        env.substitutions = get_substitutions(env, self.instance)
         env.outbasepath = "modm/src/modm/platform/can"
 
         env.template("can.hpp.in", "can_{}.hpp".format(self.instance))
@@ -159,22 +152,13 @@ def prepare(module, options):
     return True
 
 def build(env):
-    device = env[":target"]
-    driver = device.get_driver("can")
-
-    properties = device.properties
-    properties["target"] = device.identifier
-    properties["driver"] = driver
-
-    if "instance" not in driver:
-        properties.update(get_substitutions(0, device, env))
-
-    env.substitutions = properties
+    env.substitutions = {"target": env[":target"].identifier}
     env.outbasepath = "modm/src/modm/platform/can"
 
     env.template("can_filter.hpp.in")
     env.template("can_filter.cpp.in")
 
     if "instance" not in driver:
+        env.substitutions = get_substitutions(env, 0)
         env.template("can.hpp.in")
         env.template("can.cpp.in")

src/modm/platform/clock/lpc/module.lb

@@ -25,7 +25,7 @@ def build(env):
     device = env[":target"]
     driver = device.get_driver("clock")
 
-    properties = device.properties
+    properties = {}
     properties["target"] = target = device.identifier
     properties["driver"] = driver
 

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

@@ -26,7 +26,7 @@ class Instance(Module):
         device = env[":target"]
         driver = device.get_driver("comp")
 
-        properties = device.properties
+        properties = {}
         properties["target"] = device.identifier
         instance_id = int(self.instance)
         properties["id"] = instance_id
@@ -50,8 +50,6 @@ class Instance(Module):
             properties["blanking_source"]["b010"] = "Tim2Oc3"
             properties["blanking_source"]["b011"] = "Tim3Oc3"
 
-
-
         env.substitutions = properties
         env.outbasepath = "modm/src/modm/platform/comp"
 
@@ -109,7 +107,7 @@ def build(env):
     device = env[":target"]
     driver = device.get_driver("comp")
 
-    properties = device.properties
+    properties = {}
     properties["target"] = device.identifier
     properties["driver"] = driver
     properties["csr"] = "COMP_CSR_" if device.identifier["family"] in ["l4", "g4"] else "COMP_CSR_COMPx"

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

@@ -34,7 +34,7 @@ def prepare(module, options):
 def build(env):
     device = env[":target"]
 
-    properties = device.properties
+    properties = {}
     properties["target"] = device.identifier
     dma = device.get_driver("dma")
     properties["dma"] = dma
@@ -60,7 +60,6 @@ def build(env):
 
     env.substitutions = properties
     env.outbasepath = "modm/src/modm/platform/dma"
-
     env.template("dma_base.hpp.in")
     env.template("dma_hal.hpp.in")
     env.template("dma_hal_impl.hpp.in")

src/modm/platform/gpio/lpc/module.lb

@@ -25,7 +25,7 @@ def build(env):
     device = env[":target"]
     driver = device.get_driver("gpio")
 
-    properties = device.properties
+    properties = {}
     properties["target"] = target = device.identifier
     properties["driver"] = driver
 

src/modm/platform/i2c/at90_tiny_mega/module.lb

@@ -32,16 +32,7 @@ def prepare(module, options):
     return True
 
 def build(env):
-    device = env[":target"]
-    driver = device.get_driver("i2c")
-
-    properties = device.properties
-    properties["target"] = device.identifier
-    properties["driver"] = driver
-
-    env.substitutions = properties
     env.outbasepath = "modm/src/modm/platform/i2c"
-
     env.template("i2c.hpp.in")
     env.template("i2c_master.hpp.in")
     env.template("i2c_master.cpp.in")

src/modm/platform/i2c/stm32-extended/module.lb

@@ -31,15 +31,10 @@ class Instance(Module):
         return True
 
     def build(self, env):
-        device = env[":target"]
-        driver = device.get_driver("i2c")
-
-        properties = device.properties
-        properties["target"] = target = device.identifier
-        properties["id"] = self.instance
-        properties["shared_interrupt"] = "0" in target.family
-
-        env.substitutions = properties
+        env.substitutions = {
+            "shared_interrupt": "0" in env[":target"].identifier.family,
+            "id": self.instance,
+        }
         env.outbasepath = "modm/src/modm/platform/i2c"
 
         env.template("i2c_master.cpp.in", "i2c_master_{}.cpp".format(self.instance))

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

@@ -32,14 +32,10 @@ class Instance(Module):
         return True
 
     def build(self, env):
-        device = env[":target"]
-        driver = device.get_driver("i2c")
-
-        properties = device.properties
-        properties["target"] = target = device.identifier
-        properties["id"] = self.instance
-
-        env.substitutions = properties
+        env.substitutions = {
+            "target": env[":target"].identifier,
+            "id": self.instance
+        }
         env.outbasepath = "modm/src/modm/platform/i2c"
 
         env.template("i2c_master.cpp.in", "i2c_master_{}.cpp".format(self.instance))

src/modm/platform/i2c/xmega/module.lb

@@ -14,7 +14,7 @@
 def get_properties(env):
     device = env[":target"]
     driver = device.get_driver("i2c:xmega")
-    properties = device.properties
+    properties = {}
     properties["target"] = device.identifier
     properties["driver"] = driver
     return properties

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

@@ -22,12 +22,7 @@ def prepare(module, options):
     return True
 
 def build(env):
-    device = env[":target"]
-
-    properties = device.properties
-    properties["target"] = device.identifier
-
-    env.substitutions = properties
+    env.substitutions = {"target": env[":target"].identifier}
     env.outbasepath = "modm/src/modm/platform/random"
 
     env.template("random_number_generator.hpp.in")

src/modm/platform/spi/at90_tiny_mega/module.lb

@@ -11,15 +11,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 # -----------------------------------------------------------------------------
 
-def get_properties(env):
-    device = env[":target"]
-    driver = device.get_driver("spi:avr")
-    properties = device.properties
-    properties["target"] = device.identifier
-    properties["partname"] = device.partname
-    properties["driver"] = driver
-    return properties
-
 def load_options(module):
     module.add_option(
         BooleanOption(
@@ -42,10 +33,11 @@ class Instance(Module):
         return True
 
     def build(self, env):
-        properties = get_properties(env)
-        properties["id"] = self.instance
-
-        env.substitutions = properties
+        env.substitutions = {
+            "target": env[":target"].identifier,
+            "partname": env[":target"].partname,
+            "id": self.instance,
+        }
         env.outbasepath = "modm/src/modm/platform/spi"
 
         env.template("spi.hpp.in", "spi{}.hpp".format(self.instance))
@@ -77,16 +69,14 @@ def prepare(module, options):
     return True
 
 def build(env):
-    properties = get_properties(env)
-    driver = properties["driver"]
-
-    if "instance" not in driver:
-        properties["id"] = ""
-
-    env.substitutions = properties
-    env.outbasepath = "modm/src/modm/platform/spi"
-
+    driver = env[":target"].get_driver("spi")
     if "instance" not in driver:
+        env.substitutions = {
+            "target": env[":target"].identifier,
+            "partname": env[":target"].partname,
+            "id": "",
+        }
+        env.outbasepath = "modm/src/modm/platform/spi"
         env.template("spi_master.hpp.in")
         env.template("spi_master.cpp.in")
         env.template("spi.hpp.in")

src/modm/platform/spi/at90_tiny_mega_uart/module.lb

@@ -13,11 +13,7 @@
 
 def get_properties(env):
     device = env[":target"]
-    driver = device.get_driver("spi:avr_uart")
-    properties = device.properties
-    properties["target"] = device.identifier
-    properties["driver"] = driver
-    return properties
+    return {"target": device.identifier}
 
 
 class Instance(Module):
@@ -52,10 +48,8 @@ class Instance(Module):
         return True
 
     def build(self, env):
-        properties = get_properties(env)
-        properties["id"] = self.instance
-
-        target = properties["target"]
+        target = env[":target"].identifier
+        properties = {"target": target, "id": self.instance}
 
         properties["extended"] = False
         if target["name"] in ["48", "88", "168", "328"] and target["type"] == "p":
@@ -102,5 +96,4 @@ def prepare(module, options):
     return True
 
 def build(env):
-    env.substitutions = get_properties(env)
-    env.outbasepath = "modm/src/modm/platform/spi_uart"
+    pass

src/modm/platform/spi/lpc/module.lb

@@ -25,7 +25,7 @@ def build(env):
     device = env[":target"]
     driver = device.get_driver("spi")
 
-    properties = device.properties
+    properties = {}
     properties["target"] = target = device.identifier
     properties["driver"] = driver