diff --git a/hardware_components/mux_2024_rev_0_0.py b/hardware_components/mux_2024_rev_0_0.py index 29847107e09ca45194a8be4c17caef445cc772e8..c0aea847109a91adfac3a808b490d8e2266f7b52 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 d93b197429858562752bbc9d8ead2bcf6e770415..e3bc3ec77f865c6e3b83291555064a7e9b6ac5fe 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 fe159104ab762df5c7b484bd107418bd578406fb..825e39a4c17dcd0221ce6d8e25107636722a95d3 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)