Cosmetics

This commit is contained in:
Andre Bernet
2014-04-28 12:54:08 +02:00
parent 225ea5d63d
commit db1336522e
6 changed files with 12 additions and 12 deletions
+3 -3
View File
@@ -58,16 +58,16 @@ void hapticQueue::heartbeat()
hapticOn(g_eeGeneral.hapticStrength * 20); hapticOn(g_eeGeneral.hapticStrength * 20);
#else #else
if (hapticTick-- > 0) { if (hapticTick-- > 0) {
HAPTIC_ON; HAPTIC_ON();
} }
else { else {
HAPTIC_OFF; HAPTIC_OFF();
hapticTick = g_eeGeneral.hapticStrength; hapticTick = g_eeGeneral.hapticStrength;
} }
#endif #endif
} }
else { else {
HAPTIC_OFF; HAPTIC_OFF();
if (buzzPause > 0) { if (buzzPause > 0) {
buzzPause--; buzzPause--;
} }
+2 -2
View File
@@ -186,8 +186,8 @@ void pwrOff();
// Haptic driver // Haptic driver
#define hapticOff() // TODO hapticOn() cleaner ... #define hapticOff() // TODO hapticOn() cleaner ...
#define HAPTIC_ON PORTD &= ~(1 << OUT_D_HAPTIC) #define HAPTIC_ON() PORTD &= ~(1 << OUT_D_HAPTIC)
#define HAPTIC_OFF PORTD |= (1 << OUT_D_HAPTIC) #define HAPTIC_OFF() PORTD |= (1 << OUT_D_HAPTIC)
// Rotary encoder driver // Rotary encoder driver
#if ROTARY_ENCODERS <= 2 #if ROTARY_ENCODERS <= 2
+2 -2
View File
@@ -189,7 +189,7 @@ void pwrOff();
// Haptic driver // Haptic driver
#define hapticOff() // TODO hapticOn() cleaner ... #define hapticOff() // TODO hapticOn() cleaner ...
#define HAPTIC_ON PORTD &= ~(1 << OUT_D_HAPTIC) #define HAPTIC_ON() PORTD &= ~(1 << OUT_D_HAPTIC)
#define HAPTIC_OFF PORTD |= (1 << OUT_D_HAPTIC) #define HAPTIC_OFF() PORTD |= (1 << OUT_D_HAPTIC)
#endif #endif
+1 -1
View File
@@ -239,7 +239,7 @@ extern int8_t Coproc_maxtemp;
// Haptic driver // Haptic driver
void hapticOff(void); void hapticOff(void);
void hapticOn(uint32_t pwmPercent); void hapticOn(uint32_t pwmPercent);
#define HAPTIC_OFF hapticOff() #define HAPTIC_OFF() hapticOff()
// BlueTooth driver // BlueTooth driver
#if defined(BLUETOOTH) #if defined(BLUETOOTH)
+2 -2
View File
@@ -231,8 +231,8 @@ void rotencPoll();
#endif #endif
// Haptic // Haptic
#define HAPTIC_ON PORTG |= (1 << OUT_G_HAPTIC) #define HAPTIC_ON() PORTG |= (1 << OUT_G_HAPTIC)
#define HAPTIC_OFF PORTG &= ~(1 << OUT_G_HAPTIC) #define HAPTIC_OFF() PORTG &= ~(1 << OUT_G_HAPTIC)
// USB fake driver // USB fake driver
#define usbPlugged() false #define usbPlugged() false
+2 -2
View File
@@ -243,8 +243,8 @@ void debugPutc(const char c);
void hapticOff(void); void hapticOff(void);
void hapticOn(uint32_t pwmPercent); void hapticOn(uint32_t pwmPercent);
void hapticInit(void); void hapticInit(void);
#define HAPTIC_OFF hapticOff() #define HAPTIC_OFF() hapticOff()
#define HAPTIC_ON hapticOn(100) #define HAPTIC_ON() hapticOn(100)
extern uint8_t currentTrainerMode; extern uint8_t currentTrainerMode;