From 3c2e4b7151f780b727e38b2b91c721d9279329be Mon Sep 17 00:00:00 2001
From: Arnaud Watlet <arnaud.watlet@umons.ac.be>
Date: Wed, 29 Nov 2023 11:56:31 +0100
Subject: [PATCH] tests new cabling config
---
ohmpi/hardware_components/abstract_hardware_components.py | 2 +-
ohmpi/hardware_components/mux_2023_0_X.py | 4 ++--
ohmpi/hardware_components/mux_2024_0_X.py | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ohmpi/hardware_components/abstract_hardware_components.py b/ohmpi/hardware_components/abstract_hardware_components.py
index 3843b35d..74394fa2 100644
--- a/ohmpi/hardware_components/abstract_hardware_components.py
+++ b/ohmpi/hardware_components/abstract_hardware_components.py
@@ -141,7 +141,7 @@ class MuxAbstract(ABC):
if cabling is not None:
for k, v in cabling.items():
if v[0] == self.board_id:
- self.cabling.update({k: (v, k[1])})
+ self.cabling.update({k: (v[1], k[1])})
self.exec_logger.debug(f'{self.board_id} cabling: {self.cabling}')
self.addresses = kwargs.pop('addresses', None)
self._barrier = kwargs.pop('barrier', Barrier(1))
diff --git a/ohmpi/hardware_components/mux_2023_0_X.py b/ohmpi/hardware_components/mux_2023_0_X.py
index cf249a1d..565cfa12 100644
--- a/ohmpi/hardware_components/mux_2023_0_X.py
+++ b/ohmpi/hardware_components/mux_2023_0_X.py
@@ -90,7 +90,7 @@ class Mux(MuxAbstract):
electrodes = kwargs.pop('electrodes', None)
self.cabling = {}
if cabling is None:
- self.cabling = {(e, r): i + 1 for r in roles for i, e in enumerate(electrodes)}
+ self.cabling = {(e, r): (self.board_id, i + 1) for r in roles for i, e in enumerate(electrodes)}
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]
@@ -107,7 +107,7 @@ class Mux(MuxAbstract):
self.addresses = {}
d = {}
for k, v in self.cabling.items():
- d.update({k: ic[(v[0], self._roles[k])]})
+ d.update({k: ic[(v[0], self._roles[k[1]])]})
self.addresses = d
def reset(self):
diff --git a/ohmpi/hardware_components/mux_2024_0_X.py b/ohmpi/hardware_components/mux_2024_0_X.py
index 2a88f825..fb450116 100644
--- a/ohmpi/hardware_components/mux_2024_0_X.py
+++ b/ohmpi/hardware_components/mux_2024_0_X.py
@@ -87,7 +87,7 @@ class Mux(MuxAbstract):
electrodes = kwargs.pop('electrodes', None)
self.cabling = {}
if cabling is None:
- self.cabling = {(e, r): i + 1 for r in roles for i, e in enumerate(electrodes)}
+ self.cabling = {(e, r): (self.board_id, i + 1) for r in roles for i, e in enumerate(electrodes)}
# Setup TCA
tca_address = kwargs.pop('tca_address', None)
@@ -126,7 +126,7 @@ class Mux(MuxAbstract):
self.addresses = {}
d = {}
for k, v in self.cabling.items():
- d.update({k: ic[(v[0], self._roles[k])]})
+ d.update({k: ic[(v[0], self._roles[k[1]])]})
self.addresses = d
def reset(self):
--
GitLab