diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index b8114cdf8c731083be763ce64094bddb72147d03..cdbacbfd066b687935620e69af0e298a9ccb5dbd 100644 --- a/ohmpi/hardware_system.py +++ b/ohmpi/hardware_system.py @@ -103,13 +103,13 @@ class OhmPiHardware: mux_config.update({'exec_logger': self.exec_logger, 'data_logger': self.data_logger, 'soh_logger': self.soh_logger}) mux_config.update(**HARDWARE_CONFIG['mux']['boards'][mux_id]) - mux_config.update({'ctl': self.ctl}) + ctl = mux_config.pop({'ctl': self.ctl}) mux_module = importlib.import_module(f'ohmpi.hardware_components.{mux_config["model"]}') - # if isinstance(ctl, dict): ### TODO: is this needed? - # mux_ctl_module = importlib.import_module(f'ohmpi.hardware_components.{mux_config["ctl"]["model"]}') - # ctl = mux_ctl_module.Ctl(**self.ctl) + if isinstance(ctl, dict): ### TODO: is this needed? + mux_ctl_module = importlib.import_module(f'ohmpi.hardware_components.{mux_config["ctl"]["model"]}') + ctl = mux_ctl_module.Ctl(**self.ctl) assert issubclass(type(mux_config['ctl']), CtlAbstract) - io = mux_config.pop('io', self.ctl.connections[mux_config.pop('connection', 'i2c')]) + io = mux_config.pop('io', ctl.connections[mux_config.pop('connection', 'i2c')]) mux_config.update({'io': io}) mux_config['id'] = mux_id