From 9fe96bd8e56a8120259b51dcb61403b034f960d3 Mon Sep 17 00:00:00 2001
From: Arnaud Watlet <arnaud.watlet@umons.ac.be>
Date: Wed, 29 Nov 2023 12:01:03 +0100
Subject: [PATCH] tests new cabling config
---
ohmpi/hardware_components/mux_2023_0_X.py | 6 +++++-
ohmpi/hardware_components/mux_2024_0_X.py | 7 +++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ohmpi/hardware_components/mux_2023_0_X.py b/ohmpi/hardware_components/mux_2023_0_X.py
index 565cfa12..786ad6e7 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 fb450116..f86e40f9 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)
--
GitLab