Merge remote-tracking branch 'origin/next' into

bsongis/Taranis_6Positions_Pot

Conflicts:
	radio/src/myeeprom.h

radio/src/eeprom_conversions.cpp

@@ -131,6 +131,22 @@ PACK(typedef struct {
   gvar_t gvars[5];
 }) PhaseData_v215;
 
+PACK(typedef struct {
+  FrSkyChannelData channels[2];
+  uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh, 3=Halcyon
+  uint8_t voltsSource;
+  uint8_t blades;   // How many blades for RPMs, 0=2 blades, 1=3 blades
+  uint8_t currentSource;
+  uint8_t screensType;
+  FrSkyScreenData screens[MAX_FRSKY_SCREENS];
+  uint8_t varioSource;
+  int8_t  varioCenterMax;
+  int8_t  varioCenterMin;
+  int8_t  varioMin;
+  int8_t  varioMax;
+  FrSkyRSSIAlarm rssiAlarms[2];
+}) FrSkyData_v215;
+
 PACK(typedef struct {
   ModelHeader header;
   TimerData_v215 timers[MAX_TIMERS];
@@ -162,9 +178,9 @@ PACK(typedef struct {
 
   swstate_t switchWarningStates;
 
-  char      gvar_names[5][LEN_GVAR_NAME];
+  char gvar_names[5][LEN_GVAR_NAME];
 
-  TELEMETRY_DATA
+  FrSkyData_v215 frsky;
 
   ROTARY_ENCODER_ARRAY_EXTRA
 
@@ -224,7 +240,7 @@ void ConvertModel_215_to_216(ModelData &model)
   }
   g_model.protocol = oldModel.protocol;
   g_model.thrTrim = oldModel.thrTrim;
-  g_model.trimInc = oldModel.trimInc;
+  g_model.trimInc = oldModel.trimInc - 2;
   g_model.disableThrottleWarning = oldModel.disableThrottleWarning;
   g_model.extendedLimits = oldModel.extendedLimits;
   g_model.extendedTrims = oldModel.extendedTrims;
@@ -443,7 +459,8 @@ void ConvertModel_215_to_216(ModelData &model)
   for (uint8_t i=0; i<5; i++) {
     memcpy(g_model.gvars[i].name, oldModel.gvar_names[i], LEN_GVAR_NAME);
   }
-  g_model.frsky = oldModel.frsky;
+
+  memcpy(&g_model.frsky, &oldModel.frsky, sizeof(oldModel.frsky));
 
 #if defined(PCBTARANIS)
   g_model.externalModule = oldModel.externalModule;