Small fixes (#273)

- Fix ncols for switch matrix - Allocate USB pins first, since they're generally dedicated pins
BerkeleyHCI · Jul 27, 2023 · f38f40d · f38f40d
1 parent c1034d0
commit f38f40d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/electronics_abstract_parts/IoControllerInterfaceMixins.py b/electronics_abstract_parts/IoControllerInterfaceMixins.py
@@ -23,7 +23,7 @@ def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
 
         self.usb = self.Port(Vector(UsbDevicePort.empty()), optional=True)
-        self.implementation(lambda base: base._io_ports.append(self.usb))
+        self.implementation(lambda base: base._io_ports.insert(0, self.usb))
 
 
 class IoControllerI2s(BlockInterfaceMixin[BaseIoController]):

diff --git a/electronics_lib/SwitchMatrix.py b/electronics_lib/SwitchMatrix.py
@@ -21,7 +21,7 @@ def __init__(self, nrows: IntLike, ncols: IntLike, voltage_drop: RangeLike = (0,
     self.voltage_drop = self.ArgParameter(voltage_drop)
 
     self.nrows = self.ArgParameter(nrows)
-    self.ncols = self.ArgParameter(nrows)
+    self.ncols = self.ArgParameter(ncols)
     self.generator_param(self.nrows, self.ncols)
 
   def generate(self):