diff --git a/ohmpi/hardware_system.py b/ohmpi/hardware_system.py index 7112c0469018be44f4de6088cdb57f44e90445e4..aa2161f9c2d6356d4433b20edee3213982185e0a 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