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

2 files changed, 11 insertions, 8 deletions

diff --git a/drivers/haptic/haptic.h b/drivers/haptic/haptic.h
index 9223ad1c81..ba8e0d20be 100644
--- a/drivers/haptic/haptic.h
+++ b/drivers/haptic/haptic.h
@@ -34,13 +34,13 @@
 typedef union {
     uint32_t raw;
     struct {
-        bool     enable : 1;
-        uint8_t  feedback : 2;
-        uint8_t  mode : 7;
-        bool     buzz : 1;
-        uint8_t  dwell : 7;
-        bool     cont : 1;
-        uint8_t  amplitude : 8;
+        bool    enable : 1;
+        uint8_t feedback : 2;
+        uint8_t mode : 7;
+        bool    buzz : 1;
+        uint8_t dwell : 7;
+        bool    cont : 1;
+        uint8_t amplitude : 8;
         uint8_t reserved : 5;
     };
 } haptic_config_t;
diff --git a/lib/python/qmk/cli/multibuild.py b/lib/python/qmk/cli/multibuild.py
index 1f3a097704..517513fc66 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):
     def _rules_mk_filter(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 _rules_mk_filter
 
 
@@ -69,7 +70,9 @@ all: {keyboard_safe}_binary
 		|| printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:default"
 	@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)