Commit b2dfb621 authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Updates hardware_sytem to handle MUX_CONFIG

Showing with 4 additions and 3 deletions
+4 -3
...@@ -103,11 +103,12 @@ class OhmPiHardware: ...@@ -103,11 +103,12 @@ class OhmPiHardware:
mux_config.update({'exec_logger': self.exec_logger, 'data_logger': self.data_logger, mux_config.update({'exec_logger': self.exec_logger, 'data_logger': self.data_logger,
'soh_logger': self.soh_logger}) 'soh_logger': self.soh_logger})
mux_config.update(**MUX_CONFIG[mux_id]) mux_config.update(**MUX_CONFIG[mux_id])
ctl = mux_config.pop('ctl', self.ctl) mux_config.update(mux_config.pop('ctl', self.ctl))
mux_module = importlib.import_module(f'ohmpi.hardware_components.{mux_config["model"]}') mux_module = importlib.import_module(f'ohmpi.hardware_components.{mux_config["model"]}')
if isinstance(ctl, dict): ### TODO: is this needed? if isinstance(mux_config['ctl'], dict): ### TODO: is this needed?
mux_ctl_module = importlib.import_module(f'ohmpi.hardware_components.{mux_config["ctl"]["model"]}') mux_ctl_module = importlib.import_module(f'ohmpi.hardware_components.{mux_config["ctl"]["model"]}')
ctl = mux_ctl_module.Ctl(**self.ctl) ctl = mux_ctl_module.Ctl(**mux_config['ctl']) # (**self.ctl)
assert issubclass(type(mux_config['ctl']), CtlAbstract) assert issubclass(type(mux_config['ctl']), CtlAbstract)
io = mux_config.pop('io', 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.update({'io': io})
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment