From da7322f263d8c108c7cc71f1b583f523fdeed94e Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Wed, 30 Aug 2023 16:13:56 +0200
Subject: [PATCH] Updates a test in dev for 4 muxes 2024
---
configs/config_mb_2023_4_mux_2024.py | 2 +-
dev/test_4_mux_2024.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configs/config_mb_2023_4_mux_2024.py b/configs/config_mb_2023_4_mux_2024.py
index 0880f7bd..b60061fa 100644
--- a/configs/config_mb_2023_4_mux_2024.py
+++ b/configs/config_mb_2023_4_mux_2024.py
@@ -42,7 +42,7 @@ HARDWARE_CONFIG = {
'mcp_0': '0x22', # NOTE: Check pos of jumper on MUX board (refer to doc)
'mcp_1': '0x23', # NOTE: Check pos of jumper on MUX board (refer to doc)
'roles': {'A': 'X', 'B': 'Y', 'M': 'XX', 'N': 'YY'},
- 'cabling': {(i, j): ('mux_02', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)},
+ 'cabling': {(i, j): ('mux_02', i) for j in ['A', 'B', 'M', 'N'] for i in range(1, 9)}, # TODO: avoid redundency of mux_id
'voltage_max': 12.},
'mux_05':
{'model': 'mux_2024_rev_0_0', # 'ohmpi_i2c_mux64_v1.01',
diff --git a/dev/test_4_mux_2024.py b/dev/test_4_mux_2024.py
index 943074f4..2d4b36ef 100644
--- a/dev/test_4_mux_2024.py
+++ b/dev/test_4_mux_2024.py
@@ -16,7 +16,7 @@ within_ohmpi = False
if stand_alone_mux:
mux_id = 'mux_02'
print(MUX_CONFIG)
- MUX_CONFIG.update(HARDWARE_CONFIG['mux']['boards'][mux_id])
+ MUX_CONFIG.update({mux_id: HARDWARE_CONFIG['mux']['boards'][mux_id]})
MUX_CONFIG['ctl'] = ctl_module.Ctl()
mux = Mux(**MUX_CONFIG)
mux.switch_one(elec=1, role='M', state='on')
--
GitLab