Massive revert of the trunk to return to the last known stable version. I would like a new release soon.

This commit is contained in:
bsongis
2012-04-18 08:24:33 +00:00
parent 090b111b7a
commit 1d2de3d3e0
21 changed files with 191 additions and 674 deletions
+13
View File
@@ -40,6 +40,9 @@ extern uint8_t beepAgainOrig;
extern uint8_t beepOn;
extern bool warble;
extern bool warbleC;
#if defined(HAPTIC)
extern uint8_t hapticTick;
#endif
#if defined(PCBARM)
#include "ersky9x/sound.h"
@@ -107,9 +110,19 @@ FORCEINLINE void AUDIO_HEARTBEAT()
BUZZER_OFF;
else
BUZZER_ON;
#if defined(HAPTIC)
if (hapticTick-- > 0) {
HAPTIC_ON; // haptic output 'high'
}
else {
HAPTIC_OFF; // haptic output 'low'
hapticTick = g_eeGeneral.hapticStrength;
}
#endif
}
else {
BUZZER_OFF;
HAPTIC_OFF;
}
}
#endif