aboutsummaryrefslogtreecommitdiff
path: root/lib/python/qmk/info.py
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2025-05-26 21:41:49 +1000
committerNick Brassel <[email protected]>2025-05-26 21:41:49 +1000
commit75a037d2f0f9c54bad8e2f68ae82134559c92f22 (patch)
tree2b264de0e7a724c30cca511a9bac7ad29705d1a2 /lib/python/qmk/info.py
parent28720c4d343a9c5e9f5a62dbd583dbf536a2e61e (diff)
parent3703699757b6ce938ff412aca0a8b064927c0cdb (diff)
downloadqmk_firmware-75a037d2f0f9c54bad8e2f68ae82134559c92f22.tar.gz
qmk_firmware-75a037d2f0f9c54bad8e2f68ae82134559c92f22.zip
Merge remote-tracking branch 'upstream/develop'0.29.0
Diffstat (limited to 'lib/python/qmk/info.py')
-rw-r--r--lib/python/qmk/info.py16
1 files changed, 3 insertions, 13 deletions
diff --git a/lib/python/qmk/info.py b/lib/python/qmk/info.py
index 93eba7376a..d95fd3d799 100644
--- a/lib/python/qmk/info.py
+++ b/lib/python/qmk/info.py
@@ -1066,23 +1066,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