Commit 54db83fd authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Improve code consistency

Showing with 12 additions and 7 deletions
+12 -7
...@@ -69,11 +69,12 @@ class Tx(TxAbstract): ...@@ -69,11 +69,12 @@ class Tx(TxAbstract):
if 'model' not in kwargs.keys(): if 'model' not in kwargs.keys():
for key in SPECS['tx'].keys(): for key in SPECS['tx'].keys():
kwargs = enforce_specs(kwargs, SPECS['tx'], key) kwargs = enforce_specs(kwargs, SPECS['tx'], key)
self.exec_logger.event(f'{self.model}\ttx_init\tstart\t{datetime.datetime.utcnow()}')
subclass_init = False subclass_init = False
else: else:
subclass_init = True subclass_init = True
super().__init__(**kwargs) 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) assert isinstance(self.connection, I2C)
kwargs.update({'pwr': kwargs.pop('pwr', SPECS['tx']['compatible_power_sources']['default'])}) kwargs.update({'pwr': kwargs.pop('pwr', SPECS['tx']['compatible_power_sources']['default'])})
if (kwargs['pwr'] != SPECS['tx']['compatible_power_sources']['default'] if (kwargs['pwr'] != SPECS['tx']['compatible_power_sources']['default']
...@@ -215,11 +216,12 @@ class Rx(RxAbstract): ...@@ -215,11 +216,12 @@ class Rx(RxAbstract):
if 'model' not in kwargs.keys(): if 'model' not in kwargs.keys():
for key in SPECS['rx'].keys(): for key in SPECS['rx'].keys():
kwargs = enforce_specs(kwargs, SPECS['rx'], key) kwargs = enforce_specs(kwargs, SPECS['rx'], key)
self.exec_logger.event(f'{self.model}\trx_init\tstart\t{datetime.datetime.utcnow()}')
subclass_init = False subclass_init = False
else: else:
subclass_init = True subclass_init = True
super().__init__(**kwargs) 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) assert isinstance(self.connection, I2C)
self.exec_logger.event(f'{self.model}\trx_init\tbegin\t{datetime.datetime.utcnow()}') self.exec_logger.event(f'{self.model}\trx_init\tbegin\t{datetime.datetime.utcnow()}')
......
...@@ -69,12 +69,12 @@ class Tx(Tx_mb_2023): ...@@ -69,12 +69,12 @@ class Tx(Tx_mb_2023):
if 'model' not in kwargs.keys(): if 'model' not in kwargs.keys():
for key in SPECS['tx'].keys(): for key in SPECS['tx'].keys():
kwargs = enforce_specs(kwargs, SPECS['tx'], key) kwargs = enforce_specs(kwargs, SPECS['tx'], key)
self.exec_logger.event(f'{self.model}\ttx_init\tstart\t{datetime.datetime.utcnow()}')
subclass_init = False subclass_init = False
else: else:
subclass_init = True subclass_init = True
super().__init__(**kwargs) super().__init__(**kwargs)
if not subclass_init:
self.exec_logger.event(f'{self.model}\ttx_init\tstart\t{datetime.datetime.utcnow()}')
# Initialize LEDs # Initialize LEDs
self.pin4 = self.mcp_board.get_pin(4) # Ohmpi_run self.pin4 = self.mcp_board.get_pin(4) # Ohmpi_run
self.pin4.direction = Direction.OUTPUT self.pin4.direction = Direction.OUTPUT
...@@ -97,11 +97,12 @@ class Rx(Rx_mb_2023): ...@@ -97,11 +97,12 @@ class Rx(Rx_mb_2023):
if 'model' not in kwargs.keys(): if 'model' not in kwargs.keys():
for key in SPECS['rx'].keys(): for key in SPECS['rx'].keys():
kwargs = enforce_specs(kwargs, SPECS['rx'], key) kwargs = enforce_specs(kwargs, SPECS['rx'], key)
self.exec_logger.event(f'{self.model}\trx_init\tstart\t{datetime.datetime.utcnow()}')
subclass_init = False subclass_init = False
else: else:
subclass_init = True subclass_init = True
super().__init__(**kwargs) 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 # I2C connection to MCP23008, for voltage
self.mcp_board = MCP23008(self.connection, address=kwargs['mcp_address']) self.mcp_board = MCP23008(self.connection, address=kwargs['mcp_address'])
# ADS1115 for voltage measurement (MN) # ADS1115 for voltage measurement (MN)
......
...@@ -62,12 +62,13 @@ class Mux(MuxAbstract): ...@@ -62,12 +62,13 @@ class Mux(MuxAbstract):
if 'model' not in kwargs.keys(): if 'model' not in kwargs.keys():
for key in SPECS.keys(): for key in SPECS.keys():
kwargs = enforce_specs(kwargs, SPECS, key) 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 subclass_init = False
else: else:
subclass_init = True subclass_init = True
kwargs.update({'cabling': kwargs.pop('cabling', default_mux_cabling)}) kwargs.update({'cabling': kwargs.pop('cabling', default_mux_cabling)})
super().__init__(**kwargs) 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) assert isinstance(self.connection, I2C)
self.exec_logger.debug(f'configuration: {kwargs}') self.exec_logger.debug(f'configuration: {kwargs}')
self._roles = kwargs.pop('roles', None) self._roles = kwargs.pop('roles', None)
......
...@@ -61,11 +61,12 @@ class Mux(MuxAbstract): ...@@ -61,11 +61,12 @@ class Mux(MuxAbstract):
if 'model' not in kwargs.keys(): if 'model' not in kwargs.keys():
for key in SPECS.keys(): for key in SPECS.keys():
kwargs = enforce_specs(kwargs, SPECS, key) 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 subclass_init = False
else: else:
subclass_init = True subclass_init = True
super().__init__(**kwargs) 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) assert isinstance(self.connection, I2C)
self.exec_logger.debug(f'configuration: {kwargs}') self.exec_logger.debug(f'configuration: {kwargs}')
tca_address = kwargs.pop('tca_address', None) tca_address = kwargs.pop('tca_address', None)
......
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