diff options
author | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
---|---|---|
committer | William Chang <william@factual.com> | 2019-11-20 22:17:07 -0800 |
commit | e7f4d56592b3975c38af329e77b4efd9108495e8 (patch) | |
tree | 0a416bccbf70bfdbdb9ffcdb3bf136b47378c014 /drivers/haptic/solenoid.h | |
parent | 71493b2f9bbd5f3d18373c518fa14ccafcbf48fc (diff) | |
parent | 8416a94ad27b3ff058576f09f35f0704a8b39ff3 (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'drivers/haptic/solenoid.h')
-rw-r--r-- | drivers/haptic/solenoid.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/haptic/solenoid.h b/drivers/haptic/solenoid.h index a08f62a11e..dd6ececa68 100644 --- a/drivers/haptic/solenoid.h +++ b/drivers/haptic/solenoid.h @@ -18,23 +18,19 @@ #pragma once #ifndef SOLENOID_DEFAULT_DWELL -#define SOLENOID_DEFAULT_DWELL 12 +# define SOLENOID_DEFAULT_DWELL 12 #endif #ifndef SOLENOID_MAX_DWELL -#define SOLENOID_MAX_DWELL 100 +# define SOLENOID_MAX_DWELL 100 #endif #ifndef SOLENOID_MIN_DWELL -#define SOLENOID_MIN_DWELL 4 -#endif - -#ifndef SOLENOID_ACTIVE -#define SOLENOID_ACTIVE false +# define SOLENOID_MIN_DWELL 4 #endif #ifndef SOLENOID_PIN -#define SOLENOID_PIN F6 +# error SOLENOID_PIN not defined #endif void solenoid_buzz_on(void); |