diff options
Diffstat (limited to 'lib/python/qmk/info.py')
| -rw-r--r-- | lib/python/qmk/info.py | 16 |
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): | |||
| 1066 | """ | 1066 | """ |
| 1067 | modules = [] | 1067 | modules = [] |
| 1068 | 1068 | ||
| 1069 | kb_info_json = info_json(keyboard) | ||
| 1070 | modules.extend(kb_info_json.get('modules', [])) | ||
| 1071 | |||
| 1069 | if keymap_filename: | 1072 | if keymap_filename: |
| 1070 | keymap_json = parse_configurator_json(keymap_filename) | 1073 | keymap_json = parse_configurator_json(keymap_filename) |
| 1071 | 1074 | ||
| 1072 | if keymap_json: | 1075 | if keymap_json: |
| 1073 | kb = keymap_json.get('keyboard', None) | ||
| 1074 | if not kb: | ||
| 1075 | kb = keyboard | ||
| 1076 | |||
| 1077 | if kb: | ||
| 1078 | kb_info_json = info_json(kb) | ||
| 1079 | if kb_info_json: | ||
| 1080 | modules.extend(kb_info_json.get('modules', [])) | ||
| 1081 | |||
| 1082 | modules.extend(keymap_json.get('modules', [])) | 1076 | modules.extend(keymap_json.get('modules', [])) |
| 1083 | 1077 | ||
| 1084 | elif keyboard: | ||
| 1085 | kb_info_json = info_json(keyboard) | ||
| 1086 | modules.extend(kb_info_json.get('modules', [])) | ||
| 1087 | |||
| 1088 | return list(dict.fromkeys(modules)) # remove dupes | 1078 | return list(dict.fromkeys(modules)) # remove dupes |
