diff options
-rw-r--r-- | drivers/haptic/haptic.h | 14 | ||||
-rwxr-xr-x | lib/python/qmk/cli/multibuild.py | 5 |
2 files changed, 11 insertions, 8 deletions
diff --git a/drivers/haptic/haptic.h b/drivers/haptic/haptic.h index 9223ad1c8..ba8e0d20b 100644 --- a/drivers/haptic/haptic.h +++ b/drivers/haptic/haptic.h | |||
@@ -34,13 +34,13 @@ | |||
34 | typedef union { | 34 | typedef union { |
35 | uint32_t raw; | 35 | uint32_t raw; |
36 | struct { | 36 | struct { |
37 | bool enable : 1; | 37 | bool enable : 1; |
38 | uint8_t feedback : 2; | 38 | uint8_t feedback : 2; |
39 | uint8_t mode : 7; | 39 | uint8_t mode : 7; |
40 | bool buzz : 1; | 40 | bool buzz : 1; |
41 | uint8_t dwell : 7; | 41 | uint8_t dwell : 7; |
42 | bool cont : 1; | 42 | bool cont : 1; |
43 | uint8_t amplitude : 8; | 43 | uint8_t amplitude : 8; |
44 | uint8_t reserved : 5; | 44 | uint8_t reserved : 5; |
45 | }; | 45 | }; |
46 | } haptic_config_t; | 46 | } haptic_config_t; |
diff --git a/lib/python/qmk/cli/multibuild.py b/lib/python/qmk/cli/multibuild.py index 1f3a09770..517513fc6 100755 --- a/lib/python/qmk/cli/multibuild.py +++ b/lib/python/qmk/cli/multibuild.py | |||
@@ -16,6 +16,7 @@ def _make_rules_mk_filter(key, value): | |||
16 | def _rules_mk_filter(keyboard_name): | 16 | def _rules_mk_filter(keyboard_name): |
17 | rules_mk = qmk.keyboard.rules_mk(keyboard_name) | 17 | rules_mk = qmk.keyboard.rules_mk(keyboard_name) |
18 | return True if key in rules_mk and rules_mk[key].lower() == str(value).lower() else False | 18 | return True if key in rules_mk and rules_mk[key].lower() == str(value).lower() else False |
19 | |||
19 | return _rules_mk_filter | 20 | return _rules_mk_filter |
20 | 21 | ||
21 | 22 | ||
@@ -69,7 +70,9 @@ all: {keyboard_safe}_binary | |||
69 | || printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:default" | 70 | || printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:default" |
70 | @rm -f "{QMK_FIRMWARE}/.build/build.log.{keyboard_safe}" || true | 71 | @rm -f "{QMK_FIRMWARE}/.build/build.log.{keyboard_safe}" || true |
71 | 72 | ||
72 | """ # noqa: yapf should not care about the formatting of the Makefile | 73 | """ |
74 | |||
75 | # noqa: yapf should not care about the formatting of the Makefile | ||
73 | ) | 76 | ) |
74 | 77 | ||
75 | cli.run([make_cmd, '-j', str(cli.args.parallel), '-f', makefile, 'all'], capture_output=False, text=False) | 78 | cli.run([make_cmd, '-j', str(cli.args.parallel), '-f', makefile, 'all'], capture_output=False, text=False) |