masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CLI: Improve error messages when layout key matrix row/col is OOB (#21640)

This commit is contained in:
Ryan 2023-07-31 09:34:19 +10:00 committed by GitHub
parent fa4d51dab7
commit 030511ece3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/python/qmk/cli/generate/keyboard_h.py
View File

@ -37,14 +37,19 @@ def _generate_layouts(keyboard, kb_info_json):
row, col = key_data['matrix'] row, col = key_data['matrix']
identifier = f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}' identifier = f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}'
try: if row >= row_num or col >= col_num:
layout_matrix[row][col] = identifier
layout_keys.append(identifier)
except IndexError:
key_name = key_data.get('label', identifier) key_name = key_data.get('label', identifier)
cli.log.error(f'{keyboard}/{layout_name}: Matrix data out of bounds at index {index} ({key_name}): [{row}, {col}]') 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}')
return [] return []
layout_matrix[row][col] = identifier
layout_keys.append(identifier)
lines.append('') lines.append('')
lines.append(f'#define {layout_name}({", ".join(layout_keys)}) {{ \\') lines.append(f'#define {layout_name}({", ".join(layout_keys)}) {{ \\')