diff --git a/configs/config_mb_2024_0_2.py b/configs/config_mb_2024_0_2.py index e90350deab5262485d623a7013ae297d49ddfca5..f99c214d235e821f4b55fca27db02d6b5bff2760 100644 --- a/configs/config_mb_2024_0_2.py +++ b/configs/config_mb_2024_0_2.py @@ -18,7 +18,7 @@ OHMPI_CONFIG = { HARDWARE_CONFIG = { 'ctl': {'model': 'raspberry_pi'}, - 'pwr': {'model': 'pwr_batt', 'voltage': 12.}, + 'pwr': {'model': 'pwr_batt', 'voltage': 12., 'interface_name': 'none'}, 'tx': {'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'current_max': 4800, # Maximum voltage read by the current ADC on the TX board [mA] diff --git a/configs/config_mb_2024_0_2__1_mux_2024.py b/configs/config_mb_2024_0_2__1_mux_2024.py index e83edf46062718979a6f96fdb8c95dcd1585d9a7..a9a91e4d052bb426c4f5c9e3765578b0a7f73a19 100644 --- a/configs/config_mb_2024_0_2__1_mux_2024.py +++ b/configs/config_mb_2024_0_2__1_mux_2024.py @@ -18,7 +18,7 @@ OHMPI_CONFIG = { HARDWARE_CONFIG = { 'ctl': {'model': 'raspberry_pi'}, - 'pwr': {'model': 'pwr_batt', 'voltage': 12.}, + 'pwr': {'model': 'pwr_batt', 'voltage': 12., 'interface_name': 'none'}, 'tx': {'model': 'mb_2024_0_2', 'voltage_max': 50., # Maximum voltage supported by the TX board [V] 'current_max': 4800, # Maximum voltage read by the current ADC on the TX board [mA] diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index 5b78d2dbdc1e89bef60e13f73f99671fc49f2830..3b264ac85f08ac6610bbb01f2fa637f5e9cd42f0 100644 --- a/ohmpi/hardware_system.py +++ b/ohmpi/hardware_system.py @@ -78,7 +78,7 @@ class OhmPiHardware: # Initialize RX HARDWARE_CONFIG['rx'].pop('model') - HARDWARE_CONFIG['rx'].update(**HARDWARE_CONFIG['rx']) + HARDWARE_CONFIG['rx'].update(**HARDWARE_CONFIG['rx']) # TODO: delete me ? HARDWARE_CONFIG['rx'].update({'ctl': HARDWARE_CONFIG['rx'].pop('ctl', self.ctl)}) if isinstance(HARDWARE_CONFIG['rx']['ctl'], dict): ctl_mod = HARDWARE_CONFIG['rx']['ctl'].pop('model', self.ctl) diff --git a/ohmpi/logging_setup.py b/ohmpi/logging_setup.py index 33642fff2fb9f01f7930997335e989380676eb67..33927655e620ea488ad99e3e05b1001cf0b6dbeb 100644 --- a/ohmpi/logging_setup.py +++ b/ohmpi/logging_setup.py @@ -14,6 +14,7 @@ def get_logging_levels(): """Gets a list of the logging levels loaded""" return [logging.getLevelName(x) for x in range(1,101) if not logging.getLevelName(x).startswith('Level')] + def add_logging_level(level_name, level_num, method_name=None): """ Comprehensively adds a new logging level to the `logging` module and the