aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/cli/generate
diff options
context:
space:
mode:
authorJoel Challis <[email protected]>2024-01-22 11:35:51 +0000
committerGitHub <[email protected]>2024-01-22 11:35:51 +0000
commit58721a433b81790368386cf117347e5bd31fa961 (patch)
tree785358aae2cdb965dc4aedc416884f198b8cbc36 /lib/python/qmk/cli/generate
parent1522695cefae93f8b8c609b33ae539dd3c6463e5 (diff)
downloadqmk_firmware-58721a433b81790368386cf117347e5bd31fa961.tar.gz
qmk_firmware-58721a433b81790368386cf117347e5bd31fa961.zip
Move layout macro OOB checks to lint (#22610)
Diffstat (limited to 'lib/python/qmk/cli/generate')
-rwxr-xr-xlib/python/qmk/cli/generate/keyboard_h.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/python/qmk/cli/generate/keyboard_h.py b/lib/python/qmk/cli/generate/keyboard_h.py
index b9e89032b9..5863a0983a 100755
--- a/lib/python/qmk/cli/generate/keyboard_h.py
+++ b/lib/python/qmk/cli/generate/keyboard_h.py
@@ -33,18 +33,11 @@ def _generate_layouts(keyboard, kb_info_json):
layout_keys = []
layout_matrix = [['KC_NO'] * col_num for _ in range(row_num)]
- for index, key_data in enumerate(layout_data['layout']):
+ for key_data in layout_data['layout']:
row, col = key_data['matrix']
identifier = f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}'
-
if row >= row_num or col >= col_num:
- key_name = key_data.get('label', identifier)
- if row >= row_num:
- cli.log.error(f'{keyboard}/{layout_name}: Matrix row for key {index} ({key_name}) is {row} but must be less than {row_num}')
-
- if col >= col_num:
- cli.log.error(f'{keyboard}/{layout_name}: Matrix column for key {index} ({key_name}) is {col} but must be less than {col_num}')
-
+ cli.log.error(f'Skipping layouts due to {layout_name} containing invalid matrix values')
return []
layout_matrix[row][col] = identifier