From 62a39aef5feae540fc81041b24772fa4dd08851c Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sun, 30 Apr 2023 15:09:04 +0200
Subject: [PATCH] Fixes bug related to MUX_CONFIG in hardware_system
---
hardware_components/mux_2024_rev_0_0.py | 2 --
hardware_system.py | 3 ++-
test_mux_2024.py | 4 ----
3 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/hardware_components/mux_2024_rev_0_0.py b/hardware_components/mux_2024_rev_0_0.py
index 29847107..c0aea847 100644
--- a/hardware_components/mux_2024_rev_0_0.py
+++ b/hardware_components/mux_2024_rev_0_0.py
@@ -52,8 +52,6 @@ inner_cabling = {'4_roles' : {(1, 'X'): {'MCP': 0, 'MCP_GPIO': 0}, (1, 'Y'): {'M
class Mux(MuxAbstract):
def __init__(self, **kwargs):
if 'id' in kwargs.keys():
- print(f'\nMUX_CONFIG {kwargs["id"]}: {MUX_CONFIG}\n\n')
- time.sleep(1.)
MUX_CONFIG.update(HARDWARE_CONFIG['mux']['boards'][kwargs['id']])
kwargs.update({'board_name': os.path.basename(__file__).rstrip('.py')})
if 'cabling' not in kwargs.keys():
diff --git a/hardware_system.py b/hardware_system.py
index d93b1974..e3bc3ec7 100644
--- a/hardware_system.py
+++ b/hardware_system.py
@@ -56,7 +56,8 @@ class OhmPiHardware:
soh_logger=self.soh_logger,
controller=self.controller))
self._cabling = kwargs.pop('cabling', default_mux_cabling)
- self.mux_boards = kwargs.pop('mux', {'mux_1': mux_module.Mux(exec_logger=self.exec_logger,
+ self.mux_boards = kwargs.pop('mux', {'mux_1': mux_module.Mux(id='mux_1',
+ exec_logger=self.exec_logger,
data_logger=self.data_logger,
soh_logger=self.soh_logger,
controller=self.controller,
diff --git a/test_mux_2024.py b/test_mux_2024.py
index fe159104..825e39a4 100644
--- a/test_mux_2024.py
+++ b/test_mux_2024.py
@@ -22,11 +22,7 @@ mux.test({'A': [9, 10, 11, 12, 13, 14, 15, 16], 'B': [9, 10, 11, 12, 13, 14, 15,
'M': [9, 10, 11, 12, 13, 14, 15, 16], 'N': [9, 10, 11, 12, 13, 14, 15, 16]})
# mux as part of a OhmPiHardware system
-
-from utils import change_config
-change_config('config_mb_2023_mux_2024.py', verbose=False)
from OhmPi.hardware_system import OhmPiHardware
-
print('Starting test of mux as part of a OhmPiHardware system.')
k = OhmPiHardware()
k.exec_logger.setLevel(logging.INFO)
--
GitLab