Skip to content

Commit

Permalink
Don't print error message when there are no row pins and no col pins (q…
Browse files Browse the repository at this point in the history
…mk#20104)

* Don't print error message when there are no row pins and no col pins

This error message could be triggered for example if MATRIX_IO_DELAY is
configured in config.h, but the matrix is a custom one. The custom matrix
can still call back to existing delay functions that make use of the
MATRIX_IO_DELAY macro. In this case 'matrix_pins' in info_data will be true,
but there will be no 'direct' 'cols' or 'rows' in info_data['matrix_pins'],
and without this commit it would trigger an invalid error.

* Update lib/python/qmk/info.py

Co-authored-by: Nick Brassel <nick@tzarc.org>

---------

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Nick Brassel <nick@tzarc.org>
  • Loading branch information
3 people authored and zgagnon committed Dec 15, 2023
1 parent 2c44e2d commit 19fbf99
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions lib/python/qmk/info.py
Original file line number Diff line number Diff line change
Expand Up @@ -743,6 +743,9 @@ def _check_matrix(info_data):
elif 'cols' in info_data['matrix_pins'] and 'rows' in info_data['matrix_pins']:
col_count = len(info_data['matrix_pins']['cols'])
row_count = len(info_data['matrix_pins']['rows'])
elif 'cols' not in info_data['matrix_pins'] and 'rows' not in info_data['matrix_pins']:
# This case caters for custom matrix implementations where normal rows/cols are specified
return

if col_count != actual_col_count and col_count != (actual_col_count / 2):
# FIXME: once we can we should detect if split is enabled to do the actual_col_count/2 check.
Expand Down

0 comments on commit 19fbf99

Please sign in to comment.