From 3708915dc85b9c95e4f0386b2303d1fa278594f8 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Fri, 4 May 2012 22:18:34 +0000
Subject: [PATCH] Trims audio little change

---
 src/beeper.h          | 2 +-
 src/ersky9x/audio.cpp | 9 +++++----
 src/ersky9x/audio.h   | 2 +-
 src/open9x.cpp        | 2 +-
 src/stock/audio.cpp   | 9 +++++----
 src/stock/audio.h     | 2 +-
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/beeper.h b/src/beeper.h
index cf18a8cba..ac682c88c 100644
--- a/src/beeper.h
+++ b/src/beeper.h
@@ -76,7 +76,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 AUDIO_TRIM_MIDDLE(f)   beep(2)
 #define AUDIO_TELEMETRY_ALARM() { warble = !(g_tmr10ms % 60); AUDIO_WARNING2(); }
 
 #define IS_AUDIO_BUSY() (g_beepCnt || beepAgain || beepOn)
diff --git a/src/ersky9x/audio.cpp b/src/ersky9x/audio.cpp
index e5c9d7d4c..20f8b51a2 100644
--- a/src/ersky9x/audio.cpp
+++ b/src/ersky9x/audio.cpp
@@ -153,6 +153,10 @@ void audioQueue::play(uint8_t tFreq, uint8_t tLen, uint8_t tPause,
 
 void audioQueue::event(uint8_t e, uint8_t f)
 {
+#ifdef HAPTIC
+  haptic.event(e); //do this before audio to help sync timings
+#endif
+
   if (g_eeGeneral.flashBeep && (e <= AU_ERROR || e >= AU_WARNING1))
     g_LightOffCounter = FLASH_DURATION;
 
@@ -192,7 +196,7 @@ void audioQueue::event(uint8_t e, uint8_t f)
           break;
         // trim center
         case AU_TRIM_MIDDLE:
-          play(BEEP_DEFAULT_FREQ, 10, 2, PLAY_NOW);
+          play(f, 10, 2, PLAY_NOW);
           break;
         // warning one
         case AU_WARNING1:
@@ -306,8 +310,5 @@ void audioQueue::event(uint8_t e, uint8_t f)
 
 void audioDefevent(uint8_t e)
 {
-#ifdef HAPTIC
-  haptic.event(e); //do this before audio to help sync timings
-#endif	
   audio.event(e, BEEP_DEFAULT_FREQ);
 }
diff --git a/src/ersky9x/audio.h b/src/ersky9x/audio.h
index dddce0159..f64a8f715 100644
--- a/src/ersky9x/audio.h
+++ b/src/ersky9x/audio.h
@@ -121,7 +121,7 @@ void audioDefevent(uint8_t e);
 #define AUDIO_POT_STICK_MIDDLE() audioDefevent(AU_POT_STICK_MIDDLE)
 #define AUDIO_VARIO_UP()    audioDefevent(AU_KEYPAD_UP)
 #define AUDIO_VARIO_DOWN()  audioDefevent(AU_KEYPAD_DOWN)
-#define AUDIO_TRIM_MIDDLE() audioDefevent(AU_TRIM_MIDDLE)
+#define AUDIO_TRIM_MIDDLE(f) audio.event(AU_TRIM_MIDDLE, f)
 #define AUDIO_TELEMETRY_ALARM() audioDefevent(AU_WARNING1)
 
 #define AUDIO_HEARTBEAT()   audio.heartbeat()
diff --git a/src/open9x.cpp b/src/open9x.cpp
index ae16acd7c..15af1eb3c 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -952,7 +952,7 @@ uint8_t checkTrim(uint8_t event)
 
     if (beepTrim) {
       killEvents(event);
-      AUDIO_TRIM_MIDDLE();
+      AUDIO_TRIM_MIDDLE(after);
     }
     else {
 #if defined (AUDIO)
diff --git a/src/stock/audio.cpp b/src/stock/audio.cpp
index b2e8592c9..57b97e9fe 100644
--- a/src/stock/audio.cpp
+++ b/src/stock/audio.cpp
@@ -150,6 +150,10 @@ void audioQueue::play(uint8_t tFreq, uint8_t tLen, uint8_t tPause,
 
 void audioQueue::event(uint8_t e, uint8_t f)
 {
+#ifdef HAPTIC
+  haptic.event(e); //do this before audio to help sync timings
+#endif
+
   if (g_eeGeneral.flashBeep && (e <= AU_ERROR || e >= AU_WARNING1))
     g_LightOffCounter = FLASH_DURATION;
 
@@ -189,7 +193,7 @@ void audioQueue::event(uint8_t e, uint8_t f)
           break;
         // trim center
         case AU_TRIM_MIDDLE:
-          play(BEEP_DEFAULT_FREQ, 10, 2, PLAY_NOW);
+          play(f, 10, 2, PLAY_NOW);
           break;
         // warning one
         case AU_WARNING1:
@@ -301,8 +305,5 @@ void audioQueue::event(uint8_t e, uint8_t f)
 
 void audioDefevent(uint8_t e)
 {
-#ifdef HAPTIC
-  haptic.event(e); //do this before audio to help sync timings
-#endif	
   audio.event(e);
 }
diff --git a/src/stock/audio.h b/src/stock/audio.h
index c82ffc1ce..c9f0378d3 100644
--- a/src/stock/audio.h
+++ b/src/stock/audio.h
@@ -130,7 +130,7 @@ void audioDefevent(uint8_t e);
 #define AUDIO_POT_STICK_MIDDLE() audioDefevent(AU_POT_STICK_MIDDLE)
 #define AUDIO_VARIO_UP()    audioDefevent(AU_KEYPAD_UP)
 #define AUDIO_VARIO_DOWN()  audioDefevent(AU_KEYPAD_DOWN)
-#define AUDIO_TRIM_MIDDLE() audioDefevent(AU_TRIM_MIDDLE)
+#define AUDIO_TRIM_MIDDLE(f) audio.event(AU_TRIM_MIDDLE, f)
 #define AUDIO_TELEMETRY_ALARM() audioDefevent(AU_WARNING1)
 
 #define AUDIO_DRIVER()      audio.driver()