diff --git a/radio/src/haptic.cpp b/radio/src/haptic.cpp index 3cbaf4cf4..ec0139795 100644 --- a/radio/src/haptic.cpp +++ b/radio/src/haptic.cpp @@ -58,16 +58,16 @@ void hapticQueue::heartbeat() hapticOn(g_eeGeneral.hapticStrength * 20); #else if (hapticTick-- > 0) { - HAPTIC_ON; + HAPTIC_ON(); } else { - HAPTIC_OFF; + HAPTIC_OFF(); hapticTick = g_eeGeneral.hapticStrength; } #endif } else { - HAPTIC_OFF; + HAPTIC_OFF(); if (buzzPause > 0) { buzzPause--; } diff --git a/radio/src/targets/gruvin9x/board_gruvin9x.h b/radio/src/targets/gruvin9x/board_gruvin9x.h index 73ddc822f..f44ba4ba6 100644 --- a/radio/src/targets/gruvin9x/board_gruvin9x.h +++ b/radio/src/targets/gruvin9x/board_gruvin9x.h @@ -186,8 +186,8 @@ void pwrOff(); // Haptic driver #define hapticOff() // TODO hapticOn() cleaner ... -#define HAPTIC_ON PORTD &= ~(1 << OUT_D_HAPTIC) -#define HAPTIC_OFF PORTD |= (1 << OUT_D_HAPTIC) +#define HAPTIC_ON() PORTD &= ~(1 << OUT_D_HAPTIC) +#define HAPTIC_OFF() PORTD |= (1 << OUT_D_HAPTIC) // Rotary encoder driver #if ROTARY_ENCODERS <= 2 diff --git a/radio/src/targets/mega2560/board_mega2560.h b/radio/src/targets/mega2560/board_mega2560.h index 42bb029f8..dcaf703de 100644 --- a/radio/src/targets/mega2560/board_mega2560.h +++ b/radio/src/targets/mega2560/board_mega2560.h @@ -189,7 +189,7 @@ void pwrOff(); // Haptic driver #define hapticOff() // TODO hapticOn() cleaner ... -#define HAPTIC_ON PORTD &= ~(1 << OUT_D_HAPTIC) -#define HAPTIC_OFF PORTD |= (1 << OUT_D_HAPTIC) +#define HAPTIC_ON() PORTD &= ~(1 << OUT_D_HAPTIC) +#define HAPTIC_OFF() PORTD |= (1 << OUT_D_HAPTIC) #endif diff --git a/radio/src/targets/sky9x/board_sky9x.h b/radio/src/targets/sky9x/board_sky9x.h index 237435f9b..89d8be49a 100644 --- a/radio/src/targets/sky9x/board_sky9x.h +++ b/radio/src/targets/sky9x/board_sky9x.h @@ -239,7 +239,7 @@ extern int8_t Coproc_maxtemp; // Haptic driver void hapticOff(void); void hapticOn(uint32_t pwmPercent); -#define HAPTIC_OFF hapticOff() +#define HAPTIC_OFF() hapticOff() // BlueTooth driver #if defined(BLUETOOTH) diff --git a/radio/src/targets/stock/board_stock.h b/radio/src/targets/stock/board_stock.h index 497232ad0..e0f7b33c7 100644 --- a/radio/src/targets/stock/board_stock.h +++ b/radio/src/targets/stock/board_stock.h @@ -231,8 +231,8 @@ void rotencPoll(); #endif // Haptic -#define HAPTIC_ON PORTG |= (1 << OUT_G_HAPTIC) -#define HAPTIC_OFF PORTG &= ~(1 << OUT_G_HAPTIC) +#define HAPTIC_ON() PORTG |= (1 << OUT_G_HAPTIC) +#define HAPTIC_OFF() PORTG &= ~(1 << OUT_G_HAPTIC) // USB fake driver #define usbPlugged() false diff --git a/radio/src/targets/taranis/board_taranis.h b/radio/src/targets/taranis/board_taranis.h index a84dff53e..dd697079a 100644 --- a/radio/src/targets/taranis/board_taranis.h +++ b/radio/src/targets/taranis/board_taranis.h @@ -243,8 +243,8 @@ void debugPutc(const char c); void hapticOff(void); void hapticOn(uint32_t pwmPercent); void hapticInit(void); -#define HAPTIC_OFF hapticOff() -#define HAPTIC_ON hapticOn(100) +#define HAPTIC_OFF() hapticOff() +#define HAPTIC_ON() hapticOn(100) extern uint8_t currentTrainerMode;