diff options
Diffstat (limited to 'drivers/haptic')
| -rw-r--r-- | drivers/haptic/solenoid.c | 5 | ||||
| -rw-r--r-- | drivers/haptic/solenoid.h | 2 | 
2 files changed, 4 insertions, 3 deletions
| diff --git a/drivers/haptic/solenoid.c b/drivers/haptic/solenoid.c index 637a77da3d..4e43903255 100644 --- a/drivers/haptic/solenoid.c +++ b/drivers/haptic/solenoid.c @@ -20,11 +20,12 @@  #include "haptic.h"  #include "gpio.h"  #include "usb_device_state.h" +#include "util.h"  #include <stdlib.h>  uint8_t      solenoid_dwell  = SOLENOID_DEFAULT_DWELL;  static pin_t solenoid_pads[] = SOLENOID_PINS; -#define NUMBER_OF_SOLENOIDS (sizeof(solenoid_pads) / sizeof(pin_t)) +#define NUMBER_OF_SOLENOIDS ARRAY_SIZE(solenoid_pads)  bool     solenoid_on[NUMBER_OF_SOLENOIDS]      = {false};  bool     solenoid_buzzing[NUMBER_OF_SOLENOIDS] = {false};  uint16_t solenoid_start[NUMBER_OF_SOLENOIDS]   = {0}; @@ -147,7 +148,7 @@ void solenoid_check(void) {  void solenoid_setup(void) {  #ifdef SOLENOID_PINS_ACTIVE_STATE      bool    state_temp[] = SOLENOID_PINS_ACTIVE_STATE; -    uint8_t bound_check  = (sizeof(state_temp) / sizeof(bool)); +    uint8_t bound_check  = ARRAY_SIZE(state_temp);  #endif      for (uint8_t i = 0; i < NUMBER_OF_SOLENOIDS; i++) { diff --git a/drivers/haptic/solenoid.h b/drivers/haptic/solenoid.h index 952f86e922..17f5345bc6 100644 --- a/drivers/haptic/solenoid.h +++ b/drivers/haptic/solenoid.h @@ -54,7 +54,7 @@  #    endif  #endif -void solenoidbuzz_on(void); +void solenoid_buzz_on(void);  void solenoid_buzz_off(void);  void solenoid_set_buzz(uint8_t buzz); | 
