diff options
author | QMK Bot <hello@qmk.fm> | 2021-03-24 16:27:28 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-03-24 16:27:28 +0000 |
commit | 0dc0516f0c38ce1eb5e7e2ec2a69b743c33e9ce6 (patch) | |
tree | d38b0682e31545e5875a7cddf4e473fd67dd0ad7 /lib/python/qmk/keyboard.py | |
parent | 743d6c430bf09710be9a1055c353fbbceed939ac (diff) | |
parent | 299008be36076343edadb7a36bf2fff820425ad1 (diff) | |
download | qmk_firmware-0dc0516f0c38ce1eb5e7e2ec2a69b743c33e9ce6.tar.gz qmk_firmware-0dc0516f0c38ce1eb5e7e2ec2a69b743c33e9ce6.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'lib/python/qmk/keyboard.py')
-rw-r--r-- | lib/python/qmk/keyboard.py | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/lib/python/qmk/keyboard.py b/lib/python/qmk/keyboard.py index a4c287375..89f9346c4 100644 --- a/lib/python/qmk/keyboard.py +++ b/lib/python/qmk/keyboard.py | |||
@@ -7,7 +7,9 @@ import os | |||
7 | from glob import glob | 7 | from glob import glob |
8 | 8 | ||
9 | from qmk.c_parse import parse_config_h_file | 9 | from qmk.c_parse import parse_config_h_file |
10 | from qmk.json_schema import json_load | ||
10 | from qmk.makefile import parse_rules_mk_file | 11 | from qmk.makefile import parse_rules_mk_file |
12 | from qmk.path import is_keyboard | ||
11 | 13 | ||
12 | BOX_DRAWING_CHARACTERS = { | 14 | BOX_DRAWING_CHARACTERS = { |
13 | "unicode": { | 15 | "unicode": { |
@@ -31,6 +33,28 @@ BOX_DRAWING_CHARACTERS = { | |||
31 | base_path = os.path.join(os.getcwd(), "keyboards") + os.path.sep | 33 | base_path = os.path.join(os.getcwd(), "keyboards") + os.path.sep |
32 | 34 | ||
33 | 35 | ||
36 | def keyboard_folder(keyboard): | ||
37 | """Returns the actual keyboard folder. | ||
38 | |||
39 | This checks aliases and DEFAULT_FOLDER to resolve the actual path for a keyboard. | ||
40 | """ | ||
41 | aliases = json_load(Path('data/mappings/keyboard_aliases.json')) | ||
42 | |||
43 | if keyboard in aliases: | ||
44 | keyboard = aliases[keyboard].get('target', keyboard) | ||
45 | |||
46 | rules_mk_file = Path(base_path, keyboard, 'rules.mk') | ||
47 | |||
48 | if rules_mk_file.exists(): | ||
49 | rules_mk = parse_rules_mk_file(rules_mk_file) | ||
50 | keyboard = rules_mk.get('DEFAULT_FOLDER', keyboard) | ||
51 | |||
52 | if not is_keyboard(keyboard): | ||
53 | raise ValueError(f'Invalid keyboard: {keyboard}') | ||
54 | |||
55 | return keyboard | ||
56 | |||
57 | |||
34 | def _find_name(path): | 58 | def _find_name(path): |
35 | """Determine the keyboard name by stripping off the base_path and rules.mk. | 59 | """Determine the keyboard name by stripping off the base_path and rules.mk. |
36 | """ | 60 | """ |