diff options
| author | QMK Bot <hello@qmk.fm> | 2021-05-09 17:15:32 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-05-09 17:15:32 +0000 |
| commit | ad1244e2cf0df975073eaac1343d74241bbf934b (patch) | |
| tree | f173d3186ef555a5173a4ea8e2c0d9f72d934063 /drivers/haptic/haptic.h | |
| parent | 62c3e3d11f6956b34966a320cb6897195a2428be (diff) | |
| parent | 6c5e94061c05c94a2404d4edcca4882cdfca844e (diff) | |
| download | qmk_firmware-ad1244e2cf0df975073eaac1343d74241bbf934b.tar.gz qmk_firmware-ad1244e2cf0df975073eaac1343d74241bbf934b.zip | |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers/haptic/haptic.h')
| -rw-r--r-- | drivers/haptic/haptic.h | 14 |
1 files changed, 7 insertions, 7 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; |