From 4c3deec76c5f0389ed0ad4eb9f297ad62c90f4e4 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 8 Jun 2023 10:16:35 +0200
Subject: [PATCH] Tries to fix "dict object has no attr pwr" error
---
ohmpi/hardware_components/mux_2024_rev_0_0.py | 2 ++
ohmpi/hardware_system.py | 2 ++
2 files changed, 4 insertions(+)
diff --git a/ohmpi/hardware_components/mux_2024_rev_0_0.py b/ohmpi/hardware_components/mux_2024_rev_0_0.py
index 309f3458..a6545d3a 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 ef38bfdb..b935237e 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'])
--
GitLab