diff options
author | Zach White <skullydazed@gmail.com> | 2020-12-01 16:04:22 -0800 |
---|---|---|
committer | Zach White <skullydazed@drpepper.org> | 2021-01-07 21:21:12 -0800 |
commit | b2c26f7cdd4b268e80f98cae7f444956559436ec (patch) | |
tree | a621c5ac6baee49c128ada7f9af940d50440eb3e /lib/python/qmk/cli/generate | |
parent | 266a85eda0cbb63852565d0c1d7ddb24700b8c1f (diff) | |
download | qmk_firmware-b2c26f7cdd4b268e80f98cae7f444956559436ec.tar.gz qmk_firmware-b2c26f7cdd4b268e80f98cae7f444956559436ec.zip |
get qmk generate-api into a good state
Diffstat (limited to 'lib/python/qmk/cli/generate')
-rwxr-xr-x | lib/python/qmk/cli/generate/api.py | 2 | ||||
-rwxr-xr-x | lib/python/qmk/cli/generate/rules_mk.py | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/python/qmk/cli/generate/api.py b/lib/python/qmk/cli/generate/api.py index 6d111f244..2fda38fc9 100755 --- a/lib/python/qmk/cli/generate/api.py +++ b/lib/python/qmk/cli/generate/api.py | |||
@@ -48,7 +48,7 @@ def generate_api(cli): | |||
48 | if 'vid' in usb and usb['vid'] not in usb_list['devices']: | 48 | if 'vid' in usb and usb['vid'] not in usb_list['devices']: |
49 | usb_list['devices'][usb['vid']] = {} | 49 | usb_list['devices'][usb['vid']] = {} |
50 | 50 | ||
51 | if 'pid' in usb and usb['pid'] not in usb_list['devices'][usb['vid']]: | 51 | if 'vid' in usb and usb['pid'] not in usb_list['devices'][usb['vid']]: |
52 | usb_list['devices'][usb['vid']][usb['pid']] = {} | 52 | usb_list['devices'][usb['vid']][usb['pid']] = {} |
53 | 53 | ||
54 | if 'vid' in usb and 'pid' in usb: | 54 | if 'vid' in usb and 'pid' in usb: |
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py index 72ed3c45f..570ef5a0d 100755 --- a/lib/python/qmk/cli/generate/rules_mk.py +++ b/lib/python/qmk/cli/generate/rules_mk.py | |||
@@ -41,9 +41,12 @@ def generate_rules_mk(cli): | |||
41 | # Find features that should be enabled | 41 | # Find features that should be enabled |
42 | if 'features' in kb_info_json: | 42 | if 'features' in kb_info_json: |
43 | for feature, enabled in kb_info_json['features'].items(): | 43 | for feature, enabled in kb_info_json['features'].items(): |
44 | feature = feature.upper() | 44 | if feature == 'bootmagic_lite' and enabled: |
45 | enabled = 'yes' if enabled else 'no' | 45 | rules_mk_lines.append(f'BOOTMAGIC_ENABLE := lite') |
46 | rules_mk_lines.append(f'{feature}_ENABLE := {enabled}') | 46 | else: |
47 | feature = feature.upper() | ||
48 | enabled = 'yes' if enabled else 'no' | ||
49 | rules_mk_lines.append(f'{feature}_ENABLE := {enabled}') | ||
47 | 50 | ||
48 | # Set the LED driver | 51 | # Set the LED driver |
49 | if 'led_matrix' in kb_info_json and 'driver' in kb_info_json['led_matrix']: | 52 | if 'led_matrix' in kb_info_json and 'driver' in kb_info_json['led_matrix']: |