From 182d97ed18ea5ae75bdb2febe26f78dad2a63bd9 Mon Sep 17 00:00:00 2001
From: "bsongis@gmail.com"
 <bsongis@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Sun, 19 May 2013 09:00:52 +0000
Subject: [PATCH] [M2561] Audio added [Taranis/sky9x] Code cleaning

---
 src/opentx.cpp                        | 13 ++++---------
 src/protocols/pulses_arm.h            |  2 ++
 src/targets/sky9x/board_sky9x.cpp     |  8 ++++----
 src/targets/stock/board_stock.cpp     |  2 +-
 src/targets/stock/board_stock.h       |  8 ++++++++
 src/targets/taranis/board_taranis.cpp |  7 +------
 src/targets/taranis/board_taranis.h   |  2 +-
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/opentx.cpp b/src/opentx.cpp
index 0f25e5681..8755196da 100644
--- a/src/opentx.cpp
+++ b/src/opentx.cpp
@@ -3789,10 +3789,10 @@ uint16_t getTmr16KHz()
 
 #if defined(PCBSTD) && (defined(AUDIO) || defined(VOICE))
 // Clocks every 128 uS
-ISR(TIMER2_OVF_vect, ISR_NOBLOCK)
+ISR(TIMER_AUDIO_VECT, ISR_NOBLOCK)
 {
   cli();
-  TIMSK &= ~(1<<TOIE2) ; // stop reentrance
+  PAUSE_AUDIO_INTERRUPT(); // stop reentrance
   sei();
 
 #if defined(AUDIO)
@@ -3804,7 +3804,7 @@ ISR(TIMER2_OVF_vect, ISR_NOBLOCK)
 #endif
 
   cli();
-  TIMSK |= (1<<TOIE2) ;
+  RESUME_AUDIO_INTERRUPT();
   sei();
 }
 #endif
@@ -4204,15 +4204,10 @@ inline void opentxInit(OPENTX_INIT_ARGS)
   backlightOn();
 
 #if defined(CPUARM)
-  start_ppm_capture();
-  // TODO inside startPulses?
-  s_pulses_paused = false;
-  // TODO startPulses should be started after the first doMixerCalculations()
+  init_trainer_capture();
 #endif
 
-#if !defined(CPUARM)
   doMixerCalculations();
-#endif
 
   startPulses();
 
diff --git a/src/protocols/pulses_arm.h b/src/protocols/pulses_arm.h
index 3f645bfb7..932002790 100644
--- a/src/protocols/pulses_arm.h
+++ b/src/protocols/pulses_arm.h
@@ -58,6 +58,8 @@ void Hubsan_Init();
 
 inline void startPulses()
 {
+  s_pulses_paused = false;
+
 #if defined(PCBTARANIS)
   setupPulses(INTERNAL_MODULE);
   setupPulses(EXTERNAL_MODULE);
diff --git a/src/targets/sky9x/board_sky9x.cpp b/src/targets/sky9x/board_sky9x.cpp
index 607e95039..a2cf97855 100644
--- a/src/targets/sky9x/board_sky9x.cpp
+++ b/src/targets/sky9x/board_sky9x.cpp
@@ -126,7 +126,7 @@ inline void setup_switches()
 }
 
 #ifdef SIMU
-#define end_ppm_capture()
+#define stop_trainer_capture()
 #define rotencEnd()
 #define sam_boot()
 #else
@@ -329,13 +329,13 @@ extern "C" void TC3_IRQHandler() //capture ppm in at 2MHz
   lastCapt = capture;
 }
 
-void start_ppm_capture()
+void init_trainer_capture()
 {
   start_timer4() ;
   start_timer3() ;
 }
 
-void end_ppm_capture()
+void stop_trainer_capture()
 {
   TC1->TC_CHANNEL[0].TC_IDR = TC_IDR0_LDRAS ;
   NVIC_DisableIRQ(TC3_IRQn) ;
@@ -744,7 +744,7 @@ void usbBootloader()
   rotencEnd();
   endPdcUsartReceive() ;          // Terminate any serial reception
   end_bt_tx_interrupt() ;
-  end_ppm_capture() ;
+  stop_trainer_capture() ;
   end_spi() ;
   audioEnd() ;
 
diff --git a/src/targets/stock/board_stock.cpp b/src/targets/stock/board_stock.cpp
index 1edeb9cb0..b9ed2cb04 100644
--- a/src/targets/stock/board_stock.cpp
+++ b/src/targets/stock/board_stock.cpp
@@ -121,7 +121,7 @@ inline void boardInit()
 #endif
 
 #if defined(AUDIO) || defined(VOICE)
-  TCCR2  = (0b010 << CS00); // Norm mode, clk/8
+  SET_TIMER_AUDIO_CTRL();
 #elif defined(PWM_BACKLIGHT)
   /** Smartieparts LED Backlight is connected to PORTB/pin7, which can be used as pwm output of timer2 **/
 #if defined(SP22)
diff --git a/src/targets/stock/board_stock.h b/src/targets/stock/board_stock.h
index 9e1ce340f..9a849d59f 100644
--- a/src/targets/stock/board_stock.h
+++ b/src/targets/stock/board_stock.h
@@ -76,6 +76,10 @@
   #define RESUME_10MS_INTERRUPT()  TIMSK2 |= (1<<OCIE2A)
   #define PAUSE_PPMIN_INTERRUPT()  TIMSK3 &= ~(1<<ICIE3)
   #define RESUME_PPMIN_INTERRUPT() TIMSK3 |= (1<<ICIE3)
+  #define TIMER_AUDIO_VECT         TIMER4_OVF_vect
+  #define SET_TIMER_AUDIO_CTRL()   TCCR4B = (0b111 << CS20)
+  #define PAUSE_AUDIO_INTERRUPT()  TIMSK4 &= ~(1<<OCIE4A)
+  #define RESUME_AUDIO_INTERRUPT() TIMSK4 |= (1<<OCIE4A)
 #else
   #define TIMER_16KHZ_VECT         TIMER0_OVF_vect
   #define COUNTER_16KHZ            TCNT0
@@ -85,6 +89,10 @@
   #define RESUME_10MS_INTERRUPT()  TIMSK |= (1<<OCIE0)
   #define PAUSE_PPMIN_INTERRUPT()  ETIMSK &= ~(1<<TICIE3)
   #define RESUME_PPMIN_INTERRUPT() ETIMSK |= (1<<TICIE3)
+  #define TIMER_AUDIO_VECT         TIMER2_OVF_vect
+  #define SET_TIMER_AUDIO_CTRL()   TCCR2 = (0b010 << CS00) // Norm mode, clk/8
+  #define PAUSE_AUDIO_INTERRUPT()  TIMSK &= ~(1<<TOIE2)
+  #define RESUME_AUDIO_INTERRUPT() TIMSK |= (1<<TOIE2)
 #endif
 
 // Power driver (none)
diff --git a/src/targets/taranis/board_taranis.cpp b/src/targets/taranis/board_taranis.cpp
index 9df52c121..b03d3ae31 100644
--- a/src/targets/taranis/board_taranis.cpp
+++ b/src/targets/taranis/board_taranis.cpp
@@ -112,14 +112,10 @@ uint8_t usbPlugged(void)
 #if defined(DEBUG)
 void debugPutc(const char c)
 {
-	uartPutc(c);
+  uartPutc(c);
 }
 #endif
 
-void start_ppm_capture()
-{
-}
-
 #if !defined(SIMU)
 extern "C" {
 USB_OTG_CORE_HANDLE USB_OTG_dev;
@@ -202,7 +198,6 @@ void boardInit()
 #if defined(DEBUG)
   uartInit(DEBUG_UART_BAUDRATE);
 #endif
-  init_trainer_capture();  
   init5msTimer();
   __enable_irq();
   eepromInit();
diff --git a/src/targets/taranis/board_taranis.h b/src/targets/taranis/board_taranis.h
index ac89df805..2514a267a 100644
--- a/src/targets/taranis/board_taranis.h
+++ b/src/targets/taranis/board_taranis.h
@@ -85,7 +85,7 @@ uint8_t usbPlugged(void);
 void delaysInit();
 
 #define DEBUG_UART_BAUDRATE 9600
-#define SPORT_BAUDRATE 57600
+#define SPORT_BAUDRATE      57600
 
 void uartInit(uint32_t baudrate);
 void uartPutc(const char c);