From cd4bcfc65845839fa04a657c3e66c39a998a061f Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 8 Jun 2023 10:18:52 +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_components/ohmpi_card_3_15.py | 8 ++++----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/ohmpi/hardware_components/mux_2024_rev_0_0.py b/ohmpi/hardware_components/mux_2024_rev_0_0.py
index a6545d3a..309f3458 100644
--- a/ohmpi/hardware_components/mux_2024_rev_0_0.py
+++ b/ohmpi/hardware_components/mux_2024_rev_0_0.py
@@ -58,8 +58,6 @@ 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_components/ohmpi_card_3_15.py b/ohmpi/hardware_components/ohmpi_card_3_15.py
index 971ba360..77e27a56 100644
--- a/ohmpi/hardware_components/ohmpi_card_3_15.py
+++ b/ohmpi/hardware_components/ohmpi_card_3_15.py
@@ -84,8 +84,8 @@ class Tx(TxAbstract):
self.current_adjustable = False
if self.ctl is None:
self.ctl = ctl_module.Ctl()
- elif isinstance(self.ctl, dict):
- self.ctl = ctl_module.Ctl(**self.ctl)
+ # elif isinstance(self.ctl, dict):
+ # self.ctl = ctl_module.Ctl(**self.ctl)
# I2C connexion to MCP23008, for current injection
self.mcp_board = MCP23008(self.ctl.bus, address=TX_CONFIG['mcp_board_address'])
@@ -207,8 +207,8 @@ class Rx(RxAbstract):
super().__init__(**kwargs)
if self.ctl is None:
self.ctl = ctl_module.Ctl()
- elif isinstance(self.ctl, dict):
- self.ctl = ctl_module.Ctl(**self.ctl)
+ # elif isinstance(self.ctl, dict):
+ # self.ctl = ctl_module.Ctl(**self.ctl)
# print(f'ctl: {self.ctl}, {type(self.ctl)}') # TODO: delete me!
# ADS1115 for voltage measurement (MN)
self._ads_voltage_address = 0x49
--
GitLab