From bbba9e0a78956c7e8e9a85c4ad81f994801143a9 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sun, 30 Apr 2023 16:37:47 +0200
Subject: [PATCH] Fixes bug related to the default_mux_cabling in hardware
system
---
hardware_components/mux_2024_rev_0_0.py | 2 +-
hardware_system.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/hardware_components/mux_2024_rev_0_0.py b/hardware_components/mux_2024_rev_0_0.py
index 86c161bd..152bb4d9 100644
--- a/hardware_components/mux_2024_rev_0_0.py
+++ b/hardware_components/mux_2024_rev_0_0.py
@@ -54,7 +54,7 @@ class Mux(MuxAbstract):
if 'id' in kwargs.keys():
MUX_CONFIG.update(HARDWARE_CONFIG['mux']['boards'][kwargs['id']])
kwargs.update({'board_name': os.path.basename(__file__).rstrip('.py')})
- if 'cabling' not in kwargs.keys() or kwargs['cabling'] is None:
+ if 'cabling' not in kwargs.keys() or kwargs['cabling']=={}:
kwargs.update({'cabling': default_mux_cabling})
super().__init__(**kwargs)
self.exec_logger.debug(f'configuration: {MUX_CONFIG}')
diff --git a/hardware_system.py b/hardware_system.py
index 568057ff..ed1f8c3f 100644
--- a/hardware_system.py
+++ b/hardware_system.py
@@ -29,7 +29,7 @@ voltage_min = RX_CONFIG['voltage_min']
default_mux_cabling = {}
for mux in mux_boards:
- update_dict(default_mux_cabling, MUX_CONFIG[mux].pop('default_mux_cabling', None))
+ update_dict(default_mux_cabling, MUX_CONFIG[mux].pop('default_mux_cabling', {}))
print(f'default_mux_cabling: {default_mux_cabling}')
--
GitLab