diff options
| author | Nick Brassel <[email protected]> | 2023-08-29 21:24:43 +1000 | 
|---|---|---|
| committer | Nick Brassel <[email protected]> | 2023-08-29 21:24:43 +1000 | 
| commit | 31a91add168c956655ace8ec4cf9750db1e2cfc6 (patch) | |
| tree | 12cea9b5f8e769f9611a31cbaede9537edad71cc /lib/python/qmk/cli/generate/keyboard_h.py | |
| parent | f07490bc092e365ba03dc685b3fc30ad0bf0b752 (diff) | |
| parent | edaf8a87ef3164f8986b0a8eb171d4879b45414c (diff) | |
| download | qmk_firmware-31a91add168c956655ace8ec4cf9750db1e2cfc6.tar.gz qmk_firmware-31a91add168c956655ace8ec4cf9750db1e2cfc6.zip | |
Merge branch 'develop'0.22.0
Diffstat (limited to 'lib/python/qmk/cli/generate/keyboard_h.py')
| -rwxr-xr-x | lib/python/qmk/cli/generate/keyboard_h.py | 15 | 
1 files changed, 10 insertions, 5 deletions
| diff --git a/lib/python/qmk/cli/generate/keyboard_h.py b/lib/python/qmk/cli/generate/keyboard_h.py index fa4036e39a..b9e89032b9 100755 --- a/lib/python/qmk/cli/generate/keyboard_h.py +++ b/lib/python/qmk/cli/generate/keyboard_h.py @@ -37,14 +37,19 @@ def _generate_layouts(keyboard, kb_info_json):              row, col = key_data['matrix']              identifier = f'k{ROW_LETTERS[row]}{COL_LETTERS[col]}' -            try: -                layout_matrix[row][col] = identifier -                layout_keys.append(identifier) -            except IndexError: +            if row >= row_num or col >= col_num:                  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 [] +            layout_matrix[row][col] = identifier +            layout_keys.append(identifier) +          lines.append('')          lines.append(f'#define {layout_name}({", ".join(layout_keys)}) {{ \\') | 
