piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

HAPTIC is now able to work without AUDIO

Browse Source 
New function in function switches to play an Audio track
Trims can be used to modify a mixer offset.
Offsets for Frsky can go from -128 to +127
Vibrations motor on v4 (HAPTIC option too)
This commit is contained in:
bsongis
2012-02-01 18:55:08 +00:00
parent 715c5967c7
commit 3e009decfb
13 changed files with 296 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/audio.h
+31 -43
View File
@@ -22,19 +22,9 @@
#define PCBSTD
#endif
// TODO remove them when everything commited in open9x.h!!!
#if defined(HAPTIC)
#if defined(PCBV4)
#define HAPTIC_OFF PORTD |= (1<<7)
#define HAPTIC_ON PORTD &= ~(1<<7)
#else
#define HAPTIC_OFF PORTG &= ~(1<<2)
#define HAPTIC_ON PORTG |= (1<<2)
#endif
#else
#define HAPTIC_OFF
#define HAPTIC_ON
#if defined(PCBSTD)
#define SPEAKER_ON BUZZER_ON
#define SPEAKER_OFF BUZZER_OFF
#endif
//audio
@@ -114,43 +104,41 @@ class audioQueue
#endif
#if defined(ISER9X)
inline void driver() {
if (toneTimeLeft > 0) {
switch (g_eeGeneral.speakerMode){
case 0:
//stock beeper. simply turn port on for x time!
if (toneTimeLeft > 0){
PORTE |= (1<<OUT_E_BUZZER); // speaker output 'high'
}
break;
case 1:
static uint8_t toneCounter;
toneCounter += toneFreq;
if ((toneCounter & 0x80) == 0x80) {
PORTE |= (1 << OUT_E_BUZZER);
} else {
PORTE &= ~(1 << OUT_E_BUZZER);
}
break;
}
} else {
PORTE &= ~(1<<OUT_E_BUZZER); // speaker output 'low'
}
}
#else
#if defined(PCBSTD)
inline void driver() {
if (toneTimeLeft > 0) {
switch (g_eeGeneral.speakerMode) {
case 0:
// stock beeper. simply turn port on for x time!
if (toneTimeLeft > 0){
PORTE |= (1<<OUT_E_BUZZER); // speaker output 'high'
}
break;
case 1:
static uint8_t toneCounter;
toneCounter += toneFreq;
if ((toneCounter & 0x80) == 0x80) {
PORTE |= (1 << OUT_E_BUZZER);
}
else {
PORTE &= ~(1 << OUT_E_BUZZER);
}
break;
}
}
else {
PORTE &= ~(1<<OUT_E_BUZZER); // speaker output 'low'
}
}
#elif defined(PCBSTD)
inline void driver() {
if (toneTimeLeft > 0) {
toneCounter += toneFreq;
if ((toneCounter & 0x80) == 0x80)
PORTE |= (1 << OUT_E_BUZZER);
BUZZER_ON;
else
PORTE &= ~(1 << OUT_E_BUZZER);
BUZZER_OFF;
}
}
#endif
#endif
// heartbeat is responsibile for issueing the audio tones and general square waves