From 30331b383f9ef4620e47aa07e4f9af7fae9d30b3 Mon Sep 17 00:00:00 2001 From: Zach White Date: Fri, 8 Jan 2021 00:00:15 -0800 Subject: [PATCH] fix bugs triggered by certain boards --- data/schemas/keyboard.jsonschema | 34 +++++++++++++++++++++--- lib/python/qmk/c_parse.py | 4 +-- lib/python/qmk/cli/generate/config_h.py | 6 ++--- lib/python/qmk/info.py | 35 +++++++++++++++++-------- 4 files changed, 59 insertions(+), 20 deletions(-) diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index 9355ee49b..e13771e92 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -166,6 +166,10 @@ "type": "string", "pattern": "^[A-K]\\d{1,2}$" }, + { + "type": "number", + "multipleOf": 1 + }, { "type": "null" } @@ -176,15 +180,37 @@ "cols": { "type": "array", "items": { - "type": "string", - "pattern": "^[A-K]\\d{1,2}$" + "oneOf": [ + { + "type": "string", + "pattern": "^[A-K]\\d{1,2}$" + }, + { + "type": "number", + "multipleOf": 1 + }, + { + "type": "null" + } + ] } }, "rows": { "type": "array", "items": { - "type": "string", - "pattern": "^[A-K]\\d{1,2}$" + "oneOf": [ + { + "type": "string", + "pattern": "^[A-K]\\d{1,2}$" + }, + { + "type": "number", + "multipleOf": 1 + }, + { + "type": "null" + } + ] } } } diff --git a/lib/python/qmk/c_parse.py b/lib/python/qmk/c_parse.py index 67e196f0e..0338484ec 100644 --- a/lib/python/qmk/c_parse.py +++ b/lib/python/qmk/c_parse.py @@ -9,7 +9,7 @@ from qmk.comment_remover import comment_remover default_key_entry = {'x': -1, 'y': 0, 'w': 1} single_comment_regex = re.compile(r' */[/*].*$') -multi_comment_regex = re.compile(r'/\*(.|\n)*\*/', re.MULTILINE) +multi_comment_regex = re.compile(r'/\*(.|\n)*?\*/', re.MULTILINE) def strip_line_comment(string): @@ -103,7 +103,7 @@ def parse_config_h_file(config_h_file, config_h=None): if config_h_file.exists(): config_h_text = config_h_file.read_text() - config_h_text = config_h_text.replace('\\\n', '') + config_h_text = config_h_text.replace('\\\n', '') # Why are you here? config_h_text = strip_multiline_comment(config_h_text) for linenum, line in enumerate(config_h_text.split('\n')): diff --git a/lib/python/qmk/cli/generate/config_h.py b/lib/python/qmk/cli/generate/config_h.py index 15d4fbf2d..1de84de7a 100755 --- a/lib/python/qmk/cli/generate/config_h.py +++ b/lib/python/qmk/cli/generate/config_h.py @@ -64,7 +64,7 @@ def direct_pins(direct_pins): rows = [] for row in direct_pins: - cols = ','.join([col or 'NO_PIN' for col in row]) + cols = ','.join(map(str, [col or 'NO_PIN' for col in row])) rows.append('{' + cols + '}') col_count = len(direct_pins[0]) @@ -88,7 +88,7 @@ def direct_pins(direct_pins): def col_pins(col_pins): """Return the config.h lines that set the column pins. """ - cols = ','.join(col_pins) + cols = ','.join(map(str, [pin or 'NO_PIN' for pin in col_pins])) col_num = len(col_pins) return """ @@ -105,7 +105,7 @@ def col_pins(col_pins): def row_pins(row_pins): """Return the config.h lines that set the row pins. """ - rows = ','.join(row_pins) + rows = ','.join(map(str, [pin or 'NO_PIN' for pin in row_pins])) row_num = len(row_pins) return """ diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index efd339115..28c281a4b 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -315,11 +315,10 @@ def _extract_rgblight(info_data, config_c): cli.log.error('%s: config.h: Could not convert "%s" to %s: %s', info_data['keyboard_folder'], config_c[config_key], config_type.__name__, e) for json_key, config_key in rgblight_toggles.items(): - if config_key in config_c: - if json_key in rgblight: - _log_warning(info_data, 'RGB Light: %s is specified in both info.json and config.h, the config.h value wins.', json_key) + if config_key in config_c and json_key in rgblight: + _log_warning(info_data, 'RGB Light: %s is specified in both info.json and config.h, the config.h value wins.', json_key) - rgblight[json_key] = config_c[config_key] + rgblight[json_key] = config_key in config_c for json_key, config_key in rgblight_animations.items(): if config_key in config_c: @@ -337,16 +336,30 @@ def _extract_rgblight(info_data, config_c): return info_data +def _pin_name(pin): + """Returns the proper representation for a pin. + """ + pin = pin.strip() + + if not pin: + return None + + elif pin.isdigit(): + return int(pin) + + elif pin == 'NO_PIN': + return None + + elif pin[0] in 'ABCDEFGHIJK' and pin[1].isdigit(): + return pin + + raise ValueError(f'Invalid pin: {pin}') + + def _extract_pins(pins): """Returns a list of pins from a comma separated string of pins. """ - pins = [pin.strip() for pin in pins.split(',') if pin] - - for pin in pins: - if pin[0] not in 'ABCDEFGHIJK' or not pin[1].isdigit(): - raise ValueError(f'Invalid pin: {pin}') - - return pins + return [_pin_name(pin) for pin in pins.split(',')] def _extract_direct_matrix(info_data, direct_pins):