diff --git a/ohmpi/hardware_components/mux_2024_rev_0_0.py b/ohmpi/hardware_components/mux_2024_rev_0_0.py index 309f345829726d7dc6b75dbd48f09e18cae213d2..a6545d3ad58abe602998599c6b89df441c8b4ac2 100644 --- a/ohmpi/hardware_components/mux_2024_rev_0_0.py +++ b/ohmpi/hardware_components/mux_2024_rev_0_0.py @@ -58,6 +58,8 @@ class Mux(MuxAbstract): if 'cabling' not in kwargs.keys() or kwargs['cabling']=={}: kwargs.update({'cabling': default_mux_cabling}) super().__init__(**kwargs) + if isinstance(self.ctl, dict): + self.ctl = None # TODO: How to pass controller to mux board self.exec_logger.debug(f'configuration: {MUX_CONFIG}') tca_address = kwargs.pop('tca_address', None) tca_channel = kwargs.pop('tca_channel', 0) diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index ef38bfdb8f56a32e943c277b12409c81c36a3817..b935237eb44fce0ec971df43c269ea2f685f3edd 100644 --- a/ohmpi/hardware_system.py +++ b/ohmpi/hardware_system.py @@ -54,6 +54,8 @@ class OhmPiHardware: HARDWARE_CONFIG['ctl'].update({'exec_logger': self.exec_logger, 'data_logger': self.data_logger, 'soh_logger': self.soh_logger}) self.ctl = kwargs.pop('ctl', ctl_module.Ctl(**HARDWARE_CONFIG['ctl'])) + if isinstance(self.ctl, dict): + self.ctl = ctl_module.Ctl(**self.ctl) HARDWARE_CONFIG['rx'].pop('model') HARDWARE_CONFIG['rx'].update(**HARDWARE_CONFIG['rx'])