diff options
| author | QMK Bot <hello@qmk.fm> | 2021-05-09 03:46:23 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-05-09 03:46:23 +0000 |
| commit | d0a3bca9ecc6ccdc75218524b97b9cfb8a681baf (patch) | |
| tree | d34ec8bccab0a7ce104f575a6dca2762cd067b3a | |
| parent | 0e6359bce9c87cd2c7b1cd6d2527aca5caaf6273 (diff) | |
| parent | 60a39f4f5d192625ea03daf8cd26bc89aa1a91c2 (diff) | |
| download | qmk_firmware-d0a3bca9ecc6ccdc75218524b97b9cfb8a681baf.tar.gz qmk_firmware-d0a3bca9ecc6ccdc75218524b97b9cfb8a681baf.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | drivers/haptic/haptic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/haptic/haptic.h b/drivers/haptic/haptic.h index 5d3bd1c31..9223ad1c8 100644 --- a/drivers/haptic/haptic.h +++ b/drivers/haptic/haptic.h | |||
| @@ -41,7 +41,7 @@ typedef union { | |||
| 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 | uint16_t reserved : 7; | 44 | uint8_t reserved : 5; |
| 45 | }; | 45 | }; |
| 46 | } haptic_config_t; | 46 | } haptic_config_t; |
| 47 | 47 | ||