sporq/qmk-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix incorrect g_led_config generation (#18431)

Browse Source
This commit is contained in:
Ryan 2022-09-21 11:41:18 +10:00 committed by GitHub
parent 89a1374ef4
commit 591701cdf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lib/python/qmk/info.py
View File

@ -613,20 +613,24 @@ def _extract_led_config(info_data, keyboard):
cols = info_data['matrix_size']['cols'] cols = info_data['matrix_size']['cols']
rows = info_data['matrix_size']['rows'] rows = info_data['matrix_size']['rows']
# Assume what feature owns g_led_config # Determine what feature owns g_led_config
feature = "rgb_matrix" features = info_data.get("features", {})
if info_data.get("features", {}).get("led_matrix", False): feature = None
if features.get("rgb_matrix", False):
feature = "rgb_matrix"
elif features.get("led_matrix", False):
feature = "led_matrix" feature = "led_matrix"
# Process if feature:
for file in find_keyboard_c(keyboard): # Process
try: for file in find_keyboard_c(keyboard):
ret = find_led_config(file, cols, rows) try:
if ret: ret = find_led_config(file, cols, rows)
info_data[feature] = info_data.get(feature, {}) if ret:
info_data[feature]["layout"] = ret info_data[feature] = info_data.get(feature, {})
except Exception as e: info_data[feature]["layout"] = ret
_log_warning(info_data, f'led_config: {file.name}: {e}') except Exception as e:
_log_warning(info_data, f'led_config: {file.name}: {e}')
return info_data return info_data