diff --git a/hardware_components/mux_2024_rev_0_0.py b/hardware_components/mux_2024_rev_0_0.py index 86c161bd1775c5d75a4db55727483555ece16a16..152bb4d954a364e19ebcce40c54f7571d0ab585f 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 568057ff7ce291e3bd7c67fa5756c8c74bee3af9..ed1f8c3f78c0a398efd2ce1955dac8d7a7928169 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}')