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

2021-05-09 03:46:23 +00:00 · 2021-05-09 03:46:23 +00:00 · d0a3bca9ec
parent 0e6359bce9 60a39f4f5d
commit d0a3bca9ec
1 changed files with 1 additions and 1 deletions
--- 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;