From 74b43c478bb1d40094a9d125c0968279c3e56ef5 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Fri, 12 Jun 2015 16:26:36 +0200
Subject: [PATCH] Cosmetics

---
 radio/src/haptic.cpp                        | 6 +++---
 radio/src/targets/gruvin9x/board_gruvin9x.h | 5 ++---
 radio/src/targets/mega2560/board_mega2560.h | 5 ++---
 radio/src/targets/sky9x/board_sky9x.h       | 1 -
 radio/src/targets/stock/board_stock.h       | 4 ++--
 radio/src/targets/taranis/board_taranis.h   | 2 --
 6 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/radio/src/haptic.cpp b/radio/src/haptic.cpp
index abf2a7dd8..2a8e661bd 100644
--- a/radio/src/haptic.cpp
+++ b/radio/src/haptic.cpp
@@ -58,16 +58,16 @@ void hapticQueue::heartbeat()
     hapticOn(HAPTIC_STRENGTH() * 20);
 #else
     if (hapticTick-- > 0) {
-      HAPTIC_ON();
+      hapticOn();
     }
     else {
-      HAPTIC_OFF();
+      hapticOff();
       hapticTick = HAPTIC_STRENGTH();
     }
 #endif
   }
   else {
-    HAPTIC_OFF();
+    hapticOff();
     if (buzzPause > 0) {
       buzzPause--;
     }
diff --git a/radio/src/targets/gruvin9x/board_gruvin9x.h b/radio/src/targets/gruvin9x/board_gruvin9x.h
index 1b94273de..b7b93cd5b 100644
--- a/radio/src/targets/gruvin9x/board_gruvin9x.h
+++ b/radio/src/targets/gruvin9x/board_gruvin9x.h
@@ -165,9 +165,8 @@ void pwrOff();
 #define usbPlugged()               false
 
 // Haptic driver
-#define hapticOff()                // TODO hapticOn() cleaner ...
-#define HAPTIC_ON()                PORTD &= ~(1 << OUT_D_HAPTIC)
-#define HAPTIC_OFF()               PORTD |=  (1 << OUT_D_HAPTIC)
+#define hapticOn()                 PORTD &= ~(1 << OUT_D_HAPTIC)
+#define hapticOff()                PORTD |=  (1 << OUT_D_HAPTIC)
 
 // Rotary encoder driver
 #define REA_DOWN()                 (~PIND & 0x20)
diff --git a/radio/src/targets/mega2560/board_mega2560.h b/radio/src/targets/mega2560/board_mega2560.h
index d8df6481a..eb9cde112 100644
--- a/radio/src/targets/mega2560/board_mega2560.h
+++ b/radio/src/targets/mega2560/board_mega2560.h
@@ -162,9 +162,8 @@ void pwrOff();
 #define usbPlugged()               false
 
 // Haptic driver
-#define hapticOff()                // TODO hapticOn() cleaner ...
-#define HAPTIC_ON()                PORTH |=  (1 << OUT_H_HAPTIC)
-#define HAPTIC_OFF()               PORTH &= ~(1 << OUT_H_HAPTIC)
+#define hapticOn()                 PORTH |=  (1 << OUT_H_HAPTIC)
+#define hapticOff()                PORTH &= ~(1 << OUT_H_HAPTIC)
 
 // Buzzer driver
 #define buzzerOn()                 PORTB |=  (1 << OUT_B_BUZZER)
diff --git a/radio/src/targets/sky9x/board_sky9x.h b/radio/src/targets/sky9x/board_sky9x.h
index 434160dbf..27004f54f 100644
--- a/radio/src/targets/sky9x/board_sky9x.h
+++ b/radio/src/targets/sky9x/board_sky9x.h
@@ -254,7 +254,6 @@ extern int8_t Coproc_maxtemp;
 // Haptic driver
 void hapticOff(void);
 void hapticOn(uint32_t pwmPercent);
-#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 b0845cedb..abc50468e 100644
--- a/radio/src/targets/stock/board_stock.h
+++ b/radio/src/targets/stock/board_stock.h
@@ -235,8 +235,8 @@ void rotencPoll();
 #endif
 
 // Haptic
-#define HAPTIC_ON()                PORTG |=  (1 << OUT_G_HAPTIC)
-#define HAPTIC_OFF()               PORTG &= ~(1 << OUT_G_HAPTIC)
+#define hapticOn()                 PORTG |=  (1 << OUT_G_HAPTIC)
+#define hapticOff()                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 583ed3236..8bcdf8bc0 100644
--- a/radio/src/targets/taranis/board_taranis.h
+++ b/radio/src/targets/taranis/board_taranis.h
@@ -314,12 +314,10 @@ void setVolume(uint8_t volume);
 // Haptic driver
 void hapticInit(void);
 void hapticOff(void);
-#define HAPTIC_OFF()    hapticOff()
 #if defined(REVPLUS)
   void hapticOn(uint32_t pwmPercent);
 #else
   void hapticOn(void);
-  #define HAPTIC_ON()   hapticOn()
 #endif
 
 // SERIAL_USART driver