diff options
| author | Joel Challis <git@zvecr.com> | 2023-06-02 02:45:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-02 02:45:48 +0100 |
| commit | aa33fb00fdba2d7b1e0f4197c2e6b78755b171e9 (patch) | |
| tree | 57bc05a20db3ca44a06ace24dc6bc3c07db3eaf3 | |
| parent | 25c16b3adeb15466d75691162763ce062b2c6e64 (diff) | |
Revert "Add *_MATRIX_LED_COUNT generation/validation (#19515)" (#21109)
This reverts commit 25c16b3adeb15466d75691162763ce062b2c6e64.
| -rw-r--r-- | data/mappings/info_config.hjson | 2 | ||||
| -rw-r--r-- | data/schemas/keyboard.jsonschema | 2 | ||||
| -rw-r--r-- | lib/python/qmk/info.py | 10 |
3 files changed, 1 insertions, 13 deletions
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson index da255892dc..e53d90da39 100644 --- a/data/mappings/info_config.hjson +++ b/data/mappings/info_config.hjson @@ -71,7 +71,6 @@ "LED_MATRIX_SPLIT": {"info_key": "led_matrix.split_count", "value_type": "array.int"}, "LED_MATRIX_TIMEOUT": {"info_key": "led_matrix.timeout", "value_type": "int"}, "LED_MATRIX_VAL_STEP": {"info_key": "led_matrix.val_steps", "value_type": "int"}, - "LED_MATRIX_LED_COUNT": {"info_key": "led_matrix.led_count", "value_type": "int", "to_json": false}, // LUFA Bootloader "QMK_ESC_INPUT": {"info_key": "qmk_lufa_bootloader.esc_input"}, @@ -110,7 +109,6 @@ "RGB_MATRIX_SPLIT": {"info_key": "rgb_matrix.split_count", "value_type": "array.int"}, "RGB_MATRIX_TIMEOUT": {"info_key": "rgb_matrix.timeout", "value_type": "int"}, "RGB_MATRIX_VAL_STEP": {"info_key": "rgb_matrix.val_steps", "value_type": "int"}, - "RGB_MATRIX_LED_COUNT": {"info_key": "rgb_matrix.led_count", "value_type": "int", "to_json": false}, // RGBLight "RGBLED_NUM": {"info_key": "rgblight.led_count", "value_type": "int"}, diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index f196e4467d..ba4a7eec55 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema @@ -372,7 +372,6 @@ } }, "driver": {"type": "string"}, - "led_count": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "center_point": { "type": "array", "minItems": 2, @@ -424,7 +423,6 @@ } }, "driver": {"type": "string"}, - "led_count": {"$ref": "qmk.definitions.v1#/unsigned_int"}, "center_point": { "type": "array", "minItems": 2, diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 6628d825ce..dbd26153d8 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -55,7 +55,7 @@ def _get_key_left_position(key): return key['x'] - 0.25 if key.get('h', 1) == 2 and key.get('w', 1) == 1.25 else key['x'] -def _additional_validation(keyboard, info_data): # noqa: C901 +def _additional_validation(keyboard, info_data): """Non schema checks """ layouts = info_data.get('layouts', {}) @@ -105,14 +105,6 @@ def _additional_validation(keyboard, info_data): # noqa: C901 if not decl.get("aliases", []): _log_error(info_data, f'Keycode {decl["key"]} has no short form alias') - # Ensure LED config is somewhat valid - for feature in ['rgb_matrix', 'led_matrix']: - if feature in info_data and all(key in info_data[feature] for key in ["layout", "led_count"]): - layout_count = len(info_data[feature]["layout"]) - led_count = info_data[feature]["led_count"] - if led_count != layout_count: - _log_warning(info_data, '%s: mismatch between LED count (%d) and layout items (%d)' % (feature, led_count, layout_count)) - def _validate(keyboard, info_data): """Perform various validation on the provided info.json data |