From cae515940840d3719c027559106c42f9ca6b1163 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Tue, 3 Oct 2023 19:59:29 +0200
Subject: [PATCH] Removes reference to tx_module.TX_CONFIG and
rx_module.RX_CONFIG
---
ohmpi/hardware_components/raspberry_pi.py | 4 ++--
ohmpi/hardware_system.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ohmpi/hardware_components/raspberry_pi.py b/ohmpi/hardware_components/raspberry_pi.py
index 86c6f00a..20540c91 100644
--- a/ohmpi/hardware_components/raspberry_pi.py
+++ b/ohmpi/hardware_components/raspberry_pi.py
@@ -29,7 +29,7 @@ class Ctl(CtlAbstract):
try:
self.interfaces['i2c_ext'] = ExtendedI2C(4) # 4 is defined
except Exception as e:
- self.exec_logger.warning('Could not initialize Extended I2C:\n{e}')
+ self.exec_logger.warning(f'Could not initialize Extended I2C:\n{e}')
# modbus
try:
self.interfaces['modbus'] = minimalmodbus.Instrument(port=modbus_port, slaveaddress=modbus_slave_address)
@@ -40,7 +40,7 @@ class Ctl(CtlAbstract):
self.interfaces['modbus'].serial.parity = modbus_parity # No parity
self.interfaces['modbus'].mode = modbus_mode # RTU mode
except Exception as e:
- self.exec_logger.warning('Could not initialize Extended modbus:\n{e}')
+ self.exec_logger.warning(f'Could not initialize Extended modbus:\n{e}')
platform, on_pi = get_platform()
assert on_pi
diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py
index 95eaad9a..fc89074d 100644
--- a/ohmpi/hardware_system.py
+++ b/ohmpi/hardware_system.py
@@ -28,7 +28,7 @@ for k, v in MUX_CONFIG.items():
for k2, v2 in MUX_DEFAULT.items():
MUX_CONFIG[k].update({k2: MUX_CONFIG[k].pop(k2, v2)})
-TX_CONFIG = HARDWARE_CONFIG['tx']
+TX_CONFIG = HARDWARE_CONFIG['tx'] # NOTE: is TX_CONFIG needed or should we use HARDWARE_CONFIX['tx']?
for k, v in tx_module.SPECS['tx'].items():
try:
TX_CONFIG.update({k: TX_CONFIG.pop(k, v['default'])})
--
GitLab