qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-09-29 05:18:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
QMK Bot
2025-04-23 00:28:22 +00:00
parent 9ea0205881 8cd71917ce
commit 2adda0fcd2
4 changed files with 72 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/python/qmk/info.py
+3 -13
View File
@@ -1072,23 +1072,13 @@ def get_modules(keyboard, keymap_filename):
"""
modules = []
kb_info_json = info_json(keyboard)
modules.extend(kb_info_json.get('modules', []))
if keymap_filename:
keymap_json = parse_configurator_json(keymap_filename)
if keymap_json:
kb = keymap_json.get('keyboard', None)
if not kb:
kb = keyboard
if kb:
kb_info_json = info_json(kb)
if kb_info_json:
modules.extend(kb_info_json.get('modules', []))
modules.extend(keymap_json.get('modules', []))
elif keyboard:
kb_info_json = info_json(keyboard)
modules.extend(kb_info_json.get('modules', []))
return list(dict.fromkeys(modules)) # remove dupes