Split Haptic from Audio

Vario from Max added
Tests needed on all boards!
This commit is contained in:
bsongis
2012-05-03 09:19:20 +00:00
parent b0ee619d0a
commit 6afc680d93
20 changed files with 1123 additions and 506 deletions
+12
View File
@@ -1429,6 +1429,13 @@ void evalFunctions()
beep(3);
#endif
}
#if defined(HAPTIC)
if (sd->func == FUNC_HAPTIC) {
haptic.event(sd->param);
}
#endif
active_functions |= mask;
}
else {
@@ -2085,6 +2092,7 @@ void perMain()
}
#if defined(PCBARM)
HAPTIC_HEARTBEAT();
AUDIO_HEARTBEAT(); // the queue processing
#endif
@@ -2156,6 +2164,10 @@ ISR(TIMER0_COMP_vect, ISR_NOBLOCK) //10ms timer
AUDIO_HEARTBEAT();
#ifdef HAPTIC
HAPTIC_HEARTBEAT();
#endif
#ifdef DEBUG
// Record start time from TCNT1 to record excution time
cli();