From b68e89f8466d6b0f33543a34db84acdbae46f734 Mon Sep 17 00:00:00 2001 From: Purdea Andrei Date: Sat, 2 Dec 2023 23:50:34 +0200 Subject: [PATCH] Don't print error message when there are no row pins and no col pins (#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 --------- Co-authored-by: Joel Challis Co-authored-by: Nick Brassel --- lib/python/qmk/info.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py index 3efd34555c..d51741ecb6 100644 --- a/lib/python/qmk/info.py +++ b/lib/python/qmk/info.py @@ -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.