Commit 0b140ddb authored by Arnaud WATLET's avatar Arnaud WATLET
Browse files

Configure pwr in hardware_system init

Showing with 22 additions and 23 deletions
+22 -23
...@@ -102,29 +102,6 @@ class OhmPiHardware: ...@@ -102,29 +102,6 @@ class OhmPiHardware:
HARDWARE_CONFIG['tx'].pop('ctl', None) HARDWARE_CONFIG['tx'].pop('ctl', None)
self.rx = kwargs.pop('rx', rx_module.Rx(**HARDWARE_CONFIG['rx'])) self.rx = kwargs.pop('rx', rx_module.Rx(**HARDWARE_CONFIG['rx']))
# Initialize power source
HARDWARE_CONFIG['pwr'].pop('model')
HARDWARE_CONFIG['pwr'].update(**HARDWARE_CONFIG['pwr']) # NOTE: Explain why this is needed or delete me
HARDWARE_CONFIG['pwr'].update({'ctl': HARDWARE_CONFIG['pwr'].pop('ctl', self.ctl)})
HARDWARE_CONFIG['pwr'].update({'current_max': self.current_max})
if isinstance(HARDWARE_CONFIG['pwr']['ctl'], dict):
ctl_mod = HARDWARE_CONFIG['pwr']['ctl'].pop('model', self.ctl)
if isinstance(ctl_mod, str):
ctl_mod = importlib.import_module(f'ohmpi.hardware_components.{ctl_mod}')
HARDWARE_CONFIG['pwr']['ctl'] = ctl_mod.Ctl(**HARDWARE_CONFIG['pwr']['ctl'])
#if 'interface_name' in HARDWARE_CONFIG['pwr']:
HARDWARE_CONFIG['pwr'].update({
'connection': HARDWARE_CONFIG['pwr'].pop(
'connection', HARDWARE_CONFIG['pwr']['ctl'].interfaces[
HARDWARE_CONFIG['pwr'].pop('interface_name', None)])})
HARDWARE_CONFIG['pwr'].update({'exec_logger': self.exec_logger, 'data_logger': self.data_logger,
'soh_logger': self.soh_logger})
self.pwr_state = "on"
self.pwr = kwargs.pop('pwr', pwr_module.Pwr(**HARDWARE_CONFIG['pwr']))
self.pwr_state = 'off'
# Initialize TX # Initialize TX
HARDWARE_CONFIG['tx'].pop('model') HARDWARE_CONFIG['tx'].pop('model')
HARDWARE_CONFIG['tx'].update(**HARDWARE_CONFIG['tx']) HARDWARE_CONFIG['tx'].update(**HARDWARE_CONFIG['tx'])
...@@ -148,6 +125,28 @@ class OhmPiHardware: ...@@ -148,6 +125,28 @@ class OhmPiHardware:
self.tx.pwr = self.pwr self.tx.pwr = self.pwr
self.tx.pwr._current_max = self.current_max self.tx.pwr._current_max = self.current_max
# Initialize power source
HARDWARE_CONFIG['pwr'].pop('model')
HARDWARE_CONFIG['pwr'].update(**HARDWARE_CONFIG['pwr']) # NOTE: Explain why this is needed or delete me
HARDWARE_CONFIG['pwr'].update({'ctl': HARDWARE_CONFIG['pwr'].pop('ctl', self.ctl)})
HARDWARE_CONFIG['pwr'].update({'current_max': self.current_max})
if isinstance(HARDWARE_CONFIG['pwr']['ctl'], dict):
ctl_mod = HARDWARE_CONFIG['pwr']['ctl'].pop('model', self.ctl)
if isinstance(ctl_mod, str):
ctl_mod = importlib.import_module(f'ohmpi.hardware_components.{ctl_mod}')
HARDWARE_CONFIG['pwr']['ctl'] = ctl_mod.Ctl(**HARDWARE_CONFIG['pwr']['ctl'])
# if 'interface_name' in HARDWARE_CONFIG['pwr']:
HARDWARE_CONFIG['pwr'].update({
'connection': HARDWARE_CONFIG['pwr'].pop(
'connection', HARDWARE_CONFIG['pwr']['ctl'].interfaces[
HARDWARE_CONFIG['pwr'].pop('interface_name', None)])})
HARDWARE_CONFIG['pwr'].update({'exec_logger': self.exec_logger, 'data_logger': self.data_logger,
'soh_logger': self.soh_logger})
self.pwr_state = "on"
self.pwr = kwargs.pop('pwr', pwr_module.Pwr(**HARDWARE_CONFIG['pwr']))
self.pwr_state = 'off'
# Initialize Muxes # Initialize Muxes
self._cabling = kwargs.pop('cabling', {}) self._cabling = kwargs.pop('cabling', {})
self.mux_boards = {} self.mux_boards = {}
......
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