From 667dd5fe9e0a7f3a6db7688e6a3f92c863c4dbe7 Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 29 Apr 2014 10:08:54 +0200 Subject: [PATCH] Haptic / Taranis fix --- radio/src/targets/taranis/board_taranis.h | 7 ++++++- radio/src/targets/taranis/haptic_driver.cpp | 11 +++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h index 0802db102..889d6c4dc 100644 --- a/radio/src/targets/taranis/board_taranis.h +++ b/radio/src/targets/taranis/board_taranis.h @@ -242,8 +242,13 @@ void debugPutc(const char c); // Haptic driver void hapticInit(void); void hapticOff(void); -void hapticOn(uint32_t pwmPercent); #define HAPTIC_OFF() hapticOff() +#if defined(REVPLUS) + void hapticOn(uint32_t pwmPercent); +#else + void hapticOn(); + #define HAPTIC_ON() hapticOn() +#endif extern uint8_t currentTrainerMode; diff --git a/radio/src/targets/taranis/haptic_driver.cpp b/radio/src/targets/taranis/haptic_driver.cpp index 8fe82268c..c3b910995 100644 --- a/radio/src/targets/taranis/haptic_driver.cpp +++ b/radio/src/targets/taranis/haptic_driver.cpp @@ -39,22 +39,25 @@ void hapticOff(void) { #if defined(REVPLUS) - return; //TODO PWM support + return; // TODO PWM support #else GPIO_ResetBits(GPIO_HAPTIC, PIN_HAPTIC); #endif } +#if defined(REVPLUS) void hapticOn(uint32_t pwmPercent) { -#if defined(REVPLUS) // pwmPercent 0-100 - return; //TODO PWM support + return; // TODO PWM support +} #else +void hapticOn() +{ // No PWM before REVPLUS GPIO_SetBits(GPIO_HAPTIC, PIN_HAPTIC); -#endif } +#endif void hapticInit(void) {