drashna/qmk_firmware
1
0
Fork 0
Code Activity Actions

Merge remote-tracking branch 'origin/master' into develop

Browse source
This commit is contained in:
Joshua Diamond 2022-09-12 18:57:58 -04:00
commit 23e12497b2
39 changed files with 1583 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -370,7 +370,7 @@ def _extract_split_right_pins(info_data, config_c):
direct_pins = config_c.get('DIRECT_PINS_RIGHT', '').replace(' ', '')[1:-1]
if row_pins or col_pins or direct_pins:
if info_data.get('split', {}).get('matrix_pins', {}).get('right') in info_data:
if info_data.get('split', {}).get('matrix_pins', {}).get('right', None):
_log_warning(info_data, 'Right hand matrix data is specified in both info.json and config.h, the config.h values win.')
if 'split' not in info_data: