poz/qmk_firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't print error message when there are no row pins and no col pins (#20104)

Browse source 
* 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>
This commit is contained in:
Purdea Andrei 2023-12-02 23:50:34 +02:00 committed by GitHub
parent afa0eab374
commit b68e89f846
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/python/qmk/info.py
View file

@ -743,6 +743,9 @@ def _check_matrix(info_data):
elif 'cols' in info_data['matrix_pins'] and 'rows' in info_data['matrix_pins']: elif 'cols' in info_data['matrix_pins'] and 'rows' in info_data['matrix_pins']:
col_count = len(info_data['matrix_pins']['cols']) col_count = len(info_data['matrix_pins']['cols'])
row_count = len(info_data['matrix_pins']['rows']) 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): 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. # FIXME: once we can we should detect if split is enabled to do the actual_col_count/2 check.