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

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

companion/src/eeprominterface.h

@@ -66,7 +66,7 @@ const uint8_t modn12x3[4][4]= {
   {4, 3, 2, 1} };
 
 #define C9X_MAX_MODELS            60
-#define C9X_MAX_PHASES            9
+#define C9X_MAX_FLIGHT_MODES            9
 #define C9X_MAX_MIXERS            64
 #define C9X_MAX_INPUTS            32
 #define C9X_MAX_EXPOS             64
@@ -210,6 +210,7 @@ enum ThrottleSource {
 
 enum TelemetrySource {
   TELEMETRY_SOURCE_TX_BATT,
+  TELEMETRY_SOURCE_TX_TIME,
   TELEMETRY_SOURCE_TIMER1,
   TELEMETRY_SOURCE_TIMER2,
   TELEMETRY_SOURCE_SWR,
@@ -371,6 +372,7 @@ enum RawSwitchType {
   SWITCH_TYPE_ROTARY_ENCODER,
   SWITCH_TYPE_ON,
   SWITCH_TYPE_OFF,
+  SWITCH_TYPE_FLIGHT_MODE,
   SWITCH_TYPE_TIMER_MODE
 };
 
@@ -488,6 +490,7 @@ class GeneralSettings {
     int    PPM_Multiplier;
     int    hapticLength;
     unsigned int   reNavigation;
+    unsigned int stickReverse;
     bool      hideNameOnSplash;
     bool      enablePpmsim;
     unsigned int   speakerPitch;
@@ -940,6 +943,8 @@ class ModelData {
     ExpoData * insertInput(const int idx);
     void removeInput(const int idx);
 
+    bool isInputValid(const unsigned int idx) const;
+
     bool      used;
     char      name[12+1];
     uint8_t   modelVoice;
@@ -954,7 +959,7 @@ class ModelData {
     bool      extendedLimits; // TODO xml
     bool      extendedTrims;
     bool      throttleReversed;
-    PhaseData phaseData[C9X_MAX_PHASES];
+    PhaseData phaseData[C9X_MAX_FLIGHT_MODES];
     MixData   mixData[C9X_MAX_MIXERS];
     LimitData limitData[C9X_NUM_CHNOUT];
 
@@ -1018,9 +1023,9 @@ class RadioData {
 
 // TODO rename FlightPhase to FlightMode
 enum Capability {
- FlightPhases,
+ FlightModes,
  FlightModesName,
- FlightPhasesHaveFades,
+ FlightModesHaveFades,
  Mixes,
  MixesWithoutExpo,
  Timers,
@@ -1076,7 +1081,7 @@ enum Capability {
  Gvars,
  GvarsInCS,
  GvarsAreNamed,
- GvarsFlightPhases,
+ GvarsFlightModes,
  GvarsName,
  NoTelemetryProtocol,
  TelemetryCustomScreens,
@@ -1198,7 +1203,7 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
   ModelData model_copy = model;
 
   // trims
-  for (int p=0; p<C9X_MAX_PHASES; p++) {
+  for (int p=0; p<C9X_MAX_FLIGHT_MODES; p++) {
     for (int i=0; i<NUM_STICKS/2; i++) {
       int converted_stick = applyStickMode(i+1, mode) - 1;
       int tmp = model.phaseData[p].trim[i];