diff options
Diffstat (limited to 'lib/python/qmk/info.py')
| -rw-r--r-- | lib/python/qmk/info.py | 50 | 
1 files changed, 17 insertions, 33 deletions
| diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 7460d84ad3..5ca282b2d3 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -437,19 +437,6 @@ def _extract_matrix_info(info_data, config_c):      return info_data -# TODO: kill off usb.device_ver in favor of usb.device_version -def _extract_device_version(info_data): -    if info_data.get('usb'): -        if info_data['usb'].get('device_version') and not info_data['usb'].get('device_ver'): -            (major, minor, revision) = info_data['usb']['device_version'].split('.', 3) -            info_data['usb']['device_ver'] = f'0x{major.zfill(2)}{minor}{revision}' -        if not info_data['usb'].get('device_version') and info_data['usb'].get('device_ver'): -            major = int(info_data['usb']['device_ver'][2:4]) -            minor = int(info_data['usb']['device_ver'][4]) -            revision = int(info_data['usb']['device_ver'][5]) -            info_data['usb']['device_version'] = f'{major}.{minor}.{revision}' - -  def _config_to_json(key_type, config_value):      """Convert config value using spec      """ @@ -479,7 +466,7 @@ def _config_to_json(key_type, config_value):          return int(config_value)      elif key_type == 'str': -        return config_value.strip('"') +        return config_value.strip('"').replace('\\"', '"').replace('\\\\', '\\')      elif key_type == 'bcd_version':          major = int(config_value[2:4]) @@ -535,7 +522,6 @@ def _extract_config_h(info_data, config_c):      _extract_split_right_pins(info_data, config_c)      _extract_encoders(info_data, config_c)      _extract_split_encoders(info_data, config_c) -    _extract_device_version(info_data)      return info_data @@ -627,20 +613,24 @@ def _extract_led_config(info_data, keyboard):      cols = info_data['matrix_size']['cols']      rows = info_data['matrix_size']['rows'] -    # Assume what feature owns g_led_config -    feature = "rgb_matrix" -    if info_data.get("features", {}).get("led_matrix", False): +    # Determine what feature owns g_led_config +    features = info_data.get("features", {}) +    feature = None +    if features.get("rgb_matrix", False): +        feature = "rgb_matrix" +    elif features.get("led_matrix", False):          feature = "led_matrix" -    # Process -    for file in find_keyboard_c(keyboard): -        try: -            ret = find_led_config(file, cols, rows) -            if ret: -                info_data[feature] = info_data.get(feature, {}) -                info_data[feature]["layout"] = ret -        except Exception as e: -            _log_warning(info_data, f'led_config: {file.name}: {e}') +    if feature: +        # Process +        for file in find_keyboard_c(keyboard): +            try: +                ret = find_led_config(file, cols, rows) +                if ret: +                    info_data[feature] = info_data.get(feature, {}) +                    info_data[feature]["layout"] = ret +            except Exception as e: +                _log_warning(info_data, f'led_config: {file.name}: {e}')      return info_data @@ -755,9 +745,6 @@ def arm_processor_rules(info_data, rules):      info_data['processor_type'] = 'arm'      info_data['protocol'] = 'ChibiOS' -    if 'bootloader' not in info_data: -        info_data['bootloader'] = 'unknown' -      if 'STM32' in info_data['processor']:          info_data['platform'] = 'STM32'      elif 'MCU_SERIES' in rules: @@ -775,9 +762,6 @@ def avr_processor_rules(info_data, rules):      info_data['platform'] = rules['ARCH'] if 'ARCH' in rules else 'unknown'      info_data['protocol'] = 'V-USB' if rules.get('MCU') in VUSB_PROCESSORS else 'LUFA' -    if 'bootloader' not in info_data: -        info_data['bootloader'] = 'atmel-dfu' -      # FIXME(fauxpark/anyone): Eventually we should detect the protocol by looking at PROTOCOL inherited from mcu_selection.mk:      # info_data['protocol'] = 'V-USB' if rules.get('PROTOCOL') == 'VUSB' else 'LUFA' | 
