From 91239103c2ae58a6f4de88c66322cd31901fdcc5 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Tue, 3 Oct 2023 19:51:00 +0200
Subject: [PATCH] Removes reference to tx_module.TX_CONFIG and
rx_module.RX_CONFIG
---
ohmpi/hardware_components/mb_2023_0_X.py | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/ohmpi/hardware_components/mb_2023_0_X.py b/ohmpi/hardware_components/mb_2023_0_X.py
index 1f5efa98..8f892aec 100644
--- a/ohmpi/hardware_components/mb_2023_0_X.py
+++ b/ohmpi/hardware_components/mb_2023_0_X.py
@@ -108,8 +108,9 @@ def _gain_auto(channel):
class Tx(TxAbstract):
def __init__(self, **kwargs):
- for key in SPECS['tx']:
- kwargs = enforce_specs(kwargs, SPECS['tx'], key)
+ for key in kwargs.keys():
+ if key in SPECS['tx'].keys():
+ kwargs = enforce_specs(kwargs, SPECS['tx'], key)
kwargs.update({'board_name': os.path.basename(__file__).rstrip('.py')})
super().__init__(**kwargs)
assert isinstance(self.connection, I2C)
@@ -119,7 +120,7 @@ class Tx(TxAbstract):
assert kwargs['pwr'] in SPECS['tx']
#self.pwr = None # TODO: set a list of compatible power system with the tx
self.exec_logger.event(f'{self.board_name}\ttx_init\tbegin\t{datetime.datetime.utcnow()}')
- self.voltage_max = kwargs['voltage_max']
+ # self.voltage_max = kwargs['voltage_max'] # TODO: check if used
self.voltage_adjustable = False
self.current_adjustable = False
@@ -252,8 +253,9 @@ class Tx(TxAbstract):
class Rx(RxAbstract):
def __init__(self, **kwargs):
- for key in kwargs:
- kwargs = enforce_specs(kwargs, SPECS['rx'], key)
+ for key in kwargs.keys():
+ if key in SPECS['rx'].keys():
+ kwargs = enforce_specs(kwargs, SPECS['rx'], key)
kwargs.update({'board_name': os.path.basename(__file__).rstrip('.py')})
super().__init__(**kwargs)
assert isinstance(self.connection, I2C)
--
GitLab