From 50b2f4b03784103f4ed276a9c1483bac842a31fc Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 8 Jun 2023 15:53:16 +0200
Subject: [PATCH] Tests using 2 muxes
---
configs/config_mb_2023_2_mux_2024.py | 2 +-
ohmpi/hardware_system.py | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/configs/config_mb_2023_2_mux_2024.py b/configs/config_mb_2023_2_mux_2024.py
index 58f0eba2..912c2c1d 100644
--- a/configs/config_mb_2023_2_mux_2024.py
+++ b/configs/config_mb_2023_2_mux_2024.py
@@ -42,7 +42,7 @@ HARDWARE_CONFIG = {
'mcp_0': '0x22', # TODO : Replace this with pos of jumper on MUX board (address doesn't mean anything for the average user...
'mcp_1': '0x23', # TODO : Replace this with pos of jumper on MUX board (address doesn't mean anything for the average user...)
'roles': {'A': 'X', 'B': 'Y', 'M' : 'XX', 'N' : 'YY'},
- 'channels': {(i+16, j): ('mux_1', i) for j in ['A', 'B', 'M', 'N'] for i in range(1,9)},
+ 'channels': {(i, j): ('mux_1', i) for j in ['A', 'B', 'M', 'N'] for i in range(1,9)},
'voltage_max': 12.},
'mux_2':
{'model': 'mux_2024_rev_0_0', # 'ohmpi_i2c_mux64_v1.01',
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index f047d9ce..38958e7e 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -26,7 +26,6 @@ for mux_id, mux_config in HARDWARE_CONFIG['mux']['boards'].items():
MUX_CONFIG[mux_id] = mux_module.MUX_CONFIG
MUX_CONFIG[mux_id].update(mux_config)
MUX_CONFIG[mux_id].update({'id': mux_id})
- MUX_CONFIG[mux_id].update({'constructor': mux_module.Mux})
# mux_boards.append(mux_id)
TX_CONFIG = tx_module.TX_CONFIG
@@ -120,7 +119,7 @@ class OhmPiHardware:
self.mux_barrier = Barrier(len(self.mux_boards) + 1)
self._cabling = {}
for mux_id, mux in self.mux_boards.items():
- print(f'{mux_id} CONFIG: {MUX_CONFIG["mux_id"]}')
+ print(f'{mux_id} CONFIG: {MUX_CONFIG}\n {HARDWARE_CONFIG["mux"]["boards"][mux_id]}')
mux.barrier = self.mux_barrier
for k, v in mux.cabling.items():
update_dict(self._cabling, {k: (mux_id, k[0])})
--
GitLab