Merge remote-tracking branch 'origin/next' into TaranisPlus

Conflicts:
	companion/src/generaledit.cpp
	companion/src/generaledit.ui
	radio/src/gui/menu_general.cpp

radio/src/targets/gruvin9x/somo14d.h

@@ -47,7 +47,10 @@ extern bool isPlaying();
 #define PUSH_NUMBER_PROMPT(p) pushPrompt(PROMPT_I18N_BASE+(p))
 #define PUSH_SYSTEM_PROMPT(p) pushPrompt(PROMPT_SYSTEM_BASE+(p))
 #define PLAY_NUMBER(n, u, a) playNumber((n), (u), (a))
-#define PLAY_DURATION(d) playDuration((d))
+#define PLAY_DURATION(d, att) playDuration((d))
+#define PLAY_DURATION_ATT
+#define PLAY_TIME
+#define IS_PLAY_TIME() (0)
 #define IS_PLAYING(id) isPlaying()
 #define PLAY_VALUE(v, id) playValue((v))
 

radio/src/targets/sky9x/adc_driver.cpp

@@ -38,7 +38,7 @@
 
 volatile uint16_t Analog_values[NUMBER_ANALOG];
 
-#if defined(TARANIS_STICKS)
+#if defined(FRSKY_STICKS)
 const char ana_direction[NUMBER_ANALOG] = {1, 1, 0, 1 ,0 ,1 ,0, 0, 0};
 #endif
 
@@ -118,12 +118,12 @@ void adcRead()
   }
 
   // adc direction correct
-  #if defined(TARANIS_STICKS)
+#if defined(FRSKY_STICKS)
   uint32_t i ;
   for (i=0; i<NUMBER_ANALOG; i++) {
     if (ana_direction[i]) {
       Analog_values[i] = 4096-Analog_values[i];
     }
   }  
-  #endif
+#endif
 }

radio/src/targets/sky9x/board_sky9x.cpp

@@ -314,15 +314,14 @@ extern "C" void TC3_IRQHandler() //capture ppm in at 2MHz
     ppmInState = 1; // triggered
   }
   else {
-    if (ppmInState && ppmInState<=16)
-    {
-      if (val>800 && val<2200) // if valid pulse-width range
-      {
-        g_ppmIns[ppmInState++ - 1] =
-            (int16_t)(val - 1500)*(g_eeGeneral.PPM_Multiplier+10)/10; //+-500 != 512, but close enough.
+    if (ppmInState>0 && ppmInState<=16) {
+      if (val>800 && val<2200) { // if valid pulse-width range
+        ppmInValid = 100;
+        g_ppmIns[ppmInState++ - 1] = (int16_t)(val - 1500)*(g_eeGeneral.PPM_Multiplier+10)/10; //+-500 != 512, but close enough.
       }
-      else
+      else {
         ppmInState = 0; // not triggered
+      }
     }
   }
 

radio/src/targets/stock/voice.h

@@ -134,6 +134,9 @@ inline bool isPlaying()
 #define PUSH_NUMBER_PROMPT(p) pushNumberPrompt((p))
 #define PUSH_SYSTEM_PROMPT(p) pushNumberPrompt(PROMPT_SYSTEM_BASE-PROMPT_I18N_BASE+(p))
 #define PLAY_NUMBER(n, u, a) playNumber((n), (u), (a))
-#define PLAY_DURATION(d) playDuration((d))
+#define PLAY_DURATION(d, att) playDuration((d))
+#define PLAY_DURATION_ATT
+#define PLAY_TIME
+#define IS_PLAY_TIME() (0)
 #define IS_PLAYING(id) (0) /* isPlaying() */
 #define PLAY_VALUE(v, id) playValue((v))

radio/src/targets/taranis/trainer_driver.cpp

@@ -126,12 +126,13 @@ extern "C" void TIM3_IRQHandler()
 
     // We process g_ppmInsright here to make servo movement as smooth as possible
     //    while under trainee control
-    if ((val>4000) && (val < 19000)) { // G: Prioritize reset pulse. (Needed when less than 16 incoming pulses)
+    if (val>4000 && val<19000) { // G: Prioritize reset pulse. (Needed when less than 16 incoming pulses)
       ppmInState = 1; // triggered
     }
     else {
-      if (ppmInState && (ppmInState<=16)) {
-        if ((val>800) && (val<2200)) {
+      if (ppmInState>0 && ppmInState<=16) {
+        if (val>800 && val<2200) {
+          ppmInValid = 100;
           g_ppmIns[ppmInState++ - 1] = (int16_t)(val - 1500)*(g_eeGeneral.PPM_Multiplier+10)/10; //+-500 != 512, but close enough.
         }
         else {