diff --git a/src/ersky9x/audio.h b/src/ersky9x/audio.h index 646c06e35..d25ce2064 100644 --- a/src/ersky9x/audio.h +++ b/src/ersky9x/audio.h @@ -98,7 +98,7 @@ void audioEvent(uint8_t e, uint8_t f=BEEP_DEFAULT_FREQ); #define AUDIO_VARIO_UP() audioEvent(AU_KEYPAD_UP) #define AUDIO_VARIO_DOWN() audioEvent(AU_KEYPAD_DOWN) #define AUDIO_TRIM_MIDDLE(f) audioEvent(AU_TRIM_MIDDLE, f) -#define AUDIO_TRIM_END(f) audioEvent(AU_TRIM_END, f) +#define AUDIO_TRIM_END(f) audioEvent(AU_TRIM_END, f) #define AUDIO_TRIM(event, f) audioEvent(AU_TRIM_MOVE, f) #define AUDIO_PLAY(p) audioEvent(p) #define AUDIO_VARIO(f, t) play(f, t, 0, PLAY_SOUND_VARIO) diff --git a/src/open9x.h b/src/open9x.h index 3a23370e0..0303ce616 100644 --- a/src/open9x.h +++ b/src/open9x.h @@ -873,7 +873,9 @@ enum AUDIO_SOUNDS { AU_WARNING2, AU_WARNING3, AU_TRIM_MIDDLE, - AU_TRIM_END, +#if defined(PCBARM) + AU_TRIM_END, +#endif AU_TADA, AU_POT_STICK_MIDDLE, AU_MIX_WARNING_1, diff --git a/src/stock/audio.cpp b/src/stock/audio.cpp index 94973f6e3..723d67369 100644 --- a/src/stock/audio.cpp +++ b/src/stock/audio.cpp @@ -209,9 +209,6 @@ void audioQueue::event(uint8_t e, uint8_t f) case AU_TRIM_MIDDLE: play(f, 10, 2, PLAY_NOW); break; - case AU_TRIM_END: - play(f, 10, 2, PLAY_NOW); - break; // warning one case AU_WARNING1: play(BEEP_DEFAULT_FREQ, 10, 1, PLAY_NOW); diff --git a/src/stock/audio.h b/src/stock/audio.h index 3769babfa..f0cc0f0b0 100644 --- a/src/stock/audio.h +++ b/src/stock/audio.h @@ -131,7 +131,7 @@ void audioDefevent(uint8_t e); #define AUDIO_VARIO_UP() audioDefevent(AU_KEYPAD_UP) #define AUDIO_VARIO_DOWN() audioDefevent(AU_KEYPAD_DOWN) #define AUDIO_TRIM_MIDDLE(f) audio.event(AU_TRIM_MIDDLE, f) -#define AUDIO_TRIM_END) audio.event(AU_TRIM_END, f) +#define AUDIO_TRIM_END(f) AUDIO_TRIM_MIDDLE(f) #define AUDIO_TRIM(event, f) audio.event(AU_TRIM_MOVE, f) #define AUDIO_PLAY(p) audio.event(p) #define AUDIO_VARIO(f, t) audio.play(f, t, 0, PLAY_SOUND_VARIO)