Compilation error on VC++

Release notes updated
Fixes #1300
2014-06-17 17:38:29 +02:00 · 2014-06-17 17:13:32 +02:00 · 2014-06-17 17:05:47 +02:00 · 2014-06-17 16:54:05 +02:00 · 2014-06-17 16:51:39 +02:00 · 2014-06-17 15:57:25 +02:00
141 changed files with 6791 additions and 5783 deletions
@@ -278,7 +278,7 @@ Josep Clodas Sola
 Thierry Martin
 Peter Mauro 
 Mitchell Brenner
-Ulach Green
+Yak
 Lluis Bullich Rañe 
 Steffen Rohr 
 Eric Jacquin
@@ -423,3 +423,60 @@ Kenneth Frehafer
 Peter McHenry 
 Matthias Hase 
 Markus Wolf
+Andrew Fazio
+Stefan Künst
+Stephen Adams
+Arold Reinders
+Tauno Rautakorpi
+Frank Houvenaghel
+Aerial Tech Hobbies - www.aerialtechhobbies.com
+George Neusse
+Andreja Rusjakovski
+Axel Stöckle
+Mike Perkins
+Erwin Störrle
+Rodger Hopper
+Fernando Cesar
+Jonathan Gillis
+DK-System
+Lexington S Morley
+Bernd Koehler
+Davis RC
+Pete Johnson
+Patricia Martin
+Florian Tschacher
+Brian Spearing
+Craig Hall
+Joseph Case
+Harald Klein
+Robert Crockford
+Chris Boultinghouse
+Kitsew
+Georgios Papadopoulos
+Fourmost Products
+Dennis Miller
+Dave Matison
+Maximilian Radig
+Juan Rodriguez
+Robert Sessler
+John Murray
+Martin Sniedze
+David Poole
+Manfred Delakowitz
+Martijn Kruissen
+Jörgen Norman
+Nathan Kinney
+John Godden
+Larry Roper
+Mike Frizell
+Daniel Pospolita
+Peter Herz
+Don Mondrik
+Paul Fram
+Charles Knight
+Matthew Adams
+Kenneth Reed
+Gary Wild
+Christof Ramm
+Bruno Bedard
+Salih Samim Aydin
@@ -1,3 +1,16 @@
+<h2>Version 2.0.3</h2>
+<ul>
+<li>EEPROM import bug on AdjustGVAR function</li>
+<li>Timers correctly displayed in logical switches tab</li> 
+</ul>
+
+<h2>Version 2.0.2</h2>
+<ul>
+<li>Mouse scroll wheel behaves differently</li>
+<li>Play Sounds should now work on all platforms</li>
+<li>A lot of small bug fixes</li>
+</ul>
+
 <h2>Version 2.0.1</h2>
 <ul>
 <li>Fix on recursive GVars</li>
@@ -2,7 +2,7 @@ PROJECT( companion )

 SET( C9X_VERSION_MAJOR "2" )
 SET( C9X_VERSION_MINOR "0" )
-SET( C9X_VERSION_REVISION "1" )
+SET( C9X_VERSION_REVISION "3" )
 SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION} )

 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
@@ -42,18 +42,14 @@ SET( QT_USE_QTNETWORK True )
 SET( QT_USE_QTXML True )
 INCLUDE( ${QT_USE_FILE} )

-IF ( APPLE )
-    MESSAGE( STATUS "Phonon still not supported on APPLE " )
+MESSAGE( STATUS "Looking for PHONON " )
+FIND_PACKAGE(Phonon)
+IF ( PHONON_FOUND )
+    INCLUDE_DIRECTORIES( ${PHONO_INCLUDE_DIR} )
+    MESSAGE("PHONON Include Path: " ${PHONON_INCLUDE_DIR} )
+    ADD_DEFINITIONS( -DPHONON )
 ELSE()
-    MESSAGE( STATUS "Looking for PHONON " )
-    FIND_PACKAGE(Phonon)
-    IF ( PHONON_FOUND )
-        INCLUDE_DIRECTORIES( ${PHONO_INCLUDE_DIR} )
-        MESSAGE("PHONON Include Path: " ${PHONON_INCLUDE_DIR} )
-        ADD_DEFINITIONS( -DPHONON )
-    ELSE()
-        MESSAGE( "PHONON not found!" )
-    ENDIF()
+    MESSAGE( "PHONON not found!" )
 ENDIF()

 ADD_CUSTOM_COMMAND(
@@ -134,15 +130,10 @@ set(common_SRCS
  firmwares/opentx/opentxM128simulator.cpp
  firmwares/opentx/opentxM64simulator.cpp
  file.cpp
-  googleanalytics.cpp
  appdata.cpp
 )

-set(common_MOC_HDRS
-  googleanalytics.h
-)
-
-qt4_wrap_cpp( common_SRCS ${common_MOC_HDRS} )
+qt4_wrap_cpp(common_SRCS)

 add_library(common ${common_SRCS})

@@ -633,6 +633,9 @@ AppData::AppData()
        settings.remove("startup_check_companion9x");
        settings.remove("wizardEnable");

+        // Delete settings that we do not want to carry over from 1.52
+        settings.remove("dfu_location");
+
        // Select the new default profile as current profile
        id( 0 );
    }
@@ -3,7 +3,6 @@
 #include <QtGui>
 #include "eeprominterface.h"
 #include "flashinterface.h"
-#include "googleanalytics.h"

 #if defined WIN32 || !defined __GNUC__
 #include <Windows.h>
@@ -94,8 +93,6 @@ avrOutputDialog::avrOutputDialog(QWidget *parent, QString prog, QStringList arg,
        process->start(prog,arg);
      }
    }
-
-    ga.sendPageView(getBoardName(GetCurrentFirmware()->getBoard()) + " Flash");
 }

 # if !__GNUC__
@@ -142,8 +139,8 @@ void avrOutputDialog::doCopy()
  if (source.open(QIODevice::ReadOnly)) {
    QFile dest(destFile);
    if (dest.open(QIODevice::WriteOnly)) {
+      addText(tr("Writing file: "));
      for (int i=0; i<blocks; i++) {
-        addText(tr("Writing file: "));
        int read = source.read(buf, BLKSIZE);
        if (dest.write(buf, read) == read) {
          dest.flush();
@@ -159,11 +156,11 @@ void avrOutputDialog::doCopy()
      dest.close();
    }
    else {
-      QMessageBox::warning(this, tr("Error"),tr("Cannot write destination"));
+      QMessageBox::warning(this, tr("Error"),tr("Cannot write destination") + ": " + dest.errorString());
    }
  }
  else {
-    QMessageBox::warning(this, tr("Error"),tr("Cannot open source file"));
+    QMessageBox::warning(this, tr("Error"),tr("Cannot open source file") + ": " + source.errorString());
  }

  source.close();
@@ -438,7 +435,7 @@ void avrOutputDialog::doFinished(int code=0)
        if (hasErrors || code) {
          if (!cmdLine.isEmpty()) {
            if (getProgrammer()!="AVRDUDE") {
-               QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("did not finish correctly"));
+              QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("did not finish correctly"));
            }
            else {
              int res = QMessageBox::question(this, "Companion",getProgrammer() + " " + tr("did not finish correctly!\nDo you want some help ?"),QMessageBox::Yes | QMessageBox::No);
@@ -446,8 +443,9 @@ void avrOutputDialog::doFinished(int code=0)
                errorWizard();
              }
            }
-          } else {
-            QMessageBox::critical(this, "Companion",  tr("Copy did not finish correctly"));
+          }
+          else {
+            QMessageBox::critical(this, "Companion", tr("Copy did not finish correctly"));
          }
            // reject();
        }
@@ -467,8 +465,6 @@ void avrOutputDialog::doFinished(int code=0)
    default: //AVR_DIALOG_KEEP_OPEN
      break;
    }
-
-
 }

 void avrOutputDialog::doProcessStarted()
@@ -20,7 +20,7 @@ class avrOutputDialog : public QDialog
 {
    Q_OBJECT

-public:
+  public:
    explicit avrOutputDialog(QWidget *parent, QString prog, QStringList arg, QString wTitle, int closeBehaviour=AVR_DIALOG_CLOSE_IF_SUCCESSFUL, bool displayDetails=false);
    ~avrOutputDialog();

@@ -29,7 +29,7 @@ public:
    void waitForFinish();
    void addReadFuses();

-protected slots:
+  protected slots:
    void doAddTextStdOut();
    void doAddTextStdErr();
    void doProcessStarted();
@@ -41,7 +41,7 @@ protected slots:
    void killTimerElapsed();
    void errorWizard();

-private:
+  private:
    QString getProgrammer();
    Ui::avrOutputDialog *ui;

@@ -193,7 +193,7 @@ void burnDialog::checkFw(QString fileName)
    ui->FramFWInfo->show();
    ui->DateField->setText(flash.getDate() + " " + flash.getTime());
    ui->versionField->setText(flash.getVersion());
-    ui->ModField->setText(flash.getEEprom());
+    ui->ModField->setText(flash.getEEpromId());

    ui->SplashFrame->hide();
    if (flash.hasSplash()) {
@@ -310,8 +310,8 @@ void CompareDialog::printPhases()
  }
  str.append("</tr>");
  for (i=0; i<GetCurrentFirmware()->getCapability(FlightModes); i++) {
-    PhaseData *pd1=&g_model1->phaseData[i];
-    PhaseData *pd2=&g_model2->phaseData[i];
+    FlightModeData *pd1=&g_model1->flightModeData[i];
+    FlightModeData *pd2=&g_model2->flightModeData[i];
    str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
    color=getColor1(pd1->name,pd2->name);
    str.append(QString("<font size=+1 face='Courier New' color=%2>%1</font></td>").arg(pd1->name).arg(color));
@@ -367,8 +367,8 @@ void CompareDialog::printPhases()
    }
    str.append("</tr>");
    for (i=0; i<GetCurrentFirmware()->getCapability(FlightModes); i++) {
-      PhaseData *pd1=&g_model1->phaseData[i];
-      PhaseData *pd2=&g_model2->phaseData[i];
+      FlightModeData *pd1=&g_model1->flightModeData[i];
+      FlightModeData *pd2=&g_model2->flightModeData[i];
      str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
      color=getColor1(pd1->name,pd2->name);
      str.append(QString("<font size=+1 face='Courier New' color=%2>%1</font></td>").arg(pd1->name).arg(color));
@@ -412,8 +412,8 @@ void CompareDialog::printPhases()
  }
  str.append("</tr>");
  for (i=0; i<GetCurrentFirmware()->getCapability(FlightModes); i++) {
-    PhaseData *pd1=&g_model1->phaseData[i];
-    PhaseData *pd2=&g_model2->phaseData[i];
+    FlightModeData *pd1=&g_model1->flightModeData[i];
+    FlightModeData *pd2=&g_model2->flightModeData[i];
    str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
    color=getColor2(pd1->name,pd2->name);
    str.append(QString("<font size=+1 face='Courier New' color=%2>%1</font></td>").arg(pd2->name).arg(color));
@@ -456,8 +456,8 @@ void CompareDialog::printPhases()
    }
    str.append("</tr>");
    for (i=0; i<GetCurrentFirmware()->getCapability(FlightModes); i++) {
-      PhaseData *pd1=&g_model1->phaseData[i];
-      PhaseData *pd2=&g_model2->phaseData[i];
+      FlightModeData *pd1=&g_model1->flightModeData[i];
+      FlightModeData *pd2=&g_model2->flightModeData[i];
      str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
      color=getColor1(pd1->name,pd2->name);
      str.append(QString("<font size=+1 face='Courier New' color=%2>%1</font></td>").arg(pd2->name).arg(color));
@@ -574,8 +574,8 @@ void CompareDialog::printGvars()
    str.append("<tr><td colspan=2><h2>"+tr("Global Variables")+"</h2></td></tr>");
    str.append("<tr><td width=50%>");
    str.append("<table border=1 cellspacing=0 cellpadding=3 width=100>");
-    PhaseData *pd1=&g_model1->phaseData[0];
-    PhaseData *pd2=&g_model2->phaseData[0];
+    FlightModeData *pd1=&g_model1->flightModeData[0];
+    FlightModeData *pd2=&g_model2->flightModeData[0];
    int width=100/gvarnum;
    str.append("<tr>");
    for(int i=0; i<gvarnum; i++) {        
@@ -673,7 +673,7 @@ void CompareDialog::printExpos()
                first=1;
                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightModes);j++) {
                  if (!(ed->phases & mask)) {
-                    PhaseData *pd = &g_model1->phaseData[j];
+                    FlightModeData *pd = &g_model1->flightModeData[j];
                    if (!first) {
                      str += QString(", ")+ QString("%1").arg(getPhaseName(j+1, pd->name));
                    } else {
@@ -751,7 +751,7 @@ void CompareDialog::printExpos()
                first=1;
                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightModes);j++) {
                  if (!(ed->phases & mask)) {
-                    PhaseData *pd = &g_model2->phaseData[j];
+                    FlightModeData *pd = &g_model2->flightModeData[j];
                    if (!first) {
                      str += QString(", ")+ QString("%1").arg(getPhaseName(j+1, pd->name));
                    } else {
@@ -849,7 +849,7 @@ void CompareDialog::printMixers()
                first=1;
                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightModes);j++) {
                  if (!(md->phases & mask)) {
-                    PhaseData *pd = &g_model1->phaseData[j];
+                    FlightModeData *pd = &g_model1->flightModeData[j];
                    if (!first) {
                      str += QString(", ")+ QString("%1").arg(getPhaseName(j+1, pd->name));
                    } else {
@@ -928,7 +928,7 @@ void CompareDialog::printMixers()
                first=1;
                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightModes);j++) {
                  if (!(md->phases & mask)) {
-                    PhaseData *pd = &g_model2->phaseData[j];
+                    FlightModeData *pd = &g_model2->flightModeData[j];
                    if (!first) {
                      str += QString(", ")+ QString("%1").arg(getPhaseName(j+1, pd->name));
                    } else {
@@ -116,7 +116,7 @@ RawSourceRange RawSource::getRange(bool singleprec)
        case TELEMETRY_SOURCE_TIMER1:
        case TELEMETRY_SOURCE_TIMER2:
          result.step = singleprec ? 5 : 1;
-          result.max = singleprec ? 255*5 : 7200;
+          result.max = singleprec ? 255*5 : 60*60;
          break;
        case TELEMETRY_SOURCE_RSSI_TX:
        case TELEMETRY_SOURCE_RSSI_RX:
@@ -125,6 +125,8 @@ RawSourceRange RawSource::getRange(bool singleprec)
          break;
        case TELEMETRY_SOURCE_A1:
        case TELEMETRY_SOURCE_A2:
+        case TELEMETRY_SOURCE_A3:
+        case TELEMETRY_SOURCE_A4:
          if (model) {
            const FrSkyChannelData & channel = model->frsky.channels[index-TELEMETRY_SOURCE_A1];
            float ratio = channel.getRatio();
@@ -263,7 +265,7 @@ QString RawSource::toString()

  static const QString telemetry[] = {
    QObject::tr("Batt"), QObject::tr("Time"), QObject::tr("Timer1"), QObject::tr("Timer2"),
-    QObject::tr("SWR"), QObject::tr("RSSI Tx"), QObject::tr("RSSI Rx"), QObject::tr("Rx Batt"),
+    QObject::tr("SWR"), QObject::tr("RSSI Tx"), QObject::tr("RSSI Rx"),
    QObject::tr("A1"), QObject::tr("A2"), QObject::tr("A3"), QObject::tr("A4"),
    QObject::tr("Alt"), QObject::tr("Rpm"), QObject::tr("Fuel"), QObject::tr("T1"), QObject::tr("T2"),
    QObject::tr("Speed"), QObject::tr("Dist"), QObject::tr("GPS Alt"),
@@ -457,6 +459,11 @@ CSFunctionFamily LogicalSwitchData::getFunctionFamily()
    return LS_FAMILY_VCOMP;
 }

+bool LogicalSwitchData::isDeltaFunction()
+{
+  return (func == LS_FN_DPOS || func == LS_FN_DAPOS);
+}
+
 QString LogicalSwitchData::funcToString()
 {
  switch (func) {
@@ -543,7 +550,7 @@ QString LogicalSwitchData::toString(const ModelData & model)
      else if (func == LS_FN_DPOS) result = "d(" + res + ")";
      result += res;

-      if (func == LS_FN_APOS || func == LS_FN_VPOS || func == LS_FN_DAPOS || func == LS_FN_DPOS)
+      if (func == LS_FN_APOS || func == LS_FN_VPOS || isDeltaFunction())
        result += " &gt; ";
      else if (func == LS_FN_ANEG || func == LS_FN_VNEG)
        result += " &lt; ";
@@ -852,11 +859,16 @@ GeneralSettings::GeneralSettings()
    calibSpanPos[i] = 0x180;
  }

-  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+  BoardEnum board = GetEepromInterface()->getBoard();
+  if (IS_TARANIS(board)) {
    potsType[0] = 1;
    potsType[1] = 1;
  }

+  if (IS_ARM(board)) {
+    speakerVolume = 12;
+  }
+
  templateSetup = g.profile[g.id()].channelOrder();
  stickMode = g.profile[g.id()].defaultMode();

@@ -991,7 +1003,6 @@ void FrSkyData::clear()
  memset(this, 0, sizeof(FrSkyData));
  rssiAlarms[0].clear(2, 45);
  rssiAlarms[1].clear(3, 42);
-  rxBattAlarms[1] = round(43.0*255/132);
  varioSource = 2/*VARIO*/;
  blades = 2;
 }
@@ -1039,14 +1050,34 @@ bool ModelData::isInputValid(const unsigned int idx) const

 void ModelData::removeInput(const int idx)
 {
+  unsigned int chn = expoData[idx].chn;
+
  memmove(&expoData[idx], &expoData[idx+1], (C9X_MAX_EXPOS-(idx+1))*sizeof(ExpoData));
  expoData[C9X_MAX_EXPOS-1].clear();
+
+  //also remove input name if removing last line for this input
+  bool found = false;
+  for (int i=0; i<C9X_MAX_EXPOS; i++) {
+    if (expoData[i].mode==0) continue;
+    if (expoData[i].chn==chn) {
+      found = true;
+      break;
+    }
+  }
+  if (!found) inputNames[chn][0] = 0;
 }

 void ModelData::clearInputs()
 {
  for (int i=0; i<C9X_MAX_EXPOS; i++)
    expoData[i].clear();
+
+  //clear all input names
+  if (GetCurrentFirmware()->getCapability(VirtualInputs)) {
+    for (int i=0; i<C9X_MAX_INPUTS; i++) {
+      inputNames[i][0] = 0;
+    }
+  }
 }

 void ModelData::clearMixes()
@@ -1073,11 +1104,11 @@ void ModelData::clear()
    moduleData[0].protocol=PPM;
    moduleData[1].protocol=OFF;      
  }
-  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++)
-    phaseData[i].clear();
+  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
+    flightModeData[i].clear();
+  }
  clearInputs();
  clearMixes();
-
  for (int i=0; i<C9X_NUM_CHNOUT; i++)
    limitData[i].clear();
  for (int i=0; i<NUM_STICKS; i++)
@@ -1088,7 +1119,6 @@ void ModelData::clear()
    curves[i].clear(5);
  for (int i=0; i<2; i++)
    timers[i].clear();
-
  swashRingData.clear();
  frsky.clear();
 }
@@ -1144,7 +1174,7 @@ int ModelData::getTrimValue(int phaseIdx, int trimIdx)
 {
  int result = 0;
  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    PhaseData & phase = phaseData[phaseIdx];
+    FlightModeData & phase = flightModeData[phaseIdx];
    if (phase.trimMode[trimIdx] < 0) {
      return result;
    }
@@ -1166,17 +1196,17 @@ int ModelData::getTrimValue(int phaseIdx, int trimIdx)

 bool ModelData::isGVarLinked(int phaseIdx, int gvarIdx)
 {
-  return phaseData[phaseIdx].gvars[gvarIdx] > 1024;
+  return flightModeData[phaseIdx].gvars[gvarIdx] > 1024;
 }

 int ModelData::getGVarValue(int phaseIdx, int gvarIdx)
 {
-  int idx = phaseData[phaseIdx].gvars[gvarIdx];
+  int idx = flightModeData[phaseIdx].gvars[gvarIdx];
  for (int i=0; idx>1024 && i<C9X_MAX_FLIGHT_MODES; i++) {
    int nextPhase = idx - 1025;
    if (nextPhase >= phaseIdx) nextPhase += 1;
    phaseIdx = nextPhase;
-    idx = phaseData[phaseIdx].gvars[gvarIdx];
+    idx = flightModeData[phaseIdx].gvars[gvarIdx];
  }
  return idx;
 }
@@ -1184,7 +1214,7 @@ int ModelData::getGVarValue(int phaseIdx, int gvarIdx)
 void ModelData::setTrimValue(int phaseIdx, int trimIdx, int value)
 {
  for (uint8_t i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    PhaseData & phase = phaseData[phaseIdx];
+    FlightModeData & phase = flightModeData[phaseIdx];
    int mode = phase.trimMode[trimIdx];
    int p = phase.trimRef[trimIdx];
    int & trim = phase.trim[trimIdx];
@@ -1211,9 +1241,9 @@ void ModelData::setTrimValue(int phaseIdx, int trimIdx, int value)
 void ModelData::removeGlobalVar(int & var)
 {
  if (var >= 126 && var <= 130)
-    var = phaseData[0].gvars[var-126];
+    var = flightModeData[0].gvars[var-126];
  else if (var <= -126 && var >= -130)
-    var = - phaseData[0].gvars[-126-var];
+    var = - flightModeData[0].gvars[-126-var];
 }

 ModelData ModelData::removeGlobalVars()
@@ -1234,6 +1264,14 @@ ModelData ModelData::removeGlobalVars()
  return result;
 }

+int ModelData::getChannelsMax()
+{
+  if (extendedLimits)
+    return IS_TARANIS(GetCurrentFirmware()->getBoard()) ? 150 : 125;
+  else
+    return 100;
+}
+
 QList<EEPROMInterface *> eepromInterfaces;
 void RegisterEepromInterfaces()
 {
@@ -229,7 +229,6 @@ enum TelemetrySource {
  TELEMETRY_SOURCE_SWR,
  TELEMETRY_SOURCE_RSSI_TX,
  TELEMETRY_SOURCE_RSSI_RX,
-  TELEMETRY_SOURCE_RX_BATT,
  TELEMETRY_SOURCE_A1,
  TELEMETRY_SOURCE_A2,
  TELEMETRY_SOURCE_A3,
@@ -371,6 +370,11 @@ class RawSource {
      return (this->type != other.type) || (this->index != other.index);
    }

+    bool isTimeBased() const
+    {
+      return (type==SOURCE_TYPE_TELEMETRY && (index==TELEMETRY_SOURCE_TX_TIME || index==TELEMETRY_SOURCE_TIMER1 || index==TELEMETRY_SOURCE_TIMER2));
+    }
+
    RawSourceType type;
    int index;
    const ModelData * model;
@@ -496,7 +500,6 @@ class GeneralSettings {
    bool      disableBG;
    unsigned int  splashMode;
    int splashDuration;
-    uint8_t   filterInput; // TODO enum
    unsigned int  backlightDelay;
    bool   blightinv;
    bool   stickScroll;
@@ -517,6 +520,7 @@ class GeneralSettings {
    unsigned int    gpsFormat;
    int     speakerVolume;
    unsigned int   backlightBright;
+    int switchesDelay;
    int    currentCalib;
    int    temperatureCalib;
    int    temperatureWarn;
@@ -635,6 +639,8 @@ enum MltpxValue {
  MLTPX_REP=2
 };

+#define MIXDATA_NAME_LEN  10
+
 class MixData {
  public:
    MixData() { clear(); }
@@ -653,7 +659,7 @@ class MixData {
    unsigned int mixWarn;           // mixer warning
    unsigned int phases;             // -5=!FP4, 0=normal, 5=FP4
    int    sOffset;
-    char   name[10+1];
+    char   name[MIXDATA_NAME_LEN+1];

    void clear() { memset(this, 0, sizeof(MixData)); }
 };
@@ -709,6 +715,7 @@ class LogicalSwitchData { // Logical Switches data
    int andsw;
    void clear() { memset(this, 0, sizeof(LogicalSwitchData)); }
    CSFunctionFamily getFunctionFamily();
+    bool isDeltaFunction();
    QString funcToString();
    QString toString(const ModelData & model);
 };
@@ -759,9 +766,9 @@ class FuncSwData { // Function Switches data
    QStringList toStringList();
 };

-class PhaseData {
+class FlightModeData {
  public:
-    PhaseData() { clear(); }
+    FlightModeData() { clear(); }
    int trimMode[NUM_STICKS];
    int trimRef[NUM_STICKS];
    int trim[NUM_STICKS];
@@ -771,7 +778,7 @@ class PhaseData {
    unsigned int fadeOut;
    int rotaryEncoders[2];
    int gvars[C9X_MAX_GVARS];
-    void clear() { memset(this, 0, sizeof(PhaseData)); }
+    void clear() { memset(this, 0, sizeof(FlightModeData)); }
 };

 class SwashRingData { // Swash Ring data
@@ -796,15 +803,6 @@ class FrSkyAlarmData {
    void clear() { memset(this, 0, sizeof(FrSkyAlarmData)); }
 };

-class FrSkyErAlarmData {
-  public:
-    FrSkyErAlarmData() { clear(); }
-    uint8_t frskyAlarmType ;
-    uint8_t frskyAlarmLimit ;
-    uint8_t frskyAlarmSound ;
-    void clear() { memset(this, 0, sizeof(FrSkyErAlarmData)); }
-};
-
 class FrSkyRSSIAlarm {
  public:
    FrSkyRSSIAlarm() { clear(0, 50); }
@@ -868,7 +866,6 @@ enum TelemetryVarioSources {
 };

 enum TelemetryVoltsSources {
-  TELEMETRY_VOLTS_SOURCE_RXBATT,
  TELEMETRY_VOLTS_SOURCE_A1,
  TELEMETRY_VOLTS_SOURCE_A2,
  TELEMETRY_VOLTS_SOURCE_A3,
@@ -907,7 +904,6 @@ class FrSkyData {
    bool mAhPersistent;
    unsigned int storedMah;
    int fasOffset;
-    unsigned int rxBattAlarms[2];

    void clear();
 };
@@ -990,7 +986,6 @@ class ModelData {

    bool      used;
    char      name[12+1];
-    uint8_t   modelVoice;
    TimerData timers[2];
    bool      thrTrim;            // Enable Throttle Trim
    bool      thrExpo;            // Enable Throttle Expo
@@ -1002,7 +997,7 @@ class ModelData {
    bool      extendedLimits; // TODO xml
    bool      extendedTrims;
    bool      throttleReversed;
-    PhaseData phaseData[C9X_MAX_FLIGHT_MODES];
+    FlightModeData flightModeData[C9X_MAX_FLIGHT_MODES];
    MixData   mixData[C9X_MAX_MIXERS];
    LimitData limitData[C9X_NUM_CHNOUT];

@@ -1013,8 +1008,7 @@ class ModelData {
    LogicalSwitchData  customSw[C9X_NUM_CSW];
    FuncSwData    funcSw[C9X_MAX_CUSTOM_FUNCTIONS];
    SwashRingData swashRingData;
-    unsigned int  thrTraceSrc;
-    int8_t   traineron;  // 0 disable trainer, 1 allow trainer
+    unsigned int thrTraceSrc;
    unsigned int modelId;
    unsigned int switchWarningStates;
    unsigned int nSwToWarn;
@@ -1024,9 +1018,6 @@ class ModelData {
    // TODO structure
    char     gvars_names[C9X_MAX_GVARS][6+1];
    bool     gvars_popups[C9X_MAX_GVARS];
-    uint8_t  gvsource[5];
-    uint8_t  bt_telemetry;
-    uint8_t  numVoice;
    MavlinkData mavlink;
    unsigned int telemetryProtocol;
    FrSkyData frsky;
@@ -1056,6 +1047,8 @@ class ModelData {
    void clearMixes();
    void clearInputs();

+    int getChannelsMax();
+
  protected:
    void removeGlobalVar(int & var);
 };
@@ -1244,12 +1237,12 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
  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];
-      model.phaseData[p].trim[i] = model.phaseData[p].trim[converted_stick];
-      model.phaseData[p].trim[converted_stick] = tmp;
-      tmp = model.phaseData[p].trimRef[i];
-      model.phaseData[p].trimRef[i] = model.phaseData[p].trimRef[converted_stick];
-      model.phaseData[p].trimRef[converted_stick] = tmp;
+      int tmp = model.flightModeData[p].trim[i];
+      model.flightModeData[p].trim[i] = model.flightModeData[p].trim[converted_stick];
+      model.flightModeData[p].trim[converted_stick] = tmp;
+      tmp = model.flightModeData[p].trimRef[i];
+      model.flightModeData[p].trimRef[i] = model.flightModeData[p].trimRef[converted_stick];
+      model.flightModeData[p].trimRef[converted_stick] = tmp;
    }
  }

@@ -1379,6 +1372,8 @@ class FirmwareInterface {

    virtual int getCapability(const Capability) = 0;

+    virtual bool isTelemetrySourceAvailable(int source) = 0;
+
    virtual SimulatorInterface * getSimulator()
    {
      return NULL;
@@ -356,7 +356,6 @@ t_Er9xModelData::operator ModelData ()
 {
  ModelData c9x;
  c9x.used = true;
-  c9x.modelVoice = modelVoice;
  getEEPROMString(c9x.name, name, sizeof(name));
  c9x.timers[0].mode = getEr9xTimerMode(tmrMode);
  c9x.timers[0].dir = tmrDir;
@@ -375,8 +374,6 @@ t_Er9xModelData::operator ModelData ()
      c9x.moduleData[0].protocol = PPM;
      break;
  }
-  c9x.traineron= traineron;
-  // c9x.t2throttle =  t2throttle;
  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
  c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
  c9x.thrTrim = thrTrim;
@@ -446,7 +443,7 @@ t_Er9xModelData::operator ModelData ()
  }

  for (int i=0; i<NUM_STICKS; i++)
-    c9x.phaseData[0].trim[i] = trim[i];
+    c9x.flightModeData[0].trim[i] = trim[i];

  for (int i=0; i<ER9X_MAX_CURVE5; i++) {
    c9x.curves[i].count = 5;
@@ -195,13 +195,13 @@ PACK(typedef struct t_gvar {
 //	int8_t gvswitch ;
 }) Er9xGvarData ;

-PACK(typedef struct t_PhaseData {
+PACK(typedef struct t_FlightModeData {
 	// Trim store as -1001 to -1, trim value-501, 0-5 use trim of phase 0-5
  int16_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of modes 1|2|3|4 instead
  int8_t swtch;        // Try 0-5 use trim of phase 0-5, 1000-2000, trim + 1500 ???
  uint8_t fadeIn:4;
  uint8_t fadeOut:4;
-}) Er9xPhaseData;
+}) Er9xFlightModeData;

 PACK(typedef struct t_Er9xModelData {
  char      name[10];             // 10 must be first for eeLoadModelName
@@ -251,7 +251,7 @@ PACK(typedef struct t_Er9xModelData {
  uint8_t unused1[8] ;
  uint8_t CustomDisplayIndex[6] ;
  Er9xGvarData gvars[ER9X_MAX_GVARS] ;
-  Er9xPhaseData phaseData[ER9X_MAX_MODES] ;
+  Er9xFlightModeData flightModeData[ER9X_MAX_MODES] ;
  
  operator ModelData();
  t_Er9xModelData() { memset(this, 0, sizeof(t_Er9xModelData)); }
@@ -125,7 +125,6 @@ Ersky9xGeneral::operator GeneralSettings ()
  result.splashMode = disableSplashScreen;
  result.disablePotScroll=(disablePotScroll==1);
  result.disableBG=(disableBG==1);
-  result.filterInput = filterInput;
  result.templateSetup = templateSetup;
  result.PPM_Multiplier = PPM_Multiplier;
  getEEPROMString(result.ownerName, ownerName, sizeof(ownerName));
@@ -507,8 +506,6 @@ t_Ersky9xModelData_v10::operator ModelData ()
      c9x.moduleData[0].protocol = PPM;
      break;
  }
-  c9x.traineron= traineron;
-  // c9x.t2throttle =  t2throttle;
  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
  c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
  c9x.thrTrim = thrTrim;
@@ -574,7 +571,7 @@ t_Ersky9xModelData_v10::operator ModelData ()
  }

  for (int i=0; i<NUM_STICKS; i++)
-    c9x.phaseData[0].trim[i] = trim[i];
+    c9x.flightModeData[0].trim[i] = trim[i];

  for (int i=0; i<ERSKY9X_MAX_CURVE5; i++) {
    c9x.curves[i].count = 5;
@@ -628,8 +625,6 @@ t_Ersky9xModelData_v11::operator ModelData ()
      c9x.moduleData[0].protocol = PPM;
      break;
  }
-  c9x.traineron= traineron;
-  // c9x.t2throttle =  t2throttle;
  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
  c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
  c9x.thrTrim = thrTrim;
@@ -695,7 +690,7 @@ t_Ersky9xModelData_v11::operator ModelData ()
  }

  for (int i=0; i<NUM_STICKS; i++)
-    c9x.phaseData[0].trim[i] = trim[i];
+    c9x.flightModeData[0].trim[i] = trim[i];

  for (int i=0; i<ERSKY9X_MAX_CURVE5; i++) {
    c9x.curves[i].count = 5;
@@ -731,8 +726,8 @@ t_Ersky9xModelData_v11::operator ModelData ()
  //   c9x.customdisplay[i]=customDisplayIndex[i];
  // }
  for (int i=0; i<5;i++) {
-    c9x.phaseData[0].gvars[i]=gvars[i].gvar;
-    c9x.gvsource[i]=gvars[i].gvsource;
+    c9x.flightModeData[0].gvars[i]=gvars[i].gvar;
+    // c9x.gvsource[i]=gvars[i].gvsource;
  }
  return c9x;
 }
@@ -237,14 +237,14 @@ PACK(typedef struct t_Ersky9xgvar {
 //	int8_t gvswitch ;
 }) Ersky9xGvarData ;

-PACK(typedef struct t_Ersky9xPhaseData {
+PACK(typedef struct t_Ersky9xFlightModeData {
  int16_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
  int8_t swtch;       // swtch of phase[0] is not used
  char name[6];
  uint8_t fadeIn:4;
  uint8_t fadeOut:4;
  uint16_t spare ;		// Future expansion
-}) Ersky9xPhaseData;
+}) Ersky9xFlightModeData;

 PACK(typedef struct t_Ersky9xFuncSwData { // Function Switches data
  int8_t  swtch; //input
@@ -421,7 +421,7 @@ PACK(typedef struct t_Ersky9xModelData_v11 {
 // Add 6 bytes for custom telemetry screen
  uint8_t customDisplayIndex[6] ;
  Ersky9xFuncSwData   funcSw[ERSKY9X_NUM_FSW];
-  Ersky9xPhaseData phaseData[6] ;
+  Ersky9xFlightModeData flightModeData[6] ;
  Ersky9xGvarData gvars[ERSKY9X_MAX_GVARS] ;

  operator ModelData();
@@ -108,7 +108,6 @@ Gruvin9xGeneral_v103::operator GeneralSettings ()
  result.flashBeep = flashBeep;
  result.splashMode = disableSplashScreen;
  result.enableTelemetryAlarm = enableTelemetryAlarm;
-  result.filterInput = filterInput;
  result.templateSetup = templateSetup;
  result.PPM_Multiplier = PPM_Multiplier;
  // TODO frskyRssiAlarms[2];
@@ -153,7 +152,6 @@ Gruvin9xGeneral_v104::operator GeneralSettings ()
  result.flashBeep = flashBeep;
  result.splashMode = disableSplashScreen;
  result.enableTelemetryAlarm = enableTelemetryAlarm;
-  result.filterInput = filterInput;
  result.templateSetup = templateSetup;
  result.PPM_Multiplier = PPM_Multiplier;
  // TODO frskyRssiAlarms[2];
@@ -349,9 +347,9 @@ t_Gruvin9xSwashRingData::operator SwashRingData ()
  return c9x;
 }

-t_Gruvin9xPhaseData_v102::operator PhaseData ()
+t_Gruvin9xFlightModeData_v102::operator FlightModeData ()
 {
-  PhaseData c9x;
+  FlightModeData c9x;
  for (int i=0; i<NUM_STICKS; i++)
    c9x.trim[i] = trim[i];
  c9x.swtch = gruvin9xToSwitch(swtch);
@@ -361,9 +359,9 @@ t_Gruvin9xPhaseData_v102::operator PhaseData ()
  return c9x;
 }

-t_Gruvin9xPhaseData_v106::operator PhaseData ()
+t_Gruvin9xFlightModeData_v106::operator FlightModeData ()
 {
-  PhaseData c9x;
+  FlightModeData c9x;
  for (int i=0; i<NUM_STICKS; i++)
    c9x.trim[i] = (((int16_t)trim[i]) << 2) + ((trim_ext >> (2*i)) & 0x03);
  c9x.swtch = gruvin9xToSwitch(swtch);
@@ -456,7 +454,7 @@ t_Gruvin9xModelData_v102::operator ModelData ()
  c9x.moduleData[0].ppmPulsePol = pulsePol;
  c9x.extendedLimits = extendedLimits;
  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++)
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
  for (int i=0; i<G9X_MAX_MIXERS; i++)
    c9x.mixData[i] = mixData[i];
  for (int i=0; i<G9X_NUM_CHNOUT; i++)
@@ -527,7 +525,7 @@ t_Gruvin9xModelData_v103::operator ModelData ()
  c9x.moduleData[0].ppmPulsePol = pulsePol;
  c9x.extendedLimits = extendedLimits;
  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++)
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
  for (int i=0; i<G9X_MAX_MIXERS; i++)
    c9x.mixData[i] = mixData[i];
  for (int i=0; i<G9X_NUM_CHNOUT; i++)
@@ -599,20 +597,20 @@ t_Gruvin9xModelData_v105::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (phaseData[i].trim[j] > 125) {
-        c9x.phaseData[i].trimRef[j] = 0;
-        c9x.phaseData[i].trim[j] = 0;
+      if (flightModeData[i].trim[j] > 125) {
+        c9x.flightModeData[i].trimRef[j] = 0;
+        c9x.flightModeData[i].trim[j] = 0;
      }
-      else if (phaseData[i].trim[j] < -125) {
-        c9x.phaseData[i].trimRef[j] = 129 + phaseData[i].trim[j];
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      else if (flightModeData[i].trim[j] < -125) {
+        c9x.flightModeData[i].trimRef[j] = 129 + flightModeData[i].trim[j];
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
      else {
-        c9x.phaseData[i].trim[j] += subtrim[j];
+        c9x.flightModeData[i].trim[j] += subtrim[j];
      }
    }
  }
@@ -690,13 +688,13 @@ t_Gruvin9xModelData_v106::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -244,19 +244,19 @@ PACK(typedef struct t_Gruvin9xSwashRingData { // Swash Ring data
  t_Gruvin9xSwashRingData();
 }) Gruvin9xSwashRingData;

-PACK(typedef struct t_Gruvin9xPhaseData_v102 {
+PACK(typedef struct t_Gruvin9xFlightModeData_v102 {
  int8_t trim[4];     // -125..125 => trim value, 127 => use trim of phase 0, -128, -127, -126 => use trim of phases 1|2|3|4 instead
  int8_t swtch;       // swtch of phase[0] is not used
  char name[6];
  uint8_t fadeIn:4;
  uint8_t fadeOut:4;

-  operator PhaseData();
-  t_Gruvin9xPhaseData_v102() { memset(this, 0, sizeof(t_Gruvin9xPhaseData_v102)); }
-}) Gruvin9xPhaseData_v102;
+  operator FlightModeData();
+  t_Gruvin9xFlightModeData_v102() { memset(this, 0, sizeof(t_Gruvin9xFlightModeData_v102)); }
+}) Gruvin9xFlightModeData_v102;


-PACK(typedef struct t_Gruvin9xPhaseData_v106 {
+PACK(typedef struct t_Gruvin9xFlightModeData_v106 {
  int8_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
  int8_t trim_ext:8;  // 2 less significant extra bits per trim (10bits trims)
  int8_t swtch;       // swtch of phase[0] is not used
@@ -264,9 +264,9 @@ PACK(typedef struct t_Gruvin9xPhaseData_v106 {
  uint8_t fadeIn:4;
  uint8_t fadeOut:4;

-  operator PhaseData();
-  t_Gruvin9xPhaseData_v106() { memset(this, 0, sizeof(t_Gruvin9xPhaseData_v106)); }
-}) Gruvin9xPhaseData_v106;
+  operator FlightModeData();
+  t_Gruvin9xFlightModeData_v106() { memset(this, 0, sizeof(t_Gruvin9xFlightModeData_v106)); }
+}) Gruvin9xFlightModeData_v106;

 PACK(typedef struct t_Gruvin9xTimerData {
  int8_t    mode:7;            // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw
@@ -312,7 +312,7 @@ PACK(typedef struct t_Gruvin9xModelData_v102 {
  Gruvin9xLogicalSwitchData  customSw[G9X_NUM_CSW];
  Gruvin9xSafetySwData  safetySw[G9X_NUM_CHNOUT];
  Gruvin9xSwashRingData swashR;
-  Gruvin9xPhaseData_v102 phaseData[G9X_MAX_FLIGHT_MODES];
+  Gruvin9xFlightModeData_v102 flightModeData[G9X_MAX_FLIGHT_MODES];
  Gruvin9xFrSkyData frsky;

  operator ModelData();
@@ -344,7 +344,7 @@ PACK(typedef struct t_Gruvin9xModelData_v103 {
  Gruvin9xLogicalSwitchData  customSw[G9X_NUM_CSW];
  Gruvin9xSafetySwData  safetySw[G9X_NUM_CHNOUT];
  Gruvin9xSwashRingData swashR;
-  Gruvin9xPhaseData_v102 phaseData[G9X_MAX_FLIGHT_MODES];
+  Gruvin9xFlightModeData_v102 flightModeData[G9X_MAX_FLIGHT_MODES];
  Gruvin9xFrSkyData frsky;

  operator ModelData();
@@ -377,7 +377,7 @@ PACK(typedef struct t_Gruvin9xModelData_v105 {
  Gruvin9xSafetySwData  safetySw[G9X_NUM_CHNOUT];
  Gruvin9xFuncSwData    funcSw[G9X_NUM_FSW];
  Gruvin9xSwashRingData swashR;
-  Gruvin9xPhaseData_v102 phaseData[G9X_MAX_FLIGHT_MODES];
+  Gruvin9xFlightModeData_v102 flightModeData[G9X_MAX_FLIGHT_MODES];
  int16_t   subtrim[NUM_STICKS];
  Gruvin9xFrSkyData frsky;

@@ -409,7 +409,7 @@ PACK(typedef struct t_Gruvin9xModelData_v106 {
  Gruvin9xSafetySwData  safetySw[G9X_NUM_CHNOUT];
  Gruvin9xFuncSwData    funcSw[G9X_NUM_FSW];
  Gruvin9xSwashRingData swashR;
-  Gruvin9xPhaseData_v106 phaseData[G9X_MAX_FLIGHT_MODES];
+  Gruvin9xFlightModeData_v106 flightModeData[G9X_MAX_FLIGHT_MODES];
  Gruvin9xFrSkyData frsky;

  operator ModelData();
@@ -8,9 +8,9 @@
 extern void getEEPROMZString(char *dst, const char *src, int size);
 extern RawSwitch open9xStockToSwitch(int8_t sw);

-t_Open9xGruvin9xPhaseData_v207::operator PhaseData ()
+t_Open9xGruvin9xFlightModeData_v207::operator FlightModeData ()
 {
-  PhaseData c9x;
+  FlightModeData c9x;
  for (int i=0; i<NUM_STICKS; i++)
    c9x.trim[i] = (((int16_t)trim[i]) << 2) + ((trim_ext >> (2*i)) & 0x03);
  c9x.swtch = open9xStockToSwitch(swtch);
@@ -22,9 +22,9 @@ t_Open9xGruvin9xPhaseData_v207::operator PhaseData ()
  return c9x;
 }

-t_Open9xGruvin9xPhaseData_v208::operator PhaseData ()
+t_Open9xGruvin9xFlightModeData_v208::operator FlightModeData ()
 {
-  PhaseData c9x;
+  FlightModeData c9x;
  for (int i=0; i<NUM_STICKS; i++)
    c9x.trim[i] = trim[i];
  c9x.swtch = open9xStockToSwitch(swtch);
@@ -461,13 +461,13 @@ t_Open9xGruvin9xModelData_v207::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -546,13 +546,13 @@ t_Open9xGruvin9xModelData_v208::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -635,13 +635,13 @@ t_Open9xGruvin9xModelData_v209::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -725,13 +725,13 @@ t_Open9xGruvin9xModelData_v210::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -812,13 +812,13 @@ t_Open9xGruvin9xModelData_v211::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -22,7 +22,7 @@

 #include "open9xStockeeprom.h"

-PACK(typedef struct t_Open9xGruvin9xPhaseData_v207 {
+PACK(typedef struct t_Open9xGruvin9xFlightModeData_v207 {
  int8_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
  int8_t trim_ext:8;  // 2 less significant extra bits per trim (10bits trims)
  int8_t swtch;       // swtch of phase[0] is not used
@@ -30,20 +30,20 @@ PACK(typedef struct t_Open9xGruvin9xPhaseData_v207 {
  uint8_t fadeIn:4;
  uint8_t fadeOut:4;
  int16_t rotaryEncoders[2];
-  operator PhaseData();
-  t_Open9xGruvin9xPhaseData_v207() { memset(this, 0, sizeof(t_Open9xGruvin9xPhaseData_v207)); }
-}) Open9xGruvin9xPhaseData_v207;
+  operator FlightModeData();
+  t_Open9xGruvin9xFlightModeData_v207() { memset(this, 0, sizeof(t_Open9xGruvin9xFlightModeData_v207)); }
+}) Open9xGruvin9xFlightModeData_v207;

-PACK(typedef struct t_Open9xGruvin9xPhaseData_v208 {
+PACK(typedef struct t_Open9xGruvin9xFlightModeData_v208 {
  int16_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
  int8_t swtch;       // swtch of phase[0] is not used
  char name[6];
  uint8_t fadeIn:4;
  uint8_t fadeOut:4;
  int16_t rotaryEncoders[2];
-  operator PhaseData();
-  t_Open9xGruvin9xPhaseData_v208() { memset(this, 0, sizeof(t_Open9xGruvin9xPhaseData_v208)); }
-}) Open9xGruvin9xPhaseData_v208;
+  operator FlightModeData();
+  t_Open9xGruvin9xFlightModeData_v208() { memset(this, 0, sizeof(t_Open9xGruvin9xFlightModeData_v208)); }
+}) Open9xGruvin9xFlightModeData_v208;

 PACK(typedef struct t_Open9xGruvin9xMixData_v207 {
  uint8_t destCh:4;          // 0, 1..C9X_NUM_CHNOUT
@@ -197,7 +197,7 @@ PACK(typedef struct t_Open9xGruvin9xModelData_v207 {
  Open9xGruvin9xLogicalSwitchData_v207  customSw[O9X_NUM_CSW];
  Open9xFuncSwData_v203 funcSw[O9X_NUM_FSW];
  Open9xGruvin9xSwashRingData_v208 swashR;
-  Open9xGruvin9xPhaseData_v207 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xGruvin9xFlightModeData_v207 flightModeData[O9X_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v205 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -231,7 +231,7 @@ PACK(typedef struct t_Open9xGruvin9xModelData_v208 {
  Open9xGruvin9xLogicalSwitchData_v207  customSw[O9X_NUM_CSW];
  Open9xGruvin9xFuncSwData_v203 funcSw[O9X_NUM_FSW];
  Open9xGruvin9xSwashRingData_v208 swashR;
-  Open9xGruvin9xPhaseData_v208 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xGruvin9xFlightModeData_v208 flightModeData[O9X_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v208 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -270,7 +270,7 @@ PACK(typedef struct t_Open9xGruvin9xModelData_v209 {
  Open9xGruvin9xLogicalSwitchData_v209  customSw[O9X_NUM_CSW];
  Open9xGruvin9xFuncSwData_v203 funcSw[O9X_NUM_FSW];
  Open9xGruvin9xSwashRingData_v209 swashR;
-  Open9xGruvin9xPhaseData_v208 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xGruvin9xFlightModeData_v208 flightModeData[O9X_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v208 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -310,7 +310,7 @@ PACK(typedef struct t_Open9xGruvin9xModelData_v210 {
  Open9xGruvin9xLogicalSwitchData_v209  customSw[O9X_NUM_CSW];
  Open9xGruvin9xFuncSwData_v210 funcSw[O9X_NUM_FSW];
  Open9xGruvin9xSwashRingData_v209 swashR;
-  Open9xGruvin9xPhaseData_v208 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xGruvin9xFlightModeData_v208 flightModeData[O9X_MAX_FLIGHT_MODES];

  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -348,7 +348,7 @@ PACK(typedef struct t_Open9xGruvin9xModelData_v211 {
  Open9xGruvin9xLogicalSwitchData_v209  customSw[O9X_NUM_CSW];
  Open9xGruvin9xFuncSwData_v210 funcSw[O9X_NUM_FSW];
  Open9xGruvin9xSwashRingData_v209 swashR;
-  Open9xGruvin9xPhaseData_v208 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xGruvin9xFlightModeData_v208 flightModeData[O9X_MAX_FLIGHT_MODES];

  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -220,9 +220,9 @@ t_Open9xArmExpoData_v212::operator ExpoData ()
  return c9x;
 }

-t_Open9xArmPhaseData_v208::operator PhaseData ()
+t_Open9xArmFlightModeData_v208::operator FlightModeData ()
 {
-  PhaseData c9x;
+  FlightModeData c9x;
  for (int i=0; i<NUM_STICKS; i++)
    c9x.trim[i] = trim[i];
  c9x.swtch = open9xArmToSwitch(swtch);
@@ -232,9 +232,9 @@ t_Open9xArmPhaseData_v208::operator PhaseData ()
  return c9x;
 }

-t_Open9xArmPhaseData_v212::operator PhaseData ()
+t_Open9xArmFlightModeData_v212::operator FlightModeData ()
 {
-  PhaseData c9x;
+  FlightModeData c9x;
  for (int i=0; i<NUM_STICKS; i++)
    c9x.trim[i] = trim[i];
  c9x.swtch = open9xArmToSwitch(swtch);
@@ -768,13 +768,13 @@ t_Open9xArmModelData_v208::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_ARM_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -857,13 +857,13 @@ t_Open9xArmModelData_v209::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_ARM_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -947,13 +947,13 @@ t_Open9xArmModelData_v210::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_ARM_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1031,13 +1031,13 @@ t_Open9xArmModelData_v211::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_ARM_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1118,13 +1118,13 @@ t_Open9xArmModelData_v212::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_ARM_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -169,26 +169,26 @@ PACK(typedef struct t_Open9xArmMixData_v212 {
  t_Open9xArmMixData_v212() { memset(this, 0, sizeof(t_Open9xArmMixData_v212)); }
 }) Open9xArmMixData_v212;

-PACK(typedef struct t_Open9xArmPhaseData_v208 {
+PACK(typedef struct t_Open9xArmFlightModeData_v208 {
  int16_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
  int8_t swtch;       // swtch of phase[0] is not used
  char name[6];
  uint8_t fadeIn:4;
  uint8_t fadeOut:4;
-  operator PhaseData();
-  t_Open9xArmPhaseData_v208() { memset(this, 0, sizeof(t_Open9xArmPhaseData_v208)); }
-}) Open9xArmPhaseData_v208;
+  operator FlightModeData();
+  t_Open9xArmFlightModeData_v208() { memset(this, 0, sizeof(t_Open9xArmFlightModeData_v208)); }
+}) Open9xArmFlightModeData_v208;

-PACK(typedef struct t_Open9xArmPhaseData_v212 {
+PACK(typedef struct t_Open9xArmFlightModeData_v212 {
  int16_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
  int8_t swtch;       // swtch of phase[0] is not used
  char name[6];
  uint8_t fadeIn:4;
  uint8_t fadeOut:4;
  int16_t rotaryEncoders[1];
-  operator PhaseData();
-  t_Open9xArmPhaseData_v212() { memset(this, 0, sizeof(t_Open9xArmPhaseData_v212)); }
-}) Open9xArmPhaseData_v212;
+  operator FlightModeData();
+  t_Open9xArmFlightModeData_v212() { memset(this, 0, sizeof(t_Open9xArmFlightModeData_v212)); }
+}) Open9xArmFlightModeData_v212;

 PACK(typedef struct t_Open9xArmLogicalSwitchData_v208 { // Custom Switches data
  int8_t  v1; //input
@@ -346,7 +346,7 @@ PACK(typedef struct t_Open9xArmModelData_v208 {
  Open9xArmLogicalSwitchData_v208 customSw[O9X_ARM_NUM_CSW];
  Open9xArmFuncSwData_v208 funcSw[O9X_ARM_NUM_FSW];
  Open9xArmSwashRingData_v208 swashR;
-  Open9xArmPhaseData_v208 phaseData[O9X_ARM_MAX_FLIGHT_MODES];
+  Open9xArmFlightModeData_v208 flightModeData[O9X_ARM_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v208 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -385,7 +385,7 @@ PACK(typedef struct t_Open9xArmModelData_v209 {
  Open9xArmLogicalSwitchData_v209 customSw[O9X_ARM_NUM_CSW];
  Open9xArmFuncSwData_v208 funcSw[O9X_ARM_NUM_FSW];
  Open9xArmSwashRingData_v209 swashR;
-  Open9xArmPhaseData_v208 phaseData[O9X_ARM_MAX_FLIGHT_MODES];
+  Open9xArmFlightModeData_v208 flightModeData[O9X_ARM_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v208 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -425,7 +425,7 @@ PACK(typedef struct t_Open9xArmModelData_v210 {
  Open9xArmLogicalSwitchData_v210 customSw[O9X_ARM_NUM_CSW];
  Open9xArmFuncSwData_v210 funcSw[O9X_ARM_NUM_FSW];
  Open9xArmSwashRingData_v209 swashR;
-  Open9xArmPhaseData_v208 phaseData[O9X_ARM_MAX_FLIGHT_MODES];
+  Open9xArmFlightModeData_v208 flightModeData[O9X_ARM_MAX_FLIGHT_MODES];
  Open9xArmFrSkyData_v210 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -464,7 +464,7 @@ PACK(typedef struct t_Open9xArmModelData_v211 {
  Open9xArmLogicalSwitchData_v210 customSw[O9X_ARM_NUM_CSW];
  Open9xArmFuncSwData_v211 funcSw[O9X_ARM_NUM_FSW];
  Open9xArmSwashRingData_v209 swashR;
-  Open9xArmPhaseData_v208 phaseData[O9X_ARM_MAX_FLIGHT_MODES];
+  Open9xArmFlightModeData_v208 flightModeData[O9X_ARM_MAX_FLIGHT_MODES];

  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -502,7 +502,7 @@ PACK(typedef struct t_Open9xArmModelData_v212 {
  Open9xArmLogicalSwitchData_v210 customSw[O9X_ARM_NUM_CSW];
  Open9xArmFuncSwData_v211 funcSw[O9X_ARM_NUM_FSW];
  Open9xArmSwashRingData_v210 swashR;
-  Open9xArmPhaseData_v212 phaseData[O9X_ARM_MAX_FLIGHT_MODES];
+  Open9xArmFlightModeData_v212 flightModeData[O9X_ARM_MAX_FLIGHT_MODES];

  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -686,9 +686,9 @@ t_Open9xSwashRingData_v209::operator SwashRingData ()
  return c9x;
 }

-t_Open9xPhaseData_v201::operator PhaseData ()
+t_Open9xFlightModeData_v201::operator FlightModeData ()
 {
-  PhaseData c9x;
+  FlightModeData c9x;
  for (int i=0; i<NUM_STICKS; i++)
    c9x.trim[i] = (((int16_t)trim[i]) << 2) + ((trim_ext >> (2*i)) & 0x03);
  c9x.swtch = open9xStockToSwitch(swtch);
@@ -949,13 +949,13 @@ t_Open9xModelData_v201::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1023,13 +1023,13 @@ t_Open9xModelData_v202::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1099,13 +1099,13 @@ t_Open9xModelData_v203::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1173,13 +1173,13 @@ t_Open9xModelData_v204::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1252,13 +1252,13 @@ t_Open9xModelData_v205::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1338,13 +1338,13 @@ t_Open9xModelData_v208::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1431,13 +1431,13 @@ t_Open9xModelData_v209::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1525,13 +1525,13 @@ t_Open9xModelData_v210::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1613,13 +1613,13 @@ t_Open9xModelData_v211::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -445,7 +445,7 @@ PACK(typedef struct t_Open9xSwashRingData_v209 { // Swash Ring data
  t_Open9xSwashRingData_v209() { memset(this, 0, sizeof(t_Open9xSwashRingData_v209)); }
 }) Open9xSwashRingData_v209;

-PACK(typedef struct t_Open9xPhaseData_v201 {
+PACK(typedef struct t_Open9xFlightModeData_v201 {
  int8_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
  int8_t trim_ext:8;  // 2 less significant extra bits per trim (10bits trims)
  int8_t swtch;       // swtch of phase[0] is not used
@@ -453,9 +453,9 @@ PACK(typedef struct t_Open9xPhaseData_v201 {
  uint8_t fadeIn:4;
  uint8_t fadeOut:4;

-  operator PhaseData();
-  t_Open9xPhaseData_v201() { memset(this, 0, sizeof(t_Open9xPhaseData_v201)); }
-}) Open9xPhaseData_v201;
+  operator FlightModeData();
+  t_Open9xFlightModeData_v201() { memset(this, 0, sizeof(t_Open9xFlightModeData_v201)); }
+}) Open9xFlightModeData_v201;

 PACK(typedef struct t_Open9xTimerData_v201 {
  int8_t    mode;            // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw
@@ -520,7 +520,7 @@ PACK(typedef struct t_Open9xModelData_v201 {
  Open9xSafetySwData  safetySw[O9X_NUM_CHNOUT];
  Open9xFuncSwData_v201 funcSw[12];
  Open9xSwashRingData_v208 swashR;
-  Open9xPhaseData_v201 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xFlightModeData_v201 flightModeData[O9X_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v201 frsky;

  operator ModelData();
@@ -551,7 +551,7 @@ PACK(typedef struct t_Open9xModelData_v202 {
  Open9xSafetySwData  safetySw[O9X_NUM_CHNOUT];
  Open9xFuncSwData_v201 funcSw[12];
  Open9xSwashRingData_v208 swashR;
-  Open9xPhaseData_v201 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xFlightModeData_v201 flightModeData[O9X_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v202 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -584,7 +584,7 @@ PACK(typedef struct t_Open9xModelData_v203 {
  Open9xLogicalSwitchData_v208 customSw[O9X_NUM_CSW];
  Open9xFuncSwData_v203 funcSw[O9X_NUM_FSW];
  Open9xSwashRingData_v208 swashR;
-  Open9xPhaseData_v201 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xFlightModeData_v201 flightModeData[O9X_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v202 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -617,7 +617,7 @@ PACK(typedef struct t_Open9xModelData_v204 {
  Open9xLogicalSwitchData_v208  customSw[O9X_NUM_CSW];
  Open9xFuncSwData_v203 funcSw[O9X_NUM_FSW];
  Open9xSwashRingData_v208 swashR;
-  Open9xPhaseData_v201 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xFlightModeData_v201 flightModeData[O9X_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v204 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -650,7 +650,7 @@ PACK(typedef struct t_Open9xModelData_v205 {
  Open9xLogicalSwitchData_v208  customSw[O9X_NUM_CSW];
  Open9xFuncSwData_v203 funcSw[O9X_NUM_FSW];
  Open9xSwashRingData_v208 swashR;
-  Open9xPhaseData_v201 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xFlightModeData_v201 flightModeData[O9X_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v205 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -685,7 +685,7 @@ PACK(typedef struct t_Open9xModelData_v208 {
  Open9xLogicalSwitchData_v208  customSw[O9X_NUM_CSW];
  Open9xFuncSwData_v203 funcSw[O9X_NUM_FSW];
  Open9xSwashRingData_v208 swashR;
-  Open9xPhaseData_v201 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xFlightModeData_v201 flightModeData[O9X_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v208 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -724,7 +724,7 @@ PACK(typedef struct t_Open9xModelData_v209 {
  Open9xLogicalSwitchData_v209  customSw[O9X_NUM_CSW];
  Open9xFuncSwData_v203 funcSw[O9X_NUM_FSW];
  Open9xSwashRingData_v209 swashR;
-  Open9xPhaseData_v201 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xFlightModeData_v201 flightModeData[O9X_MAX_FLIGHT_MODES];
  Open9xFrSkyData_v208 frsky;
  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -764,7 +764,7 @@ PACK(typedef struct t_Open9xModelData_v210 {
  Open9xLogicalSwitchData_v209  customSw[O9X_NUM_CSW];
  Open9xFuncSwData_v210 funcSw[O9X_NUM_FSW];
  Open9xSwashRingData_v209 swashR;
-  Open9xPhaseData_v201 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xFlightModeData_v201 flightModeData[O9X_MAX_FLIGHT_MODES];

  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -802,7 +802,7 @@ PACK(typedef struct t_Open9xModelData_v211 {
  Open9xLogicalSwitchData_v209  customSw[O9X_NUM_CSW];
  Open9xFuncSwData_v210 funcSw[O9X_NUM_FSW];
  Open9xSwashRingData_v209 swashR;
-  Open9xPhaseData_v201 phaseData[O9X_MAX_FLIGHT_MODES];
+  Open9xFlightModeData_v201 flightModeData[O9X_MAX_FLIGHT_MODES];

  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -177,13 +177,13 @@ void Open9xGruvin9xSimulator::setValues(TxInputs &inputs)
 void Open9xGruvin9xSimulator::setTrim(unsigned int idx, int value)
 {
  idx = Open9xGruvin9x::modn12x3[4*getStickMode() + idx];
-  uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
+  uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
  setTrimValue(phase, idx, value);
 }

 void Open9xGruvin9xSimulator::getTrims(Trims & trims)
 {
-  uint8_t phase = getFlightPhase();
+  uint8_t phase = getFlightMode();
  trims.extended = hasExtendedTrims();
  for (uint8_t idx=0; idx<4; idx++) {
    trims.values[idx] = getTrimValue(getTrimFlightPhase(phase, idx), idx);
@@ -204,13 +204,13 @@ void Open9xGruvin9xSimulator::wheelEvent(uint8_t steps)

 unsigned int Open9xGruvin9xSimulator::getPhase()
 {
-  return getFlightPhase();
+  return getFlightMode();
 }

 const char * Open9xGruvin9xSimulator::getPhaseName(unsigned int phase)
 {
-  static char buff[sizeof(g_model.phaseData[0].name)+1];
-  zchar2str(buff, g_model.phaseData[phase].name, sizeof(g_model.phaseData[0].name));
+  static char buff[sizeof(g_model.flightModeData[0].name)+1];
+  zchar2str(buff, g_model.flightModeData[phase].name, sizeof(g_model.flightModeData[0].name));
  return buff;
 }

@@ -169,13 +169,13 @@ void OpenTxM128Simulator::setValues(TxInputs &inputs)
 void OpenTxM128Simulator::setTrim(unsigned int idx, int value)
 {
  idx = OpenTxM128::modn12x3[4*getStickMode() + idx];
-  uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
+  uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
  setTrimValue(phase, idx, value);
 }

 void OpenTxM128Simulator::getTrims(Trims & trims)
 {
-  uint8_t phase = getFlightPhase();
+  uint8_t phase = getFlightMode();
  trims.extended = hasExtendedTrims();
  for (uint8_t idx=0; idx<4; idx++) {
    trims.values[idx] = getTrimValue(getTrimFlightPhase(phase, idx), idx);
@@ -195,13 +195,13 @@ void OpenTxM128Simulator::wheelEvent(uint8_t steps)

 unsigned int OpenTxM128Simulator::getPhase()
 {
-  return getFlightPhase();
+  return getFlightMode();
 }

 const char * OpenTxM128Simulator::getPhaseName(unsigned int phase)
 {
-  static char buff[sizeof(g_model.phaseData[0].name)+1];
-  zchar2str(buff, g_model.phaseData[phase].name, sizeof(g_model.phaseData[0].name));
+  static char buff[sizeof(g_model.flightModeData[0].name)+1];
+  zchar2str(buff, g_model.flightModeData[phase].name, sizeof(g_model.flightModeData[0].name));
  return buff;
 }

@@ -179,13 +179,13 @@ void OpenTxM64Simulator::setValues(TxInputs &inputs)
 void OpenTxM64Simulator::setTrim(unsigned int idx, int value)
 {
  idx = OpenTxM64::modn12x3[4*getStickMode() + idx];
-  uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
+  uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
  setTrimValue(phase, idx, value);
 }

 void OpenTxM64Simulator::getTrims(Trims & trims)
 {
-  uint8_t phase = getFlightPhase();
+  uint8_t phase = getFlightMode();
  trims.extended = hasExtendedTrims();
  for (uint8_t idx=0; idx<4; idx++) {
    trims.values[idx] = getTrimValue(getTrimFlightPhase(phase, idx), idx);
@@ -201,13 +201,13 @@ void OpenTxM64Simulator::getTrims(Trims & trims)

 unsigned int OpenTxM64Simulator::getPhase()
 {
-  return getFlightPhase();
+  return getFlightMode();
 }

 const char * OpenTxM64Simulator::getPhaseName(unsigned int phase)
 {
-  static char buff[sizeof(g_model.phaseData[0].name)+1];
-  zchar2str(buff, g_model.phaseData[phase].name, sizeof(g_model.phaseData[0].name));
+  static char buff[sizeof(g_model.flightModeData[0].name)+1];
+  zchar2str(buff, g_model.flightModeData[phase].name, sizeof(g_model.flightModeData[0].name));
  return buff;
 }

@@ -120,6 +120,7 @@ namespace Open9xSky9x {
 #include "radio/src/translations/tts_pt.cpp"
 #include "radio/src/translations/tts_sk.cpp"
 #include "radio/src/translations/tts_pl.cpp"
+#include "radio/src/translations/tts_hu.cpp"

 int16_t g_anas[NUM_STICKS+BOARD_9X_NUM_POTS];

@@ -212,13 +213,13 @@ void Open9xSky9xSimulator::setValues(TxInputs &inputs)
 void Open9xSky9xSimulator::setTrim(unsigned int idx, int value)
 {
  idx = Open9xSky9x::modn12x3[4*getStickMode() + idx];
-  uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
+  uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
  setTrimValue(phase, idx, value);
 }

 void Open9xSky9xSimulator::getTrims(Trims & trims)
 {
-  uint8_t phase = getFlightPhase();
+  uint8_t phase = getFlightMode();
  trims.extended = hasExtendedTrims();
  for (uint8_t idx=0; idx<4; idx++) {
    trims.values[idx] = getTrimValue(getTrimFlightPhase(phase, idx), idx);
@@ -239,13 +240,13 @@ void Open9xSky9xSimulator::wheelEvent(uint8_t steps)

 unsigned int Open9xSky9xSimulator::getPhase()
 {
-  return getFlightPhase();
+  return getFlightMode();
 }

 const char * Open9xSky9xSimulator::getPhaseName(unsigned int phase)
 {
-  static char buff[sizeof(g_model.phaseData[0].name)+1];
-  zchar2str(buff, g_model.phaseData[phase].name, sizeof(g_model.phaseData[0].name));
+  static char buff[sizeof(g_model.flightModeData[0].name)+1];
+  zchar2str(buff, g_model.flightModeData[phase].name, sizeof(g_model.flightModeData[0].name));
  return buff;
 }

@@ -129,7 +129,7 @@ inline int geteepromsize() {
 #include "radio/src/translations/tts_pt.cpp"
 #include "radio/src/translations/tts_sk.cpp"
 #include "radio/src/translations/tts_pl.cpp"
-
+#include "radio/src/translations/tts_hu.cpp"
 #include "radio/src/lua.cpp"
 #include "radio/src/lua/src/lapi.c"
 #include "radio/src/lua/src/lcode.c"
@@ -251,13 +251,13 @@ void OpentxTaranisSimulator::setValues(TxInputs &inputs)
 void OpentxTaranisSimulator::setTrim(unsigned int idx, int value)
 {
  idx = Open9xX9D::modn12x3[4*getStickMode() + idx];
-  uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
+  uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
  setTrimValue(phase, idx, value);
 }

 void OpentxTaranisSimulator::getTrims(Trims & trims)
 {
-  uint8_t phase = getFlightPhase();
+  uint8_t phase = getFlightMode();
  trims.extended = hasExtendedTrims();
  for (uint8_t idx=0; idx<4; idx++) {
    trims.values[idx] = getTrimValue(getTrimFlightPhase(phase, idx), idx);
@@ -278,13 +278,13 @@ void OpentxTaranisSimulator::wheelEvent(uint8_t steps)

 unsigned int OpentxTaranisSimulator::getPhase()
 {
-  return getFlightPhase();
+  return getFlightMode();
 }

 const char * OpentxTaranisSimulator::getPhaseName(unsigned int phase)
 {
-  static char buff[sizeof(g_model.phaseData[0].name)+1];
-  zchar2str(buff, g_model.phaseData[phase].name, sizeof(g_model.phaseData[0].name));
+  static char buff[sizeof(g_model.flightModeData[0].name)+1];
+  zchar2str(buff, g_model.flightModeData[phase].name, sizeof(g_model.flightModeData[0].name));
  return buff;
 }

@@ -260,15 +260,17 @@ class SourcesConversionTable: public ConversionTable {

        for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
          if (version < 216) {
-            if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_RX_BATT || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPD || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
+            if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPD || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
              continue;
          }
          if (!IS_ARM(board)) {
-            if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR|| i==TELEMETRY_SOURCE_RX_BATT || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_A3_MIN || i==TELEMETRY_SOURCE_A4_MIN)
+            if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_A3_MIN || i==TELEMETRY_SOURCE_A4_MIN)
              continue;
          }
          addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
          if (version >= 216 && IS_ARM(board)) {
+            if (i==TELEMETRY_SOURCE_RSSI_RX)
+              val += 1;
            if (i==TELEMETRY_SOURCE_TX_TIME)
              val += 5;
            if (i==TELEMETRY_SOURCE_DTE)
@@ -414,7 +416,7 @@ class TelemetrySourcesConversionTable: public ConversionTable {
      addConversion(1+TELEMETRY_SOURCE_RSSI_TX, val++);
      addConversion(1+TELEMETRY_SOURCE_RSSI_RX, val++);
      if (IS_ARM(board) && version >= 216)
-        addConversion(1+TELEMETRY_SOURCE_RX_BATT, val++);
+        addConversion(1+TELEMETRY_SOURCE_RESERVE, val++);
      addConversion(1+TELEMETRY_SOURCE_A1, val++);
      addConversion(1+TELEMETRY_SOURCE_A2, val++);
      if (IS_ARM(board) && version >= 216) {
@@ -699,7 +701,7 @@ class HeliField: public StructField {

 class FlightModeField: public TransformedField {
  public:
-    FlightModeField(PhaseData & phase, int index, BoardEnum board, unsigned int version):
+    FlightModeField(FlightModeData & phase, int index, BoardEnum board, unsigned int version):
      TransformedField(internalField),
      internalField("Phase"),
      phase(phase),
@@ -824,7 +826,7 @@ class FlightModeField: public TransformedField {

  protected:
    StructField internalField;
-    PhaseData & phase;
+    FlightModeData & phase;
    int index;
    BoardEnum board;
    unsigned int version;
@@ -1158,6 +1160,9 @@ class InputField: public TransformedField {
          }
        }
      }
+      else if (expo.mode) {
+        expo.srcRaw = RawSource(SOURCE_TYPE_STICK, expo.chn);
+      }

      expo.weight = smallGvarToC9x(_weight);

@@ -1247,13 +1252,20 @@ class CurvesField: public TransformedField {

      for (int i=0; i<maxCurves; i++) {
        CurveData *curve = &curves[i];
-        int size = (curve->type == CurveData::CURVE_TYPE_CUSTOM ? curve->count * 2 - 2 : curve->count);
-        if (offset+size > maxPoints) {
-          EEPROMWarnings += ::QObject::tr("OpenTX only accepts %1 points in all curves").arg(maxPoints) + "\n";
-          break;
+        if (IS_TARANIS(board) && version >= 216) {
+          offset += (curve->type == CurveData::CURVE_TYPE_CUSTOM ? curve->count * 2 - 2 : curve->count);
+          if (offset > maxPoints) {
+            EEPROMWarnings += ::QObject::tr("OpenTX only accepts %1 points in all curves").arg(maxPoints) + "\n";
+            break;
+          }
        }
-        if (!IS_TARANIS(board) || version < 216) {
-          _curves[i] = offset - (5*i);
+        else {
+          offset += (curve->type == CurveData::CURVE_TYPE_CUSTOM ? curve->count * 2 - 2 : curve->count) - 5;
+          if (offset > maxPoints - 5 * maxCurves) {
+            EEPROMWarnings += ::QObject::tr("OpenTx only accepts %1 points in all curves").arg(maxPoints) + "\n";
+            break;
+          }
+          _curves[i] = offset;
        }
        for (int j=0; j<curve->count; j++) {
          *cur++ = curve->points[j].y;
@@ -1263,7 +1275,6 @@ class CurvesField: public TransformedField {
            *cur++ = curve->points[j].x;
          }
        }
-        offset += size;
      }
    }

@@ -1783,7 +1794,7 @@ class ArmCustomFunctionField: public TransformedField {
    {
      _mode = 0;

-      if (fn.func == FuncPlaySound || fn.func == FuncPlayPrompt || fn.func == FuncPlayValue)
+      if (fn.func == FuncPlaySound || fn.func == FuncPlayPrompt || fn.func == FuncPlayValue || fn.func == FuncPlayHaptic)
        _active = (version >= 216 ? fn.repeatParam : (fn.repeatParam/5));
      else
        _active = (fn.enabled ? 1 : 0);
@@ -1855,7 +1866,7 @@ class ArmCustomFunctionField: public TransformedField {

    virtual void afterImport()
    {
-      if (fn.func == FuncPlaySound || fn.func == FuncPlayPrompt || fn.func == FuncPlayValue)
+      if (fn.func == FuncPlaySound || fn.func == FuncPlayPrompt || fn.func == FuncPlayValue || fn.func == FuncPlayHaptic)
        fn.repeatParam = (version >= 216 ? _active : (_active*5));
      else
        fn.enabled = (_active & 0x01);
@@ -1897,7 +1908,7 @@ class ArmCustomFunctionField: public TransformedField {
          else if (fn.adjustMode == 2)
            fn.param = RawSource(SOURCE_TYPE_GVAR, value).toValue();
          else
-            fn.param = value;
+            fn.param = (int16_t)value;
        }
        else if (version >= 214) {
          fn.adjustMode = _mode;
@@ -1906,7 +1917,7 @@ class ArmCustomFunctionField: public TransformedField {
          else if (fn.adjustMode == 2)
            fn.param = RawSource(SOURCE_TYPE_GVAR, value).toValue();
          else
-            fn.param = value;
+            fn.param = (int8_t)value;
        }
        else {
          sourcesConversionTable->importValue(value, (int &)fn.param);
@@ -2202,8 +2213,6 @@ class TelemetryVoltsSourceConversionTable: public ConversionTable
    TelemetryVoltsSourceConversionTable(BoardEnum board, unsigned int version)
    {
      int val = 0;
-      if (IS_ARM(board) && version >= 216)
-        addConversion(TELEMETRY_VOLTS_SOURCE_RXBATT, val++);
      addConversion(TELEMETRY_VOLTS_SOURCE_A1, val++);
      addConversion(TELEMETRY_VOLTS_SOURCE_A2, val++);
      if (IS_ARM(board) && version >= 216) {
@@ -2466,7 +2475,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  }
  internalField.Append(new HeliField(modelData.swashRingData, board, version, variant));
  for (int i=0; i<MAX_FLIGHT_MODES(board, version); i++)
-    internalField.Append(new FlightModeField(modelData.phaseData[i], i, board, version));
+    internalField.Append(new FlightModeField(modelData.flightModeData[i], i, board, version));

  if (!IS_ARM(board) || version < 216) {
    internalField.Append(new SignedField<8>(modelData.moduleData[0].ppmFrameLength));
@@ -2490,7 +2499,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  if ((board == BOARD_STOCK || (board == BOARD_M128 && version >= 215)) && (variant & GVARS_VARIANT)) {
    for (int i=0; i<MAX_GVARS(board, version); i++) {
      // on M64 GVARS are common to all phases, and there is no name
-      internalField.Append(new SignedField<16>(modelData.phaseData[0].gvars[i]));
+      internalField.Append(new SignedField<16>(modelData.flightModeData[0].gvars[i]));
    }
  }

@@ -2569,8 +2578,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  }

  if (IS_ARM(board) && version >= 216) {
-    internalField.Append(new UnsignedField<8>(modelData.frsky.rxBattAlarms[0]));
-    internalField.Append(new UnsignedField<8>(modelData.frsky.rxBattAlarms[1]));
+    internalField.Append(new SpareBitsField<16>());
  }
 }

@@ -2703,7 +2711,11 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
    internalField.Append(new SpareBitsField<3>());
  internalField.Append(new SignedField<2>((int &)generalData.hapticMode));

-  internalField.Append(new SpareBitsField<8>());
+  if (IS_ARM(board))
+    internalField.Append(new SignedField<8>(generalData.switchesDelay));
+  else
+    internalField.Append(new SpareBitsField<8>());
+
  internalField.Append(new UnsignedField<8>(generalData.backlightDelay));
  internalField.Append(new UnsignedField<8>(generalData.templateSetup));
  internalField.Append(new SignedField<8>(generalData.PPM_Multiplier));
@@ -2806,7 +2818,8 @@ void OpenTxGeneralData::beforeExport()
 void OpenTxGeneralData::afterImport()
 {
  for (int i=0; i<4; i++) {
-    if (i<2 && generalData.potsType[i] == 0)
+    generalData.potsType[i] = potsType[i];
+    if (i<2 && potsType[i] == 0)
      generalData.potsType[i] = 1;
  }
 }
@@ -504,7 +504,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
      return 1;
    case GvarsAreNamed:
    case GvarsFlightModes:
-      return ((IS_ARM(board)||(board==BOARD_GRUVIN9X)) ? 1 : 0);
+      return ((IS_ARM(board) || board==BOARD_GRUVIN9X) ? 1 : 0);
    case Mixes:
      return (IS_ARM(board) ? O9X_ARM_MAX_MIXERS : O9X_MAX_MIXERS);
    case OffsetWeight:
@@ -659,6 +659,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
    case LuaInputs:
    case LimitsPer1000:
    case EnhancedCurves:
+      return IS_TARANIS(board);
    case HasFasOffset:
      return (IS_STOCK(board) ? false : true);
    case HasMahPersistent:
@@ -679,6 +680,17 @@ int OpenTxFirmware::getCapability(const Capability capability)
  }
 }

+bool OpenTxFirmware::isTelemetrySourceAvailable(int source)
+{
+  if (IS_TARANIS(board) && (source == TELEMETRY_SOURCE_RSSI_TX))
+    return false;
+
+  if (source == TELEMETRY_SOURCE_DTE)
+    return false;
+
+  return true;
+}
+
 int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
 {
  if (IS_TARANIS(board)) {
@@ -103,6 +103,7 @@ class OpenTxFirmware: public FirmwareInterface {
      addTTSLanguage("pl");
      addTTSLanguage("pt");
      addTTSLanguage("es");
+      addTTSLanguage("hu");
    }
    
    virtual QString getStampUrl();
@@ -113,6 +114,8 @@ class OpenTxFirmware: public FirmwareInterface {

    virtual int getCapability(const Capability);

+    virtual bool isTelemetrySourceAvailable(int source);
+
    virtual SimulatorInterface * getSimulator();
    
    
@@ -85,7 +85,6 @@ Th9xGeneral::operator GeneralSettings ()
  }
  result.stickMode = stickMode;
  result.inactivityTimer = inactivityMin;
-  result.filterInput = adcFilt;
  return result;
 }

@@ -296,7 +295,7 @@ t_Th9xModelData::operator ModelData ()
  for (int i=0; i<TH9X_MAX_MIXERS; i++)
    c9x.mixData[i] = mixData[i];
  for (int i=0; i<NUM_STICKS; i++)
-    c9x.phaseData[0].trim[i] = trimData[i].itrim;
+    c9x.flightModeData[0].trim[i] = trimData[i].itrim;
  for (int i=0; i<TH9X_MAX_CURVES3; i++) {
    c9x.curves[i].count = 3;
    for (int j=0; j<3; j++) {
@@ -69,7 +69,17 @@ FlashInterface::FlashInterface(QString fileName):
    version = seekLabel(VERS_MARK);
    date = seekLabel(DATE_MARK);
    time = seekLabel(TIME_MARK);
-    eeprom = seekLabel(EEPR_MARK);
+    eepromId = seekLabel(EEPR_MARK);
+
+    if (eepromId.contains('-')) {
+      QStringList list = eepromId.split('-');
+      eepromVersion = list[0].toInt();
+      eepromVariant = list[1].toInt();
+    }
+    else {
+      eepromVersion = eepromId.toInt();
+    }
+
    versionId = version2index(version);
    SeekSplash();
    isValidFlag = true;
@@ -49,7 +49,9 @@ class FlashInterface
    int getSize() { return flash_size; }
    inline QString getVersion() { return version; }
    unsigned int getVersionId() { return versionId; }
-    inline QString getEEprom() { return eeprom; }
+    inline int getEEpromVersion() { return eepromVersion; }
+    inline int getEEpromVariant() { return eepromVariant; }
+    inline QString getEEpromId() { return eepromId; }
    QImage getSplash();
    bool setSplash(const QImage & newsplash);
    bool hasSplash();
@@ -72,7 +74,9 @@ class FlashInterface
    QString time;
    QString version;
    int versionId;
-    QString eeprom;
+    QString eepromId;
+    int eepromVersion;
+    int eepromVariant;
    QByteArray splash;
    uint splash_offset;
    uint splash_size;
@@ -4,7 +4,6 @@
 #include "appdata.h"
 #include <QDateTime>
 #include <QtGui>
-#include "googleanalytics.h"

 #define BIT_WARN_THR     ( 0x01 )
 #define BIT_WARN_SW      ( 0x02 )
@@ -51,7 +50,8 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
        ui->chkSG->setValue(switchstate & 0x3);
        switchstate >>= 2;
        ui->chkSH->setValue(switchstate & 0x3);      
-      } else {
+      }
+      else {
        for (int i=0; pmsl[i]; i++) {
          pmsl[i]->hide();
        }
@@ -87,7 +87,8 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
    if (!GetCurrentFirmware()->getCapability(MultiLangVoice)) {
      ui->VoiceLang_label->hide();
      ui->voiceLang_CB->hide();
-    } else {
+    }
+    else {
      voiceLangEditLock=true;
      populateVoiceLangCB(ui->voiceLang_CB, g_eeGeneral.ttsLanguage);
      voiceLangEditLock=false;
@@ -96,7 +97,8 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
    if (!mavlink) {
      ui->mavbaud_CB->hide();
      ui->mavbaud_label->hide();
-    } else {
+    }
+    else {
      mavbaudEditLock=true;
      ui->mavbaud_CB->setCurrentIndex(g_eeGeneral.mavbaud);
      populateVoiceLangCB(ui->voiceLang_CB, g_eeGeneral.ttsLanguage);
@@ -169,7 +171,8 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
      ui->volume_SB->hide();
      ui->volume_SB->setDisabled(true);
      ui->label_volume->hide();
-    } else {
+    }
+    else {
      ui->volume_SB->setMaximum(GetCurrentFirmware()->getCapability(MaxVolume));
    }    
    if (!GetCurrentFirmware()->getCapability(HasBrightness)) {
@@ -305,7 +308,15 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
      ui->backlightColor2_label->hide();
    }

-    ga.sendPageView(getBoardName(GetCurrentFirmware()->getBoard()) + " GeneralEdit");
+    if (IS_ARM(eepromInterface->getBoard())) {
+      ui->switchesDelay->setValue(10*(g_eeGeneral.switchesDelay+15));
+    }
+    else {
+      ui->switchesDelay->hide();
+      ui->switchesDelayLabel->hide();
+    }
+
+    disableMouseScrolling();
 }

 GeneralEdit::~GeneralEdit()
@@ -516,6 +527,12 @@ void GeneralEdit::on_backlightautoSB_editingFinished()
  }
 }

+void GeneralEdit::on_switchesDelay_valueChanged()
+{
+  g_eeGeneral.switchesDelay = (ui->switchesDelay->value() / 10) - 15;
+  updateSettings();
+}
+
 void GeneralEdit::on_backlightColor_SL_valueChanged()
 {
  g_eeGeneral.backlightColor = ui->backlightColor_SL->value();
@@ -1061,7 +1078,8 @@ void GeneralEdit::on_calstore_PB_clicked()
  if (name.isEmpty()) {
    ui->calstore_PB->setDisabled(true);
    return;
-  } else {
+  }
+  else {
    QString calib=g.profile[profile_id].stickPotCalib();
    if (!(calib.isEmpty())) {
      int ret = QMessageBox::question(this, "Companion", 
@@ -1100,7 +1118,50 @@ void GeneralEdit::on_calstore_PB_clicked()
  }
 }

-void GeneralEdit::shrink() {
-    resize(100,100);
-    resize(0,0);
+void GeneralEdit::shrink()
+{
+  resize(100, 100);
+  resize(0, 0);
+}
+
+bool GeneralEdit::eventFilter(QObject *object, QEvent * event)
+{
+  QWidget * widget = qobject_cast<QWidget*>(object);
+  if (widget) {
+    if (event->type() == QEvent::Wheel) {
+      if (widget->focusPolicy() == Qt::WheelFocus) {
+        event->accept();
+        return false;
+      }
+      else {
+        event->ignore();
+        return true;
+      }
+    }
+    else if (event->type() == QEvent::FocusIn) {
+      widget->setFocusPolicy(Qt::WheelFocus);
+    }
+    else if (event->type() == QEvent::FocusOut) {
+      widget->setFocusPolicy(Qt::StrongFocus);
+    }
+  }
+  return QWidget::eventFilter(object, event);
+}
+
+void GeneralEdit::disableMouseScrolling()
+{
+  Q_FOREACH(QComboBox * cb, findChildren<QComboBox*>()) {
+    cb->installEventFilter(this);
+    cb->setFocusPolicy(Qt::StrongFocus);
+  }
+
+  Q_FOREACH(QAbstractSpinBox * sb, findChildren<QAbstractSpinBox*>()) {
+    sb->installEventFilter(this);
+    sb->setFocusPolicy(Qt::StrongFocus);
+  }
+
+  Q_FOREACH(QSlider * slider, findChildren<QSlider*>()) {
+    slider->installEventFilter(this);
+    slider->setFocusPolicy(Qt::StrongFocus);
+  }
 }
@@ -12,12 +12,12 @@ class GeneralEdit : public QDialog
 {
    Q_OBJECT

-public:
+  public:
    explicit GeneralEdit(RadioData &radioData, QWidget *parent = 0);
    ~GeneralEdit();
    void updateSettings();

-private:
+  private:
    Ui::GeneralEdit *ui;
    RadioData &radioData;
    GeneralSettings g_eeGeneral;
@@ -28,11 +28,15 @@ private:
    void getGeneralSwitchDefPos(int i, bool val);
    void setSwitchDefPos();
    void updateVarioPitchRange();
+    void disableMouseScrolling();
+
+  protected:
+    virtual bool eventFilter(QObject *obj, QEvent *event);
    
-signals:
+  signals:
    void modelValuesChanged();

-private slots:
+  private slots:
    void on_faimode_CB_stateChanged(int );
    void on_speakerPitchSB_editingFinished();
    void on_timezoneSB_editingFinished();
@@ -132,6 +136,7 @@ private slots:
    void setValues();
    void shrink();
    void stickReverseEdited();
+    void on_switchesDelay_valueChanged();
 };

 #endif // GENERALEDIT_H
@@ -1968,6 +1968,52 @@ Mode 4:
         </property>
        </widget>
       </item>
+       <item row="34" column="0">
+        <widget class="QLabel" name="switchesDelayLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Play Delay (switch mid position)</string>
+         </property>
+        </widget>
+       </item>
+       <item row="34" column="1">
+        <widget class="QSpinBox" name="switchesDelay">
+         <property name="toolTip">
+          <string/>
+         </property>
+         <property name="statusTip">
+          <string/>
+         </property>
+         <property name="whatsThis">
+          <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;LCD Screen Contrast&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Values can be 20-45&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="suffix">
+          <string> ms</string>
+         </property>
+         <property name="minimum">
+          <number>0</number>
+         </property>
+         <property name="maximum">
+          <number>300</number>
+         </property>
+         <property name="singleStep">
+          <number>10</number>
+         </property>
+         <property name="value">
+          <number>0</number>
+         </property>
+        </widget>
+       </item>
      </layout>
     </widget>
     <widget class="QWidget" name="tabTrainer">
@@ -1,73 +0,0 @@
-#include "googleanalytics.h"
-#include <QtGui>
-
-#define TRACKING_ID  "UA-40098569-1"
-
-GoogleAnalytics ga;
-
-GoogleAnalytics::GoogleAnalytics():
-  userId(qrand()),
-  networkManager(new QNetworkAccessManager(this))
-{
-}
-
-GoogleAnalytics::~GoogleAnalytics()
-{
-  delete networkManager;
-}
-
-void GoogleAnalytics::sendPageView(QString title)
-{
-  // create request and set URL of receiver
-  QNetworkRequest request;
-  QUrl host("http://www.google-analytics.com/collect");
-  request.setUrl(host);
-  request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-
-  // setup parameters of request
-  QString requestParams;
-  requestParams += "v=1"; // version of protocol
-  requestParams += "&t=pageview"; // type of request
-  requestParams += "&tid=" TRACKING_ID; // Google Analytics account
-  requestParams += "&cid=" + QString::number(userId); // unique user identifier
-  requestParams += "&dp=companion-" + title.toLower().replace(" ", "-"); // name of page
-  requestParams += "&dt=" + title; // title of page
-  requestParams += "&ul=" + QLocale::system().name(); // language
-
-  // send request via post method
-  networkManager->post(request, requestParams.toStdString().c_str());
-}
-
-void GoogleAnalytics::sendEvent(QString category, QString action, QString label)
-{
-  // create request and set URL of receiver
-  QNetworkRequest request;
-  QUrl host("http://www.google-analytics.com/collect");
-  request.setUrl(host);
-  request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-
-  // setup parameters of request
-  QString requestParams;
-  requestParams += "v=1"; // version of protocol
-  requestParams += "&t=event"; // type of request
-  requestParams += "&ec=" + category;
-  requestParams += "&ea=" + action;
-  requestParams += "&el=" + label;
-  requestParams += "&tid=" TRACKING_ID; // Google Analytics account
-  requestParams += "&cid=" + QString::number(userId); // unique user identifier
-  requestParams += "&dt=Companion"; // name of page (or app name)
-  requestParams += "&ul=" + QLocale::system().name(); // language
-
-  // send request via post method
-  networkManager->post(request, requestParams.toStdString().c_str());
-}
-
-void GoogleAnalytics::slot_receive(QNetworkReply * reply)
-{
-  // output information about reply
-  qDebug() << "RequestUrl:" << reply->request().url();
-  qDebug() << "Status:" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-  qDebug() << "Error:"<< reply->error();
-  QByteArray bytes = reply->readAll();
-  qDebug() << "Contents" << QString::fromUtf8(bytes.data(), bytes.size());
-}
@@ -1,21 +0,0 @@
-#include <QtNetwork>
-
-class GoogleAnalytics: public QObject
-{
-  Q_OBJECT
-
-  public:
-    GoogleAnalytics();
-    ~GoogleAnalytics();
-    void sendPageView(QString page);
-    void sendEvent(QString category, QString action, QString label="");
-
-  protected slots:
-    void slot_receive(QNetworkReply * reply);
-
-  protected:
-    int userId;
-    QNetworkAccessManager * networkManager;
-};
-
-extern GoogleAnalytics ga;
@@ -835,7 +835,7 @@ QString getPhasesStr(unsigned int phases, ModelData & model)
      for (int i=0; i<numphases;i++) {
        if (!(phases & (1<<i))) {
          if (count++ > 0) str += QString(", ");
-          str += getPhaseName(i+1, model.phaseData[i].name);
+          str += getPhaseName(i+1, model.flightModeData[i].name);
        }
      }
    }
@@ -132,4 +132,12 @@ QPixmap makePixMap( QImage image, QString firmwareType );
 int version2index(QString version);
 QString index2version(int index);

+class QTimeS : public QTime
+{
+  public:
+    QTimeS(int s) { int h = s/3600; s %= 3600; int m = s/60; s %=60; setHMS(h, m, s); };
+    QTimeS(const QTime & q) : QTime(q) {};
+    int seconds() const { return hour()*3600 + minute()*60 + second(); };
+};
+
 #endif // HELPERS_H
@@ -64,7 +64,6 @@
 #include "helpers.h"
 #include "appdata.h"
 #include "radionotfound.h"
-#include "googleanalytics.h"
 #include "firmwares/opentx/opentxinterface.h" // TODO get rid of this include

 #define DONATE_STR      "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QUZ48K4SEXDP2"
@@ -106,7 +105,7 @@ MainWindow::MainWindow():
    restoreState(g.mainWinState());
    restoreGeometry(g.mainWinGeo());

-    setUnifiedTitleAndToolBarOnMac(true);
+    // setUnifiedTitleAndToolBarOnMac(true);
    this->setWindowIcon(QIcon(":/icon.png"));
    this->setIconSize(QSize(32, 32));
    QNetworkProxyFactory::setUseSystemConfiguration(true);
@@ -152,7 +151,8 @@ MainWindow::MainWindow():
          if (!(printing && (model >=0 && model<GetEepromInterface()->getMaxModels()) && !printfilename.isEmpty()  )) {
            statusBar()->showMessage(tr("File loaded"), 2000);
            child->show();
-          } else {
+          }
+          else {
            child->show();            
            child->print(model,printfilename);
            child->close();
@@ -163,8 +163,6 @@ MainWindow::MainWindow():
    if (printing) {
      QTimer::singleShot(0, this, SLOT(autoClose()));
    }
-
-    ga.sendPageView("Home");
 }

 void MainWindow::displayWarnings()
@@ -511,7 +509,6 @@ void MainWindow::startFirmwareDownload()
    downloadDialog * dd = new downloadDialog(this, url, filename);
    connect(dd, SIGNAL(accepted()), this, SLOT(firmwareDownloadAccepted()));
    dd->exec();
-    ga.sendEvent(getBoardName(GetCurrentFirmware()->getBoard()), "Download", url);
  }
 }

@@ -990,7 +987,6 @@ bool MainWindow::readFirmwareFromRadio(const QString filename)
      ad->setWindowIcon(CompanionIcon("read_flash.png"));
      ad->exec();
      delete ad;
-      sleep(1);
      result = true;
    }
  }
@@ -1025,7 +1021,6 @@ bool MainWindow::writeFirmwareToRadio(const QString filename)
      ad->setWindowIcon(CompanionIcon("write_flash.png"));
      ad->exec();
      delete ad;
-      sleep(1);
      result = true;
    }
  }
@@ -1053,6 +1048,10 @@ bool MainWindow::readEepromFromRadio(const QString filename, const QString messa

  if (IS_ARM(GetCurrentFirmware()->getBoard())) {
    QString path = FindMassstoragePath("EEPROM.BIN");
+    if (path.isEmpty()) {
+      // On previous OpenTX we called the EEPROM file "TARANIS.BIN" :(
+      path = FindMassstoragePath("TARANIS.BIN");
+    }
    if (path.isEmpty()) {
      // Mike's bootloader calls the EEPROM file "ERSKY9X.BIN" :(
      path = FindMassstoragePath("ERSKY9X.BIN");
@@ -1064,7 +1063,6 @@ bool MainWindow::readEepromFromRadio(const QString filename, const QString messa
      ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
      ad->exec();
      delete ad;
-      sleep(1);
      result = true;
    }
  }
@@ -1075,7 +1073,6 @@ bool MainWindow::readEepromFromRadio(const QString filename, const QString messa
    ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
    ad->exec();
    delete ad;
-    sleep(1);
    result = true;
  }

@@ -1098,6 +1095,10 @@ bool MainWindow::writeEepromToRadio(const QString filename, const QString messag

  if (IS_ARM(GetCurrentFirmware()->getBoard())) {
    QString path = FindMassstoragePath("EEPROM.BIN");
+    if (path.isEmpty()) {
+      // On previous OpenTX we called the EEPROM file "TARANIS.BIN" :(
+      path = FindMassstoragePath("TARANIS.BIN");
+    }
    if (path.isEmpty()) {
      // Mike's bootloader calls the EEPROM file "ERSKY9X.BIN" :(
      path = FindMassstoragePath("ERSKY9X.BIN");
@@ -1105,22 +1106,20 @@ bool MainWindow::writeEepromToRadio(const QString filename, const QString messag
    if (!path.isEmpty()) {
      QStringList str;
      str << filename << path;
-      avrOutputDialog *ad = new avrOutputDialog(this, "", str, message);
-      ad->setWindowIcon(CompanionIcon("read_eeprom.png"));
+      avrOutputDialog *ad = new avrOutputDialog(this, "", str, message, AVR_DIALOG_SHOW_DONE);
+      ad->setWindowIcon(CompanionIcon("write_eeprom.png"));
      ad->exec();
      delete ad;
-      sleep(1);
      result = true;
    }
  }

  if (result == false && !IS_TARANIS(GetCurrentFirmware()->getBoard())) {
    QStringList str = GetSendEEpromCommand(filename);
-    avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, "Write Backup To Radio", AVR_DIALOG_SHOW_DONE);
+    avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, "Write EEPROM To Radio", AVR_DIALOG_SHOW_DONE);
    ad->setWindowIcon(CompanionIcon("write_eeprom.png"));
    ad->exec();
    delete ad;
-    sleep(1);
    result = true;
  }

@@ -1262,11 +1261,8 @@ bool MainWindow::convertEEPROM(QString backupFile, QString restoreFile, QString
    if (!flash.isValid())
      return false;

-    unsigned int version = 0;
-    unsigned int variant = 0;
-
-    QString fwEEprom = flash.getEEprom();
-    version = fwEEprom.toInt();
+    unsigned int version = flash.getEEpromVersion();
+    unsigned int variant = flash.getEEpromVariant();

    QFile file(backupFile);
    int eeprom_size = file.size();
@@ -1328,7 +1324,7 @@ void MainWindow::writeFlash(QString fileToFlash)
        if (backupEnable) {
          QDateTime datetime;
          backupFile.clear();
-          backupFile=backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin";
+          backupFile = backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin";
        }

        if (readEepromFromRadio(backupFile, tr("Backup Models and Settings From Radio"))) {
@@ -1420,6 +1416,7 @@ void MainWindow::compare()
 void MainWindow::logFile()
 {
  logsDialog *fd = new logsDialog(this);
+  fd->setWindowFlags(Qt::Window);   //to show minimize an maximize buttons
  fd->setAttribute(Qt::WA_DeleteOnClose, true);
  fd->show();
 }
@@ -1472,8 +1469,9 @@ MdiChild *MainWindow::createMdiChild()
 {
  MdiChild * child = new MdiChild();
  mdiArea->addSubWindow(child);
-  if(!child->parentWidget()->isMaximized() && !child->parentWidget()->isMinimized())
+  if (!child->parentWidget()->isMaximized() && !child->parentWidget()->isMinimized()) {
    child->parentWidget()->resize(400, 400);
+  }

  connect(child, SIGNAL(copyAvailable(bool)),cutAct, SLOT(setEnabled(bool)));
  connect(child, SIGNAL(copyAvailable(bool)),copyAct, SLOT(setEnabled(bool)));
@@ -54,7 +54,6 @@
 #include "appdata.h"
 #include "wizarddialog.h"
 #include <QFileInfo>
-#include "googleanalytics.h"

 #if defined WIN32 || !defined __GNUC__
 #include <windows.h>
@@ -71,17 +70,15 @@ MdiChild::MdiChild():
  fileChanged(false)
 {
  ui->setupUi(this);
-  this->setWindowIcon(CompanionIcon("open.png"));
+  setWindowIcon(CompanionIcon("open.png"));
  ui->SimulateTxButton->setIcon(CompanionIcon("simulate.png"));
  setAttribute(Qt::WA_DeleteOnClose);

  eepromInterfaceChanged();

-  if(!(this->isMaximized() || this->isMinimized())) {
+  if (!(this->isMaximized() || this->isMinimized())) {
    adjustSize();
  }
-
-  ga.sendPageView(getBoardName(firmware->getBoard()) + " Models");
 }

 MdiChild::~MdiChild() 
@@ -69,7 +69,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
    minSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
    minSB->setAccelerated(true);
    minSB->setDecimals(1);
-    minSB->setMinimum(model.extendedLimits ? -125 : -100);
+    minSB->setMinimum(-model.getChannelsMax());
    minSB->setSingleStep(0.1);
    minSB->setMaximum(0);
    minSB->setValue(float(model.limitData[i].min) / 10);
@@ -85,7 +85,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
    maxSB->setDecimals(1);
    maxSB->setMinimum(0);
    maxSB->setSingleStep(0.1);
-    maxSB->setMaximum(model.extendedLimits ? 125 : 100);
+    maxSB->setMaximum(model.getChannelsMax());
    maxSB->setValue(float(model.limitData[i].max) / 10);
    connect(maxSB, SIGNAL(editingFinished()), this, SLOT(maxEdited()));
    gridLayout->addWidget(maxSB, i+1, col++, 1, 1);
@@ -136,6 +136,8 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
  }
  // Push the rows up
  addVSpring(gridLayout, 0,firmware->getCapability(Outputs)+1);
+
+  disableMouseScrolling();
 }

 Channels::~Channels()
@@ -192,8 +194,8 @@ void Channels::refreshExtendedLimits()
    QDoubleSpinBox * minDSB = minSpins[i];
    QDoubleSpinBox * maxDSB = maxSpins[i];
    
-    minDSB->setMinimum(model.extendedLimits ? -125 : -100);
-    maxDSB->setMaximum(model.extendedLimits ? 125 : 100);
+    minDSB->setMinimum(-model.getChannelsMax());
+    maxDSB->setMaximum(model.getChannelsMax());
  }
  emit modified(); 
 }
@@ -180,6 +180,8 @@ Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSet
  addTemplate(tr("Symmetrical f(x)=-f(-x)"), CURVE_COEFF_ENABLE, curveSymmetricalY);
  addTemplate(tr("Symmetrical f(x)=f(-x)"), CURVE_COEFF_ENABLE | CURVE_YMID_ENABLE, curveSymmetricalX);

+  disableMouseScrolling();
+
  lock = false;
 }

@@ -246,12 +248,13 @@ void Curves::updateCurveType()
    index = model.curves[currentCurve].count - 2;
  }
  else {
+    ui->curveSmooth->hide();
    if (model.curves[currentCurve].count == 5)
-      index += 2;
+      index = 1;
    else if (model.curves[currentCurve].count == 9)
-      index += 4;
+      index = 2;
    else if (model.curves[currentCurve].count == 17)
-      index += 6;
+      index = 3;
  }

  ui->curvePoints->setCurrentIndex(index);
@@ -87,7 +87,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
      lang="en";
    path.append(lang);
    QDir qd(path);
-    int vml= firmware->getCapability(VoicesMaxLength)+4;
+    int vml= firmware->getCapability(VoicesMaxLength);
    if (qd.exists()) {
      QStringList filters;
      filters << "*.wav" << "*.WAV";
@@ -196,6 +196,8 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
  // Push rows upward
  addDoubleSpring(gridLayout, 5, num_fsw+1);

+  disableMouseScrolling();
+  
  lock = false;
 }

@@ -264,7 +266,7 @@ void CustomFunctionsPanel::playMusic()
    else {
      phononCurrent = index;
      clickObject->clear();
-      clickObject->setCurrentSource(QUrl(track));
+      clickObject->setCurrentSource(QUrl("file://"+track));
      clickObject->play();
      playBT[index]->setIcon(CompanionIcon("stop.png"));
    }
@@ -571,10 +573,10 @@ void CustomFunctionsPanel::fsw_customContextMenuRequested(QPoint pos)
    bool hasData = mimeData->hasFormat("application/x-companion-fsw");

    QMenu contextMenu;
-    contextMenu.addAction(CompanionIcon("clear.png"), tr("&Delete"),this,SLOT(fswDelete()),tr("Delete"));
    contextMenu.addAction(CompanionIcon("copy.png"), tr("&Copy"),this,SLOT(fswCopy()),tr("Ctrl+C"));
    contextMenu.addAction(CompanionIcon("cut.png"), tr("&Cut"),this,SLOT(fswCut()),tr("Ctrl+X"));
    contextMenu.addAction(CompanionIcon("paste.png"), tr("&Paste"),this,SLOT(fswPaste()),tr("Ctrl+V"))->setEnabled(hasData);
+    contextMenu.addAction(CompanionIcon("clear.png"), tr("&Delete"),this,SLOT(fswDelete()),tr("Delete"));

    contextMenu.exec(globalPos);
 }
@@ -18,10 +18,18 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
  setWindowTitle(tr("Edit %1").arg(getInputStr(model, ed->chn)));
  QRegExp rx(CHAR_FOR_NAMES_REGEX);

-  if (IS_TARANIS(GetEepromInterface()->getBoard()))
-    gvGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, 100, -100, 100);
-  else
-    gvGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, 100, 0, 100);
+  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, 100, -100, 100);
+    gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, ed->offset, 0, -100, 100);
+  }
+  else {
+    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, 100, 0, 100);
+    gvOffsetGroup = NULL;
+    ui->offsetLabel->hide();
+    ui->offsetGV->hide();
+    ui->offsetSB->hide();
+    ui->offsetCB->hide();
+  }

  curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve);

@@ -105,7 +113,8 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G

 ExpoDialog::~ExpoDialog()
 {
-  delete gvGroup;
+  delete gvWeightGroup;
+  delete gvOffsetGroup;
  delete curveGroup;
  delete ui;
 }
@@ -31,7 +31,8 @@ class ExpoDialog : public QDialog {
    FirmwareInterface * firmware;
    ExpoData * ed;
    char * inputName;
-    GVarGroup * gvGroup;
+    GVarGroup * gvWeightGroup;
+    GVarGroup * gvOffsetGroup;
    CurveGroup * curveGroup;
 };

@@ -30,10 +30,10 @@
    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
  </property>
  <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="1">
-    <widget class="QComboBox" name="sourceCB">
-     <property name="whatsThis">
-      <string>Source for the mixer.</string>
+   <item row="9" column="0">
+    <widget class="QLabel" name="label_phases">
+     <property name="text">
+      <string>Flight modes</string>
     </property>
    </widget>
   </item>
@@ -44,20 +44,6 @@
     </property>
    </widget>
   </item>
-   <item row="0" column="1">
-    <widget class="QLineEdit" name="inputName">
-     <property name="maxLength">
-      <number>6</number>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0">
-    <widget class="QLabel" name="label_3">
-     <property name="text">
-      <string>Weight</string>
-     </property>
-    </widget>
-   </item>
   <item row="6" column="1">
    <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,1,0">
     <item>
@@ -92,14 +78,28 @@
     </item>
    </layout>
   </item>
-   <item row="8" column="0">
-    <widget class="QLabel" name="label_phases">
-     <property name="text">
-      <string>Flight modes</string>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="inputName">
+     <property name="maxLength">
+      <number>6</number>
     </property>
    </widget>
   </item>
-   <item row="8" column="1">
+   <item row="2" column="1">
+    <widget class="QComboBox" name="sourceCB">
+     <property name="whatsThis">
+      <string>Source for the mixer.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="0">
+    <widget class="QLabel" name="label_3">
+     <property name="text">
+      <string>Weight</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="1">
    <layout class="QGridLayout" name="gridLayout_4">
     <item row="0" column="0">
      <widget class="QLabel" name="lb_FP0">
@@ -256,14 +256,14 @@
     </item>
    </layout>
   </item>
-   <item row="9" column="0">
+   <item row="10" column="0">
    <widget class="QLabel" name="label_7">
     <property name="text">
      <string>Switch</string>
     </property>
    </widget>
   </item>
-   <item row="9" column="1">
+   <item row="10" column="1">
    <widget class="QComboBox" name="switchesCB">
     <property name="whatsThis">
      <string>Switch used to enable the line.
@@ -271,14 +271,14 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</string
     </property>
    </widget>
   </item>
-   <item row="11" column="0">
+   <item row="12" column="0">
    <widget class="QLabel" name="sideLabel">
     <property name="text">
      <string>Stick Side</string>
     </property>
    </widget>
   </item>
-   <item row="11" column="1">
+   <item row="12" column="1">
    <widget class="QComboBox" name="sideCB">
     <item>
      <property name="text">
@@ -297,7 +297,7 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</string
     </item>
    </widget>
   </item>
-   <item row="13" column="0" colspan="2">
+   <item row="14" column="0" colspan="2">
    <widget class="QDialogButtonBox" name="buttonBox">
     <property name="minimumSize">
      <size>
@@ -316,7 +316,7 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</string
     </property>
    </widget>
   </item>
-   <item row="12" column="0" colspan="2">
+   <item row="13" column="0" colspan="2">
    <spacer name="verticalSpacer">
     <property name="orientation">
      <enum>Qt::Vertical</enum>
@@ -370,14 +370,14 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</string
     </item>
    </widget>
   </item>
-   <item row="7" column="0">
+   <item row="8" column="0">
    <widget class="QLabel" name="label_curves">
     <property name="text">
      <string>Curve</string>
     </property>
    </widget>
   </item>
-   <item row="7" column="1">
+   <item row="8" column="1">
    <layout class="QHBoxLayout" name="horizontalLayout" stretch="1,0,1,0">
     <item>
      <widget class="QComboBox" name="curveTypeCB">
@@ -429,6 +429,47 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</string
     </property>
    </widget>
   </item>
+   <item row="7" column="0">
+    <widget class="QLabel" name="offsetLabel">
+     <property name="text">
+      <string>Offset</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1">
+    <layout class="QHBoxLayout" name="offsetLayout" stretch="0,0,1,0">
+     <item>
+      <widget class="QCheckBox" name="offsetGV">
+       <property name="text">
+        <string>GV</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QSpinBox" name="offsetSB"/>
+     </item>
+     <item>
+      <widget class="QComboBox" name="offsetCB">
+       <property name="whatsThis">
+        <string>The source for the mixer</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <spacer name="offsetSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>0</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+    </layout>
+   </item>
  </layout>
 </widget>
 <tabstops>
@@ -9,7 +9,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
  ModelPanel(parent, model, generalSettings, firmware),
  ui(new Ui::FlightMode),
  phaseIdx(phaseIdx),
-  phase(model.phaseData[phaseIdx]),
+  phase(model.flightModeData[phaseIdx]),
  reCount(firmware->getCapability(RotaryEncoders)),
  gvCount(((!firmware->getCapability(HasVariants)) || (GetCurrentFirmwareVariant() & GVARS_VARIANT)) ?
      firmware->getCapability(Gvars) : 0)
@@ -121,7 +121,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
  }

  // GVars
-  if (gvCount > 0) {
+  if (gvCount > 0 && (firmware->getCapability(GvarsFlightModes) || phaseIdx == 0) ) {
    QGridLayout *gvLayout = new QGridLayout(ui->gvGB);
    for (int i=0; i<gvCount; i++) {
      int col = 0;
@@ -171,6 +171,8 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
    ui->gvGB->hide();
  }

+  disableMouseScrolling();
+
  update();
 }

@@ -200,23 +202,24 @@ void FlightModePanel::update()
    trimUpdate(i);
  }

-  for (int i=0; i<gvCount; i++) {
-    gvNames[i]->setText(model.gvars_names[i]);
-    gvValues[i]->setDisabled(model.isGVarLinked(phaseIdx, i));
-    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+  if (ui->gvGB->isVisible()) {
+    for (int i=0; i<gvCount; i++) {
+      gvNames[i]->setText(model.gvars_names[i]);
+      gvValues[i]->setDisabled(model.isGVarLinked(phaseIdx, i));
      gvValues[i]->setValue(model.getGVarValue(phaseIdx, i));
-      if (phaseIdx == 0) 
+      if (IS_TARANIS(GetEepromInterface()->getBoard()) && phaseIdx == 0) { 
        gvPopups[i]->setChecked(model.gvars_popups[i]);
+      }
    }
  }

  for (int i=0; i<reCount; i++) {    
    reValues[i]->setDisabled(false);
    int idx = phase.rotaryEncoders[i];
-    PhaseData *phasere = &phase;
+    FlightModeData *phasere = &phase;
    while (idx > 1024) {
      idx -= 1025;
-      phasere = &model.phaseData[idx];
+      phasere = &model.flightModeData[idx];
      idx = phasere->rotaryEncoders[i];
      reValues[i]->setDisabled(true);
    }
@@ -296,14 +299,6 @@ void FlightModePanel::GVName_editingFinished()
  }
 }

-void FlightModePanel::GVSource_currentIndexChanged(int index)
-{
-  QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
-  int gvar = comboBox->property("index").toInt();
-  model.gvsource[gvar] = index;
-  emit modified();
-}
-
 void FlightModePanel::phaseGVUse_currentIndexChanged(int index)
 {
  if (!lock) {
@@ -441,7 +436,7 @@ void FlightModesPanel::onPhaseModified()
 QString FlightModesPanel::getTabName(int index)
 {
  QString result = tr("Flight Mode %1").arg(index);
-  const char *name = model.phaseData[index].name;
+  const char *name = model.flightModeData[index].name;
  if (firmware->getCapability(FlightModesName) && strlen(name) > 0) {
    result += tr(" (%1)").arg(name);
  }
@@ -35,7 +35,6 @@ class FlightModePanel : public ModelPanel
    void phaseTrim_valueChanged();
    void phaseTrimSlider_valueChanged();
    void GVName_editingFinished();
-    void GVSource_currentIndexChanged(int index);
    void phaseGVValue_editingFinished();
    void phaseGVUse_currentIndexChanged(int index);
    void phaseGVPopupToggled(bool checked);
@@ -45,7 +44,7 @@ class FlightModePanel : public ModelPanel
  private:
    Ui::FlightMode *ui;
    int phaseIdx;
-    PhaseData & phase;
+    FlightModeData & phase;
    int reCount;
    int gvCount;
    QVector<QLabel *> trimsLabel;
@@ -14,6 +14,8 @@ HeliPanel::HeliPanel(QWidget *parent, ModelData & model, GeneralSettings & gener
  connect(ui->swashInvertELE, SIGNAL(stateChanged(int)), this, SLOT(edited()));
  connect(ui->swashInvertAIL, SIGNAL(stateChanged(int)), this, SLOT(edited()));
  connect(ui->swashInvertCOL, SIGNAL(stateChanged(int)), this, SLOT(edited()));
+
+  disableMouseScrolling();
 }

 HeliPanel::~HeliPanel()
@@ -162,6 +162,7 @@ QString InputsPanel::getInputText(int dest, bool * new_ch)
    }

    str += " " + tr("Weight(%1)").arg(getGVarString(md->weight));
+    if (md->offset) str += " " + tr("Offset(%1)").arg(getGVarString(md->offset));

    if (firmware->getCapability(VirtualInputs)) {
      str += " " + tr("Source(%1)").arg(md->srcRaw.toString());
@@ -271,6 +272,9 @@ void InputsPanel::setSelectedByExpoList(QList<int> list)

 void InputsPanel::exposDelete(bool ask)
 {
+    QList<int> list = createExpoListFromSelected();
+    if(list.isEmpty()) return;
+
    QMessageBox::StandardButton ret = QMessageBox::No;

    if(ask)
@@ -280,7 +284,7 @@ void InputsPanel::exposDelete(bool ask)


    if ((ret == QMessageBox::Yes) || (!ask)) {
-        exposDeleteList(createExpoListFromSelected());
+        exposDeleteList(list);
        emit modified();
        update();
    }
@@ -82,6 +82,12 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
    connect(cswitchOffset2[i], SIGNAL(editingFinished()), this, SLOT(edited()));
    cswitchOffset2[i]->setVisible(false);
    v2Layout->addWidget(cswitchOffset2[i]);
+    cswitchTOffset[i] = new QTimeEdit(this);
+    cswitchTOffset[i]->setProperty("index",i);
+    cswitchTOffset[i]->setAccelerated(true);
+    connect(cswitchTOffset[i],SIGNAL(editingFinished()),this,SLOT(edited()));
+    v2Layout->addWidget(cswitchTOffset[i]);
+    cswitchTOffset[i]->setVisible(false);
    gridLayout->addLayout(v2Layout, i+1, 3);

    // AND
@@ -116,6 +122,9 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
  }
  // Push rows upward
  addVSpring(gridLayout,0,firmware->getCapability(LogicalSwitches)+1);
+
+  disableMouseScrolling();
+
  lock = false;
 }

@@ -131,7 +140,7 @@ void LogicalSwitchesPanel::v1Edited(int value)
    if (model.customSw[i].getFunctionFamily() == LS_FAMILY_VOFS) {
      RawSource source = RawSource(model.customSw[i].val1, &model);
      RawSourceRange range = source.getRange();
-      if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
+      if (model.customSw[i].isDeltaFunction()) {
        model.customSw[i].val2 = (cswitchOffset[i]->value() / range.step);
      }
      else {
@@ -182,6 +191,7 @@ void LogicalSwitchesPanel::edited()
    int i = sender()->property("index").toInt();
    int newFunc = csw[i]->itemData(csw[i]->currentIndex()).toInt();
    bool chAr = (model.customSw[i].getFunctionFamily() != LogicalSwitchData(newFunc).getFunctionFamily());
+    bool chDelta = (model.customSw[i].isDeltaFunction() ^ LogicalSwitchData(newFunc).isDeltaFunction());
    model.customSw[i].func = newFunc;
    if (chAr) {
      if (model.customSw[i].getFunctionFamily() == LS_FAMILY_TIMER) {
@@ -200,6 +210,10 @@ void LogicalSwitchesPanel::edited()
      model.customSw[i].andsw = 0;
      setSwitchWidgetVisibility(i);
    }
+    if (chDelta) {
+      model.customSw[i].val2 = 0;
+      setSwitchWidgetVisibility(i);
+    }

    RawSource source;
    switch (model.customSw[i].getFunctionFamily())
@@ -208,14 +222,18 @@ void LogicalSwitchesPanel::edited()
      {
        source = RawSource(model.customSw[i].val1, &model);
        RawSourceRange range = source.getRange();
-        if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
-          model.customSw[i].val2 = (cswitchOffset[i]->value() / range.step);
-          cswitchOffset[i]->setValue(model.customSw[i].val2*range.step);
+        int value = source.isTimeBased() ? QTimeS(cswitchTOffset[i]->time()).seconds() : cswitchOffset[i]->value();
+        if (model.customSw[i].isDeltaFunction()) {
+          /*TODO: is this delta function value set correctly*/
+          model.customSw[i].val2 = (value/range.step);
+          value=model.customSw[i].val2*range.step;
        }
        else {
-          model.customSw[i].val2 = round((cswitchOffset[i]->value()-range.offset)/range.step);
-          cswitchOffset[i]->setValue(model.customSw[i].val2*range.step + range.offset);
+          model.customSw[i].val2 = round((value-range.offset)/range.step);;
+          value= model.customSw[i].val2*range.step + range.offset;
        }
+        if (source.isTimeBased()) cswitchTOffset[i]->setTime(QTimeS(value));
+        else cswitchOffset[i]->setValue(value);
        break;
      }
      case LS_FAMILY_TIMER:
@@ -263,6 +281,7 @@ void LogicalSwitchesPanel::updateTimerParam(QDoubleSpinBox *sb, int timer, bool
 #define VALUE1_VISIBLE   0x4
 #define VALUE2_VISIBLE   0x8
 #define VALUE3_VISIBLE   0x10
+#define VALUE_TO_VISIBLE 0x20

 void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
 {
@@ -275,19 +294,39 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
  switch (model.customSw[i].getFunctionFamily())
  {
    case LS_FAMILY_VOFS:
-      mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE;
+      mask |= SOURCE1_VISIBLE;
      populateSourceCB(cswitchSource1[i], source, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
      cswitchOffset[i]->setDecimals(range.decimals);
      cswitchOffset[i]->setSingleStep(range.step);
-      if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
-        cswitchOffset[i]->setMinimum(range.step*-127);
-        cswitchOffset[i]->setMaximum(range.step*127);
-        cswitchOffset[i]->setValue(range.step*model.customSw[i].val2);
+      if (source.isTimeBased()) {
+        mask |= VALUE_TO_VISIBLE;
+        int maxTime;
+        int value;
+        if (model.customSw[i].isDeltaFunction()) {
+          /*TODO: is this delta function value set correctly*/
+          maxTime = range.step*127;
+          value = range.step*model.customSw[i].val2;
+        } else {
+          maxTime = range.max;
+          value = range.step*(model.customSw[i].val2/* TODO+source.getRawOffset(model)*/)+range.offset;
+        }
+        cswitchTOffset[i]->setMaximumTime(QTimeS(maxTime));
+        cswitchTOffset[i]->setDisplayFormat((maxTime>=3600)?"hh:mm:ss":"mm:ss");
+        cswitchTOffset[i]->setTime(QTimeS(value));
      }
      else {
-        cswitchOffset[i]->setMinimum(range.min);
-        cswitchOffset[i]->setMaximum(range.max);
-        cswitchOffset[i]->setValue(range.step*(model.customSw[i].val2/* TODO+source.getRawOffset(model)*/)+range.offset);
+        mask |= VALUE2_VISIBLE;
+        if (model.customSw[i].isDeltaFunction()) {
+          /*TODO: is this delta function value set correctly*/
+          cswitchOffset[i]->setMinimum(range.step*-127);
+          cswitchOffset[i]->setMaximum(range.step*127);
+          cswitchOffset[i]->setValue(range.step*model.customSw[i].val2);
+        }
+        else {
+          cswitchOffset[i]->setMinimum(range.min);
+          cswitchOffset[i]->setMaximum(range.max);
+          cswitchOffset[i]->setValue(range.step*(model.customSw[i].val2/* TODO+source.getRawOffset(model)*/)+range.offset);
+        }
      }
      break;
    case LS_FAMILY_VBOOL:
@@ -319,7 +358,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
  cswitchValue[i]->setVisible(mask & VALUE1_VISIBLE);
  cswitchOffset[i]->setVisible(mask & VALUE2_VISIBLE);
  cswitchOffset2[i]->setVisible(mask & VALUE3_VISIBLE);
-
+  cswitchTOffset[i]->setVisible(mask & VALUE_TO_VISIBLE);
  lock = false;
 }

@@ -437,10 +476,10 @@ void LogicalSwitchesPanel::csw_customContextMenuRequested(QPoint pos)
    bool hasData = mimeData->hasFormat("application/x-companion-csw");

    QMenu contextMenu;
-    contextMenu.addAction(CompanionIcon("clear.png"), tr("&Delete"),this,SLOT(cswDelete()),tr("Delete"));
    contextMenu.addAction(CompanionIcon("copy.png"), tr("&Copy"),this,SLOT(cswCopy()),tr("Ctrl+C"));
    contextMenu.addAction(CompanionIcon("cut.png"), tr("&Cut"),this,SLOT(cswCut()),tr("Ctrl+X"));
    contextMenu.addAction(CompanionIcon("paste.png"), tr("&Paste"),this,SLOT(cswPaste()),tr("Ctrl+V"))->setEnabled(hasData);
+    contextMenu.addAction(CompanionIcon("clear.png"), tr("&Delete"),this,SLOT(cswDelete()),tr("Delete"));

    contextMenu.exec(globalPos);
 }
@@ -4,6 +4,7 @@
 #include "modelpanel.h"
 #include <QComboBox>
 #include <QDoubleSpinBox>
+#include <QTimeEdit>

 class LogicalSwitchesPanel : public ModelPanel
 {
@@ -33,6 +34,7 @@ class LogicalSwitchesPanel : public ModelPanel
    QDoubleSpinBox  * cswitchValue[C9X_NUM_CSW];
    QDoubleSpinBox  * cswitchOffset[C9X_NUM_CSW];
    QDoubleSpinBox  * cswitchOffset2[C9X_NUM_CSW];
+    QTimeEdit  * cswitchTOffset[C9X_NUM_CSW];
    QComboBox * cswitchAnd[C9X_NUM_CSW];
    QDoubleSpinBox  * cswitchDuration[C9X_NUM_CSW];
    QDoubleSpinBox  * cswitchDelay[C9X_NUM_CSW];
@@ -191,9 +191,8 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch)
      str += " " + Qt::escape(tr("Switch(%1)").arg(md->swtch.toString()));
    }

-    if (md->carryTrim) {
-      str += " " + Qt::escape(tr("NoTrim"));
-    }
+    if (md->carryTrim>0)      str += " " + Qt::escape(tr("NoTrim"));
+    else if (md->carryTrim<0) str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();

    if (firmware->getCapability(HasNoExpo) && md->noExpo) str += " " + Qt::escape(tr("No DR/Expo"));
    if (md->sOffset)     str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(md->sOffset)));
@@ -323,6 +322,9 @@ void MixesPanel::setSelectedByMixList(QList<int> list)

 void MixesPanel::mixersDelete(bool ask)
 {
+    QList<int> list = createMixListFromSelected();
+    if(list.isEmpty()) return;
+
    QMessageBox::StandardButton ret = QMessageBox::No;

    if(ask)
@@ -332,7 +334,7 @@ void MixesPanel::mixersDelete(bool ask)


    if ((ret == QMessageBox::Yes) || (!ask)) {
-      mixersDeleteList(createMixListFromSelected());
+      mixersDeleteList(list);
      emit modified();
      update();
    }
@@ -523,10 +525,17 @@ void MixesPanel::mixerlistWidget_KeyPress(QKeyEvent *event)

 int MixesPanel::gm_moveMix(int idx, bool dir) //true=inc=down false=dec=up
 {
-    if(idx>firmware->getCapability(Mixes) || (idx==0 && !dir) || (idx==firmware->getCapability(Mixes) && dir)) return idx;
+    if(idx>firmware->getCapability(Mixes) || (idx==firmware->getCapability(Mixes) && dir)) return idx;
+
+    MixData &src=model.mixData[idx];
+
+    if (idx==0 && !dir) {
+        //special case: topmost mixer moving up
+        if (src.destCh > 1) src.destCh--;
+        return idx;  
+    }

    int tdx = dir ? idx+1 : idx-1;
-    MixData &src=model.mixData[idx];
    MixData &tgt=model.mixData[tdx];

    unsigned int outputs = firmware->getCapability(Outputs);
@@ -13,7 +13,6 @@
 #include "telemetry.h"
 #include "appdata.h"
 #include <QScrollArea>
-#include "googleanalytics.h"

 ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, FirmwareInterface * firmware) :
  QDialog(parent),
@@ -43,8 +42,6 @@ ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, Firmw
    addTab(new TelemetryPanel(this, model, generalSettings, firmware), tr("Telemetry"));
    
  connect(setupPanel, SIGNAL(extendedLimitsToggled()), chnPanel, SLOT(refreshExtendedLimits()));
-
-  ga.sendPageView(getBoardName(firmware->getBoard()) + " ModelEdit");
 }

 ModelEdit::~ModelEdit()
@@ -1,5 +1,7 @@
 #include "modelpanel.h"
 #include <QLabel>
+#include <QComboBox>
+#include <QSpinBox>

 ModelPanel::ModelPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
  QWidget(parent),
@@ -57,3 +59,44 @@ void ModelPanel::addDoubleSpring(QGridLayout * gridLayout, int col, int row)
    gridLayout->addItem(spacer, row, col);
 }

+bool ModelPanel::eventFilter(QObject *object, QEvent * event)
+{
+  QWidget * widget = qobject_cast<QWidget*>(object);
+  if (widget) {
+    if (event->type() == QEvent::Wheel) {
+      if (widget->focusPolicy() == Qt::WheelFocus) {
+        event->accept();
+        return false;
+      }
+      else {
+        event->ignore();
+        return true;
+      }
+    }
+    else if (event->type() == QEvent::FocusIn) {
+      widget->setFocusPolicy(Qt::WheelFocus);
+    }
+    else if (event->type() == QEvent::FocusOut) {
+      widget->setFocusPolicy(Qt::StrongFocus);
+    }
+  }
+  return QWidget::eventFilter(object, event);
+}
+
+void ModelPanel::disableMouseScrolling()
+{
+  Q_FOREACH(QComboBox * cb, findChildren<QComboBox*>()) {
+    cb->installEventFilter(this);
+    cb->setFocusPolicy(Qt::StrongFocus);
+  }
+
+  Q_FOREACH(QAbstractSpinBox * sb, findChildren<QAbstractSpinBox*>()) {
+    sb->installEventFilter(this);
+    sb->setFocusPolicy(Qt::StrongFocus);
+  }
+
+  Q_FOREACH(QSlider * slider, findChildren<QSlider*>()) {
+    slider->installEventFilter(this);
+    slider->setFocusPolicy(Qt::StrongFocus);
+  }
+}
@@ -31,6 +31,8 @@ class ModelPanel : public QWidget
    void addHSpring(QGridLayout *, int col, int row);
    void addVSpring(QGridLayout *, int col, int row);
    void addDoubleSpring(QGridLayout *, int col, int row);
+    virtual bool eventFilter(QObject *obj, QEvent *event);
+    void disableMouseScrolling();
 };

 #endif // CHANNELS_H
@@ -28,6 +28,8 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
  if (IS_ARM(GetEepromInterface()->getBoard()) || IS_2560(GetEepromInterface()->getBoard()))
    ui->countdownBeep->addItem(tr("Voice"), 2);

+  disableMouseScrolling();
+
  lock = false;
 }

@@ -144,7 +146,7 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module
      label->setText(QString::number(i+1));
      QDoubleSpinBox * spinbox = new QDoubleSpinBox(this);
      spinbox->setMinimumSize(QSize(20, 0));
-      spinbox->setRange(-100, 100);
+      spinbox->setRange(-150, 150);
      spinbox->setSingleStep(0.1);
      spinbox->setDecimals(1);
      spinbox->setValue(((double)module.failsafeChannels[i]*100)/1024);
@@ -157,6 +159,8 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module
    }
  }

+  disableMouseScrolling();
+
  lock = false;
 }

@@ -228,7 +232,7 @@ void ModulePanel::update()
  ui->ppmDelay->setValue(module.ppmDelay);
  ui->label_ppmFrameLength->setVisible(mask & MASK_PPM_FIELDS);
  ui->ppmFrameLength->setVisible(mask & MASK_PPM_FIELDS);
-  ui->ppmFrameLength->setMinimum(module.channelsCount*(model.extendedLimits ? 2.250 :2)+3.5);
+  ui->ppmFrameLength->setMinimum(module.channelsCount*(model.extendedLimits ? 2.250 : 2)+3.5);
  ui->ppmFrameLength->setMaximum(firmware->getCapability(PPMFrameLength));
  ui->ppmFrameLength->setValue(22.5+((double)module.ppmFrameLength)*0.5);

@@ -418,6 +422,9 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
    ui->centerBeepLayout->addWidget(checkbox, 0, i+1);
    connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(onBeepCenterToggled(bool)));
    centerBeepCheckboxes << checkbox;
+    if (!IS_TARANIS_PLUS(firmware->getBoard()) && i==6) {
+        checkbox->hide();
+    }
  }

  // Startup switches warnings
@@ -466,7 +473,7 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
      ui->potWarningLayout->addWidget(cb, 0, i+1);
      connect(cb, SIGNAL(toggled(bool)), this, SLOT(potWarningToggled(bool)));
      potWarningCheckboxes << cb;
-      if (!IS_TARANIS_PLUS(firmware->getBoard())) {
+      if (!IS_TARANIS_PLUS(firmware->getBoard()) && i==2) {
        cb->hide();
      }
    }
@@ -475,6 +482,9 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
    ui->label_potWarning->hide();
    ui->potWarningMode->hide();
  }
+
+  disableMouseScrolling();
+
  lock = false;
 }

@@ -50,6 +50,8 @@ TelemetryAnalog::TelemetryAnalog(QWidget *parent, FrSkyChannelData & analog, Mod
  else {
    ui->label_Max->setText(tr("Range"));
  }
+
+  disableMouseScrolling();
 }

 void TelemetryAnalog::update()
@@ -324,6 +326,8 @@ TelemetryCustomScreen::TelemetryCustomScreen(QWidget *parent, ModelData & model,
    ui->screenBarsLayout->addWidget(maxSB[l], l, 3, 1, 1);
  }

+  disableMouseScrolling();
+
  update();
 }

@@ -336,6 +340,12 @@ void TelemetryCustomScreen::populateTelemetrySourceCB(QComboBox *b, unsigned int

  for (unsigned int i = 0; i < (last ? TELEMETRY_SOURCES_STATUS_COUNT : TELEMETRY_SOURCES_DISPLAY_COUNT); i++) {
    b->addItem(RawSource(SOURCE_TYPE_TELEMETRY, i).toString());
+    if (!firmware->isTelemetrySourceAvailable(i)) {
+      //disable item
+      QModelIndex index = b->model()->index(i+1, 0);
+      QVariant v(0);
+      b->model()->setData(index, v, Qt::UserRole - 1);
+    }
    if (!(i>=sizeof(telem_hub)/sizeof(int) || telem_hub[i]==0 || ((telem_hub[i]>=hubproto) && hubproto!=0))) {
      QModelIndex index = b->model()->index(i, 0);
      QVariant v(0);
@@ -516,6 +526,8 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
    ui->bladesCount->setMaximum(128);
  }

+  disableMouseScrolling();
+
  setup();
 }

@@ -530,20 +542,6 @@ void TelemetryPanel::setup()

    lock = true;

-    if (IS_ARM(firmware->getBoard())) {
-      ui->rxbattAlarm1DSB->setValue((13.2*model.frsky.rxBattAlarms[0])/255);
-      ui->rxbattAlarm2DSB->setValue((13.2*model.frsky.rxBattAlarms[1])/255);
-    }
-    else {
-      ui->rxbattLabel->hide();
-      ui->rxbattAlarm1Label->hide();
-      ui->rxbattAlarm2Label->hide();
-      ui->rxbattAlarm1CB->hide();
-      ui->rxbattAlarm2CB->hide();
-      ui->rxbattAlarm1DSB->hide();
-      ui->rxbattAlarm2DSB->hide();
-    }
-
    ui->rssiAlarm1SB->setValue(model.frsky.rssiAlarms[0].value);
    ui->rssiAlarm2SB->setValue(model.frsky.rssiAlarms[1].value);
    if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
@@ -692,9 +690,6 @@ void TelemetryPanel::populateVoltsSource()
 {
  QUnsignedAutoComboBox * cb = ui->frskyVoltCB;
  cb->setField(&model.frsky.voltsSource, this);
-  if (IS_ARM(firmware->getBoard())) {
-    cb->addItem(tr("RxBatt"), TELEMETRY_VOLTS_SOURCE_RXBATT);
-  }
  cb->addItem(tr("A1"), TELEMETRY_VOLTS_SOURCE_A1);
  cb->addItem(tr("A2"), TELEMETRY_VOLTS_SOURCE_A2);
  if (IS_ARM(firmware->getBoard())) {
@@ -790,18 +785,6 @@ void TelemetryPanel::on_varioLimitMin_DSB_editingFinished()
  emit modified();
 }

-void TelemetryPanel::on_rxbattAlarm1DSB_editingFinished()
-{
-  model.frsky.rxBattAlarms[0] = round(ui->rxbattAlarm1DSB->value()/(13.2/255));
-  emit modified();
-}
-
-void TelemetryPanel::on_rxbattAlarm2DSB_editingFinished()
-{
-  model.frsky.rxBattAlarms[1] = round(ui->rxbattAlarm2DSB->value()/(13.2/255));
-  emit modified();
-}
-
 void TelemetryPanel::on_varioLimitMax_DSB_editingFinished()
 {
  model.frsky.varioMax = round(ui->varioLimitMax_DSB->value()-10);
@@ -93,8 +93,6 @@ class TelemetryPanel : public ModelPanel
    void on_rssiAlarm2CB_currentIndexChanged(int index);
    void on_rssiAlarm1SB_editingFinished();
    void on_rssiAlarm2SB_editingFinished();
-    void on_rxbattAlarm1DSB_editingFinished();
-    void on_rxbattAlarm2DSB_editingFinished();
    void on_AltitudeGPS_ChkB_toggled(bool checked);
    void on_varioLimitMin_DSB_editingFinished();
    void on_varioLimitMax_DSB_editingFinished();
@@ -437,356 +437,6 @@
       </layout>
      </widget>
     </item>
-     <item row="3" column="0">
-      <widget class="QGroupBox" name="RSSIGB">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="flat">
-        <bool>false</bool>
-       </property>
-       <layout class="QGridLayout" name="gridLayout_7">
-        <property name="leftMargin">
-         <number>0</number>
-        </property>
-        <property name="topMargin">
-         <number>0</number>
-        </property>
-        <property name="rightMargin">
-         <number>3</number>
-        </property>
-        <property name="bottomMargin">
-         <number>3</number>
-        </property>
-        <item row="5" column="0">
-         <widget class="QLabel" name="rxbattAlarm2Label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Alarm 2</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="0">
-         <widget class="QLabel" name="rxbattAlarm1Label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="styleSheet">
-           <string notr="true"/>
-          </property>
-          <property name="text">
-           <string>Alarm 1</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="0">
-         <widget class="QLabel" name="rxbattLabel">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>RxBatt</string>
-          </property>
-         </widget>
-        </item>
-        <item row="5" column="1">
-         <widget class="QComboBox" name="rxbattAlarm2CB">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <item>
-           <property name="text">
-            <string>Critical Alarm</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="rssiAlarm1Label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="styleSheet">
-           <string notr="true"/>
-          </property>
-          <property name="text">
-           <string>Alarm 1</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1">
-         <widget class="QComboBox" name="rssiAlarm1CB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <item>
-           <property name="text">
-            <string>----</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Yellow</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Orange</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Red</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="1" column="2">
-         <widget class="QSpinBox" name="rssiAlarm1SB">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="suffix">
-           <string/>
-          </property>
-          <property name="minimum">
-           <number>20</number>
-          </property>
-          <property name="maximum">
-           <number>80</number>
-          </property>
-          <property name="singleStep">
-           <number>1</number>
-          </property>
-          <property name="value">
-           <number>50</number>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="0">
-         <widget class="QLabel" name="rssiAlarm2Label">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="minimumSize">
-           <size>
-            <width>0</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="text">
-           <string>Alarm 2</string>
-          </property>
-         </widget>
-        </item>
-        <item row="2" column="1">
-         <widget class="QComboBox" name="rssiAlarm2CB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <item>
-           <property name="text">
-            <string>----</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Yellow</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Orange</string>
-           </property>
-          </item>
-          <item>
-           <property name="text">
-            <string>Red</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="2" column="2">
-         <widget class="QSpinBox" name="rssiAlarm2SB">
-          <property name="enabled">
-           <bool>true</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="suffix">
-           <string/>
-          </property>
-          <property name="minimum">
-           <number>20</number>
-          </property>
-          <property name="maximum">
-           <number>80</number>
-          </property>
-          <property name="singleStep">
-           <number>1</number>
-          </property>
-          <property name="value">
-           <number>50</number>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
-         <widget class="QLabel" name="rssiLabel">
-          <property name="font">
-           <font>
-            <weight>75</weight>
-            <bold>true</bold>
-           </font>
-          </property>
-          <property name="text">
-           <string>RSSI</string>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="1">
-         <widget class="QComboBox" name="rxbattAlarm1CB">
-          <property name="enabled">
-           <bool>false</bool>
-          </property>
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <item>
-           <property name="text">
-            <string>Low Alarm</string>
-           </property>
-          </item>
-         </widget>
-        </item>
-        <item row="6" column="0">
-         <spacer name="verticalSpacer_2">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>0</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="5" column="2">
-         <widget class="QDoubleSpinBox" name="rxbattAlarm2DSB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="decimals">
-           <number>2</number>
-          </property>
-          <property name="minimum">
-           <double>0.000000000000000</double>
-          </property>
-          <property name="maximum">
-           <double>13.199999999999999</double>
-          </property>
-          <property name="singleStep">
-           <double>0.050000000000000</double>
-          </property>
-          <property name="value">
-           <double>4.300000000000000</double>
-          </property>
-         </widget>
-        </item>
-        <item row="4" column="2">
-         <widget class="QDoubleSpinBox" name="rxbattAlarm1DSB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="decimals">
-           <number>2</number>
-          </property>
-          <property name="minimum">
-           <double>0.000000000000000</double>
-          </property>
-          <property name="maximum">
-           <double>13.199999999999999</double>
-          </property>
-          <property name="singleStep">
-           <double>0.051764000000000</double>
-          </property>
-          <property name="value">
-           <double>4.300000000000000</double>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
     <item row="3" column="1">
      <widget class="QGroupBox" name="altimetryGB">
       <property name="sizePolicy">
@@ -1213,6 +863,216 @@
       </layout>
      </widget>
     </item>
+     <item row="3" column="0">
+      <widget class="QGroupBox" name="RSSIGB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="flat">
+        <bool>false</bool>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_7">
+        <property name="leftMargin">
+         <number>0</number>
+        </property>
+        <property name="topMargin">
+         <number>0</number>
+        </property>
+        <property name="rightMargin">
+         <number>3</number>
+        </property>
+        <property name="bottomMargin">
+         <number>3</number>
+        </property>
+        <item row="1" column="0">
+         <widget class="QLabel" name="rssiAlarm1Label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="styleSheet">
+           <string notr="true"/>
+          </property>
+          <property name="text">
+           <string>Alarm 1</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QComboBox" name="rssiAlarm1CB">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <item>
+           <property name="text">
+            <string>----</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Yellow</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Orange</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Red</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="1" column="2">
+         <widget class="QSpinBox" name="rssiAlarm1SB">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="suffix">
+           <string/>
+          </property>
+          <property name="minimum">
+           <number>20</number>
+          </property>
+          <property name="maximum">
+           <number>80</number>
+          </property>
+          <property name="singleStep">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>50</number>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="rssiAlarm2Label">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="minimumSize">
+           <size>
+            <width>0</width>
+            <height>0</height>
+           </size>
+          </property>
+          <property name="text">
+           <string>Alarm 2</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QComboBox" name="rssiAlarm2CB">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <item>
+           <property name="text">
+            <string>----</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Yellow</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Orange</string>
+           </property>
+          </item>
+          <item>
+           <property name="text">
+            <string>Red</string>
+           </property>
+          </item>
+         </widget>
+        </item>
+        <item row="2" column="2">
+         <widget class="QSpinBox" name="rssiAlarm2SB">
+          <property name="enabled">
+           <bool>true</bool>
+          </property>
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="suffix">
+           <string/>
+          </property>
+          <property name="minimum">
+           <number>20</number>
+          </property>
+          <property name="maximum">
+           <number>80</number>
+          </property>
+          <property name="singleStep">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>50</number>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QLabel" name="rssiLabel">
+          <property name="font">
+           <font>
+            <weight>75</weight>
+            <bold>true</bold>
+           </font>
+          </property>
+          <property name="text">
+           <string>RSSI</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="0">
+         <spacer name="verticalSpacer_2">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>0</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </widget>
+     </item>
    </layout>
   </item>
   <item>
@@ -6,7 +6,6 @@
 #include <QImage>
 #include <QColor>
 #include <QPainter>
-#include "googleanalytics.h"

 #if !defined WIN32 && defined __GNUC__
 #include <unistd.h>
@@ -62,8 +61,6 @@ PrintDialog::PrintDialog(QWidget *parent, FirmwareInterface * firmware, GeneralS
    printToFile();
    QTimer::singleShot(0, this, SLOT(autoClose()));
  }
-
-  ga.sendPageView(getBoardName(GetCurrentFirmware()->getBoard()) + " ModelsPrint");
 }

 void PrintDialog::closeEvent(QCloseEvent *event) 
@@ -174,7 +171,7 @@ QString PrintDialog::printFlightModes()
    }
    str.append("</tr>");
    for (int i=0; i<firmware->getCapability(FlightModes); i++) {
-      PhaseData *pd=&g_model->phaseData[i];
+      FlightModeData *pd=&g_model->flightModeData[i];
      str.append("<tr><td><b>"+tr("FM")+QString("%1</b> <font size=+1 face='Courier New' color=green>%2</font></td>").arg(i).arg(pd->name));
      str.append(QString("<td  align=\"right\"><font size=+1 face='Courier New' color=green>%1</font></td>").arg((qreal)pd->fadeIn/firmware->getCapability(SlowScale)));
      str.append(QString("<td width=\"30\" align=\"right\"><font size=+1 face='Courier New' color=green>%1</font></td>").arg((qreal)pd->fadeOut/firmware->getCapability(SlowScale)));
@@ -265,8 +262,8 @@ void PrintDialog::printInputs()
            QString strModes;
            for (int j=0; j<firmware->getCapability(FlightModes);j++) {
              if (!(ed->phases & mask)) {
-                //PhaseData *pd = &g_model->phaseData[j];
-                const char * pdName = g_model->phaseData[j].name;
+                //FlightModeData *pd = &g_model->flightModeData[j];
+                const char * pdName = g_model->flightModeData[j].name;
                if (first) {
                  strModes += Qt::escape(QString("%1").arg(getPhaseName(j+1,pdName)));
                  first = false;
@@ -347,9 +344,8 @@ void PrintDialog::printMixes()
        str += " " + Qt::escape(tr("Switch(%1)").arg(md->swtch.toString()));
      }

-      if (md->carryTrim) {
-        str += " " + Qt::escape(tr("NoTrim"));
-      }
+      if (md->carryTrim>0)      str += " " + Qt::escape(tr("NoTrim"));
+      else if (md->carryTrim<0) str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();

      if (firmware->getCapability(HasNoExpo) && md->noExpo) str += " " + Qt::escape(tr("No DR/Expo"));
      if (md->sOffset)     str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(md->sOffset)));
@@ -619,7 +615,7 @@ void PrintDialog::printGvars()
    QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
    str.append("<tr><td><h2>"+tr("Global Variables")+"</h2></td></tr>");
    str.append("<tr><td><table border=1 cellspacing=0 cellpadding=3 width=100>");
-    PhaseData *pd=&g_model->phaseData[0];
+    FlightModeData *pd=&g_model->flightModeData[0];
    int width=100/gvarnum;
    str.append("<tr>");
    for(unsigned int i=0; i<gvarnum; i++) {        
@@ -4,7 +4,6 @@
 #include <iostream>
 #include "helpers.h"
 #include "simulatorinterface.h"
-#include "googleanalytics.h"

 #define GBALL_SIZE  20
 #define RESX        1024
@@ -24,7 +23,6 @@ SimulatorDialog::SimulatorDialog(QWidget * parent, unsigned int flags):
  trimPressed (TRIM_NONE),
  middleButtonPressed(false)
 {
-  ga.sendPageView(getBoardName(GetCurrentFirmware()->getBoard()) + " Simulator");
 }

 uint32_t SimulatorDialog9X::switchstatus = 0;
@@ -60,7 +60,7 @@ for (int i=0; i<NUM_LOGICAL_SWITCH; i++)
  outputs.vsw[i] = getSwitch(SWSRC_SW1+i, 0);
 #endif
 #ifdef GVAR_VALUE // defined(GVARS)
-/* TODO it could be a good idea instead of getPhase() / getPhaseName() outputs.phase = getFlightPhase(); */
+/* TODO it could be a good idea instead of getPhase() / getPhaseName() outputs.phase = getFlightMode(); */
 for (int fm=0; fm<MAX_FLIGHT_MODES; fm++) {
  for (int gv=0; gv<MAX_GVARS; gv++) {
    outputs.gvars[fm][gv] = GVAR_VALUE(gv, getGVarFlightPhase(fm, gv));
@@ -42,8 +42,8 @@ WizMix::WizMix(const GeneralSettings & settings, const unsigned int modelId):

 void WizMix::maxMixSwitch(char *name, MixData &mix, int channel, int sw, int weight)
 {
-  strncpy(mix.name, name, sizeof(mix.name));
-  mix.name[sizeof(mix.name)]=0;
+  strncpy(mix.name, name, MIXDATA_NAME_LEN);
+  mix.name[MIXDATA_NAME_LEN] = '\0';
  mix.destCh = channel;
  mix.srcRaw = RawSource(SOURCE_TYPE_MAX);
  mix.swtch  = RawSwitch(SWITCH_TYPE_SWITCH, sw);  
@@ -16,7 +16,6 @@
 #include "wizarddialog.h"
 #include "wizarddata.h"
 #include "helpers.h"
-#include "googleanalytics.h"

 WizardDialog::WizardDialog(const GeneralSettings & settings, unsigned int modelId, QWidget *parent):
  QWizard(parent),
@@ -51,13 +50,15 @@ WizardDialog::WizardDialog(const GeneralSettings & settings, unsigned int modelI
    "Please note that continuing removes all old model settings!"), -1));
  setStartId(Page_Models);

-#ifndef Q_WS_MAC
+  // Workaround for Qt radio button rendering issue on Mac
+  Q_FOREACH(QAbstractButton * rb, findChildren<QAbstractButton *>()) {
+    rb->setAttribute(Qt::WA_LayoutUsesWidgetRect);
+  }
+
  setWizardStyle(ModernStyle);
-#endif
+  setOption(QWizard::NoCancelButton, false);
  setOption(HaveHelpButton, true);
  connect(this, SIGNAL(helpRequested()), this, SLOT(showHelp()));
-
-  ga.sendPageView("Wizard");
 }

 void WizardDialog::showHelp()
@@ -105,8 +105,6 @@ void saveGeneralSettings(GeneralSettings & settings, global_settings & gs)
  }
  /* TODO if (settings.disableSplashScreen)
    gs.splash_screen(false); */
-  if (settings.filterInput)
-    gs.filter_input(filter_input::value(settings.filterInput));
  /* TODO if (settings.backlightDelay)
    gs.light_auto_off_timer(settings.lightAutoOff); */
  gs.default_channel_order(settings.templateSetup);
@@ -156,14 +154,14 @@ void saveModel(ModelData & m, model & xm)
  phases xphases;
  phases::phase_sequence & phases_sequence (xphases.phase());
  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    PhaseData & p = m.phaseData[i];
+    FlightModeData & p = m.flightModeData[i];
    if (i == 0 || p.swtch.type!=SWITCH_TYPE_NONE) {
      TrimType xtrim[4];
      for (int j=0; j<4; j++) {
-        if (m.phaseData[i].trimRef[j] >= 0)
-          xtrim[j].phaseRef(m.phaseData[i].trimRef[j]);
+        if (m.flightModeData[i].trimRef[j] >= 0)
+          xtrim[j].phaseRef(m.flightModeData[i].trimRef[j]);
        else
-          xtrim[j].value(m.phaseData[i].trim[j]);
+          xtrim[j].value(m.flightModeData[i].trim[j]);
      }
      trims1 xtrims(xtrim[0], xtrim[1], xtrim[2], xtrim[3]);
      phase xphase(xtrims, i);
@@ -95,6 +95,10 @@ Section "OpenTX companion" SecDummy
  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
+   
+  CreateDirectory "$INSTDIR\phonon_backend"
+  SetOutPath "$INSTDIR\phonon_backend"
+  File "@QT_BINARY_DIR@\..\plugins\phonon_backend\Phonon_ds94.dll"
  
  CreateDirectory "$INSTDIR\lang"
  SetOutPath "$INSTDIR\lang"
@@ -123,6 +123,10 @@ Section "OpenTX Companion" SecDummy
  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
  File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb-1.0.dll"
  
+  CreateDirectory "$INSTDIR\phonon_backend"
+  SetOutPath "$INSTDIR\phonon_backend"
+  File "@QT_BINARY_DIR@\..\plugins\phonon_backend\Phonon_ds94.dll"
+
  CreateDirectory "$INSTDIR\lang"
  SetOutPath "$INSTDIR\lang"
  File "*.qm"
@@ -1,3 +1,21 @@
+<h2>Version 2.0.3 / 2014-06-17</h2>
+<ul>
+<li>Bugfix on Reset Flight function (possible freeze of the menus)
+<li>Imperial units bug (on altitude)
+<li>FIRMWARE.BIN and EEPROM.BIN are not anymore marked as system files
+</ul>
+
+<h2>Version 2.0.2 / 2014-06-12</h2>
+<ul>
+<li>RxBatt removed (merged with A1 as before)
+<li>Bootloader accessible through the 2 trims (as 2.0.0)
+<li>Delay on switches middle position only applied to Play functions
+<li>Delay for Play functions is configurable (0-300ms)
+<li>SWR, A3 and A4 now recorded in SD logs
+<li>Persistent mAh was not correctly stored in EEPROM
+<li>A lot of small bug fixes
+</ul>
+
 <h2>OpenTX 2.0.1 / 2014-02-05</h2>
 [Taranis]
 <ul>
@@ -226,7 +226,7 @@ IRPROTOS = NO
 TRANSLATIONS = EN

 # TTS
-# Values = en, fr
+# Values = en, fr, hu
 TTS = $(TRANSLATIONS)

 # UNITS
@@ -279,7 +279,7 @@ SHELL = sh
 IMG2LBM = -python ../util/img2lbm.py
 BIN2LBM = -python ../util/bin2lbm.py
 TRANSLATE = -python ../util/translate.py
-VERSION = 2.0.1
+VERSION = 2.0.3

 SRC =
 CPPSRC =
@@ -753,7 +753,7 @@ TARGET = opentx

 # List C++ source files here. (C dependencies are automatically generated.)
 ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO TARANIS))
-  TTS_SRC = translations/tts_cz.cpp translations/tts_de.cpp translations/tts_en.cpp translations/tts_es.cpp translations/tts_fr.cpp translations/tts_it.cpp translations/tts_pt.cpp translations/tts_sk.cpp translations/tts_se.cpp translations/tts_pl.cpp
+  TTS_SRC = translations/tts_cz.cpp translations/tts_de.cpp translations/tts_en.cpp translations/tts_es.cpp translations/tts_fr.cpp translations/tts_it.cpp translations/tts_pt.cpp translations/tts_sk.cpp translations/tts_se.cpp translations/tts_pl.cpp translations/tts_hu.cpp
 else
  STD_TTS_SRC = translations/tts_$(shell sh -c "echo $(TTS) | tr '[:upper:]' '[:lower:]'").cpp
  TTS_SRC = $(shell sh -c "if test -f $(STD_TTS_SRC); then echo $(STD_TTS_SRC); else echo translations/tts_en.cpp; fi")
@@ -201,8 +201,6 @@ const char * audioFilenames[] = {
  "rssi_org",
  "rssi_red",
  "swr_red",
-  "rx_org",
-  "rx_red",
  "telemko",
  "telemok"
 };
@@ -282,7 +280,7 @@ void referenceSystemAudioFiles()

 const char * suffixes[] = { "-off", "-on" };

-char * getModelPath(char * path)
+char * getModelAudioPath(char * path)
 {
  strcpy(path, SOUNDS_PATH "/");
  strncpy(path+SOUNDS_PATH_LNG_OFS, currentLanguagePack->id, 2);
@@ -294,7 +292,7 @@ char * getModelPath(char * path)

 void getPhaseAudioFile(char * filename, int index, unsigned int event)
 {
-  char * str = getModelPath(filename);
+  char * str = getModelAudioPath(filename);
  char * tmp = strcat_phasename(str, index);
  strcpy(tmp, suffixes[event]);
  strcat(tmp, SOUNDS_EXT);
@@ -302,7 +300,7 @@ void getPhaseAudioFile(char * filename, int index, unsigned int event)

 void getSwitchAudioFile(char * filename, int index)
 {
-  char * str = getModelPath(filename);
+  char * str = getModelAudioPath(filename);
  int len = STR_VSWITCHES[0];
  strncpy(str, &STR_VSWITCHES[1+len*(index+1)], len);
  str += len-1;
@@ -326,11 +324,11 @@ void getSwitchAudioFile(char * filename, int index)

 void getLogicalSwitchAudioFile(char * filename, int index, unsigned int event)
 {
-  char * str = getModelPath(filename);
+  char * str = getModelAudioPath(filename);
  int len = STR_VSWITCHES[0];
  strncpy(str, &STR_VSWITCHES[1+len*(index+SWSRC_FIRST_LOGICAL_SWITCH)], len);
-  str += len;
-  strcpy(str, suffixes[event]);
+  str[len] = '\0';
+  strcat(str, suffixes[event]);
  strcat(str, SOUNDS_EXT);
 }

@@ -348,7 +346,7 @@ void referenceModelAudioFiles()
  sdAvailableSwitchAudioFiles = 0;
  sdAvailableLogicalSwitchAudioFiles = 0;
  
-  char * filename = getModelPath(path);
+  char * filename = getModelAudioPath(path);
  *(filename-1) = '\0';

  FRESULT res = f_opendir(&dir, path);        /* Open the directory */
@@ -919,7 +917,7 @@ void AudioQueue::stopAll()
  CoEnterMutexSection(audioMutex);
  widx = ridx;                      // clean the queue
  priorityContext.clear();
-  normalContext.tone.clear();
+  normalContext.fragment.clear();
  varioContext.clear();
  backgroundContext.clear();
  CoLeaveMutexSection(audioMutex);
@@ -1057,14 +1055,12 @@ void audioEvent(uint8_t e, uint16_t f)
        case AU_TIMER_30:
          audioQueue.playTone(BEEP_DEFAULT_FREQ+150, 120, 20, PLAY_REPEAT(2)|PLAY_NOW);
          break;
-        case AU_RXBATT_ORANGE:
        case AU_A1_ORANGE:
        case AU_A2_ORANGE:
        case AU_A3_ORANGE:
        case AU_A4_ORANGE:
          audioQueue.playTone(BEEP_DEFAULT_FREQ+600, 200, 20, PLAY_NOW);
          break;
-        case AU_RXBATT_RED:
        case AU_A1_RED:
        case AU_A2_RED:
        case AU_A3_RED:
@@ -62,9 +62,10 @@
 #include "../FatFs/ff.h"
 #include "../FatFs/diskio.h"
 #include "../translations/en.h"
+#include "../stamp-opentx.h"

 #if defined(PCBTARANIS)
-  #define BOOTLOADER_TITLE      " Taranis BootLoader - v1.0"
+  #define BOOTLOADER_TITLE      " Taranis BootLoader - " VERS_STR
  #define BOOT_KEY_UP		KEY_PLUS
  #define BOOT_KEY_DOWN		KEY_MINUS
  #define BOOT_KEY_LEFT		KEY_MENU
@@ -73,7 +74,7 @@
  #define BOOT_KEY_EXIT		KEY_EXIT
  #define DISPLAY_CHAR_WIDTH	35
 #elif defined(PCBSKY9X)
-  #define BOOTLOADER_TITLE      "Sky9x Boot Loader - v1.0"
+  #define BOOTLOADER_TITLE      "Sky9x Boot Loader - " VERS_STR
 #endif

 const uint8_t bootloaderVersion[] __attribute__ ((section(".version"), used)) =
@@ -499,6 +500,9 @@ int main()
 #endif

 #if defined(PCBTARANIS)
+#if defined(REVPLUS)
+  turnBacklightOn(0, 0);
+#endif
  keysInit();
  I2C_EE_Init();
  init_hw_timer();
@@ -250,7 +250,7 @@ int applyCurve(int x, CurveRef & curve)
  switch (curve.type) {
    case CURVE_REF_DIFF:
    {
-      int curveParam = calc100to256(GET_GVAR(curve.value, -100, 100, s_current_mixer_flight_mode));
+      int curveParam = calc100to256(GET_GVAR(curve.value, -100, 100, mixerCurrentFlightMode));
      if (curveParam > 0 && x < 0)
        x = (x * (256 - curveParam)) >> 8;
      else if (curveParam < 0 && x > 0)
@@ -259,7 +259,7 @@ int applyCurve(int x, CurveRef & curve)
    }

    case CURVE_REF_EXPO:
-      return expo(x, GET_GVAR(curve.value, -100, 100, s_current_mixer_flight_mode));
+      return expo(x, GET_GVAR(curve.value, -100, 100, mixerCurrentFlightMode));

    case CURVE_REF_FUNC:
      switch (curve.value) {
@@ -41,7 +41,7 @@ PACK(typedef struct {
  uint8_t  mode;         // 0=end, 1=pos, 2=neg, 3=both
  uint8_t  chn;
  int8_t   swtch;
-  uint16_t phases;
+  uint16_t flightModes;
  int8_t   weight;
  uint8_t  curveMode;
  char     name[LEN_EXPOMIX_NAME];
@@ -53,7 +53,7 @@ PACK(typedef struct {
  uint8_t  mode;         // 0=end, 1=pos, 2=neg, 3=both
  uint8_t  chn;
  int8_t   swtch;
-  uint16_t phases;
+  uint16_t flightModes;
  int8_t   weight;
  uint8_t  curveMode;
  char     name[LEN_EXPOMIX_NAME];
@@ -80,7 +80,7 @@ PACK(typedef struct {
 #if defined(PCBTARANIS)
 PACK(typedef struct {
  uint8_t  destCh;
-  uint16_t phases;
+  uint16_t flightModes;
  uint8_t  curveMode:1;       // O=curve, 1=differential
  uint8_t  noExpo:1;
  int8_t   carryTrim:3;
@@ -103,7 +103,7 @@ PACK(typedef struct {
 #else
 PACK(typedef struct {
  uint8_t  destCh;
-  uint16_t phases;
+  uint16_t flightModes;
  uint8_t  curveMode:1;       // O=curve, 1=differential
  uint8_t  noExpo:1;
  int8_t   carryTrim:3;
@@ -142,7 +142,7 @@ PACK(typedef struct {
  uint8_t fadeOut;
  ROTARY_ENCODER_ARRAY;
  gvar_t gvars[5];
-}) PhaseData_v215;
+}) FlightModeData_v215;

 PACK(typedef struct {
  int16_t v1;
@@ -225,7 +225,7 @@ PACK(typedef struct {
  LogicalSwitchData_v215 logicalSw[NUM_LOGICAL_SWITCH];
  CustomFnData_v215 funcSw[32];
  SwashRingData swashR;
-  PhaseData_v215 phaseData[MAX_FLIGHT_MODES];
+  FlightModeData_v215 flightModeData[MAX_FLIGHT_MODES];

  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5ms increments
  uint8_t   thrTraceSrc;
@@ -338,8 +338,8 @@ int ConvertTelemetrySource_215_to_216(int source)
  // TELEM_RSSI_TX added
  if (source >= TELEM_RSSI_TX)
    source += 1;
-  // RxBatt added
-  if (source >= TELEM_RXBATT)
+  // Reserve added
+  if (source >= TELEM_RESERVE0)
    source += 1;
  // A3 and A4 added
  if (source >= TELEM_A3)
@@ -500,7 +500,7 @@ void ConvertModel_215_to_216(ModelData &model)
    MixData_v215 * oldMix = &oldModel.mixData[i];
 #if defined(PCBTARANIS)
    mix->destCh = oldMix->destCh;
-    mix->phases = oldMix->phases;
+    mix->flightModes = oldMix->flightModes;
    mix->mltpx = oldMix->mltpx;
    if (oldMix->carryTrim == TRIM_OFF) mix->carryTrim = TRIM_OFF;
    mix->weight = ConvertGVAR_215_to_216(oldMix->weight);
@@ -533,7 +533,7 @@ void ConvertModel_215_to_216(ModelData &model)
 #else
    mix->destCh = oldMix->destCh;
    mix->mixWarn = oldMix->mixWarn;
-    mix->phases = oldMix->phases;
+    mix->flightModes = oldMix->flightModes;
    mix->curveMode = oldMix->curveMode;
    mix->noExpo = oldMix->noExpo;
    mix->carryTrim = oldMix->carryTrim;
@@ -575,7 +575,7 @@ void ConvertModel_215_to_216(ModelData &model)
    if (oldExpo->mode) {
 #if defined(PCBTARANIS)
      uint8_t chn = oldExpo->chn;
-      if (!oldExpo->swtch && !oldExpo->phases) {
+      if (!oldExpo->swtch && !oldExpo->flightModes) {
        indexes[chn] = -1;
      }
      else if (indexes[chn] != -1) {
@@ -588,7 +588,7 @@ void ConvertModel_215_to_216(ModelData &model)
      expo->chn = chn;
      expo->mode = oldExpo->mode;
      expo->swtch = ConvertSwitch_215_to_216(oldExpo->swtch);
-      expo->phases = oldExpo->phases;
+      expo->flightModes = oldExpo->flightModes;
      expo->weight = oldExpo->weight;
      memcpy(expo->name, oldExpo->name, LEN_EXPOMIX_NAME);
      if (oldExpo->curveMode==0/*expo*/) {
@@ -610,7 +610,7 @@ void ConvertModel_215_to_216(ModelData &model)
      expo->chn = oldExpo->chn;
      expo->curveMode = oldExpo->curveMode;
      expo->swtch = oldExpo->swtch;
-      expo->phases = oldExpo->phases;
+      expo->flightModes = oldExpo->flightModes;
      expo->weight = oldExpo->weight;
      memcpy(expo->name, oldExpo->name, LEN_EXPOMIX_NAME);
      expo->curveParam = oldExpo->curveParam;
@@ -678,8 +678,8 @@ void ConvertModel_215_to_216(ModelData &model)
      if (cstate == LS_FAMILY_OFS || cstate == LS_FAMILY_DIFF) {
        if ((uint8_t)sw.v1 >= MIXSRC_FIRST_TELEM) {
          switch ((uint8_t)sw.v1) {
-            case MIXSRC_FIRST_TELEM + TELEM_TM1-1:
-            case MIXSRC_FIRST_TELEM + TELEM_TM2-1:
+            case MIXSRC_FIRST_TELEM + TELEM_TIMER1-1:
+            case MIXSRC_FIRST_TELEM + TELEM_TIMER2-1:
              sw.v2 = (sw.v2+128) * 3;
              break;
            case MIXSRC_FIRST_TELEM + TELEM_ALT-1:
@@ -802,22 +802,22 @@ void ConvertModel_215_to_216(ModelData &model)
  g_model.swashR.collectiveSource = ConvertSource_215_to_216(g_model.swashR.collectiveSource);

  for (uint8_t i=0; i<9; i++) {
-    if (i==0 || oldModel.phaseData[i].swtch) {
-      memcpy(&g_model.phaseData[i], &oldModel.phaseData[i], sizeof(oldModel.phaseData[i])); // the last 4 gvars will remain blank
-      g_model.phaseData[i].swtch = ConvertSwitch_215_to_216(oldModel.phaseData[i].swtch);
+    if (i==0 || oldModel.flightModeData[i].swtch) {
+      memcpy(&g_model.flightModeData[i], &oldModel.flightModeData[i], sizeof(oldModel.flightModeData[i])); // the last 4 gvars will remain blank
+      g_model.flightModeData[i].swtch = ConvertSwitch_215_to_216(oldModel.flightModeData[i].swtch);
 #if defined(PCBTARANIS)
      for (uint8_t t=0; t<4; t++) {
-        int trim = oldModel.phaseData[i].trim[t];
+        int trim = oldModel.flightModeData[i].trim[t];
        if (trim > 500) {
          trim -= 501;
          if (trim >= i)
            trim += 1;
-          g_model.phaseData[i].trim[t].mode = 2*trim;
-          g_model.phaseData[i].trim[t].value = 0;
+          g_model.flightModeData[i].trim[t].mode = 2*trim;
+          g_model.flightModeData[i].trim[t].value = 0;
        }
        else {
-          g_model.phaseData[i].trim[t].mode = 2*i;
-          g_model.phaseData[i].trim[t].value = trim;
+          g_model.flightModeData[i].trim[t].mode = 2*i;
+          g_model.flightModeData[i].trim[t].value = trim;
        }
      }
 #endif
@@ -838,9 +838,6 @@ void ConvertModel_215_to_216(ModelData &model)
  memcpy(&g_model.frsky, &oldModel.frsky, 2*sizeof(FrSkyChannelData));
  // gap for A3-A4
  memcpy(((uint8_t *)&g_model.frsky) + 4*sizeof(FrSkyChannelData), ((uint8_t *)&oldModel.frsky) + 2*sizeof(FrSkyChannelData), sizeof(oldModel.frsky) - 2*sizeof(FrSkyChannelData));
-  // RxBatt introduced
-  if (g_model.frsky.voltsSource >= FRSKY_VOLTS_SOURCE_A1)
-    g_model.frsky.voltsSource += 1;
  // A3 and A4 introduced
  if (g_model.frsky.voltsSource >= FRSKY_VOLTS_SOURCE_A3)
    g_model.frsky.voltsSource += 2;
@@ -46,7 +46,7 @@ void doMixerCalculations();
  memset(&g_model, 0, sizeof(g_model)); \
  extern uint8_t s_mixer_first_run_done; \
  s_mixer_first_run_done = false; \
-  s_last_phase = 255;
+  lastFlightMode = 255;

 int32_t lastAct = 0;
 void MIXER_RESET()
@@ -59,7 +59,7 @@ void MIXER_RESET()
  s_last_switch_used = 0;
  s_last_switch_value = 0;
 #endif
-  s_current_mixer_flight_mode = s_last_phase = 0;
+  mixerCurrentFlightMode = lastFlightMode = 0;
  lastAct = 0;
  logicalSwitchesReset();
 }
@@ -365,8 +365,8 @@ TEST(getSwitch, recursiveSW)
 TEST(FlightModes, nullFadeOut_posFadeIn)
 {
  MODEL_RESET();
-  g_model.phaseData[1].swtch = SWSRC_ID1;
-  g_model.phaseData[1].fadeIn = 15;
+  g_model.flightModeData[1].swtch = SWSRC_ID1;
+  g_model.flightModeData[1].fadeIn = 15;
  perMain();
  simuSetSwitch(3, 0);
  perMain();
@@ -527,16 +527,16 @@ TEST(Mixer, RecursiveAddChannelAfterInactivePhase)
 {
  MODEL_RESET();
  MIXER_RESET();
-  g_model.phaseData[1].swtch = SWSRC_ID1;
+  g_model.flightModeData[1].swtch = SWSRC_ID1;
  g_model.mixData[0].destCh = 0;
  g_model.mixData[0].mltpx = MLTPX_ADD;
  g_model.mixData[0].srcRaw = MIXSRC_CH2;
-  g_model.mixData[0].phases = 0b11110;
+  g_model.mixData[0].flightModes = 0b11110;
  g_model.mixData[0].weight = 50;
  g_model.mixData[1].destCh = 0;
  g_model.mixData[1].mltpx = MLTPX_ADD;
  g_model.mixData[1].srcRaw = MIXSRC_MAX;
-  g_model.mixData[1].phases = 0b11101;
+  g_model.mixData[1].flightModes = 0b11101;
  g_model.mixData[1].weight = 50;
  g_model.mixData[2].destCh = 1;
  g_model.mixData[2].srcRaw = MIXSRC_MAX;
@@ -634,23 +634,23 @@ TEST(Mixer, SlowOnPhase)
 {
  MODEL_RESET();
  MIXER_RESET();
-  g_model.phaseData[1].swtch = TR(SWSRC_THR, SWSRC_SA0);
+  g_model.flightModeData[1].swtch = TR(SWSRC_THR, SWSRC_SA0);
  g_model.mixData[0].destCh = 0;
  g_model.mixData[0].mltpx = MLTPX_ADD;
  g_model.mixData[0].srcRaw = MIXSRC_MAX;
  g_model.mixData[0].weight = 100;
-  g_model.mixData[0].phases = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
+  g_model.mixData[0].flightModes = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
  g_model.mixData[0].speedUp = SLOW_STEP*5;
  g_model.mixData[0].speedDown = SLOW_STEP*5;

  s_mixer_first_run_done = true;
-  s_current_mixer_flight_mode = 0;
+  mixerCurrentFlightMode = 0;
  evalFlightModeMixes(e_perout_mode_normal, 0);
  EXPECT_EQ(chans[0], 0);

  CHECK_SLOW_MOVEMENT(0, +1, 250);

-  s_current_mixer_flight_mode = 1;
+  mixerCurrentFlightMode = 1;
  CHECK_SLOW_MOVEMENT(0, -1, 250);
 }

@@ -659,16 +659,16 @@ TEST(Mixer, SlowOnSwitchAndPhase)
 {
  MODEL_RESET();
  MIXER_RESET();
-  g_model.phaseData[1].swtch = TR(SWSRC_THR, SWSRC_SA0);
+  g_model.flightModeData[1].swtch = TR(SWSRC_THR, SWSRC_SA0);
  g_model.mixData[0].destCh = 0;
  g_model.mixData[0].mltpx = MLTPX_ADD;
  g_model.mixData[0].srcRaw = MIXSRC_MAX;
  g_model.mixData[0].weight = 100;
  g_model.mixData[0].swtch = TR(SWSRC_THR, SWSRC_SA0);
 #if defined(CPUARM)
-  g_model.mixData[0].phases = 0x2 + 0x4 + 0x8 + 0x10 + 0x20 + 0x40 + 0x80 + 0x100 /*only enabled in phase 0*/;
+  g_model.mixData[0].flightModes = 0x2 + 0x4 + 0x8 + 0x10 + 0x20 + 0x40 + 0x80 + 0x100 /*only enabled in phase 0*/;
 #else
-  g_model.mixData[0].phases = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
+  g_model.mixData[0].flightModes = 0x2 + 0x4 + 0x8 + 0x10 /*only enabled in phase 0*/;
 #endif
  g_model.mixData[0].speedUp = SLOW_STEP*5;
  g_model.mixData[0].speedDown = SLOW_STEP*5;
@@ -678,11 +678,11 @@ TEST(Mixer, SlowOnSwitchAndPhase)
  EXPECT_EQ(chans[0], 0);

  simuSetSwitch(0, 1);
-  s_current_mixer_flight_mode = 0;
+  mixerCurrentFlightMode = 0;
  CHECK_SLOW_MOVEMENT(0, +1, 250);

  simuSetSwitch(0, -1);
-  s_current_mixer_flight_mode = 1;
+  mixerCurrentFlightMode = 1;
  CHECK_SLOW_MOVEMENT(0, -1, 250);
 }
 #endif
@@ -874,6 +874,32 @@ TEST(Heli, BasicTest)
  EXPECT_EQ(chans[1], CHANNEL_MAX/2);
  EXPECT_EQ(chans[2], CHANNEL_MAX/2);
 }
+
+TEST(Heli, Mode2Test)
+{
+  MODEL_RESET();
+  g_eeGeneral.templateSetup = 2;
+  applyDefaultTemplate();
+  g_model.swashR.collectiveSource = MIXSRC_Thr;
+  g_model.swashR.type = SWASH_TYPE_120;
+  g_model.mixData[0].destCh = 0;
+  g_model.mixData[0].mltpx = MLTPX_ADD;
+  g_model.mixData[0].srcRaw = MIXSRC_CYC1;
+  g_model.mixData[0].weight = 100;
+  g_model.mixData[1].destCh = 1;
+  g_model.mixData[1].mltpx = MLTPX_ADD;
+  g_model.mixData[1].srcRaw = MIXSRC_CYC2;
+  g_model.mixData[1].weight = 100;
+  g_model.mixData[2].destCh = 2;
+  g_model.mixData[2].mltpx = MLTPX_ADD;
+  g_model.mixData[2].srcRaw = MIXSRC_CYC3;
+  g_model.mixData[2].weight = 100;
+  anaInValues[ELE_STICK] = 1024;
+  evalFlightModeMixes(e_perout_mode_normal, 0);
+  EXPECT_EQ(chans[0], -CHANNEL_MAX);
+  EXPECT_EQ(chans[1], CHANNEL_MAX/2);
+  EXPECT_EQ(chans[2], CHANNEL_MAX/2);
+}
 #elif defined(HELI)
 TEST(Heli, BasicTest)
 {
@@ -51,19 +51,21 @@ extern LanguagePack plLanguagePack;
 extern LanguagePack ptLanguagePack;
 extern LanguagePack skLanguagePack;
 extern LanguagePack seLanguagePack;
+extern LanguagePack huLanguagePack;

 LanguagePack * languagePacks[] = {
  // alphabetical order
  &czLanguagePack,
+  &deLanguagePack,
  &enLanguagePack,
  &esLanguagePack,
  &frLanguagePack,
-  &deLanguagePack,
+  &huLanguagePack,
  &itLanguagePack,
  &plLanguagePack,
  &ptLanguagePack,
-  &skLanguagePack,
  &seLanguagePack,
+  &skLanguagePack,
  NULL
 };
 #endif
@@ -178,6 +180,7 @@ enum menuGeneralSetupItems {
  CASE_CPUARM(ITEM_SETUP_IMPERIAL)
  IF_FAI_CHOICE(ITEM_SETUP_FAI)
  CASE_MAVLINK(ITEM_MAVLINK_BAUD)
+  CASE_CPUARM(ITEM_SETUP_SWITCHES_DELAY)
  ITEM_SETUP_RX_CHANNEL_ORD,
  ITEM_SETUP_STICK_MODE_LABELS,
  ITEM_SETUP_STICK_MODE,
@@ -212,7 +215,7 @@ void menuGeneralSetup(uint8_t event)
  }
 #endif

-  MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) CASE_CPUARM(0) CASE_CPUARM(0) CASE_CPUARM(0) 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, CASE_CPUARM(0) CASE_REVPLUS(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) CASE_CPUARM(0) CASE_CPUARM(0) IF_FAI_CHOICE(0) 0, COL_TX_MODE, CASE_PCBTARANIS(0) 1/*to force edit mode*/});
+  MENU(STR_MENURADIOSETUP, menuTabDiag, e_Setup, ITEM_SETUP_MAX+1, {0, CASE_RTCLOCK(2) CASE_RTCLOCK(2) CASE_BATTGRAPH(1) LABEL(SOUND), CASE_AUDIO(0) CASE_BUZZER(0) CASE_VOICE(0) CASE_CPUARM(0) CASE_CPUARM(0) CASE_CPUARM(0) 0, CASE_AUDIO(0) CASE_VARIO_CPUARM(LABEL(VARIO)) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_VARIO_CPUARM(0) CASE_HAPTIC(LABEL(HAPTIC)) CASE_HAPTIC(0) CASE_HAPTIC(0) CASE_HAPTIC(0) 0, LABEL(ALARMS), 0, CASE_PCBSKY9X(0) CASE_PCBSKY9X(0) 0, 0, 0, IF_ROTARY_ENCODERS(0) LABEL(BACKLIGHT), 0, 0, CASE_CPUARM(0) CASE_REVPLUS(0) CASE_PWM_BACKLIGHT(0) CASE_PWM_BACKLIGHT(0) 0, CASE_SPLASH_PARAM(0) CASE_GPS(0) CASE_GPS(0) CASE_PXX(0) CASE_CPUARM(0) CASE_CPUARM(0) IF_FAI_CHOICE(0) CASE_MAVLINK(0) CASE_CPUARM(0) 0, COL_TX_MODE, CASE_PCBTARANIS(0) 1/*to force edit mode*/});

  uint8_t sub = m_posVert - 1;

@@ -405,7 +408,7 @@ void menuGeneralSetup(uint8_t event)
      case ITEM_SETUP_VARIO_REPEAT:
        lcd_putsLeft(y, STR_REPEAT_AT_ZERO);
        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, VARIO_REPEAT_ZERO+(g_eeGeneral.varioRepeat*10), attr|LEFT);
-        lcd_putsAtt(lcdLastPos, y, "ms", attr);
+        lcd_putsAtt(lcdLastPos, y, STR_MS, attr);
        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.varioRepeat, -30, 50);
        break;
 #endif
@@ -621,6 +624,15 @@ void menuGeneralSetup(uint8_t event)
        break;
 #endif

+#if defined(CPUARM)
+      case ITEM_SETUP_SWITCHES_DELAY:
+        lcd_putsLeft(y, STR_SWITCHES_DELAY);
+        lcd_outdezAtt(RADIO_SETUP_2ND_COLUMN, y, 10*SWITCHES_DELAY(), attr|LEFT);
+        lcd_putsAtt(lcdLastPos, y, STR_MS, attr);
+        if (attr) CHECK_INCDEC_GENVAR(event, g_eeGeneral.switchesDelay, -15, +15);
+        break;
+#endif
+
      case ITEM_SETUP_RX_CHANNEL_ORD:
        lcd_putsLeft(y, STR_RXCHANNELORD); // RAET->AETR
        for (uint8_t i=1; i<=4; i++) {
@@ -915,14 +915,11 @@ enum menuModelSetupItems {
  ITEM_MODEL_EXTERNAL_MODULE_CHANNELS,
  ITEM_MODEL_EXTERNAL_MODULE_BIND,
  ITEM_MODEL_EXTERNAL_MODULE_FAILSAFE,
-#if defined(PCBSKY9X) && !defined(REVX)
+#if defined(PCBSKY9X) && !defined(REVA) && !defined(REVX)
  ITEM_MODEL_EXTRA_MODULE_LABEL,
  ITEM_MODEL_EXTRA_MODULE_CHANNELS,
  ITEM_MODEL_EXTRA_MODULE_BIND,
 #endif
-  ITEM_MODEL_TRAINER_LABEL,
-  ITEM_MODEL_TRAINER_CHANNELS,
-  ITEM_MODEL_TRAINER_SETTINGS,
 #else
  ITEM_MODEL_PPM1_PROTOCOL,
  ITEM_MODEL_PPM1_PARAMS,
@@ -977,10 +974,10 @@ void onModelSetupBitmapMenu(const char *result)

 #if defined(PCBTARANIS)
  #define CURRENT_MODULE_EDITED(k)         (k>=ITEM_MODEL_TRAINER_LABEL ? TRAINER_MODULE : (k>=ITEM_MODEL_EXTERNAL_MODULE_LABEL ? EXTERNAL_MODULE : INTERNAL_MODULE))
-#elif defined(PCBSKY9X) && defined(REVX)
-  #define CURRENT_MODULE_EDITED(k)         (k>=ITEM_MODEL_TRAINER_LABEL ? TRAINER_MODULE : EXTERNAL_MODULE)
+#elif defined(PCBSKY9X) && !defined(REVA) && !defined(REVX)
+  #define CURRENT_MODULE_EDITED(k)         (k>=ITEM_MODEL_EXTRA_MODULE_LABEL ? EXTRA_MODULE : EXTERNAL_MODULE)
 #else
-  #define CURRENT_MODULE_EDITED(k)         (k>=ITEM_MODEL_TRAINER_LABEL ? TRAINER_MODULE : (k>=ITEM_MODEL_EXTRA_MODULE_LABEL ? EXTRA_MODULE : EXTERNAL_MODULE))
+  #define CURRENT_MODULE_EDITED(k)         (EXTERNAL_MODULE)
 #endif

 void menuModelSetup(uint8_t event)
@@ -1005,18 +1002,23 @@ void menuModelSetup(uint8_t event)
  #define IF_EXTERNAL_MODULE_ON(x)          (g_model.externalModule == MODULE_TYPE_NONE ? HIDDEN_ROW : (uint8_t)(x))
  #define IS_D8_RX(x)                       (g_model.moduleData[x].rfProtocol == RF_PROTO_D8)
  #define EXTERNAL_MODULE_CHANNELS_ROWS()   IF_EXTERNAL_MODULE_ON(IS_MODULE_DSM2(EXTERNAL_MODULE) ? (uint8_t)0 : (uint8_t)1)
-  #define TRAINER_CHANNELS_ROWS()           (1)
-  #define PORT_CHANNELS_ROWS(x)             (x==EXTERNAL_MODULE ? EXTERNAL_MODULE_CHANNELS_ROWS() : TRAINER_CHANNELS_ROWS())
+  #define TRAINER_CHANNELS_ROWS()           (HIDDEN_ROW)
+  #define PORT_CHANNELS_ROWS(x)             (x==EXTERNAL_MODULE ? EXTERNAL_MODULE_CHANNELS_ROWS() : 0)
  #define FAILSAFE_ROWS(x)                  ((g_model.moduleData[x].rfProtocol==RF_PROTO_X16 || g_model.moduleData[x].rfProtocol==RF_PROTO_LR12) ? (g_model.moduleData[x].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : HIDDEN_ROW)
  #define CURSOR_ON_CELL                    (true)
  #define MODEL_SETUP_MAX_LINES             (1+ITEM_MODEL_SETUP_MAX)
  #define POT_WARN_ITEMS()                  ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0)
-#if defined(REVX)
-  #define EXTRA_MODULE_ROWS
-#else
+#if defined(PCBTARANIS) || (defined(PCBSKY9X) && !defined(REVA) && !defined(REVX))
  #define EXTRA_MODULE_ROWS                 LABEL(ExtraModule), 1, 2,
+#else
+  #define EXTRA_MODULE_ROWS
 #endif
-  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0,CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0, CASE_CPUARM(LABEL(PreflightCheck)) CASE_CPUARM(0) 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, LABEL(ExternalModule), (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, EXTERNAL_MODULE_CHANNELS_ROWS(), (IS_MODULE_XJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW, IF_EXTERNAL_MODULE_XJT(FAILSAFE_ROWS(EXTERNAL_MODULE)), EXTRA_MODULE_ROWS LABEL(Trainer), TRAINER_CHANNELS_ROWS(), 2});
+#if defined(PCBTARANIS)
+  #define TRAINER_MODULE_ROWS               LABEL(Trainer), IF_TRAINER_ON(1), 2
+#else
+  #define TRAINER_MODULE_ROWS
+#endif
+  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0, CASE_CPUARM(LABEL(PreflightCheck)) CASE_CPUARM(0) 0, 6, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1, LABEL(ExternalModule), (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, EXTERNAL_MODULE_CHANNELS_ROWS(), (IS_MODULE_XJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW, IF_EXTERNAL_MODULE_XJT(FAILSAFE_ROWS(EXTERNAL_MODULE)), EXTRA_MODULE_ROWS TRAINER_MODULE_ROWS });
 #elif defined(CPUM64)
  #define CURSOR_ON_CELL                    (true)
  #define MODEL_SETUP_MAX_LINES             ((IS_PPM_PROTOCOL(protocol)||IS_DSM2_PROTOCOL(protocol)||IS_PXX_PROTOCOL(protocol)) ? 1+ITEM_MODEL_SETUP_MAX : ITEM_MODEL_SETUP_MAX)
@@ -1160,7 +1162,7 @@ void menuModelSetup(uint8_t event)
          if (event==EVT_KEY_LONG(KEY_ENTER)) {
            s_noHi = NO_HI_LEN;
            for (uint8_t i=0; i<MAX_FLIGHT_MODES; i++) {
-              memclear(&g_model.phaseData[i], TRIMS_ARRAY_SIZE);
+              memclear(&g_model.flightModeData[i], TRIMS_ARRAY_SIZE);
            }
            eeDirty(EE_MODEL);
            AUDIO_WARNING1();
@@ -1426,21 +1428,22 @@ void menuModelSetup(uint8_t event)
          }
        }
        break;
+#endif

+#if defined(PCBTARANIS)
      case ITEM_MODEL_TRAINER_LABEL:
        lcd_putsLeft(y, STR_TRAINER);
        break;

-#endif
-
-#if defined(PCBTARANIS)
      case ITEM_MODEL_INTERNAL_MODULE_CHANNELS:
 #elif defined(PCBSKY9X) && !defined(REVX)
      case ITEM_MODEL_EXTRA_MODULE_CHANNELS:
 #endif
 #if defined(CPUARM)
      case ITEM_MODEL_EXTERNAL_MODULE_CHANNELS:
+#if defined(PCBTARANIS)
      case ITEM_MODEL_TRAINER_CHANNELS:
+#endif
      {
        uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
        ModuleData & moduleData = g_model.moduleData[moduleIdx];
@@ -1457,7 +1460,11 @@ void menuModelSetup(uint8_t event)
                break;
              case 1:
                CHECK_INCDEC_MODELVAR(event, moduleData.channelsCount, -4, min<int8_t>(MAX_CHANNELS(moduleIdx), 32-8-moduleData.channelsStart));
-                if ((k == ITEM_MODEL_EXTERNAL_MODULE_CHANNELS && g_model.externalModule == MODULE_TYPE_PPM) || (k == ITEM_MODEL_TRAINER_CHANNELS))
+                if ((k == ITEM_MODEL_EXTERNAL_MODULE_CHANNELS && g_model.externalModule == MODULE_TYPE_PPM)
+#if defined(PCBTARANIS)
+                    || (k == ITEM_MODEL_TRAINER_CHANNELS)
+#endif
+                    )
                  SET_DEFAULT_PPM_FRAME_LENGTH(moduleIdx);
                break;
            }
@@ -1474,7 +1481,9 @@ void menuModelSetup(uint8_t event)
 #endif
 #if defined(CPUARM)
      case ITEM_MODEL_EXTERNAL_MODULE_BIND:
+#if defined(PCBTARANIS)
      case ITEM_MODEL_TRAINER_SETTINGS:
+#endif
      {
        uint8_t moduleIdx = CURRENT_MODULE_EDITED(k);
        ModuleData & moduleData = g_model.moduleData[moduleIdx];
@@ -1839,16 +1848,16 @@ FlightModesType editFlightModes(uint8_t x, uint8_t y, uint8_t event, FlightModes
 #if defined(PCBTARANIS)

 enum FlightModesItems {
-  ITEM_PHASES_NAME,
-  ITEM_PHASES_SWITCH,
-  ITEM_PHASES_TRIM_RUD,
-  ITEM_PHASES_TRIM_ELE,
-  ITEM_PHASES_TRIM_THR,
-  ITEM_PHASES_TRIM_AIL,
-  ITEM_PHASES_FADE_IN,
-  ITEM_PHASES_FADE_OUT,
-  ITEM_PHASES_COUNT,
-  ITEM_PHASES_LAST = ITEM_PHASES_COUNT-1
+  ITEM_FLIGHT_MODES_NAME,
+  ITEM_FLIGHT_MODES_SWITCH,
+  ITEM_FLIGHT_MODES_TRIM_RUD,
+  ITEM_FLIGHT_MODES_TRIM_ELE,
+  ITEM_FLIGHT_MODES_TRIM_THR,
+  ITEM_FLIGHT_MODES_TRIM_AIL,
+  ITEM_FLIGHT_MODES_FADE_IN,
+  ITEM_FLIGHT_MODES_FADE_OUT,
+  ITEM_FLIGHT_MODES_COUNT,
+  ITEM_FLIGHT_MODES_LAST = ITEM_FLIGHT_MODES_COUNT-1
 };

 bool isTrimModeAvailable(int mode)
@@ -1858,7 +1867,7 @@ bool isTrimModeAvailable(int mode)

 void menuModelFlightModesAll(uint8_t event)
 {
-  MENU(STR_MENUFLIGHTPHASES, menuTabModel, e_FlightModesAll, 1+MAX_FLIGHT_MODES+1, {0, NAVIGATION_LINE_BY_LINE|(ITEM_PHASES_LAST-5), NAVIGATION_LINE_BY_LINE|ITEM_PHASES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_PHASES_LAST, NAVIGATION_LINE_BY_LINE|NAVIGATION_LINE_BY_LINE|ITEM_PHASES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_PHASES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_PHASES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_PHASES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_PHASES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_PHASES_LAST, 0});
+  MENU(STR_MENUFLIGHTPHASES, menuTabModel, e_FlightModesAll, 1+MAX_FLIGHT_MODES+1, {0, NAVIGATION_LINE_BY_LINE|(ITEM_FLIGHT_MODES_LAST-5), NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, NAVIGATION_LINE_BY_LINE|ITEM_FLIGHT_MODES_LAST, 0});

  int8_t sub = m_posVert - 1;

@@ -1876,26 +1885,26 @@ void menuModelFlightModesAll(uint8_t event)
    if (k==MAX_FLIGHT_MODES) {
      // last line available - add the "check trims" line
      lcd_putsLeft((LCD_LINES-1)*FH+1, STR_CHECKTRIMS);
-      putsFlightMode(OFS_CHECKTRIMS, (LCD_LINES-1)*FH+1, s_current_mixer_flight_mode+1);
+      putsFlightMode(OFS_CHECKTRIMS, (LCD_LINES-1)*FH+1, mixerCurrentFlightMode+1);
      if (sub==MAX_FLIGHT_MODES && !trimsCheckTimer) {
        lcd_status_line();
      }
      return;
    }

-    PhaseData *p = phaseAddress(k);
+    FlightModeData *p = flightModeAddress(k);

-    putsFlightMode(0, y, k+1, (getFlightPhase()==k ? BOLD : 0) | ((sub==k && m_posHorz<0) ? INVERS : 0));
+    putsFlightMode(0, y, k+1, (getFlightMode()==k ? BOLD : 0) | ((sub==k && m_posHorz<0) ? INVERS : 0));

-    for (uint8_t j=0; j<ITEM_PHASES_COUNT; j++) {
+    for (uint8_t j=0; j<ITEM_FLIGHT_MODES_COUNT; j++) {
      uint8_t attr = ((sub==k && posHorz==j) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
      uint8_t active = (attr && (s_editMode>0 || p1valdiff)) ;
      switch (j) {
-        case ITEM_PHASES_NAME:
+        case ITEM_FLIGHT_MODES_NAME:
          editName(4*FW-1, y, p->name, sizeof(p->name), event, attr);
          break;

-        case ITEM_PHASES_SWITCH:
+        case ITEM_FLIGHT_MODES_SWITCH:
          if (k == 0) {
            lcd_puts((5+LEN_FP_NAME)*FW, y, STR_DEFAULT);
          }
@@ -1905,12 +1914,12 @@ void menuModelFlightModesAll(uint8_t event)
          }
          break;

-        case ITEM_PHASES_TRIM_RUD:
-        case ITEM_PHASES_TRIM_ELE:
-        case ITEM_PHASES_TRIM_THR:
-        case ITEM_PHASES_TRIM_AIL:
+        case ITEM_FLIGHT_MODES_TRIM_RUD:
+        case ITEM_FLIGHT_MODES_TRIM_ELE:
+        case ITEM_FLIGHT_MODES_TRIM_THR:
+        case ITEM_FLIGHT_MODES_TRIM_AIL:
          if (k != 0) {
-            uint8_t t = j-ITEM_PHASES_TRIM_RUD;
+            uint8_t t = j-ITEM_FLIGHT_MODES_TRIM_RUD;
            putsTrimMode((4+LEN_FP_NAME)*FW+j*(5*FW/2), y, k, t, attr);
            if (active) {
              trim_t & v = p->trim[t];
@@ -1918,12 +1927,12 @@ void menuModelFlightModesAll(uint8_t event)
            }
          }
          break;
-        case ITEM_PHASES_FADE_IN:
+        case ITEM_FLIGHT_MODES_FADE_IN:
          lcd_outdezAtt(32*FW-2, y, (10/DELAY_STEP)*p->fadeIn, attr|PREC1);
          if (active) p->fadeIn = checkIncDec(event, p->fadeIn, 0, DELAY_MAX, EE_MODEL|NO_INCDEC_MARKS);
          break;

-        case ITEM_PHASES_FADE_OUT:
+        case ITEM_FLIGHT_MODES_FADE_OUT:
          lcd_outdezAtt(35*FW, y, (10/DELAY_STEP)*p->fadeOut, attr|PREC1);
          if (active) p->fadeOut = checkIncDec(event, p->fadeOut, 0, DELAY_MAX, EE_MODEL|NO_INCDEC_MARKS);
          break;
@@ -1961,14 +1970,14 @@ enum menuModelPhaseItems {

 void menuModelPhaseOne(uint8_t event)
 {
-  PhaseData *phase = phaseAddress(s_currIdx);
-  putsFlightMode(13*FW, 0, s_currIdx+1, (getFlightPhase()==s_currIdx ? BOLD : 0));
+  FlightModeData *fm = flightModeAddress(s_currIdx);
+  putsFlightMode(13*FW, 0, s_currIdx+1, (getFlightMode()==s_currIdx ? BOLD : 0));

 #if defined(GVARS) && !defined(PCBSTD)
-  static const pm_uint8_t mstate_tab_phase1[] PROGMEM = {0, 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1};
+  static const pm_uint8_t mstate_tab_fm1[] PROGMEM = {0, 0, 0, (uint8_t)-1, 1, 1, 1, 1, 1};
  static const pm_uint8_t mstate_tab_others[] PROGMEM = {0, 0, 3, IF_ROTARY_ENCODERS(NUM_ROTARY_ENCODERS-1) 0, 0, (uint8_t)-1, 2, 2, 2, 2, 2};

-  if (!check(event, 0, NULL, 0, (s_currIdx == 0) ? mstate_tab_phase1 : mstate_tab_others, DIM(mstate_tab_others)-1, ITEM_MODEL_PHASE_MAX - 1 - (s_currIdx==0 ? (ITEM_MODEL_PHASE_FADE_IN-ITEM_MODEL_PHASE_SWITCH) : 0))) return;
+  if (!check(event, 0, NULL, 0, (s_currIdx == 0) ? mstate_tab_fm1 : mstate_tab_others, DIM(mstate_tab_others)-1, ITEM_MODEL_PHASE_MAX - 1 - (s_currIdx==0 ? (ITEM_MODEL_PHASE_FADE_IN-ITEM_MODEL_PHASE_SWITCH) : 0))) return;

  TITLE(STR_MENUFLIGHTPHASE);

@@ -1996,10 +2005,10 @@ void menuModelPhaseOne(uint8_t event)
 #endif
    switch(i) {
      case ITEM_MODEL_PHASE_NAME:
-        editSingleName(MIXES_2ND_COLUMN, y, STR_PHASENAME, phase->name, sizeof(phase->name), event, attr);
+        editSingleName(MIXES_2ND_COLUMN, y, STR_PHASENAME, fm->name, sizeof(fm->name), event, attr);
        break;
      case ITEM_MODEL_PHASE_SWITCH:
-        phase->swtch = switchMenuItem(MIXES_2ND_COLUMN, y, phase->swtch, attr, event);
+        fm->swtch = switchMenuItem(MIXES_2ND_COLUMN, y, fm->swtch, attr, event);
        break;
      case ITEM_MODEL_PHASE_TRIMS:
        lcd_putsLeft(y, STR_TRIMS);
@@ -2023,12 +2032,12 @@ void menuModelPhaseOne(uint8_t event)
        for (uint8_t t=0; t<NUM_ROTARY_ENCODERS; t++) {
          putsRotaryEncoderMode(MIXES_2ND_COLUMN+(t*FW), y, s_currIdx, t, m_posHorz==t ? attr : 0);
          if (attr && m_posHorz==t && ((editMode>0) || p1valdiff)) {
-            int16_t v = phaseAddress(s_currIdx)->rotaryEncoders[t];
+            int16_t v = flightModeAddress(s_currIdx)->rotaryEncoders[t];
            if (v < ROTARY_ENCODER_MAX) v = ROTARY_ENCODER_MAX;
            v = checkIncDec(event, v, ROTARY_ENCODER_MAX, ROTARY_ENCODER_MAX+MAX_FLIGHT_MODES-1, EE_MODEL);
            if (checkIncDec_Ret) {
              if (v == ROTARY_ENCODER_MAX) v = 0;
-              phaseAddress(s_currIdx)->rotaryEncoders[t] = v;
+              flightModeAddress(s_currIdx)->rotaryEncoders[t] = v;
            }
          }
        }
@@ -2036,11 +2045,11 @@ void menuModelPhaseOne(uint8_t event)
 #endif

      case ITEM_MODEL_PHASE_FADE_IN:
-        phase->fadeIn = EDIT_DELAY(0, y, event, attr, STR_FADEIN, phase->fadeIn);
+        fm->fadeIn = EDIT_DELAY(0, y, event, attr, STR_FADEIN, fm->fadeIn);
        break;

      case ITEM_MODEL_PHASE_FADE_OUT:
-        phase->fadeOut = EDIT_DELAY(0, y, event, attr, STR_FADEOUT, phase->fadeOut);
+        fm->fadeOut = EDIT_DELAY(0, y, event, attr, STR_FADEOUT, fm->fadeOut);
        break;

 #if defined(GVARS) && !defined(PCBSTD)
@@ -2058,7 +2067,7 @@ void menuModelPhaseOne(uint8_t event)

        editName(4*FW, y, g_model.gvars[idx].name, LEN_GVAR_NAME, event, posHorz==0 ? attr : 0);

-        int16_t v = phase->gvars[idx];
+        int16_t v = fm->gvars[idx];
        if (v > GVAR_MAX) {
          uint8_t p = v - GVAR_MAX - 1;
          if (p >= s_currIdx) p++;
@@ -2072,7 +2081,7 @@ void menuModelPhaseOne(uint8_t event)
          v = checkIncDec(event, v, GVAR_MAX, GVAR_MAX+MAX_FLIGHT_MODES-1, EE_MODEL);
          if (checkIncDec_Ret) {
            if (v == GVAR_MAX) v = 0;
-            phase->gvars[idx] = v;
+            fm->gvars[idx] = v;
          }
        }

@@ -2138,11 +2147,11 @@ void menuModelFlightModesAll(uint8_t event)
    uint8_t y = 1 + (i+1)*FH;
 #endif
    att = (i==sub ? INVERS : 0);
-    PhaseData *p = phaseAddress(i);
+    FlightModeData *p = flightModeAddress(i);
 #if ROTARY_ENCODERS > 2
-    putsFlightMode(0, y, i+1, att|CONDENSED|(getFlightPhase()==i ? BOLD : 0));
+    putsFlightMode(0, y, i+1, att|CONDENSED|(getFlightMode()==i ? BOLD : 0));
 #else
-    putsFlightMode(0, y, i+1, att|(getFlightPhase()==i ? BOLD : 0));
+    putsFlightMode(0, y, i+1, att|(getFlightMode()==i ? BOLD : 0));
 #endif

    lcd_putsnAtt(4*FW+NAME_OFS, y, p->name, sizeof(p->name), ZCHAR);
@@ -2171,7 +2180,7 @@ void menuModelFlightModesAll(uint8_t event)
 #endif

  lcd_putsLeft((LCD_LINES-1)*FH+1, STR_CHECKTRIMS);
-  putsFlightMode(OFS_CHECKTRIMS, (LCD_LINES-1)*FH+1, s_current_mixer_flight_mode+1);
+  putsFlightMode(OFS_CHECKTRIMS, (LCD_LINES-1)*FH+1, mixerCurrentFlightMode+1);
  if (sub==MAX_FLIGHT_MODES && !trimsCheckTimer) {
    lcd_status_line();
  }
@@ -2255,10 +2264,10 @@ int16_t expoFn(int16_t x)
  ExpoData *ed = expoAddress(s_currIdx);
  int16_t anas[NUM_INPUTS] = {0};
 #if defined(PCBTARANIS)
-  applyExpos(anas, e_perout_mode_inactive_phase, ed->srcRaw, x);
+  applyExpos(anas, e_perout_mode_inactive_flight_mode, ed->srcRaw, x);
 #else
  anas[ed->chn] = x;
-  applyExpos(anas, e_perout_mode_inactive_phase);
+  applyExpos(anas, e_perout_mode_inactive_flight_mode);
 #endif
  return anas[ed->chn];
 }
@@ -3022,7 +3031,7 @@ void menuModelExpoOne(uint8_t event)

 #if defined(FLIGHT_MODES)
      case EXPO_FIELD_FLIGHT_PHASE:
-        ed->phases = editFlightModes(EXPO_ONE_2ND_COLUMN-IF_9X(EXPO_ONE_FP_WIDTH), y, event, ed->phases, attr);
+        ed->flightModes = editFlightModes(EXPO_ONE_2ND_COLUMN-IF_9X(EXPO_ONE_FP_WIDTH), y, event, ed->flightModes, attr);
        break;
 #endif

@@ -3255,7 +3264,7 @@ void menuModelMixOne(uint8_t event)
 #endif
 #if defined(FLIGHT_MODES)
      case MIX_FIELD_FLIGHT_PHASE:
-        md2->phases = editFlightModes(COLUMN_X+MIXES_2ND_COLUMN, y, event, md2->phases, attr);
+        md2->flightModes = editFlightModes(COLUMN_X+MIXES_2ND_COLUMN, y, event, md2->flightModes, attr);
        break;
 #endif
      case MIX_FIELD_SWITCH:
@@ -3603,12 +3612,12 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
            if (ed->mode!=3) lcd_putc(EXPO_LINE_SIDE_POS, y, ed->mode == 2 ? 126 : 127);

 #if defined(CPUARM) && LCD_W >= 212
-            if (ed->phases) lcd_puts(EXPO_LINE_FM_POS, y, STR_FP);
+            if (ed->flightModes) lcd_puts(EXPO_LINE_FM_POS, y, STR_FP);
            if (ed->name[0]) lcd_putsnAtt(EXPO_LINE_NAME_POS, y, ed->name, sizeof(ed->name), ZCHAR | (isExpoActive(i) ? BOLD : 0));
 #elif defined(CPUARM)
            if (ed->name[0]) lcd_putsnAtt(EXPO_LINE_NAME_POS, y, ed->name, sizeof(ed->name), ZCHAR | (isExpoActive(i) ? BOLD : 0));
 #else
-            displayFlightModes(EXPO_LINE_FM_POS, y, ed->phases);
+            displayFlightModes(EXPO_LINE_FM_POS, y, ed->flightModes);
 #endif
          }
          else {
@@ -3635,7 +3644,7 @@ void menuModelExpoMix(uint8_t expo, uint8_t event)
            {
 #if defined(PCBTARANIS)
              putsCurveRef(MIX_LINE_CURVE_POS, y, md->curve, 0);
-              if (md->phases) lcd_puts(MIX_LINE_FM_POS, y, STR_FP);
+              if (md->flightModes) lcd_puts(MIX_LINE_FM_POS, y, STR_FP);
 #else
              if (md->curveParam) {
                if (md->curveMode == MODE_CURVE)
@@ -4117,7 +4126,7 @@ void onGVARSMenu(const char *result)
  }
  else if (result == STR_CLEAR) {
    for (int i=0; i<MAX_FLIGHT_MODES; i++) {
-      g_model.phaseData[i].gvars[sub] = 0;
+      g_model.flightModeData[i].gvars[sub] = 0;
    }
    eeDirty(EE_MODEL);
  }
@@ -4134,7 +4143,7 @@ void menuModelGVars(uint8_t event)
  if (first2seconds) {
    menuTitle = STR_GLOBAL_V;
    for (int i=0; i<MAX_GVARS; i++) {
-      putsStrIdx(GVARS_FM_COLUMN(i)-16, 1, STR_FP, i, SMLSIZE|(getFlightPhase()==i ? INVERS : 0));
+      putsStrIdx(GVARS_FM_COLUMN(i)-16, 1, STR_FP, i, SMLSIZE|(getFlightMode()==i ? INVERS : 0));
    }
  }
  else {
@@ -4178,8 +4187,8 @@ void menuModelGVars(uint8_t event)

        default:
        {
-          PhaseData *phase = &g_model.phaseData[j-1];
-          int16_t & v = phase->gvars[i];
+          FlightModeData *fm = &g_model.flightModeData[j-1];
+          int16_t & v = fm->gvars[i];
          int16_t vmin, vmax;
          if (v > GVAR_MAX) {
            uint8_t p = v - GVAR_MAX - 1;
@@ -4807,8 +4816,8 @@ void menuModelLogicalSwitches(uint8_t event)
 #endif

 #if LCD_W >= 212
-  #define MODEL_CUSTOM_FUNC_1ST_COLUMN          (5+3*FW)
-  #define MODEL_CUSTOM_FUNC_2ND_COLUMN          (8*FW)
+  #define MODEL_CUSTOM_FUNC_1ST_COLUMN          (4*FW+2)
+  #define MODEL_CUSTOM_FUNC_2ND_COLUMN          (8*FW+2)
  #define MODEL_CUSTOM_FUNC_3RD_COLUMN          (20*FW)
  #define MODEL_CUSTOM_FUNC_4TH_COLUMN          (33*FW-3)
  #define MODEL_CUSTOM_FUNC_4TH_COLUMN_ONOFF    (34*FW-3)
@@ -4828,19 +4837,30 @@ void menuModelLogicalSwitches(uint8_t event)
 void onCustomFunctionsFileSelectionMenu(const char *result)
 {
  int8_t  sub = m_posVert - 1;
+  CustomFnData * cf = &g_model.funcSw[sub];
+  uint8_t func = CFN_FUNC(cf);

  if (result == STR_UPDATE_LIST) {
-    char directory[] = SOUNDS_PATH;
-    strncpy(directory+SOUNDS_PATH_LNG_OFS, currentLanguagePack->id, 2);
-    if (!listSdFiles(directory, SOUNDS_EXT, sizeof(g_model.funcSw[sub].play.name), NULL)) {
-      POPUP_WARNING(STR_NO_SOUNDS_ON_SD);
+    char directory[256];
+    if (func == FUNC_PLAY_SCRIPT) {
+      strcpy(directory, SCRIPTS_FUNCS_PATH);
+    }
+    else {
+      strcpy(directory, SOUNDS_PATH);
+      strncpy(directory+SOUNDS_PATH_LNG_OFS, currentLanguagePack->id, 2);
+    }
+    if (!listSdFiles(directory, func==FUNC_PLAY_SCRIPT ? SCRIPTS_EXT : SOUNDS_EXT, sizeof(cf->play.name), NULL)) {
+      POPUP_WARNING(func==FUNC_PLAY_SCRIPT ? STR_NO_SCRIPTS_ON_SD : STR_NO_SOUNDS_ON_SD);
      s_menu_flags = 0;
    }
  }
  else {
-    // The user choosed a wav file in the list
-    memcpy(g_model.funcSw[sub].play.name, result, sizeof(g_model.funcSw[sub].play.name));
+    // The user choosed a file in the list
+    memcpy(cf->play.name, result, sizeof(cf->play.name));
    eeDirty(EE_MODEL);
+    if (func == FUNC_PLAY_SCRIPT) {
+      LUA_LOAD_MODEL_SCRIPTS();
+    }
  }
 }
 #endif
@@ -4874,7 +4894,6 @@ void onCustomFunctionsMenu(const char *result)
    eeDirty(EE_MODEL);
  }
 }
-
 #endif

 void menuModelCustomFunctions(uint8_t event)
@@ -5018,7 +5037,7 @@ void menuModelCustomFunctions(uint8_t event)
          }
 #endif
 #if defined(CPUARM) && defined(SDCARD)
-          else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC) {
+          else if (func == FUNC_PLAY_TRACK || func == FUNC_BACKGND_MUSIC || func == FUNC_PLAY_SCRIPT) {
 #if LCD_W >= 212
            xcoord_t x = MODEL_CUSTOM_FUNC_3RD_COLUMN;
 #else
@@ -5030,13 +5049,19 @@ void menuModelCustomFunctions(uint8_t event)
              lcd_putsiAtt(x, y, STR_VCSWFUNC, 0, attr);
            if (active && event==EVT_KEY_BREAK(KEY_ENTER)) {
              s_editMode = 0;
-              char directory[] = SOUNDS_PATH;
-              strncpy(directory+SOUNDS_PATH_LNG_OFS, currentLanguagePack->id, 2);
-              if (listSdFiles(directory, SOUNDS_EXT, sizeof(sd->play.name), sd->play.name)) {
+              char directory[256];
+              if (func==FUNC_PLAY_SCRIPT) {
+                strcpy(directory, SCRIPTS_FUNCS_PATH);
+              }
+              else {
+                strcpy(directory, SOUNDS_PATH);
+                strncpy(directory+SOUNDS_PATH_LNG_OFS, currentLanguagePack->id, 2);
+              }
+              if (listSdFiles(directory, func==FUNC_PLAY_SCRIPT ? SCRIPTS_EXT : SOUNDS_EXT, sizeof(sd->play.name), sd->play.name)) {
                menuHandler = onCustomFunctionsFileSelectionMenu;
              }
              else {
-                POPUP_WARNING(STR_NO_SOUNDS_ON_SD);
+                POPUP_WARNING(func==FUNC_PLAY_SCRIPT ? STR_NO_SCRIPTS_ON_SD : STR_NO_SOUNDS_ON_SD);
                s_menu_flags = 0;
              }
            }
@@ -5112,7 +5137,7 @@ void menuModelCustomFunctions(uint8_t event)
          else if (func == FUNC_ADJUST_GVAR) {
            switch (CFN_GVAR_MODE(sd)) {
              case FUNC_ADJUST_GVAR_CONSTANT:
-                val_displayed = (int8_t)CFN_PARAM(sd);
+                val_displayed = (int16_t)CFN_PARAM(sd);
                val_min = -CFN_GVAR_CST_MAX; val_max = +CFN_GVAR_CST_MAX;
                lcd_outdezAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT);
                break;
@@ -5204,7 +5229,7 @@ void onModelCustomScriptMenu(const char *result)
  ScriptData &sd = g_model.scriptsData[s_currIdx];

  if (result == STR_UPDATE_LIST) {
-    if (!listSdFiles(SCRIPTS_PATH, SCRIPTS_EXT, sizeof(sd.file), NULL)) {
+    if (!listSdFiles(SCRIPTS_MIXES_PATH, SCRIPTS_EXT, sizeof(sd.file), NULL)) {
      POPUP_WARNING(STR_NO_SCRIPTS_ON_SD);
      s_menu_flags = 0;
    }
@@ -5235,7 +5260,7 @@ void menuModelCustomScriptOne(uint8_t event)

  putsStrIdx(lcdLastPos+FW, 0, "LUA", s_currIdx+1, 0);

-  SUBMENU_NOTITLE(3+scriptInternalData[s_currIdx].inputsCount, { 0, 0, LABEL(inputs), 0/*repeated*/ });
+  SUBMENU_NOTITLE(3+scriptInputsOutputs[s_currIdx].inputsCount, { 0, 0, LABEL(inputs), 0/*repeated*/ });

  int8_t sub = m_posVert;

@@ -5252,7 +5277,7 @@ void menuModelCustomScriptOne(uint8_t event)
        lcd_putsiAtt(SCRIPT_ONE_2ND_COLUMN_POS, y, STR_VCSWFUNC, 0, attr);
      if (attr && event==EVT_KEY_BREAK(KEY_ENTER) && !READ_ONLY()) {
        s_editMode = 0;
-        if (listSdFiles(SCRIPTS_PATH, SCRIPTS_EXT, sizeof(sd.file), sd.file, LIST_NONE_SD_FILE)) {
+        if (listSdFiles(SCRIPTS_MIXES_PATH, SCRIPTS_EXT, sizeof(sd.file), sd.file, LIST_NONE_SD_FILE)) {
          menuHandler = onModelCustomScriptMenu;
        }
        else {
@@ -5268,32 +5293,32 @@ void menuModelCustomScriptOne(uint8_t event)
    else if (i == ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL) {
      lcd_putsLeft(y, STR_INPUTS);
    }
-    else if (i <= ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL+scriptInternalData[s_currIdx].inputsCount) {
+    else if (i <= ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL+scriptInputsOutputs[s_currIdx].inputsCount) {
      int inputIdx = i-ITEM_MODEL_CUSTOMSCRIPT_PARAMS_LABEL-1;
-      lcd_putsnAtt(INDENT_WIDTH, y, scriptInternalData[s_currIdx].inputs[inputIdx].name, 10, 0);
-      if (scriptInternalData[s_currIdx].inputs[inputIdx].type == 0) {
-        lcd_outdezAtt(SCRIPT_ONE_2ND_COLUMN_POS, y, g_model.scriptsData[s_currIdx].inputs[inputIdx]+scriptInternalData[s_currIdx].inputs[inputIdx].def, attr|LEFT);
+      lcd_putsnAtt(INDENT_WIDTH, y, scriptInputsOutputs[s_currIdx].inputs[inputIdx].name, 10, 0);
+      if (scriptInputsOutputs[s_currIdx].inputs[inputIdx].type == 0) {
+        lcd_outdezAtt(SCRIPT_ONE_2ND_COLUMN_POS, y, g_model.scriptsData[s_currIdx].inputs[inputIdx]+scriptInputsOutputs[s_currIdx].inputs[inputIdx].def, attr|LEFT);
        if (attr) {
-          CHECK_INCDEC_MODELVAR(event, g_model.scriptsData[s_currIdx].inputs[inputIdx], scriptInternalData[s_currIdx].inputs[inputIdx].min-scriptInternalData[s_currIdx].inputs[inputIdx].def, scriptInternalData[s_currIdx].inputs[inputIdx].max-scriptInternalData[s_currIdx].inputs[inputIdx].def);
+          CHECK_INCDEC_MODELVAR(event, g_model.scriptsData[s_currIdx].inputs[inputIdx], scriptInputsOutputs[s_currIdx].inputs[inputIdx].min-scriptInputsOutputs[s_currIdx].inputs[inputIdx].def, scriptInputsOutputs[s_currIdx].inputs[inputIdx].max-scriptInputsOutputs[s_currIdx].inputs[inputIdx].def);
        }
      }
      else {
-        putsMixerSource(SCRIPT_ONE_2ND_COLUMN_POS, y, g_model.scriptsData[s_currIdx].inputs[inputIdx]+scriptInternalData[s_currIdx].inputs[inputIdx].def, attr);
+        putsMixerSource(SCRIPT_ONE_2ND_COLUMN_POS, y, g_model.scriptsData[s_currIdx].inputs[inputIdx]+scriptInputsOutputs[s_currIdx].inputs[inputIdx].def, attr);
        if (attr) {
          uint8_t *source = (uint8_t *)&g_model.scriptsData[s_currIdx].inputs[inputIdx];
-          CHECK_INCDEC_MODELSOURCE(event, *source, scriptInternalData[s_currIdx].inputs[inputIdx].min-scriptInternalData[s_currIdx].inputs[inputIdx].def, scriptInternalData[s_currIdx].inputs[inputIdx].max-scriptInternalData[s_currIdx].inputs[inputIdx].def);
+          CHECK_INCDEC_MODELSOURCE(event, *source, scriptInputsOutputs[s_currIdx].inputs[inputIdx].min-scriptInputsOutputs[s_currIdx].inputs[inputIdx].def, scriptInputsOutputs[s_currIdx].inputs[inputIdx].max-scriptInputsOutputs[s_currIdx].inputs[inputIdx].def);
        }
      }
    }
  }

-  if (scriptInternalData[s_currIdx].outputsCount > 0) {
+  if (scriptInputsOutputs[s_currIdx].outputsCount > 0) {
    lcd_vline(SCRIPT_ONE_3RD_COLUMN_POS-4, FH+1, LCD_H-FH-1);
    lcd_puts(SCRIPT_ONE_3RD_COLUMN_POS, FH+1, STR_OUTPUTS);

-    for (int i=0; i<scriptInternalData[s_currIdx].outputsCount; i++) {
+    for (int i=0; i<scriptInputsOutputs[s_currIdx].outputsCount; i++) {
      putsMixerSource(SCRIPT_ONE_3RD_COLUMN_POS+INDENT_WIDTH, FH+1+FH+i*FH, MIXSRC_FIRST_LUA+(s_currIdx*MAX_SCRIPT_OUTPUTS)+i, 0);
-      lcd_outdezNAtt(SCRIPT_ONE_3RD_COLUMN_POS+11*FW+3, FH+1+FH+i*FH, calcRESXto1000(scriptInternalData[s_currIdx].outputs[i].value), PREC1);
+      lcd_outdezNAtt(SCRIPT_ONE_3RD_COLUMN_POS+11*FW+3, FH+1+FH+i*FH, calcRESXto1000(scriptInputsOutputs[s_currIdx].outputs[i].value), PREC1);
    }
  }
 }
@@ -5320,7 +5345,7 @@ void menuModelCustomScripts(uint8_t event)
      break;
  }

-  for (int i=0; i<MAX_SCRIPTS; i++) {
+  for (int i=0, scriptIndex=0; i<MAX_SCRIPTS; i++) {
    y = 1 + (i+1)*FH;

    ScriptData &sd = g_model.scriptsData[i];
@@ -5331,7 +5356,7 @@ void menuModelCustomScripts(uint8_t event)
    // LUA script
    if (ZEXIST(sd.file)) {
      lcd_putsnAtt(5*FW, y, sd.file, sizeof(sd.file), 0);
-      switch (scriptInternalData[i].state) {
+      switch (scriptInternalData[scriptIndex].state) {
        case SCRIPT_SYNTAX_ERROR:
          lcd_puts(28*FW+2, y, "(error)");
          break;
@@ -5342,12 +5367,13 @@ void menuModelCustomScripts(uint8_t event)
          lcd_puts(29*FW+2, y, "(leak)");
          break;
        default:
-          lcd_outdezAtt(31*FW, y, luaGetCpuUsed(i));
+          lcd_outdezAtt(31*FW, y, luaGetCpuUsed(scriptIndex));
          lcd_putc(31*FW, y, '%');
-          lcd_outdezAtt(34*FW+2, y, luaGetMemUsed(i));
+          lcd_outdezAtt(34*FW+2, y, luaGetMemUsed(scriptIndex));
          lcd_putc(34*FW+2, y, 'k');
          break;
      }
+      scriptIndex++;
    }
    else {
      lcd_putsiAtt(5*FW, y, STR_VCSWFUNC, 0, 0);
@@ -5361,11 +5387,6 @@ void menuModelCustomScripts(uint8_t event)

 enum menuModelTelemetryItems {
  CASE_CPUARM(ITEM_TELEMETRY_PROTOCOL_TYPE)
-#if defined(CPUARM)
-  ITEM_TELEMETRY_RXBATT_LABEL,
-  ITEM_TELEMETRY_RXBATT_ALARM1,
-  ITEM_TELEMETRY_RXBATT_ALARM2,
-#endif
  ITEM_TELEMETRY_A1_LABEL,
  ITEM_TELEMETRY_A1_RANGE,
  ITEM_TELEMETRY_A1_OFFSET,
@@ -5463,12 +5484,6 @@ enum menuModelTelemetryItems {
  #define TELEM_SCRTYPE_COL (10*FW)
 #endif

-#if defined(CPUARM)
-  #define RXBATT_ROWS       LABEL(RXBATT), 0, 0,
-#else
-  #define RXBATT_ROWS
-#endif
-
 #if defined(PCBTARANIS)
  #define CHANNEL_ROWS      LABEL(CHANNEL), 1, 0, 0, 0
  #define RSSI_ROWS         LABEL(RSSI), 0, 0
@@ -5497,7 +5512,7 @@ enum menuModelTelemetryItems {

 void menuModelTelemetry(uint8_t event)
 {
-  MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CASE_CPUARM(0) RXBATT_ROWS CHANNEL_ROWS, CHANNEL_ROWS, CASE_CPUARM(CHANNEL_ROWS) CASE_CPUARM(CHANNEL_ROWS) RSSI_ROWS, USRDATA_LINES 0, 0, IF_FAS_OFFSET(0) CASE_CPUARM(0) CASE_VARIO(LABEL(Vario)) CASE_VARIO(0) CASE_VARIO(VARIO_RANGE_ROWS) CASE_PCBTARANIS(LABEL(TopBar)) CASE_PCBTARANIS(0) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, CASE_CPUARM(SCREEN_TYPE_ROWS) CASE_CPUARM(2) CASE_CPUARM(2) CASE_CPUARM(2) CASE_CPUARM(2)});
+  MENU(STR_MENUTELEMETRY, menuTabModel, e_Telemetry, ITEM_TELEMETRY_MAX+1, {0, CASE_CPUARM(0) CHANNEL_ROWS, CHANNEL_ROWS, CASE_CPUARM(CHANNEL_ROWS) CASE_CPUARM(CHANNEL_ROWS) RSSI_ROWS, USRDATA_LINES 0, 0, IF_FAS_OFFSET(0) CASE_CPUARM(0) CASE_VARIO(LABEL(Vario)) CASE_VARIO(0) CASE_VARIO(VARIO_RANGE_ROWS) CASE_PCBTARANIS(LABEL(TopBar)) CASE_PCBTARANIS(0) SCREEN_TYPE_ROWS, 2, 2, 2, 2, SCREEN_TYPE_ROWS, 2, 2, 2, 2, CASE_CPUARM(SCREEN_TYPE_ROWS) CASE_CPUARM(2) CASE_CPUARM(2) CASE_CPUARM(2) CASE_CPUARM(2)});

  uint8_t sub = m_posVert - 1;

@@ -5536,27 +5551,10 @@ void menuModelTelemetry(uint8_t event)

 #if defined(CPUARM)
      case ITEM_TELEMETRY_PROTOCOL_TYPE:
-        g_model.telemetryProtocol = selectMenuItem(TELEM_COL2, y, "Telemetry Type", "\006S.PORTD\0    ", g_model.telemetryProtocol, PROTOCOL_FRSKY_SPORT, PROTOCOL_FRSKY_D, attr, event);
+        g_model.telemetryProtocol = selectMenuItem(TELEM_COL2, y, STR_TELEMETRY_TYPE, "\006S.PORTD\0    ", g_model.telemetryProtocol, PROTOCOL_FRSKY_SPORT, PROTOCOL_FRSKY_D, attr, event);
        break;
 #endif

-#if defined(CPUARM)
-      case ITEM_TELEMETRY_RXBATT_LABEL:
-        lcd_putsLeft(y, "RxBatt");
-        putsTelemetryChannel(TELEM_COL2+6*FW, y, TELEM_RXBATT-1, frskyData.analog[TELEM_ANA_RXBATT].value, LEFT);
-        break;
-      case ITEM_TELEMETRY_RXBATT_ALARM1:
-      case ITEM_TELEMETRY_RXBATT_ALARM2:
-      {
-        uint8_t alarm = (k==ITEM_TELEMETRY_RXBATT_ALARM1 ? 0 : 1);
-        lcd_putsLeft(y, (alarm==0 ? STR_LOWALARM : STR_CRITICALALARM));
-        putsTelemetryChannel(TELEM_COL2, y, TELEM_RXBATT-1, g_model.rxBattAlarms[alarm], LEFT|attr);
-        if (attr && (s_editMode>0 || p1valdiff)) {
-          g_model.rxBattAlarms[alarm] = checkIncDec(event, g_model.rxBattAlarms[alarm], 0, 255, EE_MODEL);
-        }
-        break;
-      }
-#endif
      case ITEM_TELEMETRY_A1_LABEL:
      case ITEM_TELEMETRY_A2_LABEL:
 #if defined(CPUARM)
@@ -341,16 +341,11 @@ uint8_t scrollbar_X = LCD_W-1;
 #if defined(CPUARM)
 bool modelHasNotes()
 {
-  FILINFO info;
-  TCHAR lfn[_MAX_LFN + 1];
-  info.lfname = lfn;
-  info.lfsize = sizeof(lfn);
-
  char filename[sizeof(MODELS_PATH)+1+sizeof(g_model.header.name)+sizeof(TEXT_EXT)] = MODELS_PATH "/";
  char *buf = strcat_modelname(&filename[sizeof(MODELS_PATH)], g_eeGeneral.currModel);
  strcpy(buf, TEXT_EXT);

-  return (f_stat(filename, &info) == FR_OK);
+  return isFileAvailable(filename);
 }

 void pushModelNotes()
@@ -1168,11 +1163,11 @@ int16_t gvarMenuItem(uint8_t x, uint8_t y, int16_t value, int16_t min, int16_t m
    s_editMode = !s_editMode;
 #if defined(CPUARM)
    if (attr & PREC1)
-      value = (GV_IS_GV_VALUE(value, min, max) ? GET_GVAR(value, min, max, s_current_mixer_flight_mode)*10 : delta);
+      value = (GV_IS_GV_VALUE(value, min, max) ? GET_GVAR(value, min, max, mixerCurrentFlightMode)*10 : delta);
    else
-      value = (GV_IS_GV_VALUE(value, min, max) ? GET_GVAR(value, min, max, s_current_mixer_flight_mode) : delta);
+      value = (GV_IS_GV_VALUE(value, min, max) ? GET_GVAR(value, min, max, mixerCurrentFlightMode) : delta);
 #else
-    value = (GV_IS_GV_VALUE(value, min, max) ? GET_GVAR(value, min, max, s_current_mixer_flight_mode) : delta);
+    value = (GV_IS_GV_VALUE(value, min, max) ? GET_GVAR(value, min, max, mixerCurrentFlightMode) : delta);
 #endif
    eeDirty(EE_MODEL);
  }
@@ -1391,7 +1386,7 @@ bool isSourceAvailable(int source)
 #if defined(LUA_MODEL_SCRIPTS)
  if (source>=MIXSRC_FIRST_LUA && source<=MIXSRC_LAST_LUA) {
    div_t qr = div(source-MIXSRC_FIRST_LUA, MAX_SCRIPT_OUTPUTS);
-    return (scriptInternalData[qr.quot].state==SCRIPT_OK && qr.rem<scriptInternalData[qr.quot].outputsCount);
+    return (qr.rem<scriptInputsOutputs[qr.quot].outputsCount);
  }
 #elif defined(PCBTARANIS)
  if (source>=MIXSRC_FIRST_LUA && source<=MIXSRC_LAST_LUA)
@@ -1451,6 +1446,9 @@ bool isTelemetrySourceAvailable(int source)
    return false;
 #endif

+  if (source == TELEM_RESERVE0)
+    return false;
+
  if (source >= TELEM_RESERVE1 && source <= TELEM_RESERVE5)
    return false;

@@ -1565,7 +1563,9 @@ bool isAssignableFunctionAvailable(int function)
    case FUNC_RESERVE1:
    case FUNC_RESERVE2:
    case FUNC_RESERVE3:
-    case FUNC_RESERVE4:
+#if !defined(LUA)
+    case FUNC_PLAY_SCRIPT:
+#endif
    case FUNC_RESERVE5:
      return false;

@@ -252,11 +252,7 @@ void displayTopBar()
    /* Rx voltage */
    lcdint_t voltage = 0;
    uint8_t channel = 0;
-    if (g_model.frsky.voltsSource == FRSKY_VOLTS_SOURCE_RXBATT) {
-      channel = TELEM_RXBATT-1;
-      voltage = frskyData.analog[TELEM_ANA_RXBATT].value;
-    }
-    else if (g_model.frsky.voltsSource <= FRSKY_VOLTS_SOURCE_A4) {
+    if (g_model.frsky.voltsSource <= FRSKY_VOLTS_SOURCE_A4) {
      channel = TELEM_A1+g_model.frsky.voltsSource-1;
      voltage = frskyData.analog[g_model.frsky.voltsSource].value;
    }
@@ -368,14 +364,20 @@ void displayTimers()
  }
 }
 #else
+
 void displayTimers()
 {
+#if defined(TRANSLATIONS_CZ)
+  #define MAINTMR_LBL_COL (9*FW-FW/2-1)
+#else
+  #define MAINTMR_LBL_COL (9*FW-FW/2+3)
+#endif
  // Main timer
  if (g_model.timers[0].mode) {
    TimerState & timerState = timersStates[0];
    uint8_t att = DBLSIZE | (timerState.val<0 ? BLINK|INVERS : 0);
    putsTimer(12*FW+2+10*FWNUM-4, FH*2, timerState.val, att, att);
-    putsTimerMode(timerState.val >= 0 ? 9*FW-FW/2+3 : 9*FW-FW/2-4, FH*3, g_model.timers[0].mode);
+    putsTimerMode(timerState.val >= 0 ? MAINTMR_LBL_COL : MAINTMR_LBL_COL-7, FH*3, g_model.timers[0].mode);
  }
 }
 #endif
@@ -652,8 +654,8 @@ void menuMainView(uint8_t event)

  {
    // Flight Phase Name
-    uint8_t phase = s_current_mixer_flight_mode;
-    lcd_putsnAtt(PHASE_X, PHASE_Y, g_model.phaseData[phase].name, sizeof(g_model.phaseData[phase].name), ZCHAR|PHASE_FLAGS);
+    uint8_t phase = mixerCurrentFlightMode;
+    lcd_putsnAtt(PHASE_X, PHASE_Y, g_model.flightModeData[phase].name, sizeof(g_model.flightModeData[phase].name), ZCHAR|PHASE_FLAGS);

    // Model Name
    putsModelName(MODELNAME_X, MODELNAME_Y, g_model.header.name, g_eeGeneral.currModel, BIGSIZE);
@@ -826,24 +828,26 @@ void menuMainView(uint8_t event)
        lcd_vline(x-1, VSWITCH_Y-len, len);
        lcd_vline(x,   VSWITCH_Y-len, len);
      }
-#elif defined(PCBGRUVIN9X) && ROTARY_ENCODERS > 2
-      for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++)
-        putsSwitches(2*FW-2 + (i/3)*(4*FW-2) + (i/3>1 ? 3*FW+6 : 0), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i) ? INVERS : 0);
 #elif defined(PCBGRUVIN9X)
      for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++)
-        putsSwitches(2*FW-2 + (i/3)*(4*FW-2) + (i/3>1 ? 3*FW : 0), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i) ? INVERS : 0);
+        putsSwitches(2*FW-3 + (i/3)*(i/3>2 ? 3*FW+2 : (3*FW-1)) + (i/3>2 ? 2*FW : 0), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i) ? INVERS : 0);
 #elif !defined(PCBSTD)
      for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++)
        putsSwitches(2*FW-2 + (i/3)*(4*FW-1), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i) ? INVERS : 0);
 #else
      for (uint8_t i=0; i<NUM_LOGICAL_SWITCH; i++)
-        putsSwitches(2*FW-2 + (i/3)*(5*FW), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i) ? INVERS : 0);
+        putsSwitches(2*FW-3 + (i/3)*(4*FW), 4*FH+1 + (i%3)*FH, SWSRC_SW1+i, getSwitch(SWSRC_SW1+i) ? INVERS : 0);
 #endif
    }
  }
  else { // timer2
+#if defined(TRANSLATIONS_CZ)
+  #define TMR2_LBL_COL (20-FW/2+1)
+#else
+  #define TMR2_LBL_COL (20-FW/2+5)
+#endif
    putsTimer(33+FW+2+10*FWNUM-4, FH*5, timersStates[1].val, DBLSIZE, DBLSIZE);
-    putsTimerMode(timersStates[1].val >= 0 ? 20-FW/2+5 : 20-FW/2-2, FH*6, g_model.timers[1].mode);
+    putsTimerMode(timersStates[1].val >= 0 ? TMR2_LBL_COL : TMR2_LBL_COL-7, FH*6, g_model.timers[1].mode);
    // lcd_outdezNAtt(33+11*FW, FH*6, s_timerVal_10ms[1], LEADING0, 2); // 1/100s
  }
 #endif // PCBTARANIS
@@ -864,13 +868,13 @@ void menuMainView(uint8_t event)
    putsStrIdx(BITMAP_X+FW, BITMAP_Y+FH-1, STR_GV, s_gvar_last+1);
    lcd_putsnAtt(BITMAP_X+4*FW+FW/2, BITMAP_Y+FH-1, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, ZCHAR);
    lcd_putsAtt(BITMAP_X+FW, BITMAP_Y+2*FH+3, PSTR("[\010]"), BOLD);
-    lcd_outdezAtt(BITMAP_X+5*FW+FW/2, BITMAP_Y+2*FH+3, GVAR_VALUE(s_gvar_last, s_current_mixer_flight_mode), BOLD);
+    lcd_outdezAtt(BITMAP_X+5*FW+FW/2, BITMAP_Y+2*FH+3, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), BOLD);
 #else
    s_warning = STR_GLOBAL_VAR;
    displayBox();
    lcd_putsnAtt(16, 5*FH, g_model.gvars[s_gvar_last].name, LEN_GVAR_NAME, ZCHAR);
    lcd_putsAtt(16+7*FW, 5*FH, PSTR("[\010]"), BOLD);
-    lcd_outdezAtt(16+7*FW+4*FW+FW/2, 5*FH, GVAR_VALUE(s_gvar_last, s_current_mixer_flight_mode), BOLD);
+    lcd_outdezAtt(16+7*FW+4*FW+FW/2, 5*FH, GVAR_VALUE(s_gvar_last, getGVarFlightPhase(mixerCurrentFlightMode, s_gvar_last)), BOLD);
    s_warning = NULL;
 #endif
  }
@@ -44,7 +44,7 @@
 #endif

 #if defined(FRSKY_HUB) && defined(GAUGES)
-uint8_t barsThresholds[THLD_MAX];
+bar_threshold_t barsThresholds[THLD_MAX];
 #endif

 enum FrskyViews {
@@ -56,7 +56,15 @@ enum FrskyViews {
  FRSKY_VIEW_MAX = e_frsky_after_flight
 };

-static uint8_t s_frsky_view = e_frsky_custom_screen_1;
+uint8_t s_frsky_view = e_frsky_custom_screen_1;
+
+#if LCD_W >= 212
+  #define BAR_LEFT    26
+  #define BAR_WIDTH   157
+#else
+  #define BAR_LEFT    25
+  #define BAR_WIDTH   100
+#endif

 #if defined(PCBTARANIS)
 void displayRssiLine()
@@ -65,8 +73,8 @@ void displayRssiLine()
    lcd_hline(0, 55, 212, 0); // separator
    uint8_t rssi = min((uint8_t)99, frskyData.rssi[0].value);
    lcd_putsn(0, STATUS_BAR_Y, STR_RX, 2); lcd_outdezNAtt(4*FW, STATUS_BAR_Y, rssi, LEADING0, 2);
-    lcd_rect(25, 57, 78, 7);
-    lcd_filled_rect(26, 58, 19*rssi/25, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
+    lcd_rect(BAR_LEFT, 57, 78, 7);
+    lcd_filled_rect(BAR_LEFT+1, 58, 19*rssi/25, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
  }
  else {
    lcd_putsAtt(7*FW, STATUS_BAR_Y, STR_NODATA, BLINK);
@@ -80,8 +88,8 @@ void displayRssiLine()
    lcd_hline(0, 55, 128, 0); // separator
    uint8_t rssi = min((uint8_t)99, frskyData.rssi[1].value);
    lcd_putsLeft(STATUS_BAR_Y, STR_TX); lcd_outdezNAtt(4*FW+1, STATUS_BAR_Y, rssi, LEADING0, 2);
-    lcd_rect(25, 57, 38, 7);
-    lcd_filled_rect(26, 58, 4*rssi/11, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
+    lcd_rect(BAR_LEFT+1, 57, 38, 7);
+    lcd_filled_rect(BAR_LEFT+1, 58, 4*rssi/11, 5, (rssi < getRssiAlarmValue(0)) ? DOTTED : SOLID);
    rssi = min((uint8_t)99, frskyData.rssi[0].value);
    lcd_puts(104, STATUS_BAR_Y, STR_RX); lcd_outdezNAtt(105+4*FW, STATUS_BAR_Y, rssi, LEADING0, 2);
    lcd_rect(65, 57, 38, 7);
@@ -157,12 +165,6 @@ void displayVoltageScreenLine(uint8_t y, uint8_t index)
  }
 }

-#if LCD_W >= 212
-  #define BAR_WIDTH   150
-#else
-  #define BAR_WIDTH   100
-#endif
-
 uint8_t barCoord(int16_t value, int16_t min, int16_t max)
 {
  return limit((uint8_t)0, (uint8_t)(((int32_t)(BAR_WIDTH-1) * (value - min)) / (max - min)), (uint8_t)BAR_WIDTH);
@@ -204,6 +206,12 @@ void menuTelemetryFrsky(uint8_t event)
 #endif
  }

+#if defined(LUA)
+  if (isTelemetryScriptAvailable(s_frsky_view)) {
+    return;
+  }
+#endif
+
  lcdDrawTelemetryTopBar();

  if (s_frsky_view < MAX_FRSKY_SCREENS) {
@@ -220,23 +228,28 @@ void menuTelemetryFrsky(uint8_t event)
        if (source && barMax > barMin) {
          uint8_t y = barHeight+6+i*(barHeight+6);
          lcd_putsiAtt(0, y+barHeight-5, STR_VTELEMCHNS, source, 0);
-          lcd_rect(25, y, BAR_WIDTH+1, barHeight+2);
+          lcd_rect(BAR_LEFT, y, BAR_WIDTH+1, barHeight+2);
          getvalue_t value = getValue(MIXSRC_FIRST_TELEM+source-1);
 #if LCD_W >= 212
-          putsTelemetryChannel(27+BAR_WIDTH, y+barHeight-6, source-1, value, LEFT);
+          putsTelemetryChannel(BAR_LEFT+2+BAR_WIDTH, y+barHeight-5, source-1, value, LEFT);
 #endif
          getvalue_t threshold = 0;
          uint8_t thresholdX = 0;
-          if (source <= TELEM_TM2)
+          if (source <= TELEM_TIMER2)
            threshold = 0;
          else if (source <= TELEM_RSSI_RX)
            threshold = getRssiAlarmValue(source-TELEM_RSSI_TX);
          else if (source <= TELEM_A2)
            threshold = g_model.frsky.channels[source-TELEM_A1].alarms_value[0];
 #if defined(FRSKY_HUB)
-          else
+          else {
+#if defined(CPUARM)
+            threshold = barsThresholds[source-TELEM_ALT];
+#else
            threshold = convertBarTelemValue(source, barsThresholds[source-TELEM_ALT]);
 #endif
+          }
+#endif

          if (threshold) {
            thresholdX = barCoord(threshold, barMin, barMax);
@@ -251,14 +264,17 @@ void menuTelemetryFrsky(uint8_t event)
          if (source == TELEM_T1 || source == TELEM_T2)
            barShade = -barShade;

-          lcd_filled_rect(26, y+1, width, barHeight, barShade);
+          lcd_filled_rect(BAR_LEFT+1, y+1, width, barHeight, barShade);

-          for (uint8_t j=24; j<99; j+=25)
-            if (j>thresholdX || j>width) lcd_vline(j*BAR_WIDTH/100+26, y+1, barHeight);
+          for (uint8_t j=24; j<99; j+=25) {
+            if (j>thresholdX || j>width) {
+              lcd_vline(j*BAR_WIDTH/100+BAR_LEFT+1, y+1, barHeight);
+            }
+          }

          if (thresholdX) {
-            lcd_vlineStip(26+thresholdX, y-2, barHeight+3, DOTTED);
-            lcd_hline(25+thresholdX, y-2, 3);
+            lcd_vlineStip(BAR_LEFT+1+thresholdX, y-2, barHeight+3, DOTTED);
+            lcd_hline(BAR_LEFT+thresholdX, y-2, 3);
          }
        }
        else {
@@ -315,9 +331,9 @@ void menuTelemetryFrsky(uint8_t event)
 #endif
            putsTelemetryChannel(pos[j+1]-2, 1+FH+2*FH*i, field-1, value, att);
            
-            if (field >= TELEM_TM1 && field <= TELEM_TM2 && i!=3) {
+            if (field >= TELEM_TIMER1 && field <= TELEM_TIMER2 && i!=3) {
              // there is not enough space on LCD for displaying "Tmr1" or "Tmr2" and still see the - sign, we write "T1" or "T2" instead
-              field = field-TELEM_TM1+TELEM_T1;
+              field = field-TELEM_TIMER1+TELEM_T1;
            }
            lcd_putsiAtt(pos[j], 1+FH+2*FH*i, STR_VTELEMCHNS, field, 0);
          }
@@ -337,11 +353,6 @@ void menuTelemetryFrsky(uint8_t event)
    lcd_putsiAtt(0, 2*FH, STR_AMPSRC, g_model.frsky.voltsSource+1, 0);
 #endif
    switch (g_model.frsky.voltsSource) {
-#if defined(CPUARM)
-      case FRSKY_VOLTS_SOURCE_RXBATT:
-        putsTelemetryChannel(3*FW+6*FW+4, FH+1, TELEM_RXBATT-1, frskyData.analog[TELEM_ANA_RXBATT].value, DBLSIZE);
-        break;
-#endif
      case FRSKY_VOLTS_SOURCE_A1:
      case FRSKY_VOLTS_SOURCE_A2:
 #if defined(CPUARM)
@@ -383,7 +394,11 @@ void menuTelemetryFrsky(uint8_t event)
      putsTelemetryChannel(3*FW+4+4*FW+6*FW+FW, 5*FH+1, TELEM_CONSUMPTION-1, frskyData.hub.currentConsumption, DBLSIZE);
    }
    else {
+#if defined(CPUARM)
+      displayVoltageScreenLine(analog > 0 ? 5*FH : 4*FH, analog==1+FRSKY_VOLTS_SOURCE_A1 ? FRSKY_VOLTS_SOURCE_A2 : FRSKY_VOLTS_SOURCE_A1);
+#else
      displayVoltageScreenLine(analog > 0 ? 5*FH : 4*FH, analog ? 2-analog : 0);
+#endif
      if (analog == 0) displayVoltageScreenLine(6*FH, 1);
    }

@@ -262,6 +262,9 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
    if (inv) bb = 0xff;
  #endif
 #endif
+
+    uint8_t *lineEnd = &displayBuf[ y / 8 * LCD_W + LCD_W ];
+
    for (int8_t i=0; i<=6; i++) {
      uint8_t b = 0;
      if (i==0) {
@@ -298,7 +301,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
      }
 #endif

-      if (p<DISPLAY_END && !BLINKING_CHAR) {
+      if (p<lineEnd && !BLINKING_CHAR) {
        ASSERT_IN_DISPLAY(p);
        uint8_t mask = ~(0xff << ym8);
        LCD_BYTE_FILTER(p, mask, b << ym8);
@@ -857,12 +860,12 @@ void lcdDrawTelemetryTopBar()
  if (g_model.timers[0].mode) {
    att = (timersStates[0].val<0 ? BLINK : 0);
    putsTimer(22*FW+5*FWNUM+3, 0, timersStates[0].val, att, att);
-    lcd_putsiAtt(18*FW+2, 1, STR_VTELEMCHNS, TELEM_TM1, SMLSIZE);
+    lcd_putsiAtt(18*FW+2, 1, STR_VTELEMCHNS, TELEM_TIMER1, SMLSIZE);
  }
  if (g_model.timers[1].mode) {
    att = (timersStates[1].val<0 ? BLINK : 0);
    putsTimer(31*FW+5*FWNUM+3, 0, timersStates[1].val, att, att);
-    lcd_putsiAtt(27*FW+2, 1, STR_VTELEMCHNS, TELEM_TM2, SMLSIZE);
+    lcd_putsiAtt(27*FW+2, 1, STR_VTELEMCHNS, TELEM_TIMER2, SMLSIZE);
  }
  lcd_invert_line(0);
 }
@@ -973,10 +976,10 @@ void putsMixerSource(xcoord_t x, uint8_t y, uint8_t idx, LcdFlags att)
  else if (idx <= MIXSRC_LAST_LUA) {
    div_t qr = div(idx-MIXSRC_FIRST_LUA, MAX_SCRIPT_OUTPUTS);
 #if defined(LUA_MODEL_SCRIPTS)
-    if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInternalData[qr.quot].outputsCount) {
+    if (qr.quot < MAX_SCRIPTS && qr.rem < scriptInputsOutputs[qr.quot].outputsCount) {
      lcd_putcAtt(x+2, y+1, '1'+qr.quot, TINSIZE);
      lcd_filled_rect(x, y, 7, 7);
-      lcd_putsnAtt(x+8, y, scriptInternalData[qr.quot].outputs[qr.rem].name, att & STREXPANDED ? 9 : 4, att);
+      lcd_putsnAtt(x+8, y, scriptInputsOutputs[qr.quot].outputs[qr.rem].name, att & STREXPANDED ? 9 : 4, att);
    }
    else
 #endif
@@ -1164,7 +1167,7 @@ void putsTrimMode(xcoord_t x, uint8_t y, uint8_t phase, uint8_t idx, LcdFlags at
 #if ROTARY_ENCODERS > 0
 void putsRotaryEncoderMode(xcoord_t x, uint8_t y, uint8_t phase, uint8_t idx, LcdFlags att)
 {
-  int16_t v = phaseAddress(phase)->rotaryEncoders[idx];
+  int16_t v = flightModeAddress(phase)->rotaryEncoders[idx];

  if (v > ROTARY_ENCODER_MAX) {
    uint8_t p = v - ROTARY_ENCODER_MAX - 1;
@@ -1211,28 +1214,11 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
      break;
    }
 #endif
-    case TELEM_TM1-1:
-    case TELEM_TM2-1:
+    case TELEM_TIMER1-1:
+    case TELEM_TIMER2-1:
      att &= ~NO_UNIT;
      putsTimer(x, y, val, att, att);
      break;
-#if defined(CPUARM)
-    case TELEM_RXBATT-1:
-      val = ((val*1320) + 127) / 255;
-#if LCD_W >= 212
-      att |= PREC2;
-#else
-      if (abs(val) < 1000) {
-        att |= PREC2;
-      }
-      else {
-        val = div10_and_round(val);
-        att |= PREC1;
-      }
-#endif
-      putsTelemetryValue(x, y, val, UNIT_VOLTS, att);
-      break;
-#endif
 #if defined(FRSKY)
    case TELEM_MIN_A1-1:
    case TELEM_MIN_A2-1:
@@ -1323,6 +1309,10 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
      putsTelemetryValue(x, y, val, UNIT_RAW, att);
      break;

+    case TELEM_HDG-1:
+      putsTelemetryValue(x, y, val, UNIT_HDG, att);
+      break;
+
 #if defined(FRSKY_SPORT)
    case TELEM_ALT-1:
      putsTelemetryValue(x, y, div10_and_round(val), UNIT_DIST, att|PREC1);
@@ -1347,8 +1337,6 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
        unit = channel + 1 - TELEM_ALT;
      if (channel >= TELEM_MIN_ALT-1 && channel <= TELEM_MAX_ALT-1)
        unit = 0;
-      if (channel == TELEM_HDG-1)
-        unit = 3;
      putsTelemetryValue(x, y, val, pgm_read_byte(bchunit_ar+unit), att);
      break;
    }
@@ -1358,8 +1346,8 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val,
 void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, uint8_t att)
 {
  switch (channel) {
-    case TELEM_TM1-1:
-    case TELEM_TM2-1:
+    case TELEM_TIMER1-1:
+    case TELEM_TIMER2-1:
      att &= ~NO_UNIT;
      putsTimer(x, y, val, att, att);
      break;
@@ -100,28 +100,30 @@ void _bootStart()
    bwdt_reset();
  }

-  if (((GPIOC->IDR & 0x00000002) == 0) || ((GPIOE->IDR & 0x00000008) == 0)) {
-    // Bootloader needed
-    const uint8_t *src;
-    uint8_t *dest;
-    uint32_t size;
+  if ((GPIOE->IDR & 0x00000008) == 0) {
+    if ((GPIOC->IDR & 0x00000002) == 0) {
+      // Bootloader needed
+      const uint8_t *src;
+      uint8_t *dest;
+      uint32_t size;

-    bwdt_reset();
-    size = sizeof(BootCode);
-    src = BootCode;
-    dest = (uint8_t *) 0x20000000;
+      bwdt_reset();
+      size = sizeof(BootCode);
+      src = BootCode;
+      dest = (uint8_t *) 0x20000000;
+
+      for (; size; size -= 1) {
+        *dest++ = *src++;
+      }
+      // Could check for a valid copy to RAM here
+      // Go execute bootloader
+      bwdt_reset();
+
+      uint32_t address = *(uint32_t *) 0x20000004;
+
+      ((void (*)(void)) (address))();		// Go execute the loaded application

-    for (; size; size -= 1) {
-      *dest++ = *src++;
    }
-    // Could check for a valid copy to RAM here
-    // Go execute bootloader
-    bwdt_reset();
-
-    uint32_t address = *(uint32_t *) 0x20000004;
-
-    ((void (*)(void)) (address))();		// Go execute the loaded application
-
  }

 // run_application() ;
@@ -115,8 +115,8 @@ const pm_char * openLogs()
    f_puts("Time,", &g_oLogFile);
 #endif

-#if defined(FRSKY_SPORT)
-    f_puts("SWR,RSSI,A1,A2,", &g_oLogFile);
+#if defined(CPUARM) && defined(FRSKY)
+    f_puts("SWR,RSSI,A1,A2,A3,A4,", &g_oLogFile);
 #elif defined(FRSKY)
    f_puts("Buffer,RX,TX,A1,A2,", &g_oLogFile);
 #endif
@@ -196,14 +196,14 @@ void writeLogs()
      f_printf(&g_oLogFile, "%d,", tmr10ms);
 #endif

-#if defined(FRSKY_SPORT)
-      f_printf(&g_oLogFile, "%d,%d,", frskyData.rssi[1].value, frskyData.rssi[0].value);
-#elif defined(FRSKY)
+#if defined(FRSKY)
+#if defined(CPUARM)
+      f_printf(&g_oLogFile, "%d,%d,", frskyData.swr.value, frskyData.rssi[0].value);
+#else
      f_printf(&g_oLogFile, "%d,%d,%d,", frskyStreaming, frskyData.rssi[0].value, frskyData.rssi[1].value);
 #endif

-#if defined(FRSKY)
-      for (uint8_t i=0; i<2; i++) {
+      for (uint8_t i=0; i<MAX_FRSKY_A_CHANNELS; i++) {
        int16_t converted_value = applyChannelRatio(i, frskyData.analog[i].value);
        f_printf(&g_oLogFile, "%d.%02d,", converted_value/100, converted_value%100);
      }
@@ -58,7 +58,9 @@ extern "C" {

 lua_State *L = NULL;
 uint8_t luaState = 0;
+uint8_t luaScriptsCount = 0;
 ScriptInternalData scriptInternalData[MAX_SCRIPTS] = { { SCRIPT_NOFILE, 0 } };
+ScriptInputsOutputs scriptInputsOutputs[MAX_SCRIPTS] = { {0} };
 ScriptInternalData standaloneScript = { SCRIPT_NOFILE, 0 };
 uint16_t maxLuaInterval = 0;
 uint16_t maxLuaDuration = 0;
@@ -854,7 +856,7 @@ static int luaModelGetGlobalVariable(lua_State *L)
  int idx = luaL_checkunsigned(L, 1);
  int phase = luaL_checkunsigned(L, 2);
  if (phase < MAX_FLIGHT_MODES && idx < MAX_GVARS)
-    lua_pushinteger(L, g_model.phaseData[phase].gvars[idx]);
+    lua_pushinteger(L, g_model.flightModeData[phase].gvars[idx]);
  else
    lua_pushnil(L);
  return 1;
@@ -866,7 +868,7 @@ static int luaModelSetGlobalVariable(lua_State *L)
  int phase = luaL_checkunsigned(L, 2);
  int value = luaL_checkinteger(L, 3);
  if (phase < MAX_FLIGHT_MODES && idx < MAX_GVARS && value >= -GVAR_LIMIT && value <= GVAR_LIMIT) {
-    g_model.phaseData[phase].gvars[idx] = value;
+    g_model.flightModeData[phase].gvars[idx] = value;
  }
  return 0;
 }
@@ -915,7 +917,7 @@ static int luaDefaultChannel(lua_State *L)
  return 1;
 }

-int luaGetInputs(ScriptInternalData & sid)
+int luaGetInputs(ScriptInputsOutputs & sid)
 {
  if (!lua_istable(L, -1))
    return -1;
@@ -969,7 +971,7 @@ int luaGetInputs(ScriptInternalData & sid)
  return 0;
 }

-int luaGetOutputs(ScriptInternalData & sid)
+int luaGetOutputs(ScriptInputsOutputs & sid)
 {
  if (!lua_istable(L, -1))
    return -1;
@@ -1107,7 +1109,7 @@ void luaFree(ScriptInternalData & sid)
  }
 }

-int luaLoad(const char *filename, ScriptInternalData & sid)
+int luaLoad(const char *filename, ScriptInternalData & sid, ScriptInputsOutputs * sio=NULL)
 {
  int init = 0;

@@ -1136,11 +1138,11 @@ int luaLoad(const char *filename, ScriptInternalData & sid)
        sid.run = luaL_ref(L, LUA_REGISTRYINDEX);
        lua_pushnil(L);
      }
-      else if (!strcmp(key, "input")) {
-        luaGetInputs(sid);
+      else if (sio && !strcmp(key, "input")) {
+        luaGetInputs(*sio);
      }
-      else if (!strcmp(key, "output")) {
-        luaGetOutputs(sid);
+      else if (sio && !strcmp(key, "output")) {
+        luaGetOutputs(*sio);
      }
    }

@@ -1167,28 +1169,109 @@ int luaLoad(const char *filename, ScriptInternalData & sid)
  return sid.state;
 }

-void luaLoadModelScript(uint8_t index)
+void luaLoadMixScript(uint8_t index)
 {
  ScriptData & sd = g_model.scriptsData[index];
-  ScriptInternalData & sid = scriptInternalData[index];
-
-  memset(&sid, 0, sizeof(sid));
-  sid.state = SCRIPT_NOFILE;

  if (ZEXIST(sd.file)) {
-    char filename[sizeof(SCRIPTS_PATH)+sizeof(sd.file)+sizeof(SCRIPTS_EXT)] = SCRIPTS_PATH "/";
-    strncpy(filename+sizeof(SCRIPTS_PATH), sd.file, sizeof(sd.file));
-    filename[sizeof(SCRIPTS_PATH)+sizeof(sd.file)] = '\0';
-    strcat(filename+sizeof(SCRIPTS_PATH), SCRIPTS_EXT);
-    luaLoad(filename, sid);
+    ScriptInternalData & sid = scriptInternalData[luaScriptsCount++];
+    ScriptInputsOutputs * sio = &scriptInputsOutputs[index];
+    memset(&sid, 0, sizeof(sid));
+    sid.reference = SCRIPT_MIX_FIRST+index;
+    sid.state = SCRIPT_NOFILE;
+    char filename[sizeof(SCRIPTS_MIXES_PATH)+sizeof(sd.file)+sizeof(SCRIPTS_EXT)] = SCRIPTS_MIXES_PATH "/";
+    strncpy(filename+sizeof(SCRIPTS_MIXES_PATH), sd.file, sizeof(sd.file));
+    filename[sizeof(SCRIPTS_MIXES_PATH)+sizeof(sd.file)] = '\0';
+    strcat(filename+sizeof(SCRIPTS_MIXES_PATH), SCRIPTS_EXT);
+    luaLoad(filename, sid, sio);
  }
 }

-void luaLoadModelScripts()
+bool luaLoadFunctionScript(uint8_t index)
 {
+  CustomFnData & fn = g_model.funcSw[index];
+
+  if (fn.func == FUNC_PLAY_SCRIPT && ZEXIST(fn.play.name)) {
+    if (luaScriptsCount < MAX_SCRIPTS) {
+      ScriptInternalData & sid = scriptInternalData[luaScriptsCount++];
+      memset(&sid, 0, sizeof(sid));
+      sid.reference = SCRIPT_FUNC_FIRST+index;
+      sid.state = SCRIPT_NOFILE;
+      char filename[sizeof(SCRIPTS_FUNCS_PATH)+sizeof(fn.play.name)+sizeof(SCRIPTS_EXT)] = SCRIPTS_FUNCS_PATH "/";
+      strncpy(filename+sizeof(SCRIPTS_FUNCS_PATH), fn.play.name, sizeof(fn.play.name));
+      filename[sizeof(SCRIPTS_FUNCS_PATH)+sizeof(fn.play.name)] = '\0';
+      strcat(filename+sizeof(SCRIPTS_FUNCS_PATH), SCRIPTS_EXT);
+      luaLoad(filename, sid);
+    }
+    else {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+void getTelemetryScriptPath(char * path, uint8_t index)
+{
+  strcpy(path, SCRIPTS_PATH "/");
+  char * curs = strcat_modelname(path+sizeof(SCRIPTS_PATH), g_eeGeneral.currModel);
+  strcpy(curs, "/telemX.lua");
+  curs[6] = '0' + index;
+}
+
+bool luaLoadTelemetryScript(uint8_t index)
+{
+  char path[256];
+  getTelemetryScriptPath(path, index);
+  if (isFileAvailable(path)) {
+    if (luaScriptsCount < MAX_SCRIPTS) {
+      ScriptInternalData & sid = scriptInternalData[luaScriptsCount++];
+      memset(&sid, 0, sizeof(sid));
+      sid.reference = SCRIPT_TELEMETRY_FIRST+index;
+      sid.state = SCRIPT_NOFILE;
+      luaLoad(path, sid);
+    }
+    else {
+      return false;
+    }
+  }
+  return true;
+}
+
+bool isTelemetryScriptAvailable(uint8_t index)
+{
+  for (int i=0; i<luaScriptsCount; i++) {
+    ScriptInternalData & sid = scriptInternalData[i];
+    if (sid.reference == SCRIPT_TELEMETRY_FIRST+index) {
+      return true;
+    }
+  }
+  return false;
+}
+
+void luaLoadMixScripts()
+{
+  luaScriptsCount = 0;
+
  // Load model scripts
  for (int i=0; i<MAX_SCRIPTS; i++) {
-    luaLoadModelScript(i);
+    luaLoadMixScript(i);
+  }
+
+  // Load custom function scripts
+  for (int i=0; i<NUM_CFN; i++) {
+    if (!luaLoadFunctionScript(i)) {
+      POPUP_WARNING("Too many Lua scripts!"); // TODO translation
+      break;
+    }
+  }
+
+  // Load telemetry scripts
+  for (int i=0; i<MAX_SCRIPTS; i++) {
+    if (!luaLoadTelemetryScript(i)) {
+      POPUP_WARNING("Too many Lua scripts!"); // TODO translation
+      break;
+    }
  }
 }

@@ -1246,6 +1329,8 @@ void luaExec(const char *filename)
  }
 }

+extern uint8_t s_frsky_view;
+
 void luaTask(uint8_t evt)
 {
  lcd_locked = false;
@@ -1330,40 +1415,71 @@ void luaTask(uint8_t evt)
    if (luaState & LUASTATE_RELOAD_MODEL_SCRIPTS) {
      luaState = 0;
      LUA_RESET();
-      luaLoadModelScripts();
+      luaLoadMixScripts();
    }

-    for (int i=0; i<MAX_SCRIPTS; i++) {
-      ScriptData & sd = g_model.scriptsData[i];
+    for (int i=0; i<luaScriptsCount; i++) {
      ScriptInternalData & sid = scriptInternalData[i];
      if (sid.state == SCRIPT_OK) {
        uint8_t prev_mem = lua_gc(L, LUA_GCCOUNT, 0);
        SET_LUA_INSTRUCTIONS_COUNT(PERMANENT_SCRIPTS_MAX_INSTRUCTIONS);
-        lua_rawgeti(L, LUA_REGISTRYINDEX, sid.run);
-        for (int j=0; j<sid.inputsCount; j++) {
-          if (sid.inputs[j].type == 1)
-            luaGetValueAndPush((uint8_t)sd.inputs[j]);
-          else
-            lua_pushinteger(L, sd.inputs[j] + sid.inputs[j].def);
+#if defined(SIMU) || defined(DEBUG)
+        const char *filename;
+#endif
+        ScriptInputsOutputs * sio = NULL;
+        if (sid.reference >= SCRIPT_MIX_FIRST && sid.reference <= SCRIPT_MIX_LAST) {
+          ScriptData & sd = g_model.scriptsData[sid.reference-SCRIPT_MIX_FIRST];
+          sio = &scriptInputsOutputs[sid.reference-SCRIPT_MIX_FIRST];
+#if defined(SIMU) || defined(DEBUG)
+          filename = sd.file;
+#endif
+          lua_rawgeti(L, LUA_REGISTRYINDEX, sid.run);
+          for (int j=0; j<sio->inputsCount; j++) {
+            if (sio->inputs[j].type == 1)
+              luaGetValueAndPush((uint8_t)sd.inputs[j]);
+            else
+              lua_pushinteger(L, sd.inputs[j] + sio->inputs[j].def);
+          }
        }
-        if (lua_pcall(L, sid.inputsCount, sid.outputsCount, 0) == 0) {
-          for (int j=sid.outputsCount-1; j>=0; j--) {
-            if (!lua_isnumber(L, -1)) {
-              sid.state = (instructionsPercent > 100 ? SCRIPT_KILLED : SCRIPT_SYNTAX_ERROR);
-              TRACE("Script %10s disabled", sd.file);
-              break;
+        else if (sid.reference >= SCRIPT_FUNC_FIRST && sid.reference <= SCRIPT_FUNC_LAST) {
+          CustomFnData & fn = g_model.funcSw[sid.reference-SCRIPT_FUNC_FIRST];
+          if (!getSwitch(fn.swtch)) {
+            continue;
+          }
+#if defined(SIMU) || defined(DEBUG)
+          filename = fn.play.name;
+#endif
+          lua_rawgeti(L, LUA_REGISTRYINDEX, sid.run);
+        }
+        else {
+          if (g_menuStack[0]!=menuTelemetryFrsky || sid.reference!=SCRIPT_TELEMETRY_FIRST+s_frsky_view) {
+            continue;
+          }
+#if defined(SIMU) || defined(DEBUG)
+          filename = "[telem]";
+#endif
+          lua_rawgeti(L, LUA_REGISTRYINDEX, sid.run);
+        }
+        if (lua_pcall(L, sio ? sio->inputsCount : 0, sio ? sio->outputsCount : 0, 0) == 0) {
+          if (sio) {
+            for (int j=sio->outputsCount-1; j>=0; j--) {
+              if (!lua_isnumber(L, -1)) {
+                sid.state = (instructionsPercent > 100 ? SCRIPT_KILLED : SCRIPT_SYNTAX_ERROR);
+                TRACE("Script %8s disabled", filename);
+                break;
+              }
+              sio->outputs[j].value = lua_tointeger(L, -1);
+              lua_pop(L, 1);
            }
-            sid.outputs[j].value = lua_tointeger(L, -1);
-            lua_pop(L, 1);
          }
        }
        else {
          if (instructionsPercent > 100) {
-            TRACE("Script %10s killed", sd.file);
+            TRACE("Script %8s killed", filename);
            sid.state = SCRIPT_KILLED;
          }
          else {
-            TRACE("Script %10s error: %s", sd.file, lua_tostring(L, -1));
+            TRACE("Script %8s error: %s", filename, lua_tostring(L, -1));
            sid.state = SCRIPT_SYNTAX_ERROR;
          }
        }
@@ -1392,6 +1508,7 @@ void luaTask(uint8_t evt)
      if (max_idx >= 0) {
        ScriptInternalData & sid = scriptInternalData[max_idx];
        TRACE("Script %d killed", max_idx);
+        // TODO Global Warning
        sid.state = SCRIPT_LEAK;
        luaFree(sid);
      }
@@ -89,7 +89,7 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
    if (!EXPO_VALID(ed)) break; // end of list
    if (ed->chn == cur_chn)
      continue;
-    if (ed->phases & (1<<s_current_mixer_flight_mode))
+    if (ed->flightModes & (1<<mixerCurrentFlightMode))
      continue;
    if (getSwitch(ed->swtch)) {
 #if defined(PCBTARANIS)
@@ -128,18 +128,18 @@ void applyExpos(int16_t *anas, uint8_t mode APPLY_EXPOS_EXTRA_PARAMS)
          if (ed->curveMode == MODE_CURVE)
            v = applyCurve(v, curveParam);
          else
-            v = expo(v, GET_GVAR(curveParam, -100, 100, s_current_mixer_flight_mode));
+            v = expo(v, GET_GVAR(curveParam, -100, 100, mixerCurrentFlightMode));
        }
 #endif

        //========== WEIGHT ===============
-        int16_t weight = GET_GVAR(ed->weight, MIN_EXPO_WEIGHT, 100, s_current_mixer_flight_mode);
+        int16_t weight = GET_GVAR(ed->weight, MIN_EXPO_WEIGHT, 100, mixerCurrentFlightMode);
        weight = calc100to256(weight);
        v = ((int32_t)v * weight) >> 8;

 #if defined(PCBTARANIS)
        //========== OFFSET ===============
-        int16_t offset = GET_GVAR(ed->offset, -100, 100, s_current_mixer_flight_mode);
+        int16_t offset = GET_GVAR(ed->offset, -100, 100, mixerCurrentFlightMode);
        if (offset) v += calc100toRESX(offset);

        //========== TRIMS ================
@@ -267,7 +267,7 @@ getvalue_t getValue(uint8_t i)
  else if (i<MIXSRC_LAST_LUA) {
 #if defined(LUA_MODEL_SCRIPTS)
    div_t qr = div(i-MIXSRC_FIRST_LUA, MAX_SCRIPT_OUTPUTS);
-    return scriptInternalData[qr.quot].outputs[qr.rem].value;
+    return scriptInputsOutputs[qr.quot].outputs[qr.rem].value;
 #else
    return 0;
 #endif
@@ -289,7 +289,7 @@ getvalue_t getValue(uint8_t i)
    return 0;
 #endif

-  else if (i<=MIXSRC_TrimAil) return calc1000toRESX((int16_t)8 * getTrimValue(s_current_mixer_flight_mode, i-MIXSRC_TrimRud));
+  else if (i<=MIXSRC_TrimAil) return calc1000toRESX((int16_t)8 * getTrimValue(mixerCurrentFlightMode, i-MIXSRC_TrimRud));

 #if defined(PCBTARANIS)
  else if (i==MIXSRC_SA) return (switchState(SW_SA0) ? -1024 : (switchState(SW_SA1) ? 0 : 1024));
@@ -314,7 +314,7 @@ getvalue_t getValue(uint8_t i)
  else if (i<=MIXSRC_LAST_CH) return ex_chans[i-MIXSRC_CH1];

 #if defined(GVARS)
-  else if (i<=MIXSRC_LAST_GVAR) return GVAR_VALUE(i-MIXSRC_GVAR1, getGVarFlightPhase(s_current_mixer_flight_mode, i-MIXSRC_GVAR1));
+  else if (i<=MIXSRC_LAST_GVAR) return GVAR_VALUE(i-MIXSRC_GVAR1, getGVarFlightPhase(mixerCurrentFlightMode, i-MIXSRC_GVAR1));
 #endif

  else if (i==MIXSRC_FIRST_TELEM-1+TELEM_TX_VOLTAGE) return g_vbat100mV;
@@ -325,11 +325,10 @@ getvalue_t getValue(uint8_t i)
    return t.tm_hour*60 + t.tm_min;
  }
 #endif
-  else if (i<=MIXSRC_FIRST_TELEM-1+TELEM_TM2) return timersStates[i-MIXSRC_FIRST_TELEM+1-TELEM_TM1].val;
+  else if (i<=MIXSRC_FIRST_TELEM-1+TELEM_TIMER2) return timersStates[i-MIXSRC_FIRST_TELEM+1-TELEM_TIMER1].val;
 #if defined(FRSKY)
 #if defined(CPUARM)
  else if (i==MIXSRC_FIRST_TELEM-1+TELEM_SWR) return frskyData.swr.value;
-  else if (i==MIXSRC_FIRST_TELEM-1+TELEM_RXBATT) return frskyData.analog[TELEM_ANA_RXBATT].value;
 #endif
  else if (i==MIXSRC_FIRST_TELEM-1+TELEM_RSSI_TX) return frskyData.rssi[1].value;
  else if (i==MIXSRC_FIRST_TELEM-1+TELEM_RSSI_RX) return frskyData.rssi[0].value;
@@ -474,7 +473,7 @@ void evalInputs(uint8_t mode)
      }
 #endif

-      if (mode <= e_perout_mode_inactive_phase && isFunctionActive(FUNCTION_TRAINER+ch) && ppmInValid) {
+      if (mode <= e_perout_mode_inactive_flight_mode && isFunctionActive(FUNCTION_TRAINER+ch) && ppmInValid) {
        // trainer mode
        TrainerMix* td = &g_eeGeneral.trainer.mix[ch];
        if (td->mode) {
@@ -529,7 +528,7 @@ void evalInputs(uint8_t mode)
  #define HELI_ANAS_ARRAY anas
 #endif

-uint8_t s_current_mixer_flight_mode;
+uint8_t mixerCurrentFlightMode;
 void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
 {
  evalInputs(mode);
@@ -635,8 +634,8 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
      }

      //========== PHASE && SWITCH =====
-      bool mixCondition = (md->phases != 0 || md->swtch);
-      delayval_t mixEnabled = !(md->phases & (1 << s_current_mixer_flight_mode)) && getSwitch(md->swtch);
+      bool mixCondition = (md->flightModes != 0 || md->swtch);
+      delayval_t mixEnabled = !(md->flightModes & (1 << mixerCurrentFlightMode)) && getSwitch(md->swtch);

      if (mixEnabled && md->srcRaw >= MIXSRC_FIRST_TRAINER && md->srcRaw <= MIXSRC_LAST_TRAINER && !ppmInValid) {
        mixEnabled = 0;
@@ -644,7 +643,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)

      //========== VALUE ===============
      getvalue_t v = 0;
-      if (mode > e_perout_mode_inactive_phase) {
+      if (mode > e_perout_mode_inactive_flight_mode) {
 #if defined(PCBTARANIS)
        if (!mixEnabled) {
          continue;
@@ -689,7 +688,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
      //========== DELAYS ===============
      delayval_t _swOn = swOn[i].now;
      delayval_t _swPrev = swOn[i].prev;
-      bool swTog = (mixEnabled != _swOn);
+      bool swTog = (mixEnabled > _swOn+DELAY_POS_MARGIN || mixEnabled < _swOn-DELAY_POS_MARGIN);
      if (mode==e_perout_mode_normal && swTog) {
        if (!swOn[i].delay) _swPrev = _swOn;
        swOn[i].delay = (mixEnabled > _swOn ? md->delayUp : md->delayDown) * (100/DELAY_STEP);
@@ -703,15 +702,20 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
        else if (mixEnabled)
          continue;
      }
-      else if (!mixEnabled) {
-        if ((md->speedDown || md->speedUp) && md->mltpx!=MLTPX_REP) {
-          if (mixCondition) {
-            v = (md->mltpx == MLTPX_ADD ? 0 : RESX);
-            apply_offset_and_curve = false;
-          }
+      else {
+        if (mode==e_perout_mode_normal) {
+          swOn[i].now = swOn[i].prev = mixEnabled;
        }
-        else if (mixCondition) {
-          continue;
+        if (!mixEnabled) {
+          if ((md->speedDown || md->speedUp) && md->mltpx!=MLTPX_REP) {
+            if (mixCondition) {
+              v = (md->mltpx == MLTPX_ADD ? 0 : RESX);
+              apply_offset_and_curve = false;
+            }
+          }
+          else if (mixCondition) {
+            continue;
+          }
        }
      }

@@ -763,14 +767,14 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
      }

      // saves 12 bytes code if done here and not together with weight; unknown reason
-      int16_t weight = GET_GVAR(MD_WEIGHT(md), GV_RANGELARGE_NEG, GV_RANGELARGE, s_current_mixer_flight_mode);
+      int16_t weight = GET_GVAR(MD_WEIGHT(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
      weight = calc100to256_16Bits(weight);

      //========== SPEED ===============
      // now its on input side, but without weight compensation. More like other remote controls
      // lower weight causes slower movement

-      if (mode <= e_perout_mode_inactive_phase && (md->speedUp || md->speedDown)) { // there are delay values
+      if (mode <= e_perout_mode_inactive_flight_mode && (md->speedUp || md->speedDown)) { // there are delay values
 #define DEL_MULT_SHIFT 8
        // we recale to a mult 256 higher value for calculation
        int32_t tact = act[i];
@@ -823,8 +827,8 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)

      //========== OFFSET / AFTER ===============
      if (apply_offset_and_curve) {
-        int16_t offset = GET_GVAR(MD_OFFSET(md), GV_RANGELARGE_NEG, GV_RANGELARGE, s_current_mixer_flight_mode);
-        if (offset) dv += calc100toRESX_16Bits(offset) << 8;
+        int16_t offset = GET_GVAR(MD_OFFSET(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
+        if (offset) dv += int32_t(calc100toRESX_16Bits(offset)) << 8;
      }

      //========== DIFFERENTIAL =========
@@ -835,7 +839,7 @@ void evalFlightModeMixes(uint8_t mode, uint8_t tick10ms)
 #else
      if (md->curveMode == MODE_DIFFERENTIAL) {
        // @@@2 also recalculate curveParam to a 256 basis which ease the calculation later a lot
-        int16_t curveParam = calc100to256(GET_GVAR(md->curveParam, -100, 100, s_current_mixer_flight_mode));
+        int16_t curveParam = calc100to256(GET_GVAR(md->curveParam, -100, 100, mixerCurrentFlightMode));
        if (curveParam > 0 && dv < 0)
          dv = (dv * (256 - curveParam)) >> 8;
        else if (curveParam < 0 && dv > 0)
@@ -921,7 +925,12 @@ int32_t sum_chans512[NUM_CHNOUT] = {0};


 #define MAX_ACT 0xffff
-uint8_t s_last_phase = 255; // TODO reinit everything here when the model changes, no???
+uint8_t lastFlightMode = 255; // TODO reinit everything here when the model changes, no???
+
+#if defined(CPUARM)
+tmr10ms_t flightModeTransitionTime;
+uint8_t   flightModeTransitionLast = 255;
+#endif

 void evalMixes(uint8_t tick10ms)
 {
@@ -931,46 +940,58 @@ void evalMixes(uint8_t tick10ms)

  static uint16_t fp_act[MAX_FLIGHT_MODES] = {0};
  static uint16_t delta = 0;
-  static ACTIVE_PHASES_TYPE s_fade_flight_phases = 0;
+  static ACTIVE_PHASES_TYPE flightModesFade = 0;

  LS_RECURSIVE_EVALUATION_RESET();
  
-  uint8_t phase = getFlightPhase();
+  uint8_t fm = getFlightMode();

-  if (s_last_phase != phase) {
-    if (s_last_phase != 255) PLAY_PHASE_OFF(s_last_phase);
-    PLAY_PHASE_ON(phase);
+  if (lastFlightMode != fm) {
+#if defined(CPUARM)
+    flightModeTransitionTime = get_tmr10ms();
+#endif

-    if (s_last_phase == 255) {
-      fp_act[phase] = MAX_ACT;
+    if (lastFlightMode == 255) {
+      fp_act[fm] = MAX_ACT;
    }
    else {
-      uint8_t fadeTime = max(g_model.phaseData[s_last_phase].fadeOut, g_model.phaseData[phase].fadeIn);
-      ACTIVE_PHASES_TYPE transitionMask = ((ACTIVE_PHASES_TYPE)1 << s_last_phase) + ((ACTIVE_PHASES_TYPE)1 << phase);
+      uint8_t fadeTime = max(g_model.flightModeData[lastFlightMode].fadeOut, g_model.flightModeData[fm].fadeIn);
+      ACTIVE_PHASES_TYPE transitionMask = ((ACTIVE_PHASES_TYPE)1 << lastFlightMode) + ((ACTIVE_PHASES_TYPE)1 << fm);
      if (fadeTime) {
-        s_fade_flight_phases |= transitionMask;
+        flightModesFade |= transitionMask;
        delta = (MAX_ACT / (100/SLOW_STEP)) / fadeTime;
      }
      else {
-        s_fade_flight_phases &= ~transitionMask;
-        fp_act[s_last_phase] = 0;
-        fp_act[phase] = MAX_ACT;
+        flightModesFade &= ~transitionMask;
+        fp_act[lastFlightMode] = 0;
+        fp_act[fm] = MAX_ACT;
      }
 #if defined(CPUARM)
-      logicalSwitchesCopyState(s_last_phase, phase); // push last logical switches state from old to new phase
+      logicalSwitchesCopyState(lastFlightMode, fm); // push last logical switches state from old to new flight mode
 #endif
    }
-    s_last_phase = phase;
+    lastFlightMode = fm;
  }

+#if defined(CPUARM)
+  if (flightModeTransitionTime && get_tmr10ms() > flightModeTransitionTime+SWITCHES_DELAY()) {
+    flightModeTransitionTime = 0;
+    if (fm != flightModeTransitionLast) {
+      if (flightModeTransitionLast != 255) PLAY_PHASE_OFF(flightModeTransitionLast);
+      PLAY_PHASE_ON(fm);
+      flightModeTransitionLast = fm;
+    }
+  }
+#endif
+
  int32_t weight = 0;
-  if (s_fade_flight_phases) {
+  if (flightModesFade) {
    memclear(sum_chans512, sizeof(sum_chans512));
    for (uint8_t p=0; p<MAX_FLIGHT_MODES; p++) {
      LS_RECURSIVE_EVALUATION_RESET();
-      if (s_fade_flight_phases & ((ACTIVE_PHASES_TYPE)1 << p)) {
-        s_current_mixer_flight_mode = p;
-        evalFlightModeMixes(p==phase ? e_perout_mode_normal : e_perout_mode_inactive_phase, p==phase ? tick10ms : 0);
+      if (flightModesFade & ((ACTIVE_PHASES_TYPE)1 << p)) {
+        mixerCurrentFlightMode = p;
+        evalFlightModeMixes(p==fm ? e_perout_mode_normal : e_perout_mode_inactive_flight_mode, p==fm ? tick10ms : 0);
        for (uint8_t i=0; i<NUM_CHNOUT; i++)
          sum_chans512[i] += (chans[i] >> 4) * fp_act[p];
        weight += fp_act[p];
@@ -978,10 +999,10 @@ void evalMixes(uint8_t tick10ms)
      LS_RECURSIVE_EVALUATION_RESET();
    }
    assert(weight);
-    s_current_mixer_flight_mode = phase;
+    mixerCurrentFlightMode = fm;
  }
  else {
-    s_current_mixer_flight_mode = phase;
+    mixerCurrentFlightMode = fm;
    evalFlightModeMixes(e_perout_mode_normal, tick10ms);
  }

@@ -1002,7 +1023,7 @@ void evalMixes(uint8_t tick10ms)
    // at the end chans[i] = chans[i]/256 =>  -1024..1024
    // interpolate value with min/max so we get smooth motion from center to stop
    // this limits based on v original values and min=-1024, max=1024  RESX=1024
-    int32_t q = (s_fade_flight_phases ? (sum_chans512[i] / weight) << 4 : chans[i]);
+    int32_t q = (flightModesFade ? (sum_chans512[i] / weight) << 4 : chans[i]);

 #if defined(PCBSTD)
    ex_chans[i] = q >> 8;
@@ -1017,17 +1038,17 @@ void evalMixes(uint8_t tick10ms)
    sei();
  }

-  if (tick10ms && s_fade_flight_phases) {
+  if (tick10ms && flightModesFade) {
    uint16_t tick_delta = delta * tick10ms;
    for (uint8_t p=0; p<MAX_FLIGHT_MODES; p++) {
-      ACTIVE_PHASES_TYPE phaseMask = ((ACTIVE_PHASES_TYPE)1 << p);
-      if (s_fade_flight_phases & phaseMask) {
-        if (p == phase) {
+      ACTIVE_PHASES_TYPE flightModeMask = ((ACTIVE_PHASES_TYPE)1 << p);
+      if (flightModesFade & flightModeMask) {
+        if (p == fm) {
          if (MAX_ACT - fp_act[p] > tick_delta)
            fp_act[p] += tick_delta;
          else {
            fp_act[p] = MAX_ACT;
-            s_fade_flight_phases -= phaseMask;
+            flightModesFade -= flightModeMask;
          }
        }
        else {
@@ -1035,12 +1056,12 @@ void evalMixes(uint8_t tick10ms)
            fp_act[p] -= tick_delta;
          else {
            fp_act[p] = 0;
-            s_fade_flight_phases -= phaseMask;
+            flightModesFade -= flightModeMask;
          }
        }
      }
    }
-  } //endif s_fade_fligh_phases
+  }

 #if defined(PCBGRUVIN9X) && defined(DEBUG) && !defined(VOICE)
  PORTH &= ~0x40; // PORTH:6 HIGH->LOW signals end of mixer interrupt
@@ -70,6 +70,14 @@
 #define PACK( __Declaration__ ) __Declaration__ __attribute__((__packed__))
 #endif

+#if defined (CPUARM)
+  #define ARM_FIELD(x) x;
+  #define AVR_FIELD(x)
+#else
+  #define ARM_FIELD(x)
+  #define AVR_FIELD(x) x;
+#endif
+
 #if defined(PCBTARANIS)
  #define MAX_MODELS          60
  #define NUM_CHNOUT          32 // number of real output channels CH1-CH32
@@ -197,7 +205,7 @@ typedef int16_t gvar_t;
  #endif
  #define MODEL_GVARS_DATA global_gvar_t gvars[MAX_GVARS];
  #define PHASE_GVARS_DATA gvar_t gvars[MAX_GVARS]
-  #define GVAR_VALUE(x, p) g_model.phaseData[p].gvars[x]
+  #define GVAR_VALUE(x, p) g_model.flightModeData[p].gvars[x]
 #endif

 PACK(typedef struct t_TrainerMix {
@@ -318,7 +326,7 @@ PACK(typedef struct t_ScriptData {
    TRAINER_MODULE
  };
  #define MODELDATA_BITMAP  char bitmap[LEN_BITMAP_NAME];
-  #define MODELDATA_EXTRA   uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][4]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS]; uint8_t rxBattAlarms[2];
+  #define MODELDATA_EXTRA   uint8_t externalModule; uint8_t trainerMode; ModuleData moduleData[NUM_MODULES+1]; char curveNames[MAX_CURVES][6]; ScriptData scriptsData[MAX_SCRIPTS]; char inputNames[MAX_INPUTS][4]; uint8_t nPotsToWarn; int8_t potPosition[NUM_POTS]; uint8_t spare[2];
  #define LIMITDATA_EXTRA   char name[LEN_CHANNEL_NAME]; int8_t curve;
  #define swstate_t         uint16_t
 #elif defined(PCBSKY9X)
@@ -407,8 +415,9 @@ PACK(typedef struct t_EEGeneral {
  uint8_t   mavbaud:3;
  SPLASH_MODE; /* 3bits */
  int8_t    hapticMode:2;    // -2=quiet, -1=only alarms, 0=no keys, 1=all
-  uint8_t   blOffBright:4;
-  uint8_t   blOnBright:4;
+  AVR_FIELD(uint8_t blOffBright:4)
+  AVR_FIELD(uint8_t blOnBright:4)
+  ARM_FIELD(int8_t switchesDelay)
  uint8_t   lightAutoOff;
  uint8_t   templateSetup;   // RETA order for receiver channels
  int8_t    PPM_Multiplier;
@@ -430,6 +439,8 @@ PACK(typedef struct t_EEGeneral {

 }) EEGeneral;

+#define SWITCHES_DELAY()     uint8_t(15+g_eeGeneral.switchesDelay)
+#define SWITCHES_DELAY_NONE  (-15)
 #define HAPTIC_STRENGTH()    (3+g_eeGeneral.hapticStrength)

 #if defined(PCBTARANIS)
@@ -470,7 +481,7 @@ PACK(typedef struct {
  uint16_t scale;
  uint8_t  chn;
  int8_t   swtch;
-  uint16_t phases;
+  uint16_t flightModes;
  int8_t   weight;
  int8_t   carryTrim:6;
  uint8_t  mode:2;
@@ -488,7 +499,7 @@ PACK(typedef struct {
  uint8_t  chn:4;
  uint8_t  curveMode:2;
  int8_t   swtch;
-  uint16_t phases;
+  uint16_t flightModes;
  int8_t   weight;
  char     name[LEN_EXPOMIX_NAME];
  int8_t   curveParam;
@@ -502,7 +513,7 @@ PACK(typedef struct t_ExpoData {
  uint8_t chn:2;
  uint8_t curveMode:1;
  uint8_t spare:3;
-  uint8_t phases;
+  uint8_t flightModes;
  int8_t  swtch;
  uint8_t weight;
  int8_t  curveParam;
@@ -515,7 +526,7 @@ PACK(typedef struct t_ExpoData {
  uint8_t mode:2;         // 0=end, 1=pos, 2=neg, 3=both
  int8_t  swtch:6;
  uint8_t chn:2;
-  uint8_t phases:5;
+  uint8_t flightModes:5;
  uint8_t curveMode:1;
  uint8_t weight;         // One spare bit here (used for GVARS)
  int8_t  curveParam;
@@ -529,9 +540,9 @@ PACK(typedef struct t_ExpoData {
  #define limit_min_max_t     int16_t
  #define LIMIT_EXT_PERCENT   150
  #define LIMIT_EXT_MAX       (LIMIT_EXT_PERCENT*10)
-  #define LIMIT_MAX(lim)      (GV_IS_GV_VALUE(lim->max, -LIMIT_EXT_MAX, LIMIT_EXT_MAX) ? GET_GVAR(lim->max, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, s_current_mixer_flight_mode)*10 : lim->max+1000)
-  #define LIMIT_MIN(lim)      (GV_IS_GV_VALUE(lim->min, -LIMIT_EXT_MAX, LIMIT_EXT_MAX) ? GET_GVAR(lim->min, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, s_current_mixer_flight_mode)*10 : lim->min-1000)
-  #define LIMIT_OFS(lim)      (GV_IS_GV_VALUE(lim->offset, -1000, 1000) ? GET_GVAR(lim->offset, -1000, 1000, s_current_mixer_flight_mode)*10 : lim->offset)
+  #define LIMIT_MAX(lim)      (GV_IS_GV_VALUE(lim->max, -LIMIT_EXT_MAX, LIMIT_EXT_MAX) ? GET_GVAR(lim->max, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, mixerCurrentFlightMode)*10 : lim->max+1000)
+  #define LIMIT_MIN(lim)      (GV_IS_GV_VALUE(lim->min, -LIMIT_EXT_MAX, LIMIT_EXT_MAX) ? GET_GVAR(lim->min, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, mixerCurrentFlightMode)*10 : lim->min-1000)
+  #define LIMIT_OFS(lim)      (GV_IS_GV_VALUE(lim->offset, -1000, 1000) ? GET_GVAR(lim->offset, -1000, 1000, mixerCurrentFlightMode)*10 : lim->offset)
  #define LIMIT_MAX_RESX(lim) calc1000toRESX(LIMIT_MAX(lim))
  #define LIMIT_MIN_RESX(lim) calc1000toRESX(LIMIT_MIN(lim))
  #define LIMIT_OFS_RESX(lim) calc1000toRESX(LIMIT_OFS(lim))
@@ -582,7 +593,7 @@ PACK(typedef struct t_LimitData {
 #if defined(PCBTARANIS)
 PACK(typedef struct {
  uint8_t  destCh;
-  uint16_t phases;
+  uint16_t flightModes;
  uint8_t  mltpx:2;         // multiplex method: 0 means +=, 1 means *=, 2 means :=
  uint8_t  carryTrim:1;
  uint8_t  spare1:5;
@@ -604,7 +615,7 @@ PACK(typedef struct {
 PACK(typedef struct {
  uint8_t  destCh:4;
  uint8_t  mixWarn:4;         // mixer warning
-  uint16_t phases;
+  uint16_t flightModes;
  uint8_t  curveMode:1;
  uint8_t  noExpo:1;
  int8_t   carryTrim:3;
@@ -662,7 +673,7 @@ PACK(typedef struct t_MixData {
  uint8_t srcRaw;
  int8_t  weight;
  int8_t  swtch;
-  uint8_t phases;
+  uint8_t flightModes;
  uint8_t mltpx:2;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
  int8_t  carryTrim:3;
  uint8_t mixWarn:2;         // mixer warning
@@ -684,7 +695,7 @@ PACK(typedef struct t_MixData {
  int8_t  weight;
  int8_t  swtch:6;
  uint8_t mltpx:2;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
-  uint8_t phases:5;
+  uint8_t flightModes:5;
  int8_t  carryTrim:3;
  uint8_t srcRaw:6;
  uint8_t mixWarn:2;         // mixer warning
@@ -813,7 +824,7 @@ enum Functions {
  FUNC_PLAY_VALUE,
 #if defined(CPUARM)
  FUNC_PLAY_DIFF,
-  FUNC_RESERVE4,
+  FUNC_PLAY_SCRIPT,
  FUNC_RESERVE5,
  FUNC_BACKGND_MUSIC,
  FUNC_BACKGND_MUSIC_PAUSE,
@@ -830,33 +841,35 @@ enum Functions {
  FUNC_MAX
 };

-#define HAS_ENABLE_PARAM(func) (func < FUNC_FIRST_WITHOUT_ENABLE)
+#define HAS_ENABLE_PARAM(func)    ((func) < FUNC_FIRST_WITHOUT_ENABLE)
+
+#if defined(VOICE)
+  #define IS_PLAY_FUNC(func)      ((func) >= FUNC_PLAY_SOUND && func <= FUNC_PLAY_VALUE)
+#else
+  #define IS_PLAY_FUNC(func)      ((func) == FUNC_PLAY_SOUND)
+#endif

 #if defined(CPUARM)
  #define IS_PLAY_BOTH_FUNC(func) (0)
-  #define IS_VOLUME_FUNC(func)    (func == FUNC_VOLUME)
+  #define IS_VOLUME_FUNC(func)    ((func) == FUNC_VOLUME)
 #else
-  #define IS_PLAY_BOTH_FUNC(func) (func == FUNC_PLAY_BOTH)
+  #define IS_PLAY_BOTH_FUNC(func) ((func) == FUNC_PLAY_BOTH)
  #define IS_VOLUME_FUNC(func)    (0)
 #endif

 #if defined(GVARS)
-  #define IS_ADJUST_GV_FUNC(func) (func == FUNC_ADJUST_GVAR)
+  #define IS_ADJUST_GV_FUNC(func) ((func) == FUNC_ADJUST_GVAR)
 #else
  #define IS_ADJUST_GV_FUNC(func) (0)
 #endif

 #if defined(HAPTIC)
-  #define IS_HAPTIC_FUNC(func)    (func == FUNC_HAPTIC)
+  #define IS_HAPTIC_FUNC(func)    ((func) == FUNC_HAPTIC)
 #else
  #define IS_HAPTIC_FUNC(func)    (0)
 #endif

-#if defined(VOICE)
-  #define HAS_REPEAT_PARAM(func) (func == FUNC_PLAY_SOUND || (func >= FUNC_PLAY_TRACK && func <= FUNC_PLAY_VALUE) || IS_HAPTIC_FUNC(func))
-#else
-  #define HAS_REPEAT_PARAM(func) (func == FUNC_PLAY_SOUND || IS_HAPTIC_FUNC(func))
-#endif
+#define HAS_REPEAT_PARAM(func)    (IS_PLAY_FUNC(func) || IS_HAPTIC_FUNC(func))

 enum ResetFunctionParam {
  FUNC_RESET_TIMER1,
@@ -885,8 +898,10 @@ enum AdjustGvarFunctionParam {
 #if defined(CPUARM)
 #if defined(PCBTARANIS)
  #define LEN_CFN_NAME 8
+  #define CFN_SPARE_TYPE int32_t
 #else
  #define LEN_CFN_NAME 6
+  #define CFN_SPARE_TYPE int16_t
 #endif
 PACK(typedef struct t_CustomFnData { // Function Switches data
  int8_t  swtch;
@@ -900,12 +915,12 @@ PACK(typedef struct t_CustomFnData { // Function Switches data
      int16_t val;
      uint8_t mode;
      uint8_t param;
-      int16_t spare2;
+      CFN_SPARE_TYPE spare2;
    }) all;

    PACK(struct {
      int32_t val1;
-      int16_t val2;
+      CFN_SPARE_TYPE val2;
    }) clear;
  });
  uint8_t active;
@@ -1017,15 +1032,15 @@ enum TelemetrySource {
  TELEM_RESERVE4,
  TELEM_RESERVE5,
 #endif
-  TELEM_TM1,
-  TELEM_TM2,
+  TELEM_TIMER1,
+  TELEM_TIMER2,
 #if defined(CPUARM)
  TELEM_SWR,
 #endif
  TELEM_RSSI_TX,
  TELEM_RSSI_RX,
 #if defined(CPUARM)
-  TELEM_RXBATT,
+  TELEM_RESERVE0,
 #endif
  TELEM_A_FIRST,
  TELEM_A1=TELEM_A_FIRST,
@@ -1102,7 +1117,7 @@ enum TelemetrySource {
 #if defined(FRSKY)
  TELEM_DISPLAY_MAX = TELEM_MAX_POWER,
 #else
-  TELEM_DISPLAY_MAX = TELEM_TM2, // because used also in PlayValue
+  TELEM_DISPLAY_MAX = TELEM_TIMER2, // because used also in PlayValue
 #endif
  TELEM_STATUS_MAX = TELEM_GPS_TIME,
  TELEM_FIRST_STREAMED_VALUE = TELEM_RSSI_TX,
@@ -1132,7 +1147,7 @@ enum VarioSource {
 #elif defined(MAVLINK)
  #define NUM_TELEMETRY      4
 #else
-  #define NUM_TELEMETRY      TELEM_TM2
+  #define NUM_TELEMETRY      TELEM_TIMER2
 #endif

 PACK(typedef struct t_FrSkyBarData {
@@ -1175,9 +1190,6 @@ enum FrskyCurrentSource {
 };

 enum FrskyVoltsSource {
-#if defined(CPUARM)
-  FRSKY_VOLTS_SOURCE_RXBATT,
-#endif
  FRSKY_VOLTS_SOURCE_A1,
  FRSKY_VOLTS_SOURCE_A2,
 #if defined(CPUARM)
@@ -1303,7 +1315,7 @@ PACK(typedef struct t_SwashRingData { // Swash Ring data
 #endif

 #if defined(CPUARM)
-PACK(typedef struct t_PhaseData {
+PACK(typedef struct t_FlightModeData {
  TRIMS_ARRAY;
  int8_t swtch;       // swtch of phase[0] is not used
  char name[LEN_FP_NAME];
@@ -1311,9 +1323,9 @@ PACK(typedef struct t_PhaseData {
  uint8_t fadeOut;
  ROTARY_ENCODER_ARRAY;
  PHASE_GVARS_DATA;
-}) PhaseData;
+}) FlightModeData;
 #else
-PACK(typedef struct t_PhaseData {
+PACK(typedef struct t_FlightModeData {
  TRIMS_ARRAY;
  int8_t swtch;       // swtch of phase[0] is not used
  char name[LEN_FP_NAME];
@@ -1321,7 +1333,7 @@ PACK(typedef struct t_PhaseData {
  uint8_t fadeOut:4;
  ROTARY_ENCODER_ARRAY;
  PHASE_GVARS_DATA;
-}) PhaseData;
+}) FlightModeData;
 #endif

 enum SwitchSources {
@@ -1669,14 +1681,6 @@ PACK(typedef struct {
  MODELDATA_BITMAP
 }) ModelHeader;

-#if defined (CPUARM)
-  #define ARM_FIELD(x) x;
-  #define AVR_FIELD(x)
-#else
-  #define ARM_FIELD(x)
-  #define AVR_FIELD(x) x;
-#endif
-
 enum ThrottleSources {
  THROTTLE_SOURCE_THR,
 #if defined(PCBTARANIS)
@@ -1702,8 +1706,8 @@ enum TelemetryProtocol
 PACK(typedef struct t_ModelData {
  ModelHeader header;
  TimerData timers[MAX_TIMERS];
-  AVR_FIELD(uint8_t   protocol:3);
-  ARM_FIELD(uint8_t   telemetryProtocol:3);
+  AVR_FIELD(uint8_t   protocol:3)
+  ARM_FIELD(uint8_t   telemetryProtocol:3)
  uint8_t   thrTrim:1;            // Enable Throttle Trim
  AVR_FIELD(int8_t    ppmNCH:4)
  ARM_FIELD(int8_t    spare2:4)
@@ -1726,7 +1730,7 @@ PACK(typedef struct t_ModelData {
  LogicalSwitchData logicalSw[NUM_LOGICAL_SWITCH];
  CustomFnData funcSw[NUM_CFN];
  SwashRingData swashR;
-  PhaseData phaseData[MAX_FLIGHT_MODES];
+  FlightModeData flightModeData[MAX_FLIGHT_MODES];

  AVR_FIELD(int8_t ppmFrameLength)     // 0=22.5ms  (10ms-30ms) 0.5ms increments
  uint8_t   thrTraceSrc;
@@ -261,9 +261,9 @@ void per10ms()
  heartbeat |= HEART_TIMER_10MS;
 }

-PhaseData *phaseAddress(uint8_t idx)
+FlightModeData *flightModeAddress(uint8_t idx)
 {
-  return &g_model.phaseData[idx];
+  return &g_model.flightModeData[idx];
 }

 ExpoData *expoAddress(uint8_t idx )
@@ -426,8 +426,8 @@ void modelDefault(uint8_t id)
  applyDefaultTemplate();

 #if defined(LUA)
-  if (isFileAvailable(TEMPLATES_PATH "/" WIZARD_NAME)) {
-    f_chdir(TEMPLATES_PATH);
+  if (isFileAvailable(WIZARD_PATH "/" WIZARD_NAME)) {
+    f_chdir(WIZARD_PATH);
    luaExec(WIZARD_NAME);
  }
 #endif
@@ -439,8 +439,6 @@ void modelDefault(uint8_t id)

 #if defined(PCBTARANIS)
  g_model.frsky.channels[0].ratio = 132;
-  g_model.rxBattAlarms[0] = 0;
-  g_model.rxBattAlarms[1] = 83; // 4.3V
 #endif

 #if defined(MAVLINK)
@@ -494,10 +492,10 @@ int8_t getMovedSource(GET_MOVED_SOURCE_PARAMS)
 #endif

 #if defined(FLIGHT_MODES)
-uint8_t getFlightPhase()
+uint8_t getFlightMode()
 {
  for (uint8_t i=1; i<MAX_FLIGHT_MODES; i++) {
-    PhaseData *phase = &g_model.phaseData[i];
+    FlightModeData *phase = &g_model.flightModeData[i];
    if (phase->swtch && getSwitch(phase->swtch)) {
      return i;
    }
@@ -508,7 +506,7 @@ uint8_t getFlightPhase()

 trim_t getRawTrimValue(uint8_t phase, uint8_t idx)
 {
-  PhaseData *p = phaseAddress(phase);
+  FlightModeData *p = flightModeAddress(phase);
 #if defined(PCBSTD)
  return (((trim_t)p->trim[idx]) << 2) + ((p->trim_ext >> (2*idx)) & 0x03);
 #else
@@ -548,7 +546,7 @@ void setTrimValue(uint8_t phase, uint8_t idx, int trim)
 {
 #if defined(PCBTARANIS)
  for (uint8_t i=0; i<MAX_FLIGHT_MODES; i++) {
-    trim_t & v = phaseAddress(phase)->trim[idx];
+    trim_t & v = flightModeAddress(phase)->trim[idx];
    if (v.mode == TRIM_MODE_NONE)
      return;
    unsigned int p = v.mode >> 1;
@@ -565,12 +563,12 @@ void setTrimValue(uint8_t phase, uint8_t idx, int trim)
    }
  }
 #elif defined(PCBSTD)
-  PhaseData *p = phaseAddress(phase);
+  FlightModeData *p = flightModeAddress(phase);
  p->trim[idx] = (int8_t)(trim >> 2);
  idx <<= 1;
  p->trim_ext = (p->trim_ext & ~(0x03 << idx)) + (((trim & 0x03) << idx));
 #else
-  PhaseData *p = phaseAddress(phase);
+  FlightModeData *p = flightModeAddress(phase);
  p->trim[idx] = trim;
 #endif
  eeDirty(EE_MODEL);
@@ -594,10 +592,10 @@ uint8_t getTrimFlightPhase(uint8_t phase, uint8_t idx)
 #if defined(ROTARY_ENCODERS)
 uint8_t getRotaryEncoderFlightPhase(uint8_t idx)
 {
-  uint8_t phase = s_current_mixer_flight_mode;
+  uint8_t phase = mixerCurrentFlightMode;
  for (uint8_t i=0; i<MAX_FLIGHT_MODES; i++) {
    if (phase == 0) return 0;
-    int16_t value = phaseAddress(phase)->rotaryEncoders[idx];
+    int16_t value = flightModeAddress(phase)->rotaryEncoders[idx];
    if (value <= ROTARY_ENCODER_MAX) return phase;
    uint8_t result = value-ROTARY_ENCODER_MAX-1;
    if (result >= phase) result++;
@@ -608,13 +606,13 @@ uint8_t getRotaryEncoderFlightPhase(uint8_t idx)

 int16_t getRotaryEncoder(uint8_t idx)
 {
-  return phaseAddress(getRotaryEncoderFlightPhase(idx))->rotaryEncoders[idx];
+  return flightModeAddress(getRotaryEncoderFlightPhase(idx))->rotaryEncoders[idx];
 }

 void incRotaryEncoder(uint8_t idx, int8_t inc)
 {
  g_rotenc[idx] += inc;
-  int16_t *value = &(phaseAddress(getRotaryEncoderFlightPhase(idx))->rotaryEncoders[idx]);
+  int16_t *value = &(flightModeAddress(getRotaryEncoderFlightPhase(idx))->rotaryEncoders[idx]);
  *value = limit((int16_t)-1024, (int16_t)(*value + (inc * 8)), (int16_t)+1024);
  eeDirty(EE_MODEL);
 }
@@ -733,6 +731,9 @@ ls_telemetry_value_t maxTelemValue(uint8_t channel)
 #if defined(CPUARM)
    case TELEM_TX_TIME:
      return 24*60-1;
+    case TELEM_TIMER1:
+    case TELEM_TIMER2:
+      return 60*60;
 #endif
    case TELEM_FUEL:
 #if defined(CPUARM)
@@ -785,8 +786,8 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value)
 {
  getvalue_t result;
  switch (channel) {
-    case TELEM_TM1:
-    case TELEM_TM2:
+    case TELEM_TIMER1:
+    case TELEM_TIMER2:
      result = value * 5;
      break;
 #if defined(FRSKY)
@@ -1082,7 +1083,9 @@ void checkTHR()
  else {
    calibratedStick[thrchn] = -1024;
 #if !defined(PCBTARANIS)
-    rawAnas[thrchn] = anas[thrchn] = calibratedStick[thrchn];
+    if (thrchn < NUM_STICKS) {
+      rawAnas[thrchn] = anas[thrchn] = calibratedStick[thrchn];
+    }
 #endif
    MESSAGE(STR_THROTTLEWARN, STR_THROTTLENOTIDLE, STR_PRESSANYKEYTOSKIP, AU_THROTTLE_ALERT);
  }
@@ -1219,13 +1222,13 @@ uint8_t checkTrim(uint8_t event)
 #if defined(PCBSTD)
      phase = 0;
 #else
-      phase = getGVarFlightPhase(s_current_mixer_flight_mode, trimGvar[idx]);
+      phase = getGVarFlightPhase(mixerCurrentFlightMode, trimGvar[idx]);
 #endif
      before = GVAR_VALUE(trimGvar[idx], phase);
      thro = false;
    }
    else {
-      phase = getTrimFlightPhase(s_current_mixer_flight_mode, idx);
+      phase = getTrimFlightPhase(mixerCurrentFlightMode, idx);
 #if defined(PCBTARANIS)
      before = getTrimValue(phase, idx);
 #else
@@ -1234,7 +1237,7 @@ uint8_t checkTrim(uint8_t event)
      thro = (idx==THR_STICK && g_model.thrTrim);
    }
 #else
-    phase = getTrimFlightPhase(s_current_mixer_flight_mode, idx);
+    phase = getTrimFlightPhase(mixerCurrentFlightMode, idx);
 #if defined(PCBTARANIS)
    before = getTrimValue(phase, idx);
 #else
@@ -1594,7 +1597,7 @@ uint16_t s_sum_samples_thr_10s;

 FORCEINLINE void evalTrims()
 {
-  uint8_t phase = s_current_mixer_flight_mode;
+  uint8_t phase = mixerCurrentFlightMode;
  for (uint8_t i=0; i<NUM_STICKS; i++) {
    // do trim -> throttle trim if applicable
    int16_t trim = getTrimValue(phase, i);
@@ -1646,19 +1649,14 @@ PLAY_FUNCTION(playValue, uint8_t idx)
    case MIXSRC_FIRST_TELEM+TELEM_TX_VOLTAGE-1:
      PLAY_NUMBER(val, 1+UNIT_VOLTS, PREC1);
      break;
-    case MIXSRC_FIRST_TELEM+TELEM_TM1-1:
-    case MIXSRC_FIRST_TELEM+TELEM_TM2-1:
+    case MIXSRC_FIRST_TELEM+TELEM_TIMER1-1:
+    case MIXSRC_FIRST_TELEM+TELEM_TIMER2-1:
      PLAY_DURATION(val, 0);
      break;
-#if defined(CPUARM)
+#if defined(CPUARM) && defined(FRSKY)
    case MIXSRC_FIRST_TELEM+TELEM_SWR-1:
      PLAY_NUMBER(val, 0, 0);
      break;
-    case MIXSRC_FIRST_TELEM+TELEM_RXBATT-1:
-      if (TELEMETRY_STREAMING()) {
-        PLAY_NUMBER((val*132+127)/255, 1+UNIT_VOLTS, PREC1);
-      }
-      break;
 #endif
 #if defined(FRSKY)
    case MIXSRC_FIRST_TELEM+TELEM_RSSI_TX-1:
@@ -1833,9 +1831,14 @@ void evalFunctions()
    CustomFnData *sd = &g_model.funcSw[i];
    int8_t swtch = CFN_SWITCH(sd);
    if (swtch) {
-      MASK_CFN_TYPE  switch_mask   = ((MASK_CFN_TYPE)1 << i);
+      MASK_CFN_TYPE  switch_mask = ((MASK_CFN_TYPE)1 << i);

+#if defined(CPUARM)
+      bool active = getSwitch(swtch, IS_PLAY_FUNC(CFN_FUNC(sd)) ? GETSWITCH_MIDPOS_DELAY : 0);
+#else
      bool active = getSwitch(swtch);
+#endif
+

      if (HAS_ENABLE_PARAM(CFN_FUNC(sd))) {
        active &= (bool)CFN_ACTIVE(sd);
@@ -1915,14 +1918,14 @@ void evalFunctions()
 #if defined(GVARS)
          case FUNC_ADJUST_GVAR:
            if (CFN_GVAR_MODE(sd) == 0) {
-              SET_GVAR(CFN_GVAR_INDEX(sd), CFN_PARAM(sd), s_current_mixer_flight_mode);
+              SET_GVAR(CFN_GVAR_INDEX(sd), CFN_PARAM(sd), mixerCurrentFlightMode);
            }
            else if (CFN_GVAR_MODE(sd) == 2) {
-              SET_GVAR(CFN_GVAR_INDEX(sd), GVAR_VALUE(CFN_PARAM(sd), s_current_mixer_flight_mode), s_current_mixer_flight_mode);
+              SET_GVAR(CFN_GVAR_INDEX(sd), GVAR_VALUE(CFN_PARAM(sd), mixerCurrentFlightMode), mixerCurrentFlightMode);
            }
            else if (CFN_GVAR_MODE(sd) == 3) {
              if (!(activeFnSwitches & switch_mask)) {
-                SET_GVAR(CFN_GVAR_INDEX(sd), GVAR_VALUE(CFN_GVAR_INDEX(sd), getGVarFlightPhase(s_current_mixer_flight_mode, CFN_GVAR_INDEX(sd))) + (CFN_PARAM(sd) ? +1 : -1), s_current_mixer_flight_mode);
+                SET_GVAR(CFN_GVAR_INDEX(sd), GVAR_VALUE(CFN_GVAR_INDEX(sd), getGVarFlightPhase(mixerCurrentFlightMode, CFN_GVAR_INDEX(sd))) + (CFN_PARAM(sd) ? +1 : -1), mixerCurrentFlightMode);
              }
            }
            else if (CFN_PARAM(sd) >= MIXSRC_TrimRud && CFN_PARAM(sd) <= MIXSRC_TrimAil) {
@@ -1932,12 +1935,12 @@ void evalFunctions()
            else if (CFN_PARAM(sd) >= MIXSRC_REa && CFN_PARAM(sd) < MIXSRC_TrimRud) {
              int8_t scroll = rePreviousValues[CFN_PARAM(sd)-MIXSRC_REa] - (g_rotenc[CFN_PARAM(sd)-MIXSRC_REa] / ROTARY_ENCODER_GRANULARITY);
              if (scroll) {
-                SET_GVAR(CFN_GVAR_INDEX(sd), GVAR_VALUE(CFN_GVAR_INDEX(sd), getGVarFlightPhase(s_current_mixer_flight_mode, CFN_GVAR_INDEX(sd))) + scroll, s_current_mixer_flight_mode);
+                SET_GVAR(CFN_GVAR_INDEX(sd), GVAR_VALUE(CFN_GVAR_INDEX(sd), getGVarFlightPhase(mixerCurrentFlightMode, CFN_GVAR_INDEX(sd))) + scroll, mixerCurrentFlightMode);
              }
            }
 #endif
            else {
-              SET_GVAR(CFN_GVAR_INDEX(sd), calcRESXto100(getValue(CFN_PARAM(sd))), s_current_mixer_flight_mode);
+              SET_GVAR(CFN_GVAR_INDEX(sd), calcRESXto100(getValue(CFN_PARAM(sd))), mixerCurrentFlightMode);
            }
            break;
 #endif
@@ -2020,11 +2023,15 @@ void evalFunctions()
              else {
 #if defined(GVARS)
                if (CFN_FUNC(sd) == FUNC_PLAY_TRACK && param > 250)
-                  param = GVAR_VALUE(param-251, getGVarFlightPhase(s_current_mixer_flight_mode, param-251));
+                  param = GVAR_VALUE(param-251, getGVarFlightPhase(mixerCurrentFlightMode, param-251));
 #endif
                PUSH_CUSTOM_PROMPT(active ? param : param+1, i+1);
              }
            }
+            if (!active) {
+              // PLAY_BOTH would change activeFnSwitches otherwise
+              switch_mask = 0;
+            }
            break;
          }
 #else
@@ -2054,8 +2061,10 @@ void evalFunctions()

 #if defined(SDCARD)
          case FUNC_LOGS:
-            newActiveFunctions |= (1 << FUNCTION_LOGS);
-            logDelay = CFN_PARAM(sd);
+            if (CFN_PARAM(sd)) {
+              newActiveFunctions |= (1 << FUNCTION_LOGS);
+              logDelay = CFN_PARAM(sd);
+            }
            break;
 #endif

@@ -2152,11 +2161,11 @@ void doMixerCalculations()
        val = val - gModelMin;

 #if defined(PPM_LIMITS_SYMETRICAL)
-      if (lim->symetrical)
+      if (lim->symetrical) {
        val -= calc1000toRESX(lim->offset);
+      }
 #endif

-
      gModelMax -= gModelMin; // we compare difference between Max and Mix for recaling needed; Max and Min are shifted to 0 by default
      // usually max is 1024 min is -1024 --> max-min = 2048 full range

@@ -2178,7 +2187,7 @@ void doMixerCalculations()
 #ifdef PCBTARANIS
      val = RESX + calibratedStick[g_model.thrTraceSrc == 0 ? THR_STICK : g_model.thrTraceSrc+NUM_STICKS-1];
 #else
-      val = RESX + rawAnas[g_model.thrTraceSrc == 0 ? THR_STICK : g_model.thrTraceSrc+NUM_STICKS-1];
+      val = RESX + (g_model.thrTraceSrc == 0 ? rawAnas[THR_STICK] : calibratedStick[g_model.thrTraceSrc+NUM_STICKS-1]);
 #endif
    }

@@ -2201,8 +2210,6 @@ void doMixerCalculations()
          timerState->sum = 0;
        }

-        // value for time described in timer->mode
-        // OFFABSTHsTH%THt
        if (tm == TMRMODE_THR_REL) {
          timerState->cnt++;
          timerState->sum+=val;
@@ -2223,21 +2230,22 @@ void doMixerCalculations()
            // @@@ open.20.fsguruh: why so complicated? we have already a s_sum field; use it for the half seconds (not showable) as well
            // check for s_cnt[i]==0 is not needed because we are shure it is at least 1
 #if defined(ACCURAT_THROTTLE_TIMER)
-            if ((timerState->sum/timerState->cnt)>=128) {  // throttle was normalized to 0 to 128 value (throttle/64*2 (because - range is added as well)
+            if ((timerState->sum/timerState->cnt) >= 128) {  // throttle was normalized to 0 to 128 value (throttle/64*2 (because - range is added as well)
              newTimerVal++;  // add second used of throttle
-              timerState->sum-=128*timerState->cnt;
+              timerState->sum -= 128*timerState->cnt;
            }
 #else
-            if ((timerState->sum/timerState->cnt)>=32) {  // throttle was normalized to 0 to 32 value (throttle/16*2 (because - range is added as well)
+            if ((timerState->sum/timerState->cnt) >= 32) {  // throttle was normalized to 0 to 32 value (throttle/16*2 (because - range is added as well)
              newTimerVal++;  // add second used of throttle
-              timerState->sum-=32*timerState->cnt;
+              timerState->sum -= 32*timerState->cnt;
            }
 #endif
            timerState->cnt=0;
          }
          else if (tm == TMRMODE_THR_TRG) {
-            if (val || newTimerVal > 0)
+            if (val || newTimerVal > 0) {
              newTimerVal++;
+            }
          }
          else {
            if (tm > 0) tm -= (TMR_VAROFS-1);
@@ -3003,6 +3011,12 @@ ISR(USART0_UDRE_vect)
 #endif
 #endif

+#if defined(PCBTARANIS)
+  #define INSTANT_TRIM_MARGIN 10 /* around 1% */
+#else
+  #define INSTANT_TRIM_MARGIN 15 /* around 1.5% */
+#endif
+
 void instantTrim()
 {
  evalInputs(e_perout_mode_notrainer);
@@ -3010,13 +3024,16 @@ void instantTrim()
  for (uint8_t i=0; i<NUM_STICKS; i++) {
    if (i!=THR_STICK) {
      // don't instant trim the throttle stick
-      uint8_t trim_phase = getTrimFlightPhase(s_current_mixer_flight_mode, i);
+      uint8_t trim_phase = getTrimFlightPhase(mixerCurrentFlightMode, i);
 #if defined(PCBTARANIS)
-      int16_t trim = limit<int16_t>(TRIM_EXTENDED_MIN, (calibratedStick[i] + trims[i]) / 2, TRIM_EXTENDED_MAX);
+      int16_t delta = calibratedStick[i];
 #else
-      int16_t trim = limit<int16_t>(TRIM_EXTENDED_MIN, (anas[i] + trims[i]) / 2, TRIM_EXTENDED_MAX);
+      int16_t delta = anas[i];
 #endif
-      setTrimValue(trim_phase, i, trim);
+      if (abs(delta) >= INSTANT_TRIM_MARGIN) {
+        int16_t trim = limit<int16_t>(TRIM_EXTENDED_MIN, (delta + trims[i]) / 2, TRIM_EXTENDED_MAX);
+        setTrimValue(trim_phase, i, trim);
+      }
    }
  }

@@ -3074,7 +3091,7 @@ void moveTrimsToOffsets() // copy state of 3 primary to subtrim
  // reset all trims, except throttle (if throttle trim)
  for (uint8_t i=0; i<NUM_STICKS; i++) {
    if (i!=THR_STICK || !g_model.thrTrim) {
-      int16_t original_trim = getTrimValue(s_current_mixer_flight_mode, i);
+      int16_t original_trim = getTrimValue(mixerCurrentFlightMode, i);
      for (uint8_t phase=0; phase<MAX_FLIGHT_MODES; phase++) {
 #if defined(PCBTARANIS)
        trim_t trim = getRawTrimValue(phase, i);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
bsongis	19ef43cd7f	Compilation error on VC++	2014-06-17 17:38:29 +02:00
bsongis	1861c5e264	Release notes updated	2014-06-17 17:13:32 +02:00
Kjell Kernen	e040ab9897	Fixes #1300	2014-06-17 17:05:47 +02:00
bsongis	f2b59df0f6	OpenTX 2.0.3 preparation	2014-06-17 16:54:05 +02:00
bsongis	824059d033	PPM Pulses code modification pulled from ersky9x	2014-06-17 16:51:39 +02:00
bsongis	500ca6554d	Sky9x compilation failure	2014-06-17 15:57:25 +02:00
bsongis	b3b35eca5b	Compilation failure	2014-06-17 15:48:03 +02:00
bsongis	39118453da	Code cleanup on Sky9x pulses	2014-06-17 15:41:27 +02:00
bsongis	9e64801384	Compilation failure on Sky9x without FRSKY extension	2014-06-17 15:41:27 +02:00
Damjan Adamic	6497407788	Removed frskyData.hub.gpsDistance simulator initialization because it is a calculated value.	2014-06-17 14:42:29 +02:00
Bertrand Songis	5a3d2244d8	Fixes #1267	2014-06-17 13:17:57 +02:00
Damjan Adamic	8115a78df7	Added couple of simulator telemety initialization values.	2014-06-17 13:04:35 +02:00
Michele	f597e6412b	Update it.h.txt Some changes in Italian translations	2014-06-17 12:53:34 +02:00
Bertrand Songis	3df0b12ccb	Update DONATIONS.txt	2014-06-17 12:31:25 +02:00
Damjan Adamic	f99fc83993	Fixes #1264 - CFN_GVAR_CST_MAX is 500, int16_t is needed	2014-06-17 11:50:08 +02:00
bsongis	bf511767ce	Fixes #1281 - Needs to be tested on Windows 8	2014-06-17 11:34:02 +02:00
bsongis	9682bf116d	Fixes #1271	2014-06-17 11:27:59 +02:00
bsongis	6086112cf9	Fixes #1264	2014-06-17 11:16:42 +02:00
bsongis	6dacd5a914	Google tests didn't compile with my last commit	2014-06-17 11:07:20 +02:00
bsongis	2094e87da5	'phase' renamed to 'flight mode' everywhere in the code	2014-06-17 10:59:00 +02:00
bsongis	20125474c1	Fixes #1267	2014-06-17 10:59:00 +02:00
Damjan Adamic	18f327612f	re #1294 - clear input name if removing last input line	2014-06-17 10:01:14 +02:00
Damjan Adamic	6689919a39	Fixes #1294 - Companion, Delete action without a selection	2014-06-17 09:25:57 +02:00
bsongis	c7133bb5a0	Backlight driver fixed on Taranis+	2014-06-17 08:50:02 +02:00
Bertrand Songis	a40dc4c4d2	Update DONATIONS.txt	2014-06-17 07:45:33 +02:00
bsongis	9840cc7dfc	Fixes #1285	2014-06-16 18:01:42 +02:00
bsongis	8cd55856e9	Fixes #1288	2014-06-16 17:48:23 +02:00
bsongis	f4bbaf682c	Fixes #1292	2014-06-16 17:39:49 +02:00
Bertrand Songis	db7dd83168	Update DONATIONS.txt	2014-06-16 17:34:05 +02:00
bsongis	4d71fb31db	Reset All should be named Reset Flight	2014-06-16 14:49:54 +02:00
bsongis	101293124a	timer10.wav and timerlt3.wav shouldn't exist any more (beeps)	2014-06-16 14:49:53 +02:00
Damjan Adamic	effcb1610b	Fixes #1290 - Gvar popup wrong if same as other FM	2014-06-15 18:50:45 +02:00
Bertrand Songis	97b37a5024	Update DONATIONS.txt	2014-06-15 16:40:18 +02:00
Bertrand Songis	c79d78664b	Update DONATIONS.txt	2014-06-15 15:23:02 +02:00
Bertrand Songis	9c972b0c42	Merge pull request #1286 from opentx/driver33/PL_TR fixes	2014-06-14 22:54:27 +02:00
Jacek Drewniak	35765394dc	fixes	2014-06-14 21:58:57 +02:00
Bertrand Songis	219c4e913c	Merge pull request #1284 from opentx/projectkk2glider/issue_1269 Fixes #1269 - RSSI Tx should be hidden in companion if radio is Taranis.	2014-06-14 20:58:44 +02:00
Bertrand Songis	d3ca801e53	Update DONATIONS.txt	2014-06-14 20:49:10 +02:00
Damjan Adamic	1c2257190a	Fixes #1269 - RSSI Tx should be hidden in companion if radio is Taranis. I followed isTelemetrySourceAvailable() and hided RssiTx and dTE.	2014-06-14 19:03:03 +02:00
Damjan Adamic	f509a7d22b	bug: wrong locaion for addText()	2014-06-14 18:30:23 +02:00
Bertrand Songis	44829cd579	Merge pull request #1276 from opentx/projectkk2glider/issue_1266 Fixes #1266 - Companion timer value not in time format	2014-06-14 11:30:34 +02:00
bsongis	94e749d08e	Companion: limit for comparaison of timers in Logical Switches is now 300 (1 hour)	2014-06-14 11:22:53 +02:00
bsongis	726a03d433	Fixes #1277	2014-06-14 11:20:40 +02:00
bsongis	d6ef1c011b	Now the Lua Telemetry scripts	2014-06-14 11:13:02 +02:00
bsongis	f295f3b888	Function renamed	2014-06-14 11:09:40 +02:00
Damjan Adamic	f55e5f862b	Merge pull request #1280 from opentx/ChrisNisbet01/issue_1278 Chris nisbet01/issue 1278	2014-06-14 09:03:16 +02:00
Bertrand Songis	3c5d9c617a	Update DONATIONS.txt	2014-06-14 08:57:35 +02:00
Damjan Adamic	10413bbede	Removed compiler warning: lua.cpp:63:60: warning: missing braces around initializer for 'ScriptInputsOutputs' [-Wmissing-braces]	2014-06-14 08:24:00 +02:00
Damjan Adamic	91dfb0309e	Removed compiler warning: lua.cpp:1382:21: warning: variable 'filename' set but not used [-Wunused-but-set-variable]	2014-06-14 08:18:47 +02:00
Damjan Adamic	6707f68923	One more warning removed: ../targets/taranis/board_taranis.h:256:3: warning: function declaration isn't a prototype [-Wstrict-prototypes]	2014-06-14 08:10:40 +02:00
Chris Nisbet	c4b19de8eb	CN - Couple of bug fixes in USB code. This functions the bugs were in don't appear to be called by any of the OpenTX code.	2014-06-14 13:02:51 +12:00
Damjan Adamic	5351514180	Using enume instead of numeric constants	2014-06-14 00:04:44 +02:00
Damjan Adamic	37ec428efc	Fixes #1266 - Companion timer value not in time format	2014-06-13 23:34:01 +02:00
Bertrand Songis	1941d3eb7e	Update DONATIONS.txt	2014-06-13 23:23:01 +02:00
bsongis	e3df420f8e	Lua scripts directories changed. We will now have /SCRIPTS/WIZARD/ /SCRIPTS/TEMPLATES/ /SCRIPTS/MIXES/ /SCRIPTS/FUNCTIONS/	2014-06-13 14:37:57 +02:00
bsongis	87c8b4b153	#1227 - TRIM_MARGIN is now radio dependant	2014-06-13 11:32:21 +02:00
bsongis	4149361de8	Hungarian voice added	2014-06-13 10:33:10 +02:00
bsongis	2fbd68ecb3	Google analytics removed. Completely wrong, we use the compilation server numbers instead.	2014-06-13 10:17:36 +02:00
Bertrand Songis	cedac96cf4	Update DONATIONS.txt	2014-06-13 07:29:20 +02:00
bsongis	89433127c4	Lua scripts now in custom functions!	2014-06-12 18:18:42 +02:00
Kjell Kernen	c23f1e974a	Fixes #1262	2014-06-12 16:14:21 +02:00
bsongis	9a83325119	Compilation error when GAUGES=NO	2014-06-12 15:59:54 +02:00
Damjan Adamic	a596001338	Companion mixer tab, if CH1 is empty the Move up button will never bring something there, fixes #1261	2014-06-12 15:16:50 +02:00
Bertrand Songis	1127ea412e	Update DONATIONS.txt	2014-06-12 12:27:12 +02:00
bsongis	e85242e08d	Release notes forgotten!	2014-06-12 12:14:50 +02:00
Andre Bernet	7ea2eb6259	Smaller analog delay margin	2014-06-12 11:23:02 +02:00
bsongis	2cd66cbc65	Fixes #1223	2014-06-12 10:34:57 +02:00
Bertrand Songis	06064b6da2	Update DONATIONS.txt	2014-06-12 07:12:08 +02:00
Bertrand Songis	809cb69b4f	Update DONATIONS.txt	2014-06-11 22:41:25 +02:00
Bertrand Songis	6f8e439154	Merge pull request #1255 from andyjenkinson/next Mac companion sound fix (partial for #1212)	2014-06-11 22:28:22 +02:00
bsongis	4c81e57134	Remaining trace	2014-06-11 21:40:36 +02:00
bsongis	ddd2d19c0c	Companion: wrong import of inputs when profile is Taranis and EEPROM is 9X	2014-06-11 21:40:17 +02:00
bsongis	eeb9ee8aa2	A3 and A4 V2 value bug in Logical Switches (Companion)	2014-06-11 21:32:48 +02:00
bsongis	30b660da17	Offset in Taranis Inputs was missing	2014-06-11 20:06:47 +02:00
Andy Jenkinson	4cd881d746	Merge remote-tracking branch 'upstream/next' into next	2014-06-11 17:36:03 +01:00
bsongis	ea731eae37	Channels limits go up to 150% when extended limits are enabled	2014-06-11 16:59:29 +02:00
Andy Jenkinson	5d77b8bf21	Merge remote-tracking branch 'upstream/next' into next	2014-06-11 15:44:27 +01:00
Bertrand Songis	621639ad0b	Merge pull request #1253 from opentx/mhotar/cz_translations Timer labels extended to 4 characters in CZ to be able to describe T-Tra...	2014-06-11 16:30:27 +02:00
Kjell Kernen	fdc95bbf23	Included some nice start Taranis start screens by Scott Page.	2014-06-11 16:28:53 +02:00
mhotar	b182d98da0	Timer labels extended to 4 characters in CZ to be able to describe T-Trace driving timers and THR alarm too.	2014-06-11 16:24:18 +02:00
Andre Bernet	e49a15bf07	French translations	2014-06-11 16:13:59 +02:00
bsongis	3cdb2b549b	French last translation	2014-06-11 16:11:00 +02:00
bsongis	69276bffcc	Cleaning work in Companion	2014-06-11 16:11:00 +02:00
Romolo Manfredini	b0afbb692f	Merge origin/next into next	2014-06-11 15:13:41 +02:00
Romolo Manfredini	0ab85725e0	Italian translation (almost finished)	2014-06-11 15:12:17 +02:00
bsongis	e8e025fdb0	Fixes #1252	2014-06-11 15:06:39 +02:00
bsongis	7d29fed9a5	2.0.2 preparation	2014-06-11 14:51:00 +02:00
bsongis	78ef42755b	Fixes #1251	2014-06-11 14:46:50 +02:00
Bertrand Songis	2a9429d183	Update DONATIONS.txt	2014-06-11 14:19:50 +02:00
Kjell Kernen	4773ba469f	Swedish OpenTX translation for 2.0.2	2014-06-11 14:13:34 +02:00
Kjell Kernen	6d1b379f53	Swedish companion translation (missed in last commit)	2014-06-11 14:03:23 +02:00
Kjell Kernen	54cbc46929	Swedish companion translation + Fixed spelling error.	2014-06-11 14:02:56 +02:00
Bertrand Songis	1fd4dbb1a9	Update DONATIONS.txt	2014-06-11 13:02:24 +02:00
Bertrand Songis	ecd871fe34	Update DONATIONS.txt	2014-06-11 12:17:02 +02:00
bsongis	5c4b2ebd90	EEPROM Backup/Restore problem on 9X128 (variant not used correctly)	2014-06-11 11:58:57 +02:00
bsongis	3fe75fac59	Fixes #1151 (applied the same trick to the GeneralEdit window)	2014-06-11 09:30:52 +02:00
bsongis	43a7434ae5	Fixes #1247	2014-06-11 09:23:11 +02:00
Bertrand Songis	134a9c2472	Update DONATIONS.txt	2014-06-11 09:16:10 +02:00
bsongis	0f495a6fd9	Fixes #1248	2014-06-11 08:21:55 +02:00
Bertrand Songis	5d037327d4	Update DONATIONS.txt	2014-06-11 08:03:56 +02:00
bsongis	ebbe2635b7	Fixes #1249	2014-06-11 07:43:00 +02:00
Bertrand Songis	cab9615fa8	Update DONATIONS.txt	2014-06-11 07:28:51 +02:00
Bertrand Songis	9b6d45bba3	Update DONATIONS.txt	2014-06-11 07:11:05 +02:00
bsongis	7ddb29ca74	RxBatt alarms files/tones removed	2014-06-10 23:42:46 +02:00
Andre Bernet	87e1c4f96d	Missing ,	2014-06-10 23:12:24 +02:00
Bertrand Songis	22e625baad	Update DONATIONS.txt	2014-06-10 22:32:03 +02:00
Bertrand Songis	b37f573226	Update DONATIONS.txt	2014-06-10 19:10:22 +02:00
bsongis	296264d8b4	Fixes #1245	2014-06-10 18:12:41 +02:00
bsongis	2ba86d8cb3	Fixes #1222	2014-06-10 18:03:54 +02:00
Andy Jenkinson	8e5a52879a	Partial solution to #1212 (needs testing on other platforms)	2014-06-10 16:14:26 +01:00
bsongis	e4d03b8c70	Fixes #1205 - Delay only applied to Play family function, with a configurable delay, between 0 and 300ms (default is 150ms).	2014-06-10 16:19:44 +02:00
bsongis	831cd81320	#1151 - Done the same trick on the sliders	2014-06-10 16:17:55 +02:00
bsongis	b2d8c76fc1	Fixes #1243	2014-06-10 15:40:20 +02:00
bsongis	3392879940	Fixes #1243	2014-06-10 15:29:57 +02:00
Damjan Adamic	d767b62d01	Added A3 and A4 simulator initialization values.	2014-06-10 15:24:55 +02:00
bsongis	2ea687099a	Fixes #1192 - Tests needed!	2014-06-10 15:21:25 +02:00
bsongis	81c4b61322	Fixes #1151	2014-06-10 15:12:30 +02:00
bsongis	0610c2c79a	Fixes #1194	2014-06-10 15:01:04 +02:00
bsongis	e50d9c0edf	Fixes #1241 - Revert "Bootloader now accessible with left OR right trim inwards" This reverts commit `54447a45a0`.	2014-06-10 14:53:24 +02:00
bsongis	72dc022dc9	Fixes #1182 - RxBatt removed	2014-06-10 14:51:16 +02:00
bsongis	123d5c1be8	Fixes #1242	2014-06-10 14:36:35 +02:00
bsongis	9be2755d91	Fixes #1235	2014-06-10 11:36:10 +02:00
bsongis	4305935fd4	Cosmetics	2014-06-10 11:36:10 +02:00
Bertrand Songis	3dff1fdac7	Update DONATIONS.txt	2014-06-10 09:31:13 +02:00
Andre Bernet	0281a5bb22	Had forgotten to bump bootloader version up	2014-06-10 09:19:34 +02:00
bsongis	cc0552d1a2	Fixes #1227 - Constant INSTANT_TRIM_MARGIN set to 1%, needs to be checked and adjusted!	2014-06-10 09:09:27 +02:00
bsongis	f4ee34dcc9	Fixes #1232	2014-06-10 08:36:52 +02:00
bsongis	9791509ec1	Fixes #1219	2014-06-10 08:15:31 +02:00
Bertrand Songis	bb71cd35f8	Update DONATIONS.txt	2014-06-10 06:55:26 +02:00
bsongis	d93b63d85c	Fixes #1237	2014-06-09 23:06:59 +02:00
bsongis	2706a3d81c	#1237 - Curves tab initialization bug (all boards except Taranis)	2014-06-09 22:52:56 +02:00
Bertrand Songis	73b0090840	Update DONATIONS.txt	2014-06-09 22:52:39 +02:00
Andre Bernet	2b3242f863	Compilation error	2014-06-09 22:41:17 +02:00
Andre Bernet	9f9a561c82	Compilation error	2014-06-09 22:29:39 +02:00
Andre Bernet	ba10ec68b6	Fix flickering backlight in Plus bootloader	2014-06-09 22:24:21 +02:00
Bertrand Songis	0b5820bdd6	Merge pull request #1231 from opentx/dvogonen/comapnion_windows_voice_play_problems Partial fix for 1212 - Only Windows	2014-06-09 21:40:49 +02:00
Bertrand Songis	bfbe0046ab	Update DONATIONS.txt	2014-06-09 21:34:53 +02:00
Andre Bernet	71ba0328bd	LS main view display on stock (Fix #1239 )	2014-06-09 20:07:38 +02:00
Andre Bernet	df80aa00c2	Fix #1234	2014-06-09 19:13:02 +02:00
Romolo Manfredini	3c181fc474	Other fixes in Italian translations (to be still finished)	2014-06-09 16:57:10 +02:00
Romolo Manfredini	e62a8e8ba7	further fix in Italian translations	2014-06-09 15:45:34 +02:00
Romolo Manfredini	eb69444cbf	further fix in Italian translations	2014-06-09 15:21:41 +02:00
Kjell Kernen	f083b6f45a	Partial fix for 1212 - Only Windows	2014-06-09 14:30:14 +02:00
Bertrand Songis	13de131fe4	Merge pull request #1220 from opentx/projectkk2glider/menu_order_change Changed order of context menu for logical switches and custom functions....	2014-06-09 11:42:56 +02:00
bsongis	4c6c9fdb20	Simu Gruvin9x compilation failure	2014-06-09 11:32:34 +02:00
bsongis	9cb4d5da1f	Sky9x Error + Warning removed	2014-06-09 11:14:57 +02:00
bsongis	ce22ea22b4	Simu compilation errors	2014-06-09 11:05:55 +02:00
Bertrand Songis	aa661ced46	Jenkins test	2014-06-09 10:43:16 +02:00
Bertrand Songis	1e56c9ba14	Jenkins test	2014-06-09 10:41:54 +02:00
Bertrand Songis	e65b9d825b	Jenkins test	2014-06-09 09:56:38 +02:00
Bertrand Songis	2561e53696	Update DONATIONS.txt	2014-06-09 00:00:13 +02:00
Bertrand Songis	2665c2318f	Update DONATIONS.txt	2014-06-08 22:53:46 +02:00
Damjan Adamic	5a0f154876	Fixes #1215	2014-06-08 19:31:02 +02:00
Damjan Adamic	15d89d638c	Hide gvars for FM>0 if tx does not support per flight mode gvars, issue #1195	2014-06-08 18:58:53 +02:00
Damjan Adamic	087c9f0202	Gvar value restored, issue #1195	2014-06-08 18:26:39 +02:00
Damjan Adamic	0ae00dddf8	Fixes #1204	2014-06-08 18:07:14 +02:00
Damjan Adamic	f865bdf785	Changed order of context menu for logical switches and custom functions. Before this change the Delete option was first and it was too easy to inadvertently delete an item.	2014-06-08 17:18:50 +02:00
Damjan Adamic	04897885dd	Fixes #1209	2014-06-08 17:11:14 +02:00
Damjan Adamic	2248c84b8f	Added error string to output, to help resolving issue #1217	2014-06-08 16:33:34 +02:00
Bertrand Songis	5f0f5de111	Merge pull request #1211 from andyjenkinson/next Updates for Mac - needs testing on other platforms	2014-06-08 11:05:48 +02:00
Bertrand Songis	b93036c81d	Update DONATIONS.txt	2014-06-08 10:58:18 +02:00
Andy Jenkinson	6bfc4f7986	Fixes #1216	2014-06-08 09:10:25 +01:00
Andy Jenkinson	34de0aa01a	Revert "Radio buttons in the wizard were too close together" and do this another way via Q_FOREACH This reverts commit `73f2e99d7d`.	2014-06-08 09:07:16 +01:00
Bertrand Songis	b8ca14c921	Update DONATIONS.txt	2014-06-08 08:04:23 +02:00
Bertrand Songis	5ec77c6dae	Update DONATIONS.txt	2014-06-08 08:02:53 +02:00
Andy Jenkinson	f482b895fb	Enabled Phonon for Mac (sounds)	2014-06-08 01:26:19 +01:00
Andy Jenkinson	73f2e99d7d	Radio buttons in the wizard were too close together	2014-06-08 00:22:27 +01:00
Andy Jenkinson	49b821b04d	Merge remote-tracking branch 'upstream/next' into next	2014-06-07 20:43:20 +01:00
Bertrand Songis	17bfe1544f	Merge pull request #1208 from andyjenkinson/next Wizard window style was not set for Mac. Fix for issue #1206	2014-06-07 21:42:35 +02:00
Andy Jenkinson	7a7b4c047e	Merge remote-tracking branch 'upstream/next' into next Testing mouse wheel focus	2014-06-07 20:13:32 +01:00
bsongis	7912b79d7e	#1151 - Another possibility which has my preference, what do you think?	2014-06-07 21:00:59 +02:00
Andrew Jenkinson	83d8834fe4	Wizard window style was not set for Mac. This fixes opentx issue #1206	2014-06-07 19:58:58 +01:00
bsongis	bf9fc6dd98	The delay on switches was * 10	2014-06-07 20:27:00 +02:00
Bertrand Songis	6edc28b4ba	Update DONATIONS.txt	2014-06-07 20:18:06 +02:00
Andre Bernet	e0deb3b665	Hide S3 center beep checkbox for !Plus	2014-06-07 17:13:27 +02:00
Andre Bernet	8f3060f99c	Pot startup check checkboxes were always hidden	2014-06-07 17:08:30 +02:00
Michele	9e7a52b952	Merge pull request #1202 from opentx/MicheleVilla/IT_Translation_Firmware Update it.h.txt	2014-06-07 12:36:09 +02:00
Michele	3b8e64fe64	Update it.h.txt Translation of new option	2014-06-07 12:35:01 +02:00
bsongis	479c070896	Fixes #1199	2014-06-07 12:33:58 +02:00
Andre Bernet	9f75be0dc4	IT translation fix (Fixes #1201 )	2014-06-07 12:01:42 +02:00
bsongis	d090175b2a	Compilation failure on sky9x	2014-06-07 11:46:34 +02:00
bsongis	93d6788605	Fixes #1200 - Needs tests!	2014-06-07 11:07:00 +02:00
Bertrand Songis	5de9f6c4a4	Update DONATIONS.txt	2014-06-07 11:03:18 +02:00
Bertrand Songis	9785720bf6	Update DONATIONS.txt	2014-06-07 07:40:27 +02:00
bsongis	626f4c5784	Issue #1151 - I just added a workaround on the CustomFunctions tab only. If feedback is good, it will be easy to call disableMouseScrolling() on other tabs.	2014-06-06 23:25:32 +02:00
Bertrand Songis	c1e15d0212	Update DONATIONS.txt	2014-06-06 22:40:45 +02:00
bsongis	a19fff0998	Buffer overflow in Companion Wizard	2014-06-06 22:36:00 +02:00
bsongis	9a502461df	Fixes #1198 - Needs to be tested before 2.0.2	2014-06-06 22:36:00 +02:00
Bertrand Songis	bc484879a5	Update DONATIONS.txt	2014-06-06 20:17:53 +02:00
Bertrand Songis	b070f56838	Update DONATIONS.txt	2014-06-06 16:54:15 +02:00
Bertrand Songis	dd874427b8	Companion on max fix	2014-06-05 21:35:33 +02:00
bsongis	902a69323a	Issue #1128 - Automatic non regression test added	2014-06-06 15:22:13 +02:00
bsongis	a6c39e83b1	#1188 - HDG not converted when units are imperial (it was done in audio, not in lcd)	2014-06-06 15:07:22 +02:00
bsongis	6511ae173d	Fixes #1191	2014-06-06 11:54:13 +02:00
Bertrand Songis	3d4d6ba313	Update DONATIONS.txt	2014-06-06 11:32:55 +02:00
Bertrand Songis	ce1ff9ea14	Update DONATIONS.txt	2014-06-06 07:56:42 +02:00