masq
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
QMK Bot 2021-05-09 17:15:32 +00:00
parent 62c3e3d11f 6c5e94061c
commit ad1244e2cf
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/haptic/haptic.h
View File

@ -34,13 +34,13 @@
typedef union { typedef union {
uint32_t raw; uint32_t raw;
struct { struct {
bool enable : 1; bool enable : 1;
uint8_t feedback : 2; uint8_t feedback : 2;
uint8_t mode : 7; uint8_t mode : 7;
bool buzz : 1; bool buzz : 1;
uint8_t dwell : 7; uint8_t dwell : 7;
bool cont : 1; bool cont : 1;
uint8_t amplitude : 8; uint8_t amplitude : 8;
uint8_t reserved : 5; uint8_t reserved : 5;
}; };
} haptic_config_t; } haptic_config_t;

5
lib/python/qmk/cli/multibuild.py
View File

@ -16,6 +16,7 @@ def _make_rules_mk_filter(key, value):
def _rules_mk_filter(keyboard_name): def _rules_mk_filter(keyboard_name):
rules_mk = qmk.keyboard.rules_mk(keyboard_name) rules_mk = qmk.keyboard.rules_mk(keyboard_name)
return True if key in rules_mk and rules_mk[key].lower() == str(value).lower() else False return True if key in rules_mk and rules_mk[key].lower() == str(value).lower() else False
return _rules_mk_filter return _rules_mk_filter
@ -69,7 +70,9 @@ all: {keyboard_safe}_binary
|| printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:default" || printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:default"
@rm -f "{QMK_FIRMWARE}/.build/build.log.{keyboard_safe}" || true @rm -f "{QMK_FIRMWARE}/.build/build.log.{keyboard_safe}" || true
""" # noqa: yapf should not care about the formatting of the Makefile """
# noqa: yapf should not care about the formatting of the Makefile
) )
cli.run([make_cmd, '-j', str(cli.args.parallel), '-f', makefile, 'all'], capture_output=False, text=False) cli.run([make_cmd, '-j', str(cli.args.parallel), '-f', makefile, 'all'], capture_output=False, text=False)