diff options
Diffstat (limited to 'lib/python/qmk/info.py')
| -rw-r--r-- | lib/python/qmk/info.py | 57 | 
1 files changed, 50 insertions, 7 deletions
| diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 47c8bff7a8..bcb4d81ef2 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -9,7 +9,7 @@ from milc import cli  from qmk.constants import CHIBIOS_PROCESSORS, LUFA_PROCESSORS, VUSB_PROCESSORS  from qmk.c_parse import find_layouts -from qmk.json_schema import deep_update, json_load, keyboard_validate, keyboard_api_validate +from qmk.json_schema import deep_update, json_load, validate  from qmk.keyboard import config_h, rules_mk  from qmk.keymap import list_keymaps  from qmk.makefile import parse_rules_mk_file @@ -64,9 +64,12 @@ def info_json(keyboard):      info_data = _extract_config_h(info_data)      info_data = _extract_rules_mk(info_data) +    # Ensure that we have matrix row and column counts +    info_data = _matrix_size(info_data) +      # Validate against the jsonschema      try: -        keyboard_api_validate(info_data) +        validate(info_data, 'qmk.api.keyboard.v1')      except jsonschema.ValidationError as e:          json_path = '.'.join([str(p) for p in e.absolute_path]) @@ -90,6 +93,9 @@ def info_json(keyboard):          if layout_name not in info_data.get('layouts', {}) and layout_name not in info_data.get('layout_aliases', {}):              _log_error(info_data, 'Claims to support community layout %s but no %s() macro found' % (layout, layout_name)) +    # Check that the reported matrix size is consistent with the actual matrix size +    _check_matrix(info_data) +      return info_data @@ -143,10 +149,7 @@ def _pin_name(pin):      elif pin == 'NO_PIN':          return None -    elif pin[0] in 'ABCDEFGHIJK' and pin[1].isdigit(): -        return pin - -    raise ValueError(f'Invalid pin: {pin}') +    return pin  def _extract_pins(pins): @@ -341,6 +344,46 @@ def _extract_rules_mk(info_data):      return info_data +def _matrix_size(info_data): +    """Add info_data['matrix_size'] if it doesn't exist. +    """ +    if 'matrix_size' not in info_data and 'matrix_pins' in info_data: +        info_data['matrix_size'] = {} + +        if 'direct' in info_data['matrix_pins']: +            info_data['matrix_size']['cols'] = len(info_data['matrix_pins']['direct'][0]) +            info_data['matrix_size']['rows'] = len(info_data['matrix_pins']['direct']) +        elif 'cols' in info_data['matrix_pins'] and 'rows' in info_data['matrix_pins']: +            info_data['matrix_size']['cols'] = len(info_data['matrix_pins']['cols']) +            info_data['matrix_size']['rows'] = len(info_data['matrix_pins']['rows']) + +    return info_data + + +def _check_matrix(info_data): +    """Check the matrix to ensure that row/column count is consistent. +    """ +    if 'matrix_pins' in info_data and 'matrix_size' in info_data: +        actual_col_count = info_data['matrix_size'].get('cols', 0) +        actual_row_count = info_data['matrix_size'].get('rows', 0) +        col_count = row_count = 0 + +        if 'direct' in info_data['matrix_pins']: +            col_count = len(info_data['matrix_pins']['direct'][0]) +            row_count = len(info_data['matrix_pins']['direct']) +        elif 'cols' in info_data['matrix_pins'] and 'rows' in info_data['matrix_pins']: +            col_count = len(info_data['matrix_pins']['cols']) +            row_count = len(info_data['matrix_pins']['rows']) + +        if col_count != actual_col_count and col_count != (actual_col_count / 2): +            # FIXME: once we can we should detect if split is enabled to do the actual_col_count/2 check. +            _log_error(info_data, f'MATRIX_COLS is inconsistent with the size of MATRIX_COL_PINS: {col_count} != {actual_col_count}') + +        if row_count != actual_row_count and row_count != (actual_row_count / 2): +            # FIXME: once we can we should detect if split is enabled to do the actual_row_count/2 check. +            _log_error(info_data, f'MATRIX_ROWS is inconsistent with the size of MATRIX_ROW_PINS: {row_count} != {actual_row_count}') + +  def _merge_layouts(info_data, new_info_data):      """Merge new_info_data into info_data in an intelligent way.      """ @@ -493,7 +536,7 @@ def merge_info_jsons(keyboard, info_data):              continue          try: -            keyboard_validate(new_info_data) +            validate(new_info_data, 'qmk.keyboard.v1')          except jsonschema.ValidationError as e:              json_path = '.'.join([str(p) for p in e.absolute_path])              cli.log.error('Not including data from file: %s', info_file) | 
