diff --git a/ohmpi/hardware_components/mux_2023_0_X.py b/ohmpi/hardware_components/mux_2023_0_X.py index 565cfa12fd9ddd49ae0a8458062d23199fe8095d..786ad6e72c9b1f07ebfdd845555cd7ff27450a19 100644 --- a/ohmpi/hardware_components/mux_2023_0_X.py +++ b/ohmpi/hardware_components/mux_2023_0_X.py @@ -90,7 +90,11 @@ class Mux(MuxAbstract): electrodes = kwargs.pop('electrodes', None) self.cabling = {} if cabling is None: - self.cabling = {(e, r): (self.board_id, i + 1) for r in roles for i, e in enumerate(electrodes)} + self.cabling = {(e, r): (i + 1, r) for r in roles for i, e in enumerate(electrodes)} + else: + for k, v in cabling.items(): + if v[0] == self.board_id: + self.cabling.update({k: (v[1], k[1])}) self._tca = [adafruit_tca9548a.TCA9548A(self.connection, kwargs['mux_tca_address'])[i] for i in np.arange(7, 3, -1)] # self._mcp_addresses = (kwargs.pop('mcp', '0x20')) # TODO: add assert on valid addresses.. self._mcp = [None, None, None, None] diff --git a/ohmpi/hardware_components/mux_2024_0_X.py b/ohmpi/hardware_components/mux_2024_0_X.py index fb4501165b9f953d254ded476e12350ba82fd1fe..f86e40f9d715995a089eaf2da514f6211b9d0f54 100644 --- a/ohmpi/hardware_components/mux_2024_0_X.py +++ b/ohmpi/hardware_components/mux_2024_0_X.py @@ -87,8 +87,11 @@ class Mux(MuxAbstract): electrodes = kwargs.pop('electrodes', None) self.cabling = {} if cabling is None: - self.cabling = {(e, r): (self.board_id, i + 1) for r in roles for i, e in enumerate(electrodes)} - + self.cabling = {(e, r): (i + 1, r) for r in roles for i, e in enumerate(electrodes)} + else: + for k, v in cabling.items(): + if v[0] == self.board_id: + self.cabling.update({k: (v[1], k[1])}) # Setup TCA tca_address = kwargs.pop('tca_address', None) tca_channel = kwargs.pop('tca_channel', 0)