cleaning

Author: ducky64

edg/abstract_parts/BaseIoControllerWrapped.py

@@ -121,3 +121,19 @@ def _remap_assigns_to_value(assigns: Dict[str, Tuple[Optional[str], Optional[str
             else:
                 raise ValueError(f"invalid assign for {name}: {assign}")
         return pin_assigns
+
+    def _make_pinning(
+        self, fixed_pinning: Dict[str, Union[Passive, HasPassivePort]], remapping: Dict[str, str]
+    ) -> Dict[str, Union[Passive, HasPassivePort]]:
+        """Creates the footprint pinning dict for the wrapped footprint, given the fixed pinning and
+        remapping from pin name to this footprint's pin number.
+        This generates pinning for all BaseIoController IOs.
+        As a side effect, this assigns self.actual_pin_assigns.
+
+        This wraps the above helpers, this should be used in most cases.
+        """
+        remapped_pin_assigns = self._remap_pin_assigns_list(remapping, self.get(self.pin_assigns))
+        pin_dict = self._generator_pin_dict()
+        fixed_pinning.update(self._remap_to_footprint_pinning(remapped_pin_assigns, pin_dict))
+        self.assign(self.actual_pin_assigns, self._remap_assigns_to_value(remapped_pin_assigns))
+        return fixed_pinning

edg/parts/microcontroller/Rp2040.py

@@ -415,20 +415,17 @@ def __init__(self, **kwargs: Any) -> None:
     def generate(self) -> None:
         super().generate()
 
-        pinning: Dict[str, Union[Passive, HasPassivePort]] = {
-            "12": self.v3v3,
-            "13": self.gnd,
-            "14": self.vcc,  # VUsb
-        }
-        remapped_pin_assigns = self._remap_pin_assigns_list(self._PIN_REMAPPING, self.get(self.pin_assigns))
-        pin_dict = self._generator_pin_dict()
-        pinning.update(self._remap_to_footprint_pinning(remapped_pin_assigns, pin_dict))
-        self.assign(self.actual_pin_assigns, self._remap_assigns_to_value(remapped_pin_assigns))
-
         self.footprint(
             "U",
             "Seeed Studio XIAO Series Library:XIAO-RP2040-SMD",
-            pinning,
+            self._make_pinning(
+                {
+                    "12": self.v3v3,
+                    "13": self.gnd,
+                    "14": self.vcc,  # VUsb
+                },
+                self._PIN_REMAPPING,
+            ),
             mfr="",
             part="XIAO RP2040",
             datasheet="https://www.seeedstudio.com/XIAO-RP2040-v1-0-p-5026.html",

edg/parts/microcontroller/nRF52840.py

@@ -478,23 +478,20 @@ def __init__(self, **kwargs: Any) -> None:
     def generate(self) -> None:
         super().generate()
 
-        pinning: Dict[str, HasPassivePort] = {
-            "14": self.vdd_nrf,
-            "1": self.gnd,
-            "25": self.gnd,
-            "37": self.gnd,
-            "22": self.vbus,
-            "21": self.p0_18,
-        }
-        remapped_pin_assigns = self._remap_pin_assigns_list(self._PIN_REMAPPING, self.get(self.pin_assigns))
-        pin_dict = self._generator_pin_dict()
-        pinning.update(self._remap_to_footprint_pinning(remapped_pin_assigns, pin_dict))
-        self.assign(self.actual_pin_assigns, self._remap_assigns_to_value(remapped_pin_assigns))
-
         self.footprint(
             "U",
             "edg:Holyiot-18010-NRF52840",
-            pinning,
+            self._make_pinning(
+                {
+                    "14": self.vdd_nrf,
+                    "1": self.gnd,
+                    "25": self.gnd,
+                    "37": self.gnd,
+                    "22": self.vbus,
+                    "21": self.p0_18,
+                },
+                self._PIN_REMAPPING,
+            ),
             mfr="Holyiot",
             part="18010",
             datasheet="http://www.holyiot.com/tp/2019042516322180424.pdf",
@@ -645,23 +642,20 @@ def __init__(self, **kwargs: Any) -> None:
     def generate(self) -> None:
         super().generate()
 
-        pinning: Dict[str, Union[HasPassivePort, Passive]] = {
-            "2": self.pwr,
-            "4": self.gnd,
-            # "1": reset,
-            "26": self.vusb,
-            # 'EN': '27',  # controls the onboard 3.3 LDO, internally pulled up
-            # 'Vbat': '28',
-        }
-        remapped_pin_assigns = self._remap_pin_assigns_list(self._PIN_REMAPPING, self.get(self.pin_assigns))
-        pin_dict = self._generator_pin_dict()
-        pinning.update(self._remap_to_footprint_pinning(remapped_pin_assigns, pin_dict))
-        self.assign(self.actual_pin_assigns, self._remap_assigns_to_value(remapped_pin_assigns))
-
         self.footprint(
             "U",
             "bldc:FEATHERWING_NODIM",
-            pinning,
+            self._make_pinning(
+                {
+                    "2": self.pwr,
+                    "4": self.gnd,
+                    # "1": reset,
+                    "26": self.vusb,
+                    # 'EN': '27',  # controls the onboard 3.3 LDO, internally pulled up
+                    # 'Vbat': '28',
+                },
+                self._PIN_REMAPPING,
+            ),
             mfr="Adafruit",
             part="Feather nRF52840 Express",
             datasheet="https://learn.adafruit.com/assets/68545",