Haptic function by Rob should now be finished. SD card Model archive function.

This commit is contained in:
bsongis
2012-04-16 17:35:54 +00:00
parent 8c6bf54cf9
commit fe9afeb6a2
24 changed files with 556 additions and 283 deletions
+1 -13
View File
@@ -40,9 +40,6 @@ 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"
@@ -76,6 +73,7 @@ extern void beep(uint8_t val);
#define AUDIO_POT_STICK_MIDDLE() beep(2)
#define AUDIO_VARIO_UP() _beep(1)
#define AUDIO_VARIO_DOWN() _beep(1)
#define AUDIO_TRIM_MIDDLE() beep(2)
#define IS_AUDIO_BUSY() (g_beepCnt || beepAgain || beepOn)
@@ -109,19 +107,9 @@ 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