From 54db83fd233224c78eb001fe07ca6187e980549d Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Tue, 10 Oct 2023 23:51:44 +0200
Subject: [PATCH] Improve code consistency
---
ohmpi/hardware_components/mb_2023_0_X.py | 6 ++++--
ohmpi/hardware_components/mb_2024_0_2.py | 7 ++++---
ohmpi/hardware_components/mux_2023_0_X.py | 3 ++-
ohmpi/hardware_components/mux_2024_0_X.py | 3 ++-
4 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/ohmpi/hardware_components/mb_2023_0_X.py b/ohmpi/hardware_components/mb_2023_0_X.py
index dd0cc6c0..c7f03e05 100644
--- a/ohmpi/hardware_components/mb_2023_0_X.py
+++ b/ohmpi/hardware_components/mb_2023_0_X.py
@@ -69,11 +69,12 @@ class Tx(TxAbstract):
if 'model' not in kwargs.keys():
for key in SPECS['tx'].keys():
kwargs = enforce_specs(kwargs, SPECS['tx'], key)
- self.exec_logger.event(f'{self.model}\ttx_init\tstart\t{datetime.datetime.utcnow()}')
subclass_init = False
else:
subclass_init = True
super().__init__(**kwargs)
+ if not subclass_init:
+ self.exec_logger.event(f'{self.model}\ttx_init\tstart\t{datetime.datetime.utcnow()}')
assert isinstance(self.connection, I2C)
kwargs.update({'pwr': kwargs.pop('pwr', SPECS['tx']['compatible_power_sources']['default'])})
if (kwargs['pwr'] != SPECS['tx']['compatible_power_sources']['default']
@@ -215,11 +216,12 @@ class Rx(RxAbstract):
if 'model' not in kwargs.keys():
for key in SPECS['rx'].keys():
kwargs = enforce_specs(kwargs, SPECS['rx'], key)
- self.exec_logger.event(f'{self.model}\trx_init\tstart\t{datetime.datetime.utcnow()}')
subclass_init = False
else:
subclass_init = True
super().__init__(**kwargs)
+ if not subclass_init:
+ self.exec_logger.event(f'{self.model}\trx_init\tstart\t{datetime.datetime.utcnow()}')
assert isinstance(self.connection, I2C)
self.exec_logger.event(f'{self.model}\trx_init\tbegin\t{datetime.datetime.utcnow()}')
diff --git a/ohmpi/hardware_components/mb_2024_0_2.py b/ohmpi/hardware_components/mb_2024_0_2.py
index a7560390..61472e2a 100644
--- a/ohmpi/hardware_components/mb_2024_0_2.py
+++ b/ohmpi/hardware_components/mb_2024_0_2.py
@@ -69,12 +69,12 @@ class Tx(Tx_mb_2023):
if 'model' not in kwargs.keys():
for key in SPECS['tx'].keys():
kwargs = enforce_specs(kwargs, SPECS['tx'], key)
- self.exec_logger.event(f'{self.model}\ttx_init\tstart\t{datetime.datetime.utcnow()}')
subclass_init = False
else:
subclass_init = True
super().__init__(**kwargs)
-
+ if not subclass_init:
+ self.exec_logger.event(f'{self.model}\ttx_init\tstart\t{datetime.datetime.utcnow()}')
# Initialize LEDs
self.pin4 = self.mcp_board.get_pin(4) # Ohmpi_run
self.pin4.direction = Direction.OUTPUT
@@ -97,11 +97,12 @@ class Rx(Rx_mb_2023):
if 'model' not in kwargs.keys():
for key in SPECS['rx'].keys():
kwargs = enforce_specs(kwargs, SPECS['rx'], key)
- self.exec_logger.event(f'{self.model}\trx_init\tstart\t{datetime.datetime.utcnow()}')
subclass_init = False
else:
subclass_init = True
super().__init__(**kwargs)
+ if not subclass_init:
+ self.exec_logger.event(f'{self.model}\trx_init\tstart\t{datetime.datetime.utcnow()}')
# I2C connection to MCP23008, for voltage
self.mcp_board = MCP23008(self.connection, address=kwargs['mcp_address'])
# ADS1115 for voltage measurement (MN)
diff --git a/ohmpi/hardware_components/mux_2023_0_X.py b/ohmpi/hardware_components/mux_2023_0_X.py
index 9dc808f1..b3fd4247 100644
--- a/ohmpi/hardware_components/mux_2023_0_X.py
+++ b/ohmpi/hardware_components/mux_2023_0_X.py
@@ -62,12 +62,13 @@ class Mux(MuxAbstract):
if 'model' not in kwargs.keys():
for key in SPECS.keys():
kwargs = enforce_specs(kwargs, SPECS, key)
- self.exec_logger.event(f'{self.model}{self.board_id}\tmux_init\tstart\t{datetime.datetime.utcnow()}')
subclass_init = False
else:
subclass_init = True
kwargs.update({'cabling': kwargs.pop('cabling', default_mux_cabling)})
super().__init__(**kwargs)
+ if not subclass_init:
+ self.exec_logger.event(f'{self.model}{self.board_id}\tmux_init\tstart\t{datetime.datetime.utcnow()}')
assert isinstance(self.connection, I2C)
self.exec_logger.debug(f'configuration: {kwargs}')
self._roles = kwargs.pop('roles', None)
diff --git a/ohmpi/hardware_components/mux_2024_0_X.py b/ohmpi/hardware_components/mux_2024_0_X.py
index 2172272b..f6e642a9 100644
--- a/ohmpi/hardware_components/mux_2024_0_X.py
+++ b/ohmpi/hardware_components/mux_2024_0_X.py
@@ -61,11 +61,12 @@ class Mux(MuxAbstract):
if 'model' not in kwargs.keys():
for key in SPECS.keys():
kwargs = enforce_specs(kwargs, SPECS, key)
- self.exec_logger.event(f'{self.model}{self.board_id}\tmux_init\tstart\t{datetime.datetime.utcnow()}')
subclass_init = False
else:
subclass_init = True
super().__init__(**kwargs)
+ if not subclass_init:
+ self.exec_logger.event(f'{self.model}{self.board_id}\tmux_init\tstart\t{datetime.datetime.utcnow()}')
assert isinstance(self.connection, I2C)
self.exec_logger.debug(f'configuration: {kwargs}')
tca_address = kwargs.pop('tca_address', None)
--
GitLab