summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-05-09 03:46:23 +0000
committerQMK Bot <hello@qmk.fm>2021-05-09 03:46:23 +0000
commitd0a3bca9ecc6ccdc75218524b97b9cfb8a681baf (patch)
treed34ec8bccab0a7ce104f575a6dca2762cd067b3a /drivers
parent0e6359bce9c87cd2c7b1cd6d2527aca5caaf6273 (diff)
parent60a39f4f5d192625ea03daf8cd26bc89aa1a91c2 (diff)
downloadqmk_firmware-d0a3bca9ecc6ccdc75218524b97b9cfb8a681baf.tar.gz
qmk_firmware-d0a3bca9ecc6ccdc75218524b97b9cfb8a681baf.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
-rw-r--r--drivers/haptic/haptic.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/haptic/haptic.h b/drivers/haptic/haptic.h
index 5d3bd1c310..9223ad1c81 100644
--- a/drivers/haptic/haptic.h
+++ b/drivers/haptic/haptic.h
@@ -41,7 +41,7 @@ typedef union {
uint8_t dwell : 7;
bool cont : 1;
uint8_t amplitude : 8;
- uint16_t reserved : 7;
+ uint8_t reserved : 5;
};
} haptic_config_t;