From 41e894694ef1ea821d0e3ce04f854138b6908376 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 27 Apr 2023 16:11:34 +0200
Subject: [PATCH] Works on issue #101
---
config_mb_2023_mux_2024.py | 2 +-
hardware_components/abstract_hardware_components.py | 5 +++--
hardware_components/mux_2024_rev_0_0.py | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/config_mb_2023_mux_2024.py b/config_mb_2023_mux_2024.py
index d3f4d8be..5a280c27 100644
--- a/config_mb_2023_mux_2024.py
+++ b/config_mb_2023_mux_2024.py
@@ -30,7 +30,7 @@ HARDWARE_CONFIG = {
'sampling_rate': 10., # ms
'nb_samples': 20, # Max value 10 # was named integer before...
},
- 'mux': {'mux_1':{'model' : 'mux_2024_rev_0_0', # 'ohmpi_i2c_mux64_v1.01',
+ 'mux': {'mux_1': {'model' : 'mux_2024_rev_0_0', # 'ohmpi_i2c_mux64_v1.01',
'tca_address': None, # TODO: This should be part of the system config (cabling of several mux boards)
'tca_channel': 0, # TODO: This should be part of the system config (cabling of several mux boards)
'mcp_0' : '0x22', # TODO : Replace this with pos of jumper on MUX board (address doesn't mean anything for the average user...)
diff --git a/hardware_components/abstract_hardware_components.py b/hardware_components/abstract_hardware_components.py
index 9d346532..f9331b64 100644
--- a/hardware_components/abstract_hardware_components.py
+++ b/hardware_components/abstract_hardware_components.py
@@ -48,11 +48,12 @@ class MuxAbstract(ABC):
self.controller = kwargs.pop('controller', None)
cabling = kwargs.pop('cabling', None)
print(f'cabling: {cabling}')
- self._cabling = {}
+ self.cabling = {}
if cabling is not None:
for k, v in cabling:
+ print('{v[0]}, {self.board_id}')
if v[0]==self.board_id:
- self._cabling.update({k: v[1]})
+ self.cabling.update({k: v[1]})
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 0f1c1e14..c26d1674 100644
--- a/hardware_components/mux_2024_rev_0_0.py
+++ b/hardware_components/mux_2024_rev_0_0.py
@@ -110,8 +110,8 @@ class Mux(MuxAbstract):
d = inner_cabling[self._mode]
self.addresses = {}
for k, v in d.items():
- print(f'self._cabling: {self._cabling}, k: {k}, self._roles: {self._roles}')
- self.addresses.update({(self._cabling[k[0]], self._roles[k[1]]): v})
+ print(f'self.cabling: {self.cabling}, k: {k}, self._roles: {self._roles}')
+ self.addresses.update({(self.cabling[k[0]], self._roles[k[1]]): v})
print(f'addresses: {self.addresses}')
def reset(self):
--
GitLab