From 110e8faa93cf452c2b701113759a31777dd44ee8 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 27 Apr 2023 20:55:35 +0200
Subject: [PATCH] Addresses issue #101
---
hardware_components/abstract_hardware_components.py | 1 +
hardware_components/mux_2024_rev_0_0.py | 3 ++-
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hardware_components/abstract_hardware_components.py b/hardware_components/abstract_hardware_components.py
index f9b95759..5522a437 100644
--- a/hardware_components/abstract_hardware_components.py
+++ b/hardware_components/abstract_hardware_components.py
@@ -52,6 +52,7 @@ class MuxAbstract(ABC):
for k, v in cabling.items():
if v[0]==self.board_id:
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)
@abstractmethod
diff --git a/hardware_components/mux_2024_rev_0_0.py b/hardware_components/mux_2024_rev_0_0.py
index 919d8b63..0f417aa4 100644
--- a/hardware_components/mux_2024_rev_0_0.py
+++ b/hardware_components/mux_2024_rev_0_0.py
@@ -7,7 +7,7 @@ from adafruit_mcp230xx.mcp23017 import MCP23017 # noqa
from digitalio import Direction # noqa
MUX_CONFIG = HARDWARE_CONFIG['mux']
-MUX_CONFIG['default_mux_cabling'] = {(i, j) : ('mux_1', i) for j in ['A', 'B', 'M', 'N'] for i in range(1,9)} # 4 roles cabling electrodes from 1 to 8
+MUX_CONFIG['default_mux_cabling'] = {(elec, role) : ('mux_1', elec) for role in ['A', 'B', 'M', 'N'] for elec in range(1,9)} # 4 roles cabling electrodes from 1 to 8
inner_cabling ={'4_roles' : {(1, 'X'): {'MCP': 0, 'MCP_GPIO': 0},
(2, 'X'): {'MCP': 0, 'MCP_GPIO': 1},
@@ -110,6 +110,7 @@ class Mux(MuxAbstract):
d = inner_cabling[self._mode]
self.addresses = {}
for k, v in d.items():
+
self.addresses.update({self.cabling[(k[0], self._roles[k[1]])]: v})
def reset(self):
--
GitLab