Copy strings for multimode support from en.h.txt to other languages

Add FY326 protocol
Implement DSM2/DSMX frame format options
2016-03-27 22:46:53 +02:00 · 2016-03-27 22:45:24 +02:00 · 2016-03-27 22:45:21 +02:00 · 2016-03-27 22:31:56 +02:00 · 2016-03-27 22:20:41 +02:00
173 changed files with 16524 additions and 21790 deletions
@@ -7,7 +7,7 @@ before_install:
    - sudo apt-get update    

 install:
-  - sudo apt-get install --yes --force-yes lcov cmake cmake-data bc curl gcc-arm-none-eabi gcc-avr avr-libc avrdude libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev libfox-1.6-dev libgtest-dev
+  - sudo apt-get install -y lcov cmake cmake-data bc curl gcc-arm-none-eabi gcc-avr avr-libc avrdude libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev libfox-1.6-dev libgtest-dev

 script:
  - radio/util/commit-tests.sh
@@ -9,7 +9,6 @@
 <a href="http://openpilot.com">David Ankers (OpenPilot)</a>
 <a href="http://3drobotics.com">3D Robotics</a>
 <a href="http://rcstudio.cz">RC Studio (monthly)</a>
-<a href="http://www.craftandtheoryllc.com">Craft & Theory (monthly)</a>

 Mario Sette
 Felice Baratto
@@ -333,6 +332,7 @@ Jose Sobral
 Heung Jin Choi
 Tomasz Janiak
 Fabien Gagné
+Joe Street
 Micha Ronen
 Albert Blondin
 Klaus Schuebel
@@ -885,129 +885,3 @@ Gilles Dando
 Denis Roussille
 Olivier Anken
 Michel Motte
-David McDonald
-Tauno Rautakorpi
-Carsten Schlassa
-Angel de la Dehesa Calles
-Michel Garbarin
-Algirdas Tamosiunas
-Petr Kysela
-Pascal Roux
-Robert Whitfield
-InTheTubeDeep
-Jaromir Malek
-Joe Street
-Regin Poulsen
-Hervé Laveyssiere
-Walter Fowler 
-Richard Wagner
-Kevin Hyman
-Herald Reichel
-Frederic Rouyre
-David Libby
-Hans Timmermans
-Adrian De Zee
-John Hanagan
-Didier van Steensel
-Julius Vicze
-Cristiano Merighi
-James Holley
-Chris Merry
-Jiri Fojtasek
-Thierry Laligand
-Hassouna Cherif
-Fred Thijssen
-Andrew Gardiner
-Christian Niß
-Douglas Penney
-Starck Associates
-Johannes Wollenweber
-Fred Page
-Jean Trouche
-Patrick Blanc
-Jean-Louis Tonnellier
-Masoud
-Mustafa Güven
-William Waters
-Joël Allamy
-William Mckinstry 
-Jean-Jacques Pointel
-Frédéric Rouyre
-Jonathan Pruett
-Jörg Zieren
-Christopher Rhodes
-Marco Strack
-Stefano Boggia
-Dwayne Myers
-Stavros Papathanasiou
-Roland Nittby
-Courtney Puskas
-NorthSide
-Martin Polák
-Ulf Reinhardt
-Wolfgang Renisch
-Trevor Hinze
-Mohammad Zargari
-Dr. Willutzki
-Jean Pierre Bernard
-Patrick Castellan
-Udo Tödter
-Marc J Merlin 
-Paul Chitonu
-Wolfgang Rauser
-Emmanuel Dallery
-James Lyons
-Tauno Rautakorpi
-Gerald Peklar
-Fabien Gagné
-David Cox
-Philip Cork
-Kevin Wright
-John Scott
-Yves Berger
-Otto Fröhlich
-Kenneth Lilja
-Benjamin Johnson
-Brad Kelley
-Michel Biancki
-Lynn Laycock
-Claude Godefroy
-Gérald Joubert
-Wayne J Podaima
-Philippe Peyron
-Julien Kieffer
-Gregor Walter 
-Carlos Viegas
-Roberto Orsello
-Steve Murray (monthly)
-Marcel Schäfer
-Sean Cull
-Holger Bothmer
-Michael Manning
-Martin Risik
-ZEN Computer Services
-Egbert Stohlmann
-Martin Peryea
-Nathan James
-Luis Suarez
-Artur Uzieblo
-InTheTubeDeep
-Jaap Greve
-Peter Glassey
-David Reynolds
-David Frazier
-Donald L Singer
-George Carnie
-Susan Holbert 
-Richard Garrett
-Paco Galván
-Matthew Sylvester
-Robert Bates
-Hans-Peter Endres
-Axel Stöckle
-Leonard MacKey
-Andrew Fernie
-Mark McCoy
-Damir Pooshs
-Jeff Dillingham
-Brent Hampton
@@ -1,16 +1,9 @@
 ##OpenTX 2.1 Branch

 [![Build Status](https://travis-ci.org/opentx/opentx.svg?branch=master)](https://travis-ci.org/opentx/opentx)
-[![Join the chat at https://opentx.rocket.chat](https://camo.githubusercontent.com/3d659054abd6ce21c0e47cf3b83a51bda69ca282/68747470733a2f2f64656d6f2e726f636b65742e636861742f696d616765732f6a6f696e2d636861742e737667)](https://opentx.rocket.chat)
+[![Join the chat at https://gitter.im/opentx/opentx](https://img.shields.io/badge/%E2%8A%AA%20GITTER%20-JOIN%20CHAT%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/opentx/opentx?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Donate using Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DJ9MASSKVW8WN)

 The ongoing development on 2.1.x is done in this branch.

-Refer to the [OpenTX wiki](https://github.com/opentx/opentx/wiki) for information about setting up the tool chains for building OpenTX and OpenTX Companion as well as other development related issues.
-
-Useful links:
- * OpenTX Blog http://blog.open-tx.org/
- * OpenTX Main Site http://www.open-tx.org/
- * OpenTx University http://open-txu.org/
- * OpenTX User Manual https://www.gitbook.com/book/opentx/opentx-taranis-manual/details
- * OpenTX Lua Reference Guide https://www.gitbook.com/book/opentx/opentx-lua-reference-guide/details
+Refer to the opentx.wiki for information about setting up the tool chains for building OpenTX and OpenTX Companion as well as other development related issues.
@@ -1,45 +1,3 @@
-<h2>Version 2.1.9 / 2016-09-14</h2>
-
-<ul>
-<li>SD sync fixes (<a href=https://github.com/opentx/opentx/issues/3351>#3351</a>)</li>
-<li>Fixed: Telemetry mode "FrSky D (cable)" choice was missing for Taranis (<a href=https://github.com/opentx/opentx/issues/3372>#3372</a>)</li>
-<li>Show persistent option only for calculated sensors (<a href=https://github.com/opentx/opentx/issues/3454>#3454</a>)</li>
-<li>Fixed Flight mode clear command (<a href=https://github.com/opentx/opentx/issues/3214>#3214</a>)</li>
-<li>Fixed a problem with Rotary encoders linked to flight mode (could freeze Companion) (<a href=https://github.com/opentx/opentx/issues/3459>#3459</a>, <a href=https://github.com/opentx/opentx/issues/3470>#3470</a>)</li>
-<li>Telemetry simulator improvements: added fuel quantity sensor, increased RPM range (<a href=https://github.com/opentx/opentx/issues/3505>#3505</a>, <a href=https://github.com/opentx/opentx/issues/3506>#3506</a>)</li>
-<li>Implemented minimal support for the DYI Multimodule (<a href=https://github.com/opentx/opentx/issues/3526>#3526</a>)</li>
-<li>Fixed: GVar combo-box not being refreshed when GV check-box (re-)selected (<a href=https://github.com/opentx/opentx/issues/3518>#3518</a>)</li>
-<li>Fixed: Heli inversion not correctly shown/saved from Companion on Radios without virtual inputs (<a href=https://github.com/opentx/opentx/issues/3510>#3510</a>)</li>
-<li>Implemented print functions for the Heli setup screen (<a href=https://github.com/opentx/opentx/issues/3554>#3554</a>)</li>
-<li>Fixed: Flight modes linked trims display value (<a href=https://github.com/opentx/opentx/issues/3547>#3547</a>, <a href=https://github.com/opentx/opentx/issues/3568>#3568</a>)</li>
-<li>Fixed: New model global variables and rotary encoders initialisation (<a href=https://github.com/opentx/opentx/issues/3473>#3473</a>)</li>
-<li>Fixed: Prevent circular linked global variables and rotary encoders (<a href=https://github.com/opentx/opentx/issues/3472>#3472</a>)</li>
-<li>Fixed wrong log replay speed issue in Telemetry simulator (<a href=https://github.com/opentx/opentx/issues/3708>#3708</a>)</li>
-<li>Various texts and translations corrections</li>
-</ul>
-
-
-<h2>Version 2.1.8 / 2016-04-14</h2>
-
-<ul>
-<li>Telemetry Simulator sensor instance number fixed (<a href=https://github.com/opentx/opentx/issues/3207>#3207</a>)</li>
-<li>Fixed: Throttle Source combo-box was populated multiple times (<a href=https://github.com/opentx/opentx/issues/3222>#3222</a>)</li>
-<li>RTC option tool-tip corrected (<a href=https://github.com/opentx/opentx/issues/3225>#3225</a>)</li>
-<li>Fixed: Companion was looking for custom scripts at the wrong place (<a href=https://github.com/opentx/opentx/issues/3237>#3237</a>)</li>
-<li>Offset displayed in inputs screen (<a href=https://github.com/opentx/opentx/issues/3248>#3248</a>)</li>
-<li>Import/export handling was broken for Average formula telemetry sensors (<a href=https://github.com/opentx/opentx/issues/3262>#3262</a>)</li>
-<li>Fixed: Hardware Setup control types and names were not stored in profile (<a href=https://github.com/opentx/opentx/issues/3260>#3260</a>)</li>
-<li>Fixed voice language list (<a href=https://github.com/opentx/opentx/issues/3338>#3338</a>)</li>
-<li>Fixed data overflow in Special Functions Override Channel (<a href=https://github.com/opentx/opentx/issues/3347>#3347</a>)</li>
-<li>Fixed: Sync dialog new line problem (only present for some UI languages) (<a href=https://github.com/opentx/opentx/issues/3350>#3350</a>)</li>
-<li>Removed a few legacy timer limitations, fix non-working limit (<a href=https://github.com/opentx/opentx/issues/3301>#3301</a>)</li>
-<li>Default AVR fuse settings changed to disable JTAG interface (<a href=https://github.com/opentx/opentx/issues/3379>#3379</a>)</li>
-<li>Channel range fix (Start, Channels) in Model Settings, Setup page, int/ext module settings</li>
-<li>Use friendly GVAR names in dialogs (if available)  (<a href=https://github.com/opentx/opentx/issues/3353>#3353</a>)</li>
-<li>Various texts and translations corrections</li>
-</ul>
-
-
 <h2>Version 2.1.7 / 2016-01-04</h2>

 <ul>
@@ -2,7 +2,7 @@ PROJECT( companion )

 SET(C9X_VERSION_MAJOR "2")
 SET(C9X_VERSION_MINOR "1")
-SET(C9X_VERSION_REVISION "9")
+SET(C9X_VERSION_REVISION "7")
 SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})

 SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})
@@ -312,8 +312,6 @@ QString Profile::speaker()       const { return _speaker;       }
 QString Profile::stickPotCalib() const { return _stickPotCalib; }
 QString Profile::timeStamp()     const { return _timeStamp;     }
 QString Profile::trainerCalib()  const { return _trainerCalib;  }
-QString Profile::controlTypes()  const { return _controlTypes;  }
-QString Profile::controlNames()  const { return _controlNames;  }
 int     Profile::txCurrentCalibration()  const { return _txCurrentCalibration;  }
 int     Profile::gsStickMode()   const { return _gsStickMode;   }
 int     Profile::ppmMultiplier() const { return _ppmMultiplier; }
@@ -344,8 +342,6 @@ void Profile::speaker       (const QString x) { store(x, _speaker,       "Speake
 void Profile::stickPotCalib (const QString x) { store(x, _stickPotCalib, "StickPotCalib"         ,"Profiles", QString("profile%1").arg(index));}
 void Profile::timeStamp     (const QString x) { store(x, _timeStamp,     "TimeStamp"             ,"Profiles", QString("profile%1").arg(index));}
 void Profile::trainerCalib  (const QString x) { store(x, _trainerCalib,  "TrainerCalib"          ,"Profiles", QString("profile%1").arg(index));}
-void Profile::controlTypes  (const QString x) { store(x, _controlTypes,  "ControlTypes"          ,"Profiles", QString("profile%1").arg(index));}
-void Profile::controlNames  (const QString x) { store(x, _controlNames,  "ControlNames"          ,"Profiles", QString("profile%1").arg(index));}
 void Profile::txCurrentCalibration  (const int x) { store(x, _txCurrentCalibration, "currentCalib","Profiles", QString("profile%1").arg(index));}
 void Profile::gsStickMode   (const int     x) { store(x, _gsStickMode,   "GSStickMode"           ,"Profiles", QString("profile%1").arg(index));}
 void Profile::ppmMultiplier (const int     x) { store(x, _ppmMultiplier, "PPM_Multiplier"        ,"Profiles", QString("profile%1").arg(index));}
@@ -382,8 +378,6 @@ Profile& Profile::operator=(const Profile& rhs)
    speaker      ( rhs.speaker()       );
    stickPotCalib( rhs.stickPotCalib() );
    trainerCalib ( rhs.trainerCalib()  );
-    controlTypes ( rhs.controlTypes()  );
-    controlNames ( rhs.controlNames()  );
    txCurrentCalibration ( rhs.txCurrentCalibration()  );
    gsStickMode  ( rhs.gsStickMode()   );
    ppmMultiplier( rhs.ppmMultiplier() );
@@ -429,8 +423,6 @@ void Profile::initFwVariables()
    _stickPotCalib = "";
    _timeStamp =     "";
    _trainerCalib =  "";
-    _controlTypes =  "";
-    _controlNames =  "";

    _txCurrentCalibration =  0;
    _gsStickMode =   0;
@@ -491,8 +483,6 @@ void Profile::flush()
    getset( _stickPotCalib, "StickPotCalib"         ,""     ,"Profiles", QString("profile%1").arg(index));
    getset( _timeStamp,     "TimeStamp"             ,""     ,"Profiles", QString("profile%1").arg(index));
    getset( _trainerCalib,  "TrainerCalib"          ,""     ,"Profiles", QString("profile%1").arg(index));
-    getset( _controlTypes,  "ControlTypes"          ,""     ,"Profiles", QString("profile%1").arg(index));
-    getset( _controlNames,  "ControlNames"          ,""     ,"Profiles", QString("profile%1").arg(index));
    getset( _txCurrentCalibration,  "currentCalib"          ,0      ,"Profiles", QString("profile%1").arg(index));
    getset( _gsStickMode,   "GSStickMode"           ,0      ,"Profiles", QString("profile%1").arg(index));
    getset( _ppmMultiplier, "PPM_Multiplier"        ,0      ,"Profiles", QString("profile%1").arg(index));
@@ -125,8 +125,6 @@ class Profile: protected CompStoreObj
    QString _stickPotCalib;
    QString _timeStamp;
    QString _trainerCalib;
-    QString _controlTypes;
-    QString _controlNames;
    int     _txCurrentCalibration;
    int     _gsStickMode;
    int     _ppmMultiplier;
@@ -158,8 +156,6 @@ class Profile: protected CompStoreObj
    QString stickPotCalib() const;
    QString timeStamp() const;
    QString trainerCalib() const;
-    QString controlTypes() const;
-    QString controlNames() const;
    int     txCurrentCalibration() const;
    int     gsStickMode() const;
    int     ppmMultiplier() const;
@@ -190,8 +186,6 @@ class Profile: protected CompStoreObj
    void stickPotCalib (const QString);
    void timeStamp     (const QString);
    void trainerCalib  (const QString);
-    void controlTypes  (const QString);
-    void controlNames  (const QString);
    void txCurrentCalibration  (const int);
    void gsStickMode   (const int);
    void ppmMultiplier (const int);
@@ -1410,7 +1410,7 @@ void ModelData::clear()
    moduleData[1].protocol = PULSES_OFF;
  }
  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    flightModeData[i].clear(i);
+    flightModeData[i].clear();
  }
  clearInputs();
  clearMixes();
@@ -1523,7 +1523,9 @@ int ModelData::getTrimValue(int phaseIdx, int trimIdx)
      }
      else {
        phaseIdx = phase.trimRef[trimIdx];
-        if (phase.trimMode[trimIdx] != 0)
+        if (phase.trimMode[trimIdx] == 0)
+          result = 0;
+        else
          result += phase.trim[trimIdx];
      }
    }
@@ -1536,57 +1538,16 @@ bool ModelData::isGVarLinked(int phaseIdx, int gvarIdx)
  return flightModeData[phaseIdx].gvars[gvarIdx] > 1024;
 }

-bool ModelData::isGVarLinkedCircular(int phaseIdx, int gvarIdx)
-{
-  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    int val = flightModeData[phaseIdx].gvars[gvarIdx];
-    if ((phaseIdx==0) || (val<=1024)) return false;
-    int nextPhase = val - 1025;
-    if (nextPhase >= phaseIdx) nextPhase += 1;
-    phaseIdx = nextPhase;
-  }
-  return true;
-}
-
 int ModelData::getGVarValue(int phaseIdx, int gvarIdx)
 {
-  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    int val = flightModeData[phaseIdx].gvars[gvarIdx];
-    if ((phaseIdx==0) || (val<=1024)) return val;
-    int nextPhase = val - 1025;
+  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 = flightModeData[phaseIdx].gvars[gvarIdx];
  }
-  return flightModeData[0].gvars[gvarIdx];  // circular linked
-}
-
-bool ModelData::isRELinked(int phaseIdx, int reIdx)
-{
-  return flightModeData[phaseIdx].rotaryEncoders[reIdx] > 1024;
-}
-
-bool ModelData::isRELinkedCircular(int phaseIdx, int reIdx)
-{
-  for (int i=0; i<C9X_MAX_ENCODERS; i++) {
-    int val = flightModeData[phaseIdx].rotaryEncoders[reIdx];
-    if ((phaseIdx==0) || (val<=1024)) return false;
-    int nextPhase = val - 1025;
-    if (nextPhase >= phaseIdx) nextPhase += 1;
-    phaseIdx = nextPhase;
-  }
-  return true;
-}
-
-int ModelData::getREValue(int phaseIdx, int reIdx)
-{
-  for (int i=0; i<C9X_MAX_ENCODERS; i++) {
-    int val = flightModeData[phaseIdx].rotaryEncoders[reIdx];
-    if ((phaseIdx==0) || (val<=1024)) return val;
-    int nextPhase = val - 1025;
-    if (nextPhase >= phaseIdx) nextPhase += 1;
-    phaseIdx = nextPhase;
-  }
-  return flightModeData[0].rotaryEncoders[reIdx];  // circular linked
+  return idx;
 }

 void ModelData::setTrimValue(int phaseIdx, int trimIdx, int value)
@@ -1882,17 +1843,3 @@ SimulatorInterface *GetCurrentFirmwareSimulator()
  else
    return NULL;
 }
-
-void FlightModeData::clear(const int phase)
-{
-  memset(this, 0, sizeof(FlightModeData));
-  if (phase != 0) {
-    for (int idx=0; idx<C9X_MAX_GVARS; idx++) {
-      gvars[idx] = 1025;
-    }
-    for (int idx=0; idx<C9X_MAX_ENCODERS; idx++) {
-      rotaryEncoders[idx] = 1025;
-    }
-  }
-}
-
@@ -632,7 +632,7 @@ class CustomFunctionData { // Function Switches data

 class FlightModeData {
  public:
-    FlightModeData() { clear(0); }
+    FlightModeData() { clear(); }
    int trimMode[NUM_STICKS];
    int trimRef[NUM_STICKS];
    int trim[NUM_STICKS];
@@ -640,9 +640,9 @@ class FlightModeData {
    char name[10+1];
    unsigned int fadeIn;
    unsigned int fadeOut;
-    int rotaryEncoders[C9X_MAX_ENCODERS];
+    int rotaryEncoders[2];
    int gvars[C9X_MAX_GVARS];
-    void clear(const int phase);
+    void clear() { memset(this, 0, sizeof(FlightModeData)); }
 };

 class SwashRingData { // Swash Ring data
@@ -842,7 +842,6 @@ enum PulsesProtocol {
  PULSES_PXX_XJT_LR12,
  PULSES_PXX_DJT,
  PULSES_CROSSFIRE,
-  PULSES_MULTIMODULE,
  PULSES_PROTOCOL_LAST
 };

@@ -1078,13 +1077,8 @@ class ModelData {
    void setTrimValue(int phaseIdx, int trimIdx, int value);

    bool isGVarLinked(int phaseIdx, int gvarIdx);
-    bool isGVarLinkedCircular(int phaseIdx, int gvarIdx);
    int getGVarValue(int phaseIdx, int gvarIdx);

-    bool isRELinked(int phaseIdx, int reIdx);
-    bool isRELinkedCircular(int phaseIdx, int reIdx);
-    int getREValue(int phaseIdx, int reIdx);
-
    ModelData removeGlobalVars();

    void clearMixes();
@@ -1630,9 +1624,7 @@ class Firmware {
    }

    virtual int getCapability(const Capability) = 0;
-    
-    virtual QTime getMaxTimerStart() = 0;
-    
+
    virtual bool isTelemetrySourceAvailable(int source) = 0;

    virtual int isAvailable(PulsesProtocol proto, int port=0) = 0;
@@ -17,6 +17,7 @@
 #include <iostream>
 #include "er9xinterface.h"
 #include "er9xeeprom.h"
+#include "simulator/er9xsimulator.h"
 #include "file.h"
 #include "appdata.h"

@@ -0,0 +1,15 @@
+set(ER9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/er9x)
+add_custom_command(
+  OUTPUT ${ER9X_CHECKOUT_DIRECTORY}/er9xsimulator.cpp
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${ER9X_CHECKOUT_DIRECTORY}
+  COMMAND cd ${ER9X_CHECKOUT_DIRECTORY} && svn checkout http://er9x.googlecode.com/svn/trunk/src@790 .
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/er9x/er9xsimulator.cpp ${ER9X_CHECKOUT_DIRECTORY}
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/er9x/er9xsimulator.cpp
+)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}
+)
+
+add_library(er9x-simulator er9xsimulator.cpp)
@@ -0,0 +1,224 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include "firmwares/er9x/er9xsimulator.h"
+#include "firmwares/er9x/er9xinterface.h"
+
+#define SIMU
+#define SIMU_EXCEPTIONS
+#define FRSKY
+#define PHASES
+#undef min
+#undef max
+
+#define NUM_POTS  3
+#define SWSRC_SW1 DSW_SW1
+
+#include <exception>
+
+namespace Er9x {
+
+#include "simpgmspace.h"
+#include "er9x.cpp"
+#include "stamp.cpp"
+#include "menus.cpp"
+#include "pers.cpp"
+#include "file.cpp"
+#include "lcd.cpp"
+#include "drivers.cpp"
+#include "simpgmspace.cpp"
+#include "templates.cpp"
+#include "frsky.cpp"
+#include "audio.cpp"
+
+uint8_t pxxFlag = 0;
+int16_t g_anas[7];
+
+#define isBacklightEnable() (PORTB & (1<<OUT_B_LIGHT))
+
+uint16_t anaIn(uint8_t chan)
+{
+  if (chan == 7)
+    return 1500;
+  else
+    return g_anas[chan];
+}
+
+bool hasExtendedTrims()
+{
+  return false;
+}
+
+void setTrim(uint8_t idx, int8_t value)
+{
+  g_model.trim[idx] = value;
+}
+
+void getTrims(int16_t values[4])
+{
+  for (int i=0; i<4; i++)
+    values[i] = g_model.trim[i];
+}
+
+#define TRIMS_GPIO_REG_LHL         pind
+#define TRIMS_GPIO_REG_LVD        pind
+#define TRIMS_GPIO_REG_RVU        pind
+#define TRIMS_GPIO_REG_RHL         pind
+#define TRIMS_GPIO_REG_LHR         pind
+#define TRIMS_GPIO_REG_LVU        pind
+#define TRIMS_GPIO_REG_RVD        pind
+#define TRIMS_GPIO_REG_RHR         pind
+#define PIN_TRIM_LH_L          (1<<INP_D_TRM_LH_DWN)
+#define PIN_TRIM_LV_DN         (1<<INP_D_TRM_LV_DWN)
+#define PIN_TRIM_RV_UP         (1<<INP_D_TRM_RV_UP)
+#define PIN_TRIM_RH_L          (1<<INP_D_TRM_RH_DWN)
+#define PIN_TRIM_LH_R          (1<<INP_D_TRM_LH_UP)
+#define PIN_TRIM_LV_UP         (1<<INP_D_TRM_LV_UP)
+#define PIN_TRIM_RV_DN         (1<<INP_D_TRM_RV_DWN)
+#define PIN_TRIM_RH_R          (1<<INP_D_TRM_RH_UP)
+
+#define TRIM_CASE(key, pin, mask) \
+    case key: \
+      if (state) pin |= mask; else pin &= ~mask;\
+      break;
+
+void simuSetTrim(uint8_t trim, bool state)
+{
+  switch (trim) {
+    TRIM_CASE(0, TRIMS_GPIO_REG_LHL, PIN_TRIM_LH_L)
+    TRIM_CASE(1, TRIMS_GPIO_REG_LHR, PIN_TRIM_LH_R)
+    TRIM_CASE(2, TRIMS_GPIO_REG_LVD, PIN_TRIM_LV_DN)
+    TRIM_CASE(3, TRIMS_GPIO_REG_LVU, PIN_TRIM_LV_UP)
+    TRIM_CASE(4, TRIMS_GPIO_REG_RVD, PIN_TRIM_RV_DN)
+    TRIM_CASE(5, TRIMS_GPIO_REG_RVU, PIN_TRIM_RV_UP)
+    TRIM_CASE(6, TRIMS_GPIO_REG_RHL, PIN_TRIM_RH_L)
+    TRIM_CASE(7, TRIMS_GPIO_REG_RHR, PIN_TRIM_RH_R)
+  }
+}
+
+#define SWITCH_CASE(swtch, pin, mask) \
+    case swtch: \
+      if (state) pin &= ~(mask); else pin |= (mask); \
+      break;
+#define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \
+    case swtch: \
+      if (state >= 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
+      if (state <= 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
+      break;
+
+void simuSetSwitch(uint8_t swtch, int8_t state)
+{
+  switch (swtch) {
+    SWITCH_CASE(0, pinc, 1<<INP_C_ThrCt)
+    SWITCH_CASE(4, pinc, 1<<INP_C_AileDR)
+    SWITCH_3_CASE(3, ping, pine, (1<<INP_G_ID1), (1<<INP_E_ID2))
+    SWITCH_CASE(1, ping, 1<<INP_G_RuddDR)
+    SWITCH_CASE(2, pine, 1<<INP_E_ElevDR)
+    SWITCH_CASE(5, pine, 1<<INP_E_Gear)
+    SWITCH_CASE(6, pine, 1<<INP_E_Trainer)
+    default:
+      break;
+  }
+}
+
+#define KEY_CASE(key, pin, mask) \
+    case key: \
+      if (state) pin |= mask; else pin &= ~mask;\
+      break;
+
+void simuSetKey(uint8_t key, bool state)
+{
+  switch (key) {
+    KEY_CASE(KEY_MENU, pinb, (1<<INP_B_KEY_MEN))
+    KEY_CASE(KEY_EXIT, pinb, (1<<INP_B_KEY_EXT))
+    KEY_CASE(KEY_RIGHT, pinb, (1<<INP_B_KEY_RGT))
+    KEY_CASE(KEY_LEFT, pinb, (1<<INP_B_KEY_LFT))
+    KEY_CASE(KEY_UP, pinb, (1<<INP_B_KEY_UP))
+    KEY_CASE(KEY_DOWN, pinb, (1<<INP_B_KEY_DWN))
+  }
+}
+
+#define isBacklightEnable() (PORTB & (1<<OUT_B_LIGHT))
+
+}
+
+using namespace Er9x;
+
+Er9xSimulator::Er9xSimulator(Er9xInterface * er9xInterface):
+  er9xInterface(er9xInterface)
+{
+}
+
+bool Er9xSimulator::timer10ms()
+{
+  AUDIO_DRIVER();  // the tone generator
+  AUDIO_HEARTBEAT();  // the queue processing
+#define TIMER10MS_IMPORT
+#include "simulatorimport.h"
+}
+
+uint8_t * Er9xSimulator::getLcd()
+{
+#define GETLCD_IMPORT
+#include "simulatorimport.h"
+}
+
+bool Er9xSimulator::lcdChanged(bool & lightEnable)
+{
+#define LCDCHANGED_IMPORT
+#include "simulatorimport.h"
+}
+
+void Er9xSimulator::start(RadioData &radioData, bool tests)
+{
+  er9xInterface->save(&eeprom[0], radioData);
+  StartMainThread(tests);
+}
+
+void Er9xSimulator::stop()
+{
+  StopMainThread();
+}
+
+void Er9xSimulator::getValues(TxOutputs &outputs)
+{
+#define GETVALUES_IMPORT
+#include "simulatorimport.h"
+  outputs.beep = audio.busy();
+}
+
+void Er9xSimulator::setValues(TxInputs &inputs)
+{
+#define SETVALUES_IMPORT
+#include "simulatorimport.h"
+}
+
+void Er9xSimulator::setTrim(unsigned int idx, int value)
+{
+  Er9x::setTrim(idx, value);
+}
+
+void Er9xSimulator::getTrims(Trims & trims)
+{
+  trims.extended = false;
+  Er9x::getTrims(trims.values);
+}
+
+const char * Er9xSimulator::getError()
+{
+#define GETERROR_IMPORT
+#include "simulatorimport.h"
+}
@@ -0,0 +1,70 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef er9x_simulator_h
+#define er9x_simulator_h
+
+#include "simulatorinterface.h"
+
+class RadioData;
+class Er9xInterface;
+
+class Er9xSimulator : public SimulatorInterface {
+
+  public:
+
+    Er9xSimulator(Er9xInterface *);
+
+    virtual void start(RadioData & radioData, bool tests);
+
+    virtual void stop();
+
+    virtual bool timer10ms();
+
+    virtual uint8_t * getLcd();
+
+    virtual bool lcdChanged(bool & lightEnable);
+
+    virtual void setValues(TxInputs &inputs);
+
+    virtual void getValues(TxOutputs &outputs);
+
+    virtual void setTrim(unsigned int idx, int value);
+
+    virtual void getTrims(Trims & trims);
+
+    virtual unsigned int getPhase() { return 0; }
+
+    virtual const char * getPhaseName(unsigned int phase) { return 0; }
+
+    virtual const char * getError();
+
+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual uint8_t getSensorInstance(uint16_t id) { return 0; };
+
+    virtual uint16_t getSensorRatio(uint16_t id) { return 0; };
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
+
+    virtual void setLuaStateReloadPermanentScripts() {};
+
+  protected:
+
+    Er9xInterface * er9xInterface;
+};
+
+#endif
@@ -17,6 +17,7 @@
 #include <iostream>
 #include "ersky9xinterface.h"
 #include "ersky9xeeprom.h"
+#include "simulator/ersky9xsimulator.h"
 #include "file.h"

 #define FILE_TYP_GENERAL 1
@@ -0,0 +1,15 @@
+set(ERSKY9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/ersky9x)
+add_custom_command(
+  OUTPUT ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${ERSKY9X_CHECKOUT_DIRECTORY}
+  COMMAND cd ${ERSKY9X_CHECKOUT_DIRECTORY} && svn checkout http://ersky9x.googlecode.com/svn/trunk/src@170 .
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp ${ERSKY9X_CHECKOUT_DIRECTORY}
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp
+)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}
+)
+
+add_library(ersky9x-simulator ersky9xsimulator.cpp)
@@ -0,0 +1,247 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include "firmwares/ersky9x/ersky9xsimulator.h"
+#include "firmwares/ersky9x/ersky9xinterface.h"
+
+#define SIMU
+#define SIMU_EXCEPTIONS
+#define PCBSKY9X
+#define PCBSKY
+#define STAMP
+#define FRSKY
+#define FRSKY_HUB
+#define WS_HOW_HIGH
+#define TEMPLATES
+#define HELI
+#define HAPTIC
+#define AUDIO
+#define REVB
+
+#define NUM_POTS  3
+#define SWSRC_SW1 DSW_SW1
+
+#undef min
+#undef max
+
+#include <exception>
+
+namespace Ersky9x {
+
+#include "../ersky9x/timers.h"
+#include "../ersky9x/ersky9x.cpp"
+#include "../ersky9x/stamp.cpp"
+#include "../ersky9x/menus.cpp"
+#include "../ersky9x/pers.cpp"
+#include "../ersky9x/file.cpp"
+#include "../ersky9x/lcd.cpp"
+#include "../ersky9x/drivers.cpp"
+#include "../ersky9x/logicio.cpp"
+#include "../ersky9x/timers.cpp"
+#include "../ersky9x/simpgmspace.cpp"
+#include "../ersky9x/templates.cpp"
+#include "../ersky9x/frsky.cpp"
+#include "../ersky9x/audio.cpp"
+#include "../ersky9x/sound.cpp"
+#include "../ersky9x/diskio.cpp"
+
+#define isBacklightEnable() (PWM->PWM_CH_NUM[0].PWM_CDTY != 100)
+
+//uint8_t pxxFlag = 0;
+int16_t g_anas[7];
+
+uint16_t anaIn(uint8_t chan)
+{
+  if (chan == 7)
+    return 1500;
+  else
+    return g_anas[chan];
+}
+
+bool hasExtendedTrims()
+{
+  return false;
+}
+
+void setTrim(uint8_t idx, int8_t value)
+{
+  g_model.trim[idx] = value;
+}
+
+void getTrims(int16_t values[4])
+{
+  for (int i=0; i<4; i++)
+    values[i] = g_model.trim[i];
+}
+
+#define SWITCH_CASE(swtch, pin, mask) \
+    case swtch: \
+      if (state) pin |= (mask); else pin &= ~(mask); \
+      break;
+#define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \
+    case swtch: \
+      if (state < 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
+      if (state > 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
+      break;
+
+void simuSetSwitch(uint8_t swtch, int8_t state)
+{
+  // printf("swtch=%d state=%d\n", swtch, state); fflush(stdout);
+  switch (swtch) {
+    SWITCH_CASE(0, PIOC->PIO_PDSR, 1<<20)
+    SWITCH_CASE(1, PIOA->PIO_PDSR, 1<<15)
+    SWITCH_CASE(2, PIOC->PIO_PDSR, 1<<31)
+    SWITCH_3_CASE(3, PIOC->PIO_PDSR, PIOC->PIO_PDSR, 0x00004000, 0x00000800)
+    SWITCH_CASE(4, PIOA->PIO_PDSR, 1<<2)
+    SWITCH_CASE(5, PIOC->PIO_PDSR, 1<<16)
+    SWITCH_CASE(6, PIOC->PIO_PDSR, 1<<8)
+
+    default:
+      break;
+  }
+}
+
+#define KEYS_GPIO_REG_MENU                PIOB->PIO_PDSR
+#define KEYS_GPIO_REG_EXIT                PIOC->PIO_PDSR
+#define KEYS_GPIO_REG_UP                  PIOC->PIO_PDSR
+#define KEYS_GPIO_REG_DOWN                PIOC->PIO_PDSR
+#define KEYS_GPIO_REG_RIGHT               PIOC->PIO_PDSR
+#define KEYS_GPIO_REG_LEFT                PIOC->PIO_PDSR
+#define KEYS_GPIO_PIN_MENU                 0x00000020
+#define KEYS_GPIO_PIN_EXIT                 0x01000000
+#define KEYS_GPIO_PIN_UP                   0x00000002
+#define KEYS_GPIO_PIN_DOWN                 0x00000020
+#define KEYS_GPIO_PIN_RIGHT                0x00000010
+#define KEYS_GPIO_PIN_LEFT                 0x00000008
+
+#define KEY_CASE(key, pin, mask) \
+    case key: \
+      if (state) pin &= ~mask; else pin |= mask;\
+      break;
+
+void simuSetKey(uint8_t key, bool state)
+{
+  switch (key) {
+    KEY_CASE(KEY_MENU, KEYS_GPIO_REG_MENU, KEYS_GPIO_PIN_MENU)
+    KEY_CASE(KEY_EXIT, KEYS_GPIO_REG_EXIT, KEYS_GPIO_PIN_EXIT)
+    KEY_CASE(KEY_RIGHT, KEYS_GPIO_REG_RIGHT, KEYS_GPIO_PIN_RIGHT)
+    KEY_CASE(KEY_LEFT, KEYS_GPIO_REG_LEFT, KEYS_GPIO_PIN_LEFT)
+    KEY_CASE(KEY_UP, KEYS_GPIO_REG_UP, KEYS_GPIO_PIN_UP)
+    KEY_CASE(KEY_DOWN, KEYS_GPIO_REG_DOWN, KEYS_GPIO_PIN_DOWN)
+  }
+}
+
+#define TRIMS_GPIO_REG_LHL                  PIOA->PIO_PDSR
+#define TRIMS_GPIO_REG_LVD                 PIOA->PIO_PDSR
+#define TRIMS_GPIO_REG_RVU                 PIOA->PIO_PDSR
+#define TRIMS_GPIO_REG_RHL                  PIOA->PIO_PDSR
+#define TRIMS_GPIO_REG_LHR                  PIOB->PIO_PDSR
+#define TRIMS_GPIO_REG_LVU                 PIOC->PIO_PDSR
+#define TRIMS_GPIO_REG_RVD                 PIOC->PIO_PDSR
+#define TRIMS_GPIO_REG_RHR                  PIOC->PIO_PDSR
+#define PIN_TRIM_LH_L                   0x00800000
+#define PIN_TRIM_LV_DN                  0x01000000
+#define PIN_TRIM_RV_UP                  0x00000002
+#define PIN_TRIM_RH_L                   0x00000001
+#define PIN_TRIM_LH_R                   0x00000010
+#define PIN_TRIM_LV_UP                  0x10000000
+#define PIN_TRIM_RV_DN                  0x00000400
+#define PIN_TRIM_RH_R                   0x00000200
+
+#define TRIM_CASE KEY_CASE
+
+void simuSetTrim(uint8_t trim, bool state)
+{
+  switch (trim) {
+    TRIM_CASE(0, TRIMS_GPIO_REG_LHL, PIN_TRIM_LH_L)
+    TRIM_CASE(1, TRIMS_GPIO_REG_LHR, PIN_TRIM_LH_R)
+    TRIM_CASE(2, TRIMS_GPIO_REG_LVD, PIN_TRIM_LV_DN)
+    TRIM_CASE(3, TRIMS_GPIO_REG_LVU, PIN_TRIM_LV_UP)
+    TRIM_CASE(4, TRIMS_GPIO_REG_RVD, PIN_TRIM_RV_DN)
+    TRIM_CASE(5, TRIMS_GPIO_REG_RVU, PIN_TRIM_RV_UP)
+    TRIM_CASE(6, TRIMS_GPIO_REG_RHL, PIN_TRIM_RH_L)
+    TRIM_CASE(7, TRIMS_GPIO_REG_RHR, PIN_TRIM_RH_R)
+  }
+}
+
+}
+
+using namespace Ersky9x;
+
+Ersky9xSimulator::Ersky9xSimulator(Ersky9xInterface * ersky9xInterface):
+  ersky9xInterface(ersky9xInterface)
+{
+}
+
+bool Ersky9xSimulator::timer10ms()
+{
+#define TIMER10MS_IMPORT
+#include "simulatorimport.h"
+}
+
+uint8_t * Ersky9xSimulator::getLcd()
+{
+#define GETLCD_IMPORT
+#include "simulatorimport.h"
+}
+
+bool Ersky9xSimulator::lcdChanged(bool & lightEnable)
+{
+#define LCDCHANGED_IMPORT
+#include "simulatorimport.h"
+}
+
+void Ersky9xSimulator::start(RadioData &radioData, bool tests)
+{
+  ersky9xInterface->save(Ersky9x::eeprom, radioData);
+  StartEepromThread(NULL);
+  StartMainThread(tests);
+}
+
+void Ersky9xSimulator::stop()
+{
+  StopMainThread();
+  StopEepromThread();
+}
+
+void Ersky9xSimulator::getValues(TxOutputs &outputs)
+{
+#define GETVALUES_IMPORT
+#include "simulatorimport.h"
+}
+
+void Ersky9xSimulator::setValues(TxInputs &inputs)
+{
+#define SETVALUES_IMPORT
+#include "simulatorimport.h"
+}
+
+void Ersky9xSimulator::setTrim(unsigned int idx, int value)
+{
+  Ersky9x::setTrim(idx, value);
+}
+
+void Ersky9xSimulator::getTrims(Trims & trims)
+{
+  trims.extended = false;
+  Ersky9x::getTrims(trims.values);
+}
+
+const char * Ersky9xSimulator::getError()
+{
+#define GETERROR_IMPORT
+#include "simulatorimport.h"
+}
@@ -0,0 +1,70 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef ersky9x_simulator_h
+#define ersky9x_simulator_h
+
+#include "simulatorinterface.h"
+
+class RadioData;
+class Ersky9xInterface;
+
+class Ersky9xSimulator : public SimulatorInterface {
+
+  public:
+
+    Ersky9xSimulator(Ersky9xInterface *);
+
+    virtual void start(RadioData & radioData, bool tests);
+
+    virtual void stop();
+
+    virtual bool timer10ms();
+
+    virtual uint8_t * getLcd();
+
+    virtual bool lcdChanged(bool & lightEnable);
+
+    virtual void setValues(TxInputs &inputs);
+
+    virtual void getValues(TxOutputs &outputs);
+
+    virtual void setTrim(unsigned int idx, int value);
+
+    virtual void getTrims(Trims & trims);
+
+    virtual unsigned int getPhase() { return 0; }
+
+    virtual const char * getPhaseName(unsigned int phase) { return 0; }
+
+    virtual const char * getError();
+
+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual uint8_t getSensorInstance(uint16_t id) { return 0; };
+
+    virtual uint16_t getSensorRatio(uint16_t id) { return 0; };
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
+
+    virtual void setLuaStateReloadPermanentScripts() {};
+
+  protected:
+
+    Ersky9xInterface * ersky9xInterface;
+};
+
+#endif
@@ -741,14 +741,6 @@ class CurveReferenceField: public TransformedField {
    int _curve_value;
 };

-static int exportHeliInversionWeight(int source) {
-  return (source < 0) ? 1 : 0;
-}
-
-static int importHeliInversionWeight(int source) {
-  return source ? -100: 100;
-}
-
 class HeliField: public StructField {
  public:
    HeliField(SwashRingData & heli, BoardEnum board, unsigned int version, unsigned int variant)
@@ -764,15 +756,22 @@ class HeliField: public StructField {
        Append(new SignedField<8>(heli.elevatorWeight));
      }
      else {
-        Append(new ConversionField< SignedField<1> >(heli.elevatorWeight, exportHeliInversionWeight, importHeliInversionWeight));
-        Append(new ConversionField< SignedField<1> >(heli.aileronWeight, exportHeliInversionWeight, importHeliInversionWeight));
-        Append(new ConversionField< SignedField<1> >(heli.collectiveWeight, exportHeliInversionWeight, importHeliInversionWeight));
+        Append(new BoolField<1>(invertELE));
+        Append(new BoolField<1>(invertAIL));
+        Append(new BoolField<1>(invertCOL));
        Append(new UnsignedField<5>(heli.type));
        Append(new SourceField<8>(heli.collectiveSource, board, version, variant));
        //, FLAG_NOSWITCHES)); Fix shift in collective
        Append(new UnsignedField<8>(heli.value));
      }
    }
+
+  // TODO before + after
+
+  protected:
+    bool invertELE;
+    bool invertAIL;
+    bool invertCOL;
 };

 class FlightModeField: public TransformedField {
@@ -2171,7 +2170,7 @@ class ArmCustomFunctionField: public TransformedField {

      if (fn.func >= FuncOverrideCH1 && fn.func <= FuncOverrideCH32) {
        fn.func = AssignFunc(fn.func + index);
-        fn.param = (int16_t)(uint16_t)value;
+        fn.param = (int8_t)value;
      }
      else if (fn.func >= FuncSetTimer1 && fn.func <= FuncSetTimer3) {
        fn.func = AssignFunc(fn.func + index);
@@ -2824,7 +2823,7 @@ class SensorField: public TransformedField {
        _instance = sensor.formula;
        if (sensor.formula == SensorData::TELEM_FORMULA_CELL)
          _param = (sensor.source) + (sensor.index << 8);
-        else if (sensor.formula == SensorData::TELEM_FORMULA_ADD || sensor.formula == SensorData::TELEM_FORMULA_AVERAGE || sensor.formula == SensorData::TELEM_FORMULA_MULTIPLY || sensor.formula == SensorData::TELEM_FORMULA_MIN || sensor.formula == SensorData::TELEM_FORMULA_MAX)
+        else if (sensor.formula == SensorData::TELEM_FORMULA_ADD || sensor.formula == SensorData::TELEM_FORMULA_MULTIPLY || sensor.formula == SensorData::TELEM_FORMULA_MIN || sensor.formula == SensorData::TELEM_FORMULA_MAX)
          _param = ((uint8_t)sensor.sources[0]) + ((uint8_t)sensor.sources[1] << 8) + ((uint8_t)sensor.sources[2] << 16) + ((uint8_t)sensor.sources[3] << 24);
        else if (sensor.formula == SensorData::TELEM_FORMULA_DIST)
          _param = (sensor.gps) + (sensor.alt << 8);
@@ -2846,7 +2845,7 @@ class SensorField: public TransformedField {
        sensor.formula = _instance;
        if (sensor.formula == SensorData::TELEM_FORMULA_CELL)
          (sensor.source = _sources[0], sensor.index = _sources[1]);
-        else if (sensor.formula == SensorData::TELEM_FORMULA_ADD || sensor.formula == SensorData::TELEM_FORMULA_AVERAGE || sensor.formula == SensorData::TELEM_FORMULA_MULTIPLY || sensor.formula == SensorData::TELEM_FORMULA_MIN || sensor.formula == SensorData::TELEM_FORMULA_MAX)
+        else if (sensor.formula == SensorData::TELEM_FORMULA_ADD || sensor.formula == SensorData::TELEM_FORMULA_MULTIPLY || sensor.formula == SensorData::TELEM_FORMULA_MIN || sensor.formula == SensorData::TELEM_FORMULA_MAX)
          for (int i=0; i<4; ++i)
            sensor.sources[i] = _sources[i];
        else if (sensor.formula == SensorData::TELEM_FORMULA_DIST)
@@ -82,8 +82,7 @@ class ProtocolsConversionTable: public ConversionTable
        addConversion(PULSES_DSMX, val++);
      }
      if (IS_TARANIS(board)) {
-        addConversion(PULSES_CROSSFIRE, val++);
-        addConversion(PULSES_MULTIMODULE, val++);
+    	addConversion(PULSES_CROSSFIRE, val++);
      }
    }
 };
@@ -805,16 +805,6 @@ int OpenTxFirmware::getCapability(const Capability capability)
  }
 }

-QTime OpenTxFirmware::getMaxTimerStart()
-{
-  if (IS_TARANIS(board))
-    return QTime(23, 59, 59);
-  else if (IS_ARM(board))
-    return QTime(8, 59, 59);
-  else
-    return QTime(0, 59, 59);
-}
-
 bool OpenTxFirmware::isTelemetrySourceAvailable(int source)
 {
  if (IS_TARANIS(board) && (source == TELEMETRY_SOURCE_RSSI_TX))
@@ -1153,7 +1143,7 @@ void addOpenTxTaranisOptions(OpenTxFirmware * firmware)
  Option usb_options[] = { { "massstorage", QObject::tr("Instead of Joystick emulation, USB connection is Mass Storage (as in the Bootloader)") }, { "cli", QObject::tr("Instead of Joystick emulation, USB connection is Command Line Interface") }, { NULL } };
  firmware->addOptions(usb_options);
  firmware->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
-  firmware->addOption("eu", QObject::tr("Removes D8 FrSky protocol support which is not legal for use in the EU on radios sold after Jan 1st, 2015"));
+  firmware->addOption("eu", QObject::tr("Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015"));
  firmware->addOption("internalppm", QObject::tr("Support for PPM internal module hack"));
 }

@@ -1178,109 +1168,8 @@ void registerOpenTxFirmwares()
  Option nav_options[] = { { "rotenc", QObject::tr("Rotary Encoder use in menus navigation") }, { "potscroll", QObject::tr("Pots use in menus navigation") }, { NULL } };
  Option dsm2_options[] = { { "DSM2", QObject::tr("Support for DSM2 modules"), 0 }, { "DSM2PPM", QObject::tr("Support for DSM2 modules using ppm instead of true serial"), 0 }, { NULL } };

-  /* Taranis Plus board */
-  firmware = new OpenTxFirmware("opentx-taranisplus", QObject::tr("FrSky Taranis Plus"), BOARD_TARANIS_PLUS);
-  addOpenTxTaranisOptions(firmware);
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
-  /* Taranis board */
-  firmware = new OpenTxFirmware("opentx-taranis", QObject::tr("FrSky Taranis"), BOARD_TARANIS);
-  firmware->addOption("haptic", QObject::tr("Haptic module installed"));
-  addOpenTxTaranisOptions(firmware);
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
-  /* Taranis X9E board */
-  firmware = new OpenTxFirmware("opentx-taranisx9e", QObject::tr("FrSky Taranis X9E"), BOARD_TARANIS_X9E);
-  firmware->addOption("shutdownconfirm", QObject::tr("Confirmation before radio shutdown"));
-  addOpenTxTaranisOptions(firmware);
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
-  /* 9XR-Pro */
-  firmware = new OpenTxFirmware("opentx-9xrpro", QObject::tr("Turnigy 9XR-PRO"), BOARD_9XRPRO);
-  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
-  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  firmware->addOption("nofp", QObject::tr("No flight modes"));
-  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
-  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
-  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
-  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  firmware->addOption("battgraph", QObject::tr("Battery graph"));
-  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
-  /* 9XR board with M128 chip */
-  firmware = new OpenTxFirmware("opentx-9xr128", QObject::tr("Turnigy 9XR with m128 chip"), BOARD_M128);
-  firmware->addOptions(extr_options);
-  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
-  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  firmware->addOption("nosplash", QObject::tr("No splash screen"));
-  firmware->addOption("nofp", QObject::tr("No flight modes"));
-  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
-  firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
-  firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
-  firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
-  // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
-  firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
-  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
-  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  firmware->addOption("battgraph", QObject::tr("Battery graph"));
-  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
-  firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
-  firmware->addOption("imperial", QObject::tr("Imperial units"));
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
-  /* 9XR board */
-  firmware = new OpenTxFirmware("opentx-9xr", QObject::tr("Turnigy 9XR"), BOARD_STOCK);
-  firmware->addOptions(extr_options);
-  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
-  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  firmware->addOption("nosplash", QObject::tr("No splash screen"));
-  firmware->addOption("nofp", QObject::tr("No flight modes"));
-  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
-  firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
-  firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
-  firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
-  // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
-  firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
-  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
-  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  firmware->addOption("battgraph", QObject::tr("Battery graph"));
-  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
-  firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
-  firmware->addOption("imperial", QObject::tr("Imperial units"));
-  firmware->addOption("nowshh", QObject::tr("No Winged Shadow How High support"));
-  firmware->addOption("novario", QObject::tr("No vario support"));
-  firmware->addOption("nogps", QObject::tr("No GPS support"));
-  firmware->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
-  firmware->addOption("stickrev", QObject::tr("Add support for reversing stick inputs (e.g. needed for FrSky gimbals)"));
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
  /* 9x board */
-  firmware = new OpenTxFirmware("opentx-9x", QObject::tr("9X with stock board"), BOARD_STOCK);
+  firmware = new OpenTxFirmware("opentx-9x", QObject::tr("9X board"), BOARD_STOCK);
  firmware->addOptions(ext_options);
  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
@@ -1316,7 +1205,7 @@ void registerOpenTxFirmwares()
  firmwares.push_back(firmware);

  /* 9x board with M128 chip */
-  firmware = new OpenTxFirmware("opentx-9x128", QObject::tr("9X with stock board and m128 chip"), BOARD_M128);
+  firmware = new OpenTxFirmware("opentx-9x128", QObject::tr("M128 / 9X board"), BOARD_M128);
  firmware->addOptions(ext_options);
  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
@@ -1345,52 +1234,69 @@ void registerOpenTxFirmwares()
  addOpenTxCommonOptions(firmware);
  firmwares.push_back(firmware);

-  /* ar9x board */
-  firmware = new OpenTxFirmware("opentx-ar9x", QObject::tr("9X with AR9X board"), BOARD_AR9X);
-  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
+  /* 9XR board */
+  firmware = new OpenTxFirmware("opentx-9xr", QObject::tr("9XR"), BOARD_STOCK);
+  firmware->addOptions(extr_options);
+  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  firmware->addOption("nosplash", QObject::tr("No splash screen"));
  firmware->addOption("nofp", QObject::tr("No flight modes"));
  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
+  firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
+  firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
+  // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
+  firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
  firmware->addOption("battgraph", QObject::tr("Battery graph"));
  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
-//  firmware->addOption("rtc", QObject::tr("Optional RTC added"));
-//  firmware->addOption("volume", QObject::tr("i2c volume control added"));
+  firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
+  firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
+  firmware->addOption("imperial", QObject::tr("Imperial units"));
+  firmware->addOption("nowshh", QObject::tr("No Winged Shadow How High support"));
+  firmware->addOption("novario", QObject::tr("No vario support"));
+  firmware->addOption("nogps", QObject::tr("No GPS support"));
+  firmware->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
+  firmware->addOption("stickrev", QObject::tr("Add support for reversing stick inputs (e.g. needed for FrSky gimbals)"));
  addOpenTxCommonOptions(firmware);
  firmwares.push_back(firmware);

-  /* Sky9x board */
-  firmware = new OpenTxFirmware("opentx-sky9x", QObject::tr("9X with Sky9x board"), BOARD_SKY9X);
-  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
+  /* 9XR board with M128 chip */
+  firmware = new OpenTxFirmware("opentx-9xr128", QObject::tr("9XR with M128 chip"), BOARD_M128);
+  firmware->addOptions(extr_options);
+  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  firmware->addOption("nosplash", QObject::tr("No splash screen"));
  firmware->addOption("nofp", QObject::tr("No flight modes"));
  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
+  firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
+  firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
+  // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
+  firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
  firmware->addOption("battgraph", QObject::tr("Battery graph"));
  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
+  firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
+  firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
+  firmware->addOption("imperial", QObject::tr("Imperial units"));
  addOpenTxCommonOptions(firmware);
  firmwares.push_back(firmware);

  /* Gruvin9x board */
-  firmware = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("9X with Gruvin9x board"), BOARD_GRUVIN9X);
+  firmware = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("Gruvin9x board / 9X"), BOARD_GRUVIN9X);
  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
  firmware->addOption("nofp", QObject::tr("No flight modes"));
@@ -1415,7 +1321,7 @@ void registerOpenTxFirmwares()
  firmwares.push_back(firmware);

  /* MEGA2560 board */
-  firmware = new OpenTxFirmware("opentx-mega2560", QObject::tr("DIY MEGA2560 radio"), BOARD_MEGA2560);
+  firmware = new OpenTxFirmware("opentx-mega2560", QObject::tr("MEGA2560 board"), BOARD_MEGA2560);
  addOpenTxLcdOptions(firmware);
  firmware->addOption("PWR", QObject::tr("Power management by soft-off circuitry"));
  firmware->addOptions(ext_options);
@@ -1426,7 +1332,7 @@ void registerOpenTxFirmwares()
  firmware->addOption("nofp", QObject::tr("No flight modes"));
  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
  firmware->addOption("sdcard", QObject::tr("Support for SD memory card"));
-  firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
+//firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
 //firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
  firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
@@ -1444,6 +1350,90 @@ void registerOpenTxFirmwares()
  addOpenTxCommonOptions(firmware);
  firmwares.push_back(firmware);

+  /* Sky9x board */
+  firmware = new OpenTxFirmware("opentx-sky9x", QObject::tr("Sky9x board / 9X"), BOARD_SKY9X);
+  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
+  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  firmware->addOption("nofp", QObject::tr("No flight modes"));
+  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
+  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
+  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
+  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
+  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  firmware->addOption("battgraph", QObject::tr("Battery graph"));
+  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
+  /* ar9x board */
+  firmware = new OpenTxFirmware("opentx-ar9x", QObject::tr("ar9x board / 9X"), BOARD_AR9X);
+  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
+  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  firmware->addOption("nofp", QObject::tr("No flight modes"));
+  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
+  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
+  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
+  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
+  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  firmware->addOption("battgraph", QObject::tr("Battery graph"));
+  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
+//  firmware->addOption("rtc", QObject::tr("Optional RTC added"));
+//  firmware->addOption("volume", QObject::tr("i2c volume control added"));
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
+  /* 9XR-Pro */
+  firmware = new OpenTxFirmware("opentx-9xrpro", QObject::tr("9XR-PRO"), BOARD_9XRPRO);
+  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
+  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  firmware->addOption("nofp", QObject::tr("No flight modes"));
+  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
+  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
+  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
+  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  firmware->addOption("battgraph", QObject::tr("Battery graph"));
+  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
+  /* Taranis board */
+  firmware = new OpenTxFirmware("opentx-taranis", QObject::tr("FrSky Taranis"), BOARD_TARANIS);
+  firmware->addOption("haptic", QObject::tr("Haptic module installed"));
+  addOpenTxTaranisOptions(firmware);
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
+  /* Taranis Plus board */
+  firmware = new OpenTxFirmware("opentx-taranisplus", QObject::tr("FrSky Taranis Plus"), BOARD_TARANIS_PLUS);
+  addOpenTxTaranisOptions(firmware);
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
+  /* Taranis X9E board */
+  firmware = new OpenTxFirmware("opentx-taranisx9e", QObject::tr("FrSky Taranis X9E"), BOARD_TARANIS_X9E);
+  firmware->addOption("shutdownconfirm", QObject::tr("Confirmation before radio shutdown"));
+  addOpenTxTaranisOptions(firmware);
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
  default_firmware_variant = GetFirmware("opentx-taranisplus-en");
  current_firmware_variant = default_firmware_variant;
 }
@@ -118,8 +118,6 @@ class OpenTxFirmware: public Firmware {
    virtual QString getFirmwareUrl();

    virtual int getCapability(const Capability);
-    
-    virtual QTime getMaxTimerStart();

    virtual bool isTelemetrySourceAvailable(int source);

@@ -30,8 +30,8 @@ macro(add_lua_export_target target)
  add_custom_target(lua_export_${target} DEPENDS ${RADIO_SRC_DIRECTORY}/lua/lua_exports_${target}.inc)
 endmacro(add_lua_export_target)

-add_lua_export_target(taranis     -DCPUARM -DPCBTARANIS                   -DLUA -DVIRTUALINPUTS)
-add_lua_export_target(taranis_x9e -DCPUARM -DPCBTARANIS -DREVPLUS -DREV9E -DLUA -DVIRTUALINPUTS)
+add_lua_export_target(taranis -DPCBTARANIS -DLUA -DVIRTUALINPUTS)
+add_lua_export_target(taranis_x9e -DPCBTARANIS -DREVPLUS -DREV9E -DLUA -DVIRTUALINPUTS)

 set(OPENTX_SRC_FILES
  opentxsimulator.cpp
@@ -77,9 +77,6 @@
 #undef min
 #undef max

-// some C++ headers must be included outside the custom namespace (fails to compile in gcc-6)
-#include <math.h>
-
 namespace NAMESPACE {

 #if defined(CPUARM)
@@ -329,11 +326,6 @@ uint16_t anaIn(uint8_t chan)
    return g_anas[chan];
 }

-uint16_t getAnalogValue(uint32_t index) 
-{
-  return anaIn(index);
-}
-
 bool hasExtendedTrims()
 {
  return g_model.extendedTrims;
@@ -505,7 +497,7 @@ void OpenTxSimulator::sendTelemetry(::uint8_t * data, unsigned int len)
 #endif
 }

-uint8_t OpenTxSimulator::getSensorInstance(uint16_t id, uint8_t defaultValue)
+uint8_t OpenTxSimulator::getSensorInstance(uint16_t id)
 {
 #if defined(FRSKY_SPORT)
  for (int i = 0; i<MAX_SENSORS; i++) {
@@ -517,7 +509,7 @@ uint8_t OpenTxSimulator::getSensorInstance(uint16_t id, uint8_t defaultValue)
    }
  }
 #endif
-  return defaultValue;
+  return 0;
 }

 uint16_t OpenTxSimulator::getSensorRatio(uint16_t id)
@@ -122,7 +122,7 @@ class DLLEXPORT OpenTxSimulator : public SimulatorInterface {

    virtual void sendTelemetry(uint8_t * data, unsigned int len);

-    virtual uint8_t getSensorInstance(uint16_t id, uint8_t defaultValue = 0);
+    virtual uint8_t getSensorInstance(uint16_t id);

    virtual uint16_t getSensorRatio(uint16_t id);

@@ -0,0 +1,15 @@
+set(TH9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/th9x)
+add_custom_command(
+  OUTPUT ${TH9X_CHECKOUT_DIRECTORY}/th9xsimulator.cpp
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${TH9X_CHECKOUT_DIRECTORY}
+  COMMAND cd ${TH9X_CHECKOUT_DIRECTORY} && svn checkout http://th9x.googlecode.com/svn/trunk/src@285 .
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/th9x/th9xsimulator.cpp ${TH9X_CHECKOUT_DIRECTORY}
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/th9x/th9xsimulator.cpp
+)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}
+)
+
+add_library(th9x-simulator th9xsimulator.cpp)
@@ -0,0 +1,233 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include "firmwares/th9x/th9xsimulator.h"
+#include "firmwares/th9x/th9xinterface.h"
+
+#define SIM
+#define SIMU
+#define SIMU_EXCEPTIONS
+
+#undef min
+#undef max
+
+#define NUM_POTS  3
+#define NUM_CSW   12
+#define SWSRC_SW1 10
+
+#include <exception>
+#include <algorithm>
+
+namespace Th9x {
+
+#include "simpgmspace.h"
+#include "th9x.cpp"
+#include "stamp.cpp"
+#include "menus.cpp"
+#include "pers.cpp"
+#include "file.cpp"
+#include "lcd.cpp"
+#include "drivers.cpp"
+#include "foldedlist.cpp"
+#include "simpgmspace.cpp"
+#include "pulses.cpp"
+
+int16_t g_anas[7];
+char g_title[80] = "";
+
+uint16_t anaIn(uint8_t chan)
+{
+  if (chan == 7)
+    return 750;
+  else
+    return 512 + g_anas[chan];
+}
+
+bool hasExtendedTrims()
+{
+  return false;
+}
+
+void setTrim(uint8_t idx, int8_t value)
+{
+  g_model.trimData[idx].itrim = trimRevertM(value, g_model.trimData[idx].tmode);
+}
+
+void getTrims(int16_t values[4])
+{
+  for (int i=0; i<4; i++) {
+    values[i] = trimVal(i);
+  }
+}
+
+void eeprom_RESV_mismatch(void)
+{
+  assert(!"Should never been called. Only needed by VC++ (debug mode)");
+}
+
+#define TRIMS_GPIO_REG_LHL         pind
+#define TRIMS_GPIO_REG_LVD        pind
+#define TRIMS_GPIO_REG_RVU        pind
+#define TRIMS_GPIO_REG_RHL         pind
+#define TRIMS_GPIO_REG_LHR         pind
+#define TRIMS_GPIO_REG_LVU        pind
+#define TRIMS_GPIO_REG_RVD        pind
+#define TRIMS_GPIO_REG_RHR         pind
+#define PIN_TRIM_LH_L          (1<<INP_D_TRM_LH_DWN)
+#define PIN_TRIM_LV_DN         (1<<INP_D_TRM_LV_DWN)
+#define PIN_TRIM_RV_UP         (1<<INP_D_TRM_RV_UP)
+#define PIN_TRIM_RH_L          (1<<INP_D_TRM_RH_DWN)
+#define PIN_TRIM_LH_R          (1<<INP_D_TRM_LH_UP)
+#define PIN_TRIM_LV_UP         (1<<INP_D_TRM_LV_UP)
+#define PIN_TRIM_RV_DN         (1<<INP_D_TRM_RV_DWN)
+#define PIN_TRIM_RH_R          (1<<INP_D_TRM_RH_UP)
+
+#define TRIM_CASE(key, pin, mask) \
+    case key: \
+      if (state) pin |= mask; else pin &= ~mask;\
+      break;
+
+void simuSetTrim(uint8_t trim, bool state)
+{
+  switch (trim) {
+    TRIM_CASE(0, TRIMS_GPIO_REG_LHL, PIN_TRIM_LH_L)
+    TRIM_CASE(1, TRIMS_GPIO_REG_LHR, PIN_TRIM_LH_R)
+    TRIM_CASE(2, TRIMS_GPIO_REG_LVD, PIN_TRIM_LV_DN)
+    TRIM_CASE(3, TRIMS_GPIO_REG_LVU, PIN_TRIM_LV_UP)
+    TRIM_CASE(4, TRIMS_GPIO_REG_RVD, PIN_TRIM_RV_DN)
+    TRIM_CASE(5, TRIMS_GPIO_REG_RVU, PIN_TRIM_RV_UP)
+    TRIM_CASE(6, TRIMS_GPIO_REG_RHL, PIN_TRIM_RH_L)
+    TRIM_CASE(7, TRIMS_GPIO_REG_RHR, PIN_TRIM_RH_R)
+  }
+}
+
+#define SWITCH_CASE(swtch, pin, mask) \
+    case swtch: \
+      if (state) pin &= ~(mask); else pin |= (mask); \
+      break;
+#define SWITCH_3_CASE(swtch, pin1, pin2, mask1, mask2) \
+    case swtch: \
+      if (state >= 0) pin1 &= ~(mask1); else pin1 |= (mask1); \
+      if (state <= 0) pin2 &= ~(mask2); else pin2 |= (mask2); \
+      break;
+
+void simuSetSwitch(uint8_t swtch, int8_t state)
+{
+  switch (swtch) {
+    SWITCH_CASE(0, pine, 1<<INP_E_ThrCt)
+    SWITCH_CASE(4, pine, 1<<INP_E_AileDR)
+    SWITCH_3_CASE(3, ping, pine, (1<<INP_G_ID1), (1<<INP_E_ID2))
+    SWITCH_CASE(1, ping, 1<<INP_G_RuddDR)
+    SWITCH_CASE(2, pine, 1<<INP_E_ElevDR)
+    SWITCH_CASE(5, pine, 1<<INP_E_Gear)
+    SWITCH_CASE(6, pine, 1<<INP_E_Trainer)
+    default:
+      break;
+  }
+}
+
+#define KEY_CASE(key, pin, mask) \
+    case key: \
+      if (state) pin |= mask; else pin &= ~mask;\
+      break;
+
+void simuSetKey(uint8_t key, bool state)
+{
+  switch (key) {
+    KEY_CASE(KEY_MENU, pinb, (1<<INP_B_KEY_MEN))
+    KEY_CASE(KEY_EXIT, pinb, (1<<INP_B_KEY_EXT))
+    KEY_CASE(KEY_RIGHT, pinb, (1<<INP_B_KEY_RGT))
+    KEY_CASE(KEY_LEFT, pinb, (1<<INP_B_KEY_LFT))
+    KEY_CASE(KEY_UP, pinb, (1<<INP_B_KEY_UP))
+    KEY_CASE(KEY_DOWN, pinb, (1<<INP_B_KEY_DWN))
+  }
+}
+
+#define isBacklightEnable() (PORTB & (1<<OUT_B_LIGHT))
+
+}
+
+using namespace Th9x;
+
+Th9xSimulator::Th9xSimulator(Th9xInterface * th9xInterface):
+  th9xInterface(th9xInterface)
+{
+}
+
+bool Th9xSimulator::timer10ms()
+{
+#define TIMER10MS_IMPORT
+#include "simulatorimport.h"
+}
+
+uint8_t * Th9xSimulator::getLcd()
+{
+#define GETLCD_IMPORT
+#include "simulatorimport.h"
+}
+
+bool Th9xSimulator::lcdChanged(bool & lightEnable)
+{
+#define LCDCHANGED_IMPORT
+#include "simulatorimport.h"
+}
+
+void Th9xSimulator::start(RadioData &radioData, bool tests)
+{
+  th9xInterface->save(&eeprom[0], radioData);
+  StartMainThread(tests);
+}
+
+void Th9xSimulator::stop()
+{
+  StopMainThread();
+}
+
+void Th9xSimulator::getValues(TxOutputs &outputs)
+{
+#define GETVALUES_IMPORT
+#include "simulatorimport.h"
+  for (int i=0; i<8; i++)
+    outputs.chans[i] *= 2;
+}
+
+void Th9xSimulator::setValues(TxInputs &_inputs)
+{
+  TxInputs inputs = _inputs;
+  for (int i=0; i<4; i++)
+    inputs.sticks[i] /= 2;
+  for (int i=0; i<3; i++)
+    inputs.pots[i] /= 2;  
+#define SETVALUES_IMPORT
+#include "simulatorimport.h"
+}
+
+void Th9xSimulator::setTrim(unsigned int idx, int value)
+{
+  Th9x::setTrim(idx, value);
+}
+
+void Th9xSimulator::getTrims(Trims & trims)
+{
+  trims.extended = false;
+  Th9x::getTrims(trims.values);
+}
+
+const char * Th9xSimulator::getError()
+{
+#define GETERROR_IMPORT
+#include "simulatorimport.h"
+}
@@ -0,0 +1,58 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef th9x_simulator_h
+#define th9x_simulator_h
+
+#include "simulatorinterface.h"
+
+class RadioData;
+class Th9xInterface;
+
+class Th9xSimulator : public SimulatorInterface {
+
+  public:
+
+    Th9xSimulator(Th9xInterface *);
+
+    virtual void start(RadioData & radioData, bool tests);
+
+    virtual void stop();
+
+    virtual bool timer10ms();
+
+    virtual uint8_t * getLcd();
+
+    virtual bool lcdChanged(bool & lightEnable);
+
+    virtual void setValues(TxInputs &inputs);
+
+    virtual void getValues(TxOutputs &outputs);
+
+    virtual void setTrim(unsigned int idx, int value);
+
+    virtual void getTrims(Trims & trims);
+
+    virtual unsigned int getPhase() { return 0; }
+
+    virtual const char * getError();
+
+  protected:
+
+    Th9xInterface * th9xInterface;
+};
+
+#endif
@@ -17,6 +17,7 @@
 #include <iostream>
 #include "th9xinterface.h"
 #include "th9xeeprom.h"
+#include "simulator/th9xsimulator.h"
 #include "file.h"
 #include "appdata.h"

@@ -84,15 +84,12 @@ void GeneralEdit::on_calretrieve_PB_clicked()
 {
  int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();
  QString calib=g.profile[profile_id].stickPotCalib();
-  int potsnum=GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
-  int numSwPots=GetCurrentFirmware()->getCapability(Switches)+GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots);
  if (calib.isEmpty()) {
    return;
  }
  else {
    QString trainercalib = g.profile[profile_id].trainerCalib();
-    QString hwtypes = g.profile[profile_id].controlTypes();
-    QString controlNames=g.profile[profile_id].controlNames();
    int8_t txVoltageCalibration = (int8_t)g.profile[profile_id].txVoltageCalibration();
    int8_t txCurrentCalibration = (int8_t)g.profile[profile_id].txCurrentCalibration();
    int8_t PPM_Multiplier = (int8_t)g.profile[profile_id].ppmMultiplier();
@@ -111,18 +108,22 @@ void GeneralEdit::on_calretrieve_PB_clicked()
      for (int i=0; i<(NUM_STICKS+potsnum); i++) {
        Byte=calib.mid(i*12,4);
        byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok) generalSettings.calibMid[i]=byte16;
+        if (ok)
+          generalSettings.calibMid[i]=byte16;
        Byte=calib.mid(4+i*12,4);
        byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok) generalSettings.calibSpanNeg[i]=byte16;
+        if (ok)
+          generalSettings.calibSpanNeg[i]=byte16;
        Byte=calib.mid(8+i*12,4);
        byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok) generalSettings.calibSpanPos[i]=byte16;
+        if (ok)
+          generalSettings.calibSpanPos[i]=byte16;
      }
      for (int i=0; i<4; i++) {
        Byte=trainercalib.mid(i*4,4);
        byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok) generalSettings.trainer.calib[i]=byte16;
+        if (ok)
+          generalSettings.trainer.calib[i]=byte16;
      }
      generalSettings.txCurrentCalibration=txCurrentCalibration;
      generalSettings.txVoltageCalibration=txVoltageCalibration;
@@ -135,48 +136,6 @@ void GeneralEdit::on_calretrieve_PB_clicked()
    } else {
      QMessageBox::critical(this, tr("Warning"), tr("Wrong data in profile, radio calibration was not retrieved"));
    }
-    if (hwtypes.length()==numSwPots) {
-      QString Byte;
-      int16_t byte16;
-      QByteArray qba;
-      int16_t offset;
-      bool ok;
-      for (int i=0; i<NUM_STICKS; i++) {
-        qba = controlNames.mid(3*i,3).toAscii();
-        strcpy(generalSettings.stickName[i], qba.data());
-      }
-      for (int i=0; i<(GetCurrentFirmware()->getCapability(Switches)); i++) {
-        Byte=hwtypes.mid(i,1);
-        byte16=(int16_t)Byte.toInt(&ok,16);
-        qba=controlNames.mid(3*(i+NUM_STICKS),3).toAscii();
-        if (ok) {
-          generalSettings.switchConfig[i]=byte16;
-          strcpy(generalSettings.switchName[i], qba.data());
-        }
-      }
-      offset = GetCurrentFirmware()->getCapability(Switches);
-      for (int i=0; i<(GetCurrentFirmware()->getCapability(Pots)); i++) {
-        Byte=hwtypes.mid(i+offset,1);
-        byte16=(int16_t)Byte.toInt(&ok,16);
-        qba=controlNames.mid(3*(i+NUM_STICKS+offset),3).toAscii();
-        if (ok) {
-          generalSettings.potConfig[i]=byte16;
-          strcpy(generalSettings.potName[i], qba.data());
-        }
-      }
-      offset += GetCurrentFirmware()->getCapability(Pots);
-      for (int i=0; i<(GetCurrentFirmware()->getCapability(Sliders)); i++) {
-        Byte=hwtypes.mid(i+offset,1);
-        byte16=(int16_t)Byte.toInt(&ok,16);
-        qba=controlNames.mid(3*(i+NUM_STICKS+offset),3).toAscii();
-        if (ok) {
-          generalSettings.sliderConfig[i]=byte16;
-          strcpy(generalSettings.sliderName[i], qba.data());
-        }
-      }
-    } else {
-      QMessageBox::critical(this, tr("Warning"), tr("Wrong data in profile, Switch/pot config not retrieved"));
-    }
    if ((DisplaySet.length()==6) && (BeeperSet.length()==4) && (HapticSet.length()==6) && (SpeakerSet.length()==6)) {
      generalSettings.stickMode=GSStickMode;
      uint8_t byte8u;
@@ -184,32 +143,45 @@ void GeneralEdit::on_calretrieve_PB_clicked()
      QString chars;
      bool ok;
      byte8=(int8_t)DisplaySet.mid(0,2).toInt(&ok,16);
-      if (ok) generalSettings.optrexDisplay=(byte8==1 ? true : false);
+      if (ok)
+        generalSettings.optrexDisplay=(byte8==1 ? true : false);
      byte8u=(uint8_t)DisplaySet.mid(2,2).toUInt(&ok,16);
-      if (ok) generalSettings.contrast=byte8u;
+      if (ok)
+        generalSettings.contrast=byte8u;
      byte8u=(uint8_t)DisplaySet.mid(4,2).toUInt(&ok,16);
-      if (ok) generalSettings.backlightBright=byte8u;
+      if (ok)
+        generalSettings.backlightBright=byte8u;
      byte8=(int8_t)BeeperSet.mid(0,2).toUInt(&ok,16);
-      if (ok) generalSettings.beeperMode = (GeneralSettings::BeeperMode)byte8;
+      if (ok)
+        generalSettings.beeperMode = (GeneralSettings::BeeperMode)byte8;
      byte8=(int8_t)BeeperSet.mid(2,2).toInt(&ok,16);
-      if (ok) generalSettings.beeperLength=byte8;
+      if (ok)
+        generalSettings.beeperLength=byte8;
      byte8=(int8_t)HapticSet.mid(0,2).toUInt(&ok,16);
-      if (ok) generalSettings.hapticMode=(GeneralSettings::BeeperMode)byte8;
+      if (ok)
+        generalSettings.hapticMode=(GeneralSettings::BeeperMode)byte8;
      byte8=(int8_t)HapticSet.mid(2,2).toInt(&ok,16);
-      if (ok) generalSettings.hapticStrength=byte8;
+      if (ok)
+        generalSettings.hapticStrength=byte8;
      byte8=(int8_t)HapticSet.mid(4,2).toInt(&ok,16);
-      if (ok) generalSettings.hapticLength=byte8;
+      if (ok)
+        generalSettings.hapticLength=byte8;
      byte8u=(uint8_t)SpeakerSet.mid(0,2).toUInt(&ok,16);
-      if (ok) generalSettings.speakerMode=byte8u;
+      if (ok)
+        generalSettings.speakerMode=byte8u;
      byte8u=(uint8_t)SpeakerSet.mid(2,2).toUInt(&ok,16);
-      if (ok) generalSettings.speakerPitch=byte8u;
+      if (ok)
+        generalSettings.speakerPitch=byte8u;
      byte8u=(uint8_t)SpeakerSet.mid(4,2).toUInt(&ok,16);
-      if (ok) generalSettings.speakerVolume=byte8u;
+      if (ok)
+        generalSettings.speakerVolume=byte8u;
      if (CountrySet.length()==6) {
        byte8u=(uint8_t)CountrySet.mid(0,2).toUInt(&ok,16);
-        if (ok) generalSettings.countryCode=byte8u;
+        if (ok)
+          generalSettings.countryCode=byte8u;
        byte8u=(uint8_t)CountrySet.mid(2,2).toUInt(&ok,16);
-        if (ok) generalSettings.imperial=byte8u;
+        if (ok)
+          generalSettings.imperial=byte8u;
        chars=CountrySet.mid(4,2);
        generalSettings.ttsLanguage[0]=chars[0].toAscii();
        generalSettings.ttsLanguage[1]=chars[1].toAscii();
@@ -228,15 +200,13 @@ void GeneralEdit::on_calstore_PB_clicked()
  int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();

  QString name=g.profile[profile_id].name();
-  int potsnum=GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots);
  if (name.isEmpty()) {
    ui->calstore_PB->setDisabled(true);
    return;
  }
  else {
    QString calib=g.profile[profile_id].stickPotCalib();
-    QString hwtypes=g.profile[profile_id].controlTypes();
-    QString controlNames=g.profile[profile_id].controlNames();
    if (!(calib.isEmpty())) {
      int ret = QMessageBox::question(this, "Companion",
                      tr("Do you want to store calibration in %1 profile<br>overwriting existing calibration?").arg(name) ,
@@ -257,25 +227,6 @@ void GeneralEdit::on_calstore_PB_clicked()
      calib.append(QString("%1").arg((uint16_t)generalSettings.trainer.calib[i], 4, 16, QChar('0')));
    }
    g.profile[profile_id].trainerCalib( calib );
-    hwtypes.clear();
-    controlNames.clear();
-    for (int i=0; i<NUM_STICKS; i++) {
-      controlNames.append(QString("%1").arg(generalSettings.stickName[i], -3));
-    }
-    for (int i=0; i<(GetCurrentFirmware()->getCapability(Switches)); i++) {
-      hwtypes.append(QString("%1").arg((uint16_t)generalSettings.switchConfig[i], 1));
-      controlNames.append(QString("%1").arg(generalSettings.switchName[i], -3));
-    }
-    for (int i=0; i<(GetCurrentFirmware()->getCapability(Pots)); i++) {
-      hwtypes.append(QString("%1").arg((uint16_t)generalSettings.potConfig[i], 1));
-      controlNames.append(QString("%1").arg(generalSettings.potName[i], -3));
-    }
-    for (int i=0; i<(GetCurrentFirmware()->getCapability(Sliders)); i++) {
-      hwtypes.append(QString("%1").arg((uint16_t)generalSettings.sliderConfig[i], 1));
-      controlNames.append(QString("%1").arg(generalSettings.sliderName[i], -3));
-    }
-    g.profile[profile_id].controlTypes( hwtypes );
-    g.profile[profile_id].controlNames( controlNames );
    g.profile[profile_id].txVoltageCalibration( generalSettings.txVoltageCalibration );
    g.profile[profile_id].txCurrentCalibration( generalSettings.txCurrentCalibration );
    g.profile[profile_id].vBatWarn( generalSettings.vBatWarn );
@@ -275,8 +275,8 @@ void GeneralSetupPanel::populateBacklightCB()
 void GeneralSetupPanel::populateVoiceLangCB()
 {
  QComboBox * b = ui->voiceLang_CB;
-  QString strings[] = { QObject::tr("English"), QObject::tr("Dutch"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), QObject::tr("Hungarian"), NULL};
-  QString langcode[] = { "en", "nl","fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", "hu", NULL};
+  QString strings[] = { QObject::tr("English"), QObject::tr("Finnish"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), NULL};
+  QString langcode[] = { "en", "fi","fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", NULL};

  b->clear();
  for (int i=0; strings[i]!=NULL; i++) {
@@ -658,7 +658,7 @@
       <item>
        <widget class="QCheckBox" name="adjustRTC">
         <property name="toolTip">
-          <string>Automatically adjust the radio's clock if a GPS is connected to telemetry.</string>
+          <string>If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.</string>
         </property>
         <property name="layoutDirection">
          <enum>Qt::RightToLeft</enum>
@@ -103,7 +103,7 @@ void populatePhasesCB(QComboBox *b, int value)
  b->setCurrentIndex(value + GetCurrentFirmware()->getCapability(FlightModes));
 }

-GVarGroup::GVarGroup(QCheckBox * weightGV, QAbstractSpinBox * weightSB, QComboBox * weightCB, int & weight, const ModelData & model, const int deflt, const int mini, const int maxi, const double step, bool allowGvars):
+GVarGroup::GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox *weightCB, int & weight, const int deflt, const int mini, const int maxi, const double step, bool allowGvars):
  QObject(),
  weightGV(weightGV),
  weightSB(weightSB),
@@ -115,7 +115,7 @@ GVarGroup::GVarGroup(QCheckBox * weightGV, QAbstractSpinBox * weightSB, QComboBo
  lock(true)
 {
  if (allowGvars && GetCurrentFirmware()->getCapability(Gvars)) {
-    populateGVCB(*weightCB, weight, model);
+    populateGVCB(weightCB, weight);
    connect(weightGV, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
    connect(weightCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
  }
@@ -179,14 +179,13 @@ void GVarGroup::valuesChanged()
  }
 }

-CurveGroup::CurveGroup(QComboBox * curveTypeCB, QCheckBox * curveGVarCB, QComboBox * curveValueCB, QSpinBox * curveValueSB, CurveReference & curve, const ModelData & model, unsigned int flags):
+CurveGroup::CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags):
  QObject(),
  curveTypeCB(curveTypeCB),
  curveGVarCB(curveGVarCB),
  curveValueCB(curveValueCB),
  curveValueSB(curveValueSB),
  curve(curve),
-  model(model),
  flags(flags),
  lock(false),
  lastType(-1)
@@ -220,7 +219,7 @@ void CurveGroup::update()
      curveGVarCB->setChecked(true);
      if (lastType != CurveReference::CURVE_REF_DIFF && lastType != CurveReference::CURVE_REF_EXPO) {
        lastType = curve.type;
-        populateGVCB(*curveValueCB, curve.value, model);
+        populateGVCB(curveValueCB, curve.value);
      }
      curveValueCB->show();
      curveValueSB->hide();
@@ -277,7 +276,6 @@ void CurveGroup::gvarCBChanged(int state)
  if (!lock) {
    if (state) {
      curve.value = 10000+1; // TODO constant in EEpromInterface ...
-      lastType = -1; // quickfix for issue #3518: force refresh of curveValueCB at next update() to set current index to GV1
    }
    else {
      curve.value = 0; // TODO could be better
@@ -480,39 +478,33 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
  b->setMaxVisibleItems(10);
 }

-void populateGVCB(QComboBox & b, int value, const ModelData & model)
+void populateGVCB(QComboBox *b, int value)
 {
  bool selected = false;

-  b.clear();
+  b->clear();

-  int count = GetCurrentFirmware()->getCapability(Gvars);
-  for (int i=-count; i<=-1; i++) {
+  int pgvars = GetCurrentFirmware()->getCapability(Gvars);
+  for (int i=-pgvars; i<=-1; i++) {
    int16_t gval = (int16_t)(-10000+i);
-    if (strlen(model.gvars_names[-i-1]) > 0)
-      b.addItem(QObject::tr("-GV%1 (%2)").arg(-i).arg(model.gvars_names[-i-1]), gval);
-    else
-      b.addItem(QObject::tr("-GV%1").arg(-i), gval);
+    b->addItem(QObject::tr("-GV%1").arg(-i), gval);
    if (value == gval) {
-      b.setCurrentIndex(b.count()-1);
+      b->setCurrentIndex(b->count()-1);
      selected = true;
    }
  }

-  for (int i=1; i<=count; i++) {
+  for (int i=1; i<=pgvars; i++) {
    int16_t gval = (int16_t)(10000+i);
-    if (strlen(model.gvars_names[i-1]) > 0)
-      b.addItem(QObject::tr("GV%1 (%2)").arg(i).arg(model.gvars_names[i-1]), gval);
-    else
-      b.addItem(QObject::tr("GV%1").arg(i), gval);
+    b->addItem(QObject::tr("GV%1").arg(i), gval);
    if (value == gval) {
-      b.setCurrentIndex(b.count()-1);
+      b->setCurrentIndex(b->count()-1);
      selected = true;
    }
  }

  if (!selected) {
-    b.setCurrentIndex(count);
+    b->setCurrentIndex(pgvars);
  }
 }

@@ -45,7 +45,7 @@ class GVarGroup: public QObject {
  Q_OBJECT

  public:
-    GVarGroup(QCheckBox * weightGV, QAbstractSpinBox * weightSB, QComboBox * weightCB, int & weight, const ModelData & model, const int deflt, const int mini, const int maxi, const double step=1.0, bool allowGVars=true);
+    GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox *weightCB, int & weight, const int deflt, const int mini, const int maxi, const double step=1.0, bool allowGVars=true);

  protected slots:
    void gvarCBChanged(int);
@@ -71,7 +71,7 @@ class CurveGroup : public QObject {
  Q_OBJECT

  public:
-    CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, const ModelData & model, unsigned int flags=0);
+    CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags=0);
    void update();

  protected slots:
@@ -85,7 +85,6 @@ class CurveGroup : public QObject {
    QComboBox *curveValueCB;
    QSpinBox *curveValueSB;
    CurveReference & curve;
-    const ModelData & model;
    unsigned int flags;
    bool lock;
    int lastType;
@@ -118,7 +117,8 @@ void populateGvarUseCB(QComboBox *b, unsigned int phase);
 #define GVARS_VARIANT 0x0001
 #define FRSKY_VARIANT 0x0002

-void populateGVCB(QComboBox & b, int value, const ModelData & model);
+// void populateGVarCB(QComboBox *b, int value, int min, int max,int pgvars=5); //TODO: Clean Up
+void populateGVCB(QComboBox *b, int value);
 void populateSourceCB(QComboBox *b, const RawSource &source, const GeneralSettings generalSettings, const ModelData * model, unsigned int flags);
 QString image2qstring(QImage image);
 int findmult(float value, float base);
@@ -7,7 +7,7 @@
 #include <QCheckBox>
 #include <QDoubleSpinBox>

-LimitsGroup::LimitsGroup(Firmware * firmware, TableLayout * tableLayout, int row, int col, int & value, const ModelData & model, int min, int max, int deflt):
+LimitsGroup::LimitsGroup(Firmware * firmware, TableLayout *tableLayout, int row, int col, int & value, int min, int max, int deflt):
  firmware(firmware),
  spinbox(new QDoubleSpinBox()),
  value(value),
@@ -50,7 +50,7 @@ LimitsGroup::LimitsGroup(Firmware * firmware, TableLayout * tableLayout, int row
  horizontalLayout->addWidget(cb);
  horizontalLayout->addWidget(spinbox);
  tableLayout->addLayout(row, col, horizontalLayout);
-  gvarGroup = new GVarGroup(gv, spinbox, cb, value, model, deflt, min, max, displayStep, allowGVars);
+  gvarGroup = new GVarGroup(gv, spinbox, cb, value, deflt, min, max, displayStep, allowGVars);
 }

 LimitsGroup::~LimitsGroup()
@@ -119,13 +119,13 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
    }

    // Channel offset
-    limitsGroups << new LimitsGroup(firmware, tableLayout, i, col++, model.limitData[i].offset, model, -1000, 1000, 0);
+    limitsGroups << new LimitsGroup(firmware, tableLayout, i, col++, model.limitData[i].offset, -1000, 1000, 0);

    // Channel min
-    limitsGroups << new LimitsGroup(firmware, tableLayout, i, col++, model.limitData[i].min, model, -model.getChannelsMax()*10, 0, -1000);
+    limitsGroups << new LimitsGroup(firmware, tableLayout, i, col++, model.limitData[i].min, -model.getChannelsMax()*10, 0, -1000);

    // Channel max
-    limitsGroups << new LimitsGroup(firmware, tableLayout, i, col++, model.limitData[i].max, model, 0, model.getChannelsMax()*10, 1000);
+    limitsGroups << new LimitsGroup(firmware, tableLayout, i, col++, model.limitData[i].max, 0, model.getChannelsMax()*10, 1000);

    // Channel inversion
    QComboBox * invCB = new QComboBox(this);
@@ -10,7 +10,7 @@ class GVarGroup;
 class LimitsGroup
 {
  public:
-    LimitsGroup(Firmware * firmware, TableLayout *tableLayout, int row, int col, int & value, const ModelData & model, int min, int max, int deflt);
+    LimitsGroup(Firmware * firmware, TableLayout *tableLayout, int row, int col, int & value, int min, int max, int deflt);
    ~LimitsGroup();

    void updateMinMax(int max);
@@ -503,8 +503,9 @@ void Curves::resizeEvent(QResizeEvent *event)
  ModelPanel::resizeEvent(event);
 }

-void Curves::on_curveType_currentIndexChanged(int index)
+void Curves::on_curveType_currentIndexChanged()
 {
+  int index = ui->curveType->currentIndex();
  unsigned int flags = templates[index].flags;
  ui->curveCoeffLabel->setVisible(flags & CURVE_COEFF_ENABLE);
  ui->curveCoeff->setVisible(flags & CURVE_COEFF_ENABLE);
@@ -46,7 +46,7 @@ class Curves : public ModelPanel
    void onNodeMoved(int x, int y);
    void onNodeFocus();
    void onNodeUnfocus();
-    void on_curveType_currentIndexChanged(int index);
+    void on_curveType_currentIndexChanged();
    void on_curveApply_clicked();

  protected:
@@ -70,7 +70,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
  s1.report("get tracks");

  if (IS_TARANIS(firmware->getBoard())) {
-    scriptsSet = getFilesSet(g.profile[g.id()].sdPath() + "/SCRIPTS/FUNCTIONS", QStringList() << "*.lua", firmware->getCapability(VoicesMaxLength));
+    scriptsSet = getFilesSet(g.profile[g.id()].sdPath() + "/SCRIPTS", QStringList() << "*.lua", firmware->getCapability(VoicesMaxLength));
    for (int i=0; i<num_fsw; i++) {
      if (functions[i].func==FuncPlayScript) {
        QString temp = functions[i].paramarm;
@@ -403,7 +403,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
    else if (func>=FuncSetTimer1 && func<=FuncSetTimer3) {
      if (modified) cfn.param = QTimeS(fswtchParamTime[i]->time()).seconds();
      fswtchParamTime[i]->setMinimumTime(QTime(0, 0, 0));
-      fswtchParamTime[i]->setMaximumTime(firmware->getMaxTimerStart());
+      fswtchParamTime[i]->setMaximumTime(QTime(0, 59, 59));
      fswtchParamTime[i]->setTime(QTimeS(cfn.param));
      widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE;
    }
@@ -46,6 +46,8 @@

 #include <math.h>

+static const double Pi = 3.14159265358979323846264338327950288419717;
+
 Edge::Edge(Node *sourceNode, Node *destNode)
    : arrowSize(10)
 {
@@ -21,11 +21,11 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
  QRegExp rx(CHAR_FOR_NAMES_REGEX);

  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
-    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, model, 100, -100, 100);
-    gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, ed->offset, model, 0, -100, 100);
+    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, model, 100, 0, 100);
+    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, 100, 0, 100);
    gvOffsetGroup = NULL;
    ui->offsetLabel->hide();
    ui->offsetGV->hide();
@@ -33,7 +33,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
    ui->offsetCB->hide();
  }

-  curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve, model,
+  curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve, 
                              firmware->getCapability(HasInputDiff) ? 0 : (HIDE_DIFF | HIDE_NEGATIVE_CURVES));

  populateSwitchCB(ui->switchesCB, ed->swtch, generalSettings, MixesContext);
@@ -110,14 +110,14 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
      reLayout->addWidget(label, i, 0, 1, 1);
      if (phaseIdx > 0) {
        // RE link to another RE
-        reUse[i] = new QComboBox(ui->reGB);
-        reUse[i]->setProperty("index", i);
-        populateGvarUseCB(reUse[i], phaseIdx);
+        QComboBox *link = new QComboBox(ui->gvGB);
+        link->setProperty("index", i);
+        populateGvarUseCB(link, phaseIdx);
+        connect(link, SIGNAL(currentIndexChanged(int)), this, SLOT(phaseREUse_currentIndexChanged(int)));
        if (phase.rotaryEncoders[i] > 1024) {
-          reUse[i]->setCurrentIndex(phase.rotaryEncoders[i] - 1024);
+          link->setCurrentIndex(phase.rotaryEncoders[i] - 1024);
        }
-        connect(reUse[i], SIGNAL(currentIndexChanged(int)), this, SLOT(phaseREUse_currentIndexChanged(int)));
-        reLayout->addWidget(reUse[i], i, 1, 1, 1);
+        reLayout->addWidget(link, i, 1, 1, 1);
      }
      // RE value
      reValues[i] = new QSpinBox(ui->reGB);
@@ -152,14 +152,14 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
      }
      if (phaseIdx > 0) {
        // GVar link to another GVar
-        gvUse[i] = new QComboBox(ui->gvGB);
-        gvUse[i]->setProperty("index", i);
-        populateGvarUseCB(gvUse[i], phaseIdx);
+        QComboBox *link = new QComboBox(ui->gvGB);
+        link->setProperty("index", i);
+        populateGvarUseCB(link, phaseIdx);
        if (phase.gvars[i] > 1024) {
-          gvUse[i]->setCurrentIndex(phase.gvars[i] - 1024);
+          link->setCurrentIndex(phase.gvars[i] - 1024);
        }
-        connect(gvUse[i], SIGNAL(currentIndexChanged(int)), this, SLOT(phaseGVUse_currentIndexChanged(int)));
-        gvLayout->addWidget(gvUse[i], i, col++, 1, 1);
+        connect(link, SIGNAL(currentIndexChanged(int)), this, SLOT(phaseGVUse_currentIndexChanged(int)));
+        gvLayout->addWidget(link, i, col++, 1, 1);
      }
      // GVar value
      gvValues[i] = new QSpinBox(ui->gvGB);
@@ -227,11 +227,17 @@ void FlightModePanel::update()
    }
  }

-  if (ui->reGB->isVisible()) {
-    for (int i=0; i<reCount; i++) {    
-      reValues[i]->setDisabled(model->isRELinked(phaseIdx, i));
-      reValues[i]->setValue(model->getREValue(phaseIdx, i));
+  for (int i=0; i<reCount; i++) {    
+    reValues[i]->setDisabled(false);
+    int idx = phase.rotaryEncoders[i];
+    FlightModeData *phasere = &phase;
+    while (idx > 1024) {
+      idx -= 1025;
+      phasere = &model->flightModeData[idx];
+      idx = phasere->rotaryEncoders[i];
+      reValues[i]->setDisabled(true);
    }
+    reValues[i]->setValue(phasere->rotaryEncoders[i]);
  }
 }

@@ -245,11 +251,9 @@ void FlightModePanel::phaseName_editingFinished()

 void FlightModePanel::phaseSwitch_currentIndexChanged(int index)
 {
-  if (!lock) {
    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
    phase.swtch = RawSwitch(comboBox->itemData(index).toInt());
    emit modified();
-  }
 }

 void FlightModePanel::phaseFadeIn_editingFinished()
@@ -286,14 +290,8 @@ void FlightModePanel::trimUpdate(unsigned int trim)
      trimsUse[trim]->setCurrentIndex(1 + 2*phase.trimRef[chn] + phase.trimMode[chn] - (phase.trimRef[chn] > phaseIdx ? 1 : 0));
    else
      trimsUse[trim]->setCurrentIndex(phase.trimRef[chn]);
-    if (phaseIdx == 0 || phase.trimRef[chn] == phaseIdx || (IS_TARANIS(board) && phase.trimMode[chn] != 0)) {
-      trimsValue[trim]->setEnabled(true);
-      trimsSlider[trim]->setEnabled(true);
-    }
-    else {
-      trimsValue[trim]->setEnabled(false);
-      trimsSlider[trim]->setEnabled(false);
-    }
+    trimsValue[trim]->setEnabled(true);
+    trimsSlider[trim]->setEnabled(true);
  }
  lock = false;
 }
@@ -332,8 +330,6 @@ void FlightModePanel::phaseGVUse_currentIndexChanged(int index)
      phase.gvars[gvar] = 1024 + index;
    }
    update();
-    if (model->isGVarLinkedCircular(phaseIdx,gvar))
-      QMessageBox::warning(this, "Companion", tr("Warning: Global variable links back to itself. Flight Mode 0 value used."));
    emit modified();
    lock = false;
  }
@@ -344,7 +340,6 @@ void FlightModePanel::phaseGVPopupToggled(bool checked)
  QCheckBox *cb = qobject_cast<QCheckBox*>(sender());
  int gvar = cb->property("index").toInt();
  model->gvars_popups[gvar] = checked;
-  emit modified();
 }

 void FlightModePanel::phaseREValue_editingFinished()
@@ -370,10 +365,8 @@ void FlightModePanel::phaseREUse_currentIndexChanged(int index)
      phase.rotaryEncoders[re] = 1024 + index;                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ;
    }
    update();
-    if (model->isRELinkedCircular(phaseIdx,re))
-      QMessageBox::warning(this, "Companion", tr("Warning: Rotary encoder links back to itself. Flight Mode 0 value used."));
-    emit modified();
    lock = false;
+    emit modified();
  }
 }

@@ -449,29 +442,9 @@ void FlightModePanel::fmClear()
 {
  int res = QMessageBox::question(this, "Companion", tr("Clear all current Flight Mode properties?"), QMessageBox::Yes | QMessageBox::No);
  if (res == QMessageBox::Yes) {
-    phase.clear(phaseIdx);
-    if (phaseIdx == 0) {
-      if (IS_TARANIS(GetEepromInterface()->getBoard())) {
-        for (int i=0; i < gvCount; ++i) {
-          memset(&model->gvars_names[i], 0, sizeof(model->gvars_names[i]));
-          model->gvars_popups[i] = 0;
-        }
-      }
-    }
-    else {
-      lock = true;
-      QComboBox * pswtch = ui->swtch;
-      RawSwitch item = RawSwitch(SWITCH_TYPE_NONE);
-      pswtch->setCurrentIndex(pswtch->findText(item.toString()));
-      if (gvCount > 0 && (firmware->getCapability(GvarsFlightModes))) {
-        for (int i=0; i<gvCount; i++) {
-          gvUse[i]->setCurrentIndex((phase.gvars[i] > 1024 ? (phase.gvars[i] - 1024) : 0));
-        }
-      }
-      for (int i=0; i<reCount; i++) {
-        reUse[i]->setCurrentIndex((phase.rotaryEncoders[i] > 1024 ? (phase.rotaryEncoders[i] - 1024) : 0));
-      }
-      lock = false;
+    phase.clear();
+    for(int i=0; i < 4; ++i) {
+      model->setTrimValue(phaseIdx, i, 0);
    }
    update();
    emit modified();
@@ -54,9 +54,7 @@ class FlightModePanel : public ModelPanel
    QLineEdit * gvNames[C9X_MAX_GVARS];
    QSpinBox * gvValues[C9X_MAX_GVARS];
    QCheckBox * gvPopups[C9X_MAX_GVARS];
-    QComboBox * gvUse[C9X_MAX_GVARS];
    QSpinBox * reValues[C9X_MAX_ENCODERS];
-    QComboBox * reUse[C9X_MAX_ENCODERS];
    QVector<QComboBox *> trimsUse;
    QVector<QSpinBox *> trimsValue;
    QVector<QSlider *> trimsSlider;
@@ -25,10 +25,10 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G

    int limit = firmware->getCapability(OffsetWeight);

-    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, md->weight, model, 100, -limit, limit);
-    gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, md->sOffset, model, 0, -limit, limit);
+    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, md->weight, 100, -limit, limit);
+    gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, md->sOffset, 0, -limit, limit);
    curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, 
-                                md->curve, model, firmware->getCapability(HasMixerExpo) ? 0 : HIDE_EXPO);
+                                md->curve, firmware->getCapability(HasMixerExpo) ? 0 : HIDE_EXPO);

    ui->MixDR_CB->setChecked(md->noExpo == 0);

@@ -42,8 +42,6 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
    ui->countdownBeep->addItem(tr("Voice"), TimerData::COUNTDOWN_VOICE);
    ui->countdownBeep->addItem(tr("Haptic"), TimerData::COUNTDOWN_HAPTIC);
  }
-  
-  ui->value->setMaximumTime(firmware->getMaxTimerStart());

  ui->persistent->setField(timer.persistent, this);
  ui->persistent->addItem(tr("Not persistent"), 0);
@@ -68,11 +66,9 @@ TimerPanel::~TimerPanel()

 void TimerPanel::update()
 {
-  int hour = timer.val / 3600;
-  int min = (timer.val - (hour * 3600)) / 60;
-  int sec = (timer.val - (hour * 3600)) % 60;
-
-  ui->value->setTime(QTime(hour, min, sec));
+  int min = timer.val / 60;
+  int sec = timer.val % 60;
+  ui->value->setTime(QTime(0, min, sec));

  if (firmware->getCapability(PermTimers)) {
    int sign = 1;
@@ -98,7 +94,7 @@ QWidget * TimerPanel::getLastFocus()

 void TimerPanel::on_value_editingFinished()
 {
-  timer.val = ui->value->time().hour()*3600 + ui->value->time().minute()*60 + ui->value->time().second();
+  timer.val = ui->value->time().minute()*60 + ui->value->time().second();
  emit modified();
 }

@@ -331,8 +327,8 @@ void ModulePanel::update()
  ui->failsafesFrame->setVisible(mask & MASK_FAILSAFES);

  if (mask & MASK_CHANNELS_RANGE) {
-    ui->channelsStart->setMaximum(33 - ui->channelsCount->value());
-    ui->channelsCount->setMaximum(qMin(16, 33-ui->channelsStart->value()));
+    ui->channelsStart->setMaximum(32 - ui->channelsCount->value());
+    ui->channelsCount->setMaximum(qMin(16, 32-ui->channelsStart->value()));
  }
 }

@@ -778,7 +774,6 @@ void SetupPanel::populateThrottleSourceCB()

  lock = true;

-  ui->throttleSource->clear();
  ui->throttleSource->addItem(QObject::tr("THR"));

  if (IS_TARANIS_X9E(GetEepromInterface()->getBoard())) {
@@ -18,7 +18,7 @@
  </property>
  <layout class="QHBoxLayout" name="horizontalLayout_2">
   <property name="spacing">
-    <number>6</number>
+    <number>-1</number>
   </property>
   <property name="margin">
    <number>0</number>
@@ -39,10 +39,10 @@
      <bool>true</bool>
     </property>
     <property name="currentSection">
-      <enum>QDateTimeEdit::HourSection</enum>
+      <enum>QDateTimeEdit::MinuteSection</enum>
     </property>
     <property name="displayFormat">
-      <string notr="true">hh:mm:ss</string>
+      <string notr="true">mm:ss</string>
     </property>
    </widget>
   </item>
@@ -619,7 +619,7 @@ void TelemetrySensorPanel::update()
  ui->source4->setVisible(sources34FieldsDisplayed);
  ui->autoOffset->setVisible(sensor.unit != SensorData::UNIT_RPMS && isConfigurable);
  ui->filter->setVisible(isConfigurable);
-  ui->persistent->setVisible(sensor.type == SensorData::TELEM_TYPE_CALCULATED);
+  ui->persistent->setVisible((sensor.type == SensorData::TELEM_TYPE_CALCULATED && sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION) || isConfigurable);

  lock = false;
 }
@@ -696,10 +696,10 @@ void TelemetrySensorPanel::on_unit_currentIndexChanged(int index)
  }
 }

-void TelemetrySensorPanel::on_prec_valueChanged(double value)
+void TelemetrySensorPanel::on_prec_valueChanged()
 {
  if (!lock) {
-    sensor.prec = value;
+    sensor.prec = ui->prec->value();
    emit dataModified();
    emit modified();
  }
@@ -800,8 +800,7 @@ void TelemetryPanel::setup()
    if (IS_ARM(firmware->getBoard())) {
      ui->telemetryProtocol->addItem(tr("FrSky S.PORT"), 0);
      ui->telemetryProtocol->addItem(tr("FrSky D"), 1);
-      if (IS_9XRPRO(firmware->getBoard()) || 
-         (IS_TARANIS(firmware->getBoard()) && generalSettings.hw_uartMode == 2)) {
+      if (IS_9XRPRO(firmware->getBoard())) {
        ui->telemetryProtocol->addItem(tr("FrSky D (cable)"), 2);
      }
      ui->telemetryProtocol->setCurrentIndex(model->telemetryProtocol);
@@ -96,7 +96,7 @@ class TelemetrySensorPanel: public ModelPanel
    void on_type_currentIndexChanged(int index);
    void on_formula_currentIndexChanged(int index);
    void on_unit_currentIndexChanged(int index);
-    void on_prec_valueChanged(double value);
+    void on_prec_valueChanged();

  protected:
    void updateSourcesComboBox(AutoComboBox * cb, bool negative);
@@ -98,8 +98,7 @@ QString ModelPrinter::printModuleProtocol(unsigned int protocol)
 	  "LP45", "DSM2", "DSMX",
 	  "PPM16", "PPMsim",
 	  "FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
-	  "Crossfire",
-	  "DIY Multiprotocol Module"
+	  "Crossfire"
  };

  return CHECK_IN_ARRAY(strings, protocol);
@@ -143,25 +142,6 @@ QString ModelPrinter::printTrainerMode()
  return result;
 }

-QString ModelPrinter::printHeliSwashType ()
-{
-  switch (model.swashRingData.type) {
-    case HELI_SWASH_TYPE_90:
-        return tr("90");
-      case HELI_SWASH_TYPE_120:
-        return tr("120");
-      case HELI_SWASH_TYPE_120X:
-        return tr("120X");
-      case HELI_SWASH_TYPE_140:
-        return tr("140");
-      case HELI_SWASH_TYPE_NONE:
-        return tr("Off");
-      default:
-        return "???";
-    }
-}
-
-
 QString ModelPrinter::printCenterBeep()
 {
  QStringList strl;
@@ -326,9 +306,6 @@ QString ModelPrinter::printInputLine(const ExpoData & input)
    else if (input.carryTrim<0) str += " " + Qt::escape(RawSource(SOURCE_TYPE_TRIM, (-(input.carryTrim)-1)).toString(&model));
  }

-  if (input.offset)
-    str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(input.offset)));
-
  if (firmware->getCapability(HasExpoNames) && input.name[0]) 
    str += Qt::escape(QString(" [%1]").arg(input.name));

@@ -44,7 +44,6 @@ class ModelPrinter: public QObject
    QString printModule(int idx);
    QString printTrainerMode();
    QString printCenterBeep();
-    QString printHeliSwashType();
    QString printTrim(int flightModeIndex, int stickIndex);
    QString printGlobalVar(int flightModeIndex, int gvarIndex);
    QString printRotaryEncoder(int flightModeIndex, int reIndex);
@@ -209,8 +209,8 @@

 #ifdef MOUNTED_GETMNTINFO

-# if defined(MOUNTED_VMOUNT) && ! HAVE_STRUCT_STATFS_F_FSTYPENAME
-static const char *
+# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
+static char *
 fstype_to_string (short int t)
 {
  switch (t)
@@ -305,11 +305,20 @@ fstype_to_string (short int t)
 }
 # endif

+static char *
+fsp_to_string (const struct statfs *fsp)
+{
+# if HAVE_STRUCT_STATFS_F_FSTYPENAME
+  return (char *) (fsp->f_fstypename);
+# else
+  return fstype_to_string (fsp->f_type);
+# endif
+}

 #endif /* MOUNTED_GETMNTINFO */

 #ifdef MOUNTED_VMOUNT                /* AIX.  */
-static const char *
+static char *
 fstype_to_string (int t)
 {
  struct vfs_ent *e;
@@ -891,7 +900,7 @@ read_file_system_list (bool need_fs_type)
  *mtail = NULL;
  return mount_list;

-#if defined(MOUNTED_GETMNTENT1) || defined(MOUNTED_GETMNTENT2) || defined(MOUNTED_GETMNT) || defined(MOUNTED_FREAD) || defined(MOUNTED_FREAD_FSTYP)
+
 free_then_fail:
  {
    int saved_errno = errno;
@@ -911,7 +920,6 @@ read_file_system_list (bool need_fs_type)
    errno = saved_errno;
    return NULL;
  }
-#endif
 }

 void free_file_system_list(struct mount_entry * mount_list)
@@ -128,8 +128,6 @@ QString MultiModelPrinter::print(QTextDocument * document)

  QString str = "<table border='1' cellspacing='0' cellpadding='3' width='100%' style='font-family: monospace;'>";
  str += printSetup();
-  if (firmware->getCapability(Heli))
-    str += printHeliSetup();
  if (firmware->getCapability(FlightModes))
    str += printFlightModes();
  str += printInputs();
@@ -183,57 +181,6 @@ QString MultiModelPrinter::printSetup()
  return str;
 }

-
-QString MultiModelPrinter::printHeliSetup()
-{
-  bool heliEnabled = false;
-  for (int k=0; k<models.size(); k++) {
-    heliEnabled =  heliEnabled || models[k]->swashRingData.type != HELI_SWASH_TYPE_NONE;
-  }
-
-  if (!heliEnabled)
-    return "";
-
-  QString str = printTitle(tr("Helicopter Setup"));
-  MultiColumns columns(models.size());
-  columns.appendTitle (tr("Swash Type:"));
-  COMPARE(modelPrinter->printHeliSwashType());
-  columns.append ("<br/>");
-
-  columns.appendTitle (tr("Swash Ring:"));
-  COMPARE(model->swashRingData.value);
-
-  columns.append ("<table cellspacing='0' cellpadding='1' width='100%' border='0' style='border-collapse:collapse'>");
-  columns.append("<tr>");
-  columns.append("<td></td><td><b>" + tr("Input") + "</b></td><td><b>" + tr("Weight") + "</b></td>");
-  columns.append("</tr>");
-
-  columns.append("<tr><td><b>" + tr("Long. cyc") + "</b></td><td>");
-  COMPARE(model->swashRingData.elevatorSource.toString(model));
-  columns.append("</td><td>");
-  COMPARE(model->swashRingData.elevatorWeight)
-  columns.append("</td></tr>");
-
-  columns.append("<tr><td><b>" + tr("Lateral cyc") + "</b></td><td>");
-  COMPARE(model->swashRingData.aileronSource.toString(model));
-  columns.append("</td><td>");
-  COMPARE(model->swashRingData.aileronWeight)
-  columns.append("</td></tr>");
-
-
-  columns.append("<tr><td><b>" + tr("Collective") + "</b></td><td>");
-  COMPARE(model->swashRingData.collectiveSource.toString(model));
-  columns.append("</td><td>");
-  COMPARE(model->swashRingData.collectiveWeight)
-  columns.append("</td></tr>");
-  columns.append("</table>");
-
-
-
-  str.append(columns.print());
-  return str;
-}
-
 QString MultiModelPrinter::printFlightModes()
 {
  QString str = printTitle(tr("Flight modes"));
@@ -43,7 +43,6 @@ class MultiModelPrinter: public QObject

    QString printTitle(const QString & label);
    QString printSetup();
-    QString printHeliSetup();
    QString printFlightModes();
    QString printLimits();
    QString printInputs();
@@ -94,7 +94,7 @@ QString SyncProcess::updateEntry(const QString & path, const QDir & source, cons
  else {
    if (!destinationInfo.exists()) {
      // qDebug() << "Copy" << path << "to" << destinationPath;
-      progress->addText(tr("Copy %1 to %2").arg(path).arg(destinationPath) + "\n");
+      progress->addText(tr("Copy %1 to %2\n").arg(path).arg(destinationPath));
      if (!QFile::copy(path, destinationPath)) {
        return QObject::tr("Copy '%1' to '%2' failed").arg(path).arg(destinationPath);
      }
@@ -105,38 +105,27 @@ QString SyncProcess::updateEntry(const QString & path, const QDir & source, cons
      if (!sourceFile.open(QFile::ReadOnly)) {
        return QObject::tr("Open '%1' failed").arg(path);
      }
-      QByteArray sourceContents = sourceFile.readAll();
+      QString sourceContents = sourceFile.readAll();
      sourceFile.close();
-
-      // retrieve destination contents
-      QFile destinationFile(destinationPath);
-      if (!destinationFile.open(QFile::ReadOnly)) {
-        return QObject::tr("Open '%1' failed").arg(destinationPath);
-      }
-      QByteArray destinationContents = destinationFile.readAll();
-      destinationFile.close();
-
-      if (contentsDifferent(sourceContents, destinationContents)) {
-        // copy contents
-        if (!destinationFile.open(QFile::WriteOnly | QIODevice::Truncate)) {
-          return QObject::tr("Write '%1' failed").arg(destinationPath);
-        }
-        progress->addText(tr("Write %1").arg(destinationPath) + "\n");
-        // qDebug() << "Write" << destinationPath;
-        destinationFile.write(sourceContents);
+      // try to retrieve destination contents
+      QFile destinationFile(path);
+      if (destinationFile.open(QFile::ReadOnly)) {
+        QString destinationContents = destinationFile.readAll();
        destinationFile.close();
+        if (sourceContents == destinationContents) {
+          // qDebug() << "Skip" << path;
+          return QString();
+        }
      }
+      if (!destinationFile.open(QFile::WriteOnly)) {
+        return QObject::tr("Write '%1' failed").arg(destinationPath);
+      }
+      progress->addText(tr("Write %1\n").arg(destinationPath));
+      // qDebug() << "Write" << destinationPath;
+      QTextStream destinationStream(&destinationFile);
+      destinationStream << sourceContents;
+      destinationFile.close();
    }
  }
  return QString();
 }
-
-bool SyncProcess::contentsDifferent(const QByteArray & source, const QByteArray & dest) {
-  if (source.size() != dest.size()) return true;
-  for(int n=0; n<source.size(); ++n) {
-    if (source[n] != dest[n]) {
-      return true;
-    }
-  }
-  return false;
-}
@@ -3,7 +3,6 @@

 #include <QString>
 #include <QStringList>
-#include <QByteArray>

 class QDir;
 class ProgressWidget;
@@ -23,7 +22,6 @@ class SyncProcess : public QObject
    int getFilesCount(const QString & directory);
    QStringList updateDir(const QString & source, const QString & destination);
    QString updateEntry(const QString & path, const QDir & source, const QDir & destination);
-    bool contentsDifferent(const QByteArray & source, const QByteArray & dest);
    QString folder1;
    QString folder2;
    ProgressWidget * progress;
@@ -191,7 +191,7 @@ void resetAvrdudeFuses(bool eepromProtect, ProgressWidget *progress)
    QStringList str;
    if (bcd.getMCU() == "m2560") {
      args << "-B8";
-      QString erStr = eepromProtect ? "hfuse:w:0x51:m" : "hfuse:w:0x59:m";
+      QString erStr = eepromProtect ? "hfuse:w:0x11:m" : "hfuse:w:0x19:m";
      str << "-U" << "lfuse:w:0xD7:m" << "-U" << erStr << "-U" << "efuse:w:0xFC:m";
      //use hfuse = 0x81 to prevent eeprom being erased with every flashing
    }
@@ -220,7 +220,7 @@ void resetAvrdudeFuses(bool eepromProtect, ProgressWidget *progress)
        lfuses = "lfuse:w:0x3F:m";
      }

-      QString erStr = eepromProtect ? "hfuse:w:0xC1:m" : "hfuse:w:0xC9:m";
+      QString erStr = eepromProtect ? "hfuse:w:0x81:m" : "hfuse:w:0x89:m";
      str << "-U" << lfuses << "-U" << erStr << "-U" << "efuse:w:0xFF:m";
      //use hfuse = 0x81 to prevent eeprom being erased with every flashing
    }
@@ -14,6 +14,7 @@ set(shared_HDRS
  autolineedit.h
  genericpanel.h
  hexspinbox.h
+  verticalscrollarea.h
 )
 
 qt4_wrap_cpp(shared_SRCS ${shared_HDRS})
@@ -5,7 +5,8 @@

 VerticalScrollArea::VerticalScrollArea(QWidget * parent, GenericPanel * panel):
  QScrollArea(parent),
-  panel(panel)
+  panel(panel),
+  parent(parent)
 {
  setWidgetResizable(true);
  setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
@@ -15,6 +15,7 @@ class VerticalScrollArea : public QScrollArea

  private:
    GenericPanel * panel;
+    QWidget * parent;
 };

 #endif
@@ -862,7 +862,7 @@ void SimulatorDialogTaranis::getValues()
    {
      -pots[0]->value(),
      pots[1]->value(),
-      ((flags & SIMULATOR_FLAGS_S3) ? pots[2]->value() : 0),
+      ((flags && SIMULATOR_FLAGS_S3) ? pots[2]->value() : 0),
      -sliders[0]->value(),
      sliders[1]->value()
    },
@@ -99,7 +99,7 @@ class SimulatorInterface

    virtual void sendTelemetry(uint8_t * data, unsigned int len) = 0;

-    virtual uint8_t getSensorInstance(uint16_t id, uint8_t defaultValue = 0) = 0;
+    virtual uint8_t getSensorInstance(uint16_t id) = 0;

    virtual uint16_t getSensorRatio(uint16_t id) = 0;

@@ -143,40 +143,37 @@ void TelemetrySimulator::closeEvent(QCloseEvent *event)
  event->accept();
 }

-#define SET_INSTANCE(control, id, def)  ui->control->setText(QString::number(simulator->getSensorInstance(id, ((def) & 0x1F) + 1)))
-
 void TelemetrySimulator::showEvent(QShowEvent *event)
 {
-  SET_INSTANCE(rxbt_inst,     BATT_ID,                0);
-  SET_INSTANCE(rssi_inst,     RSSI_ID,                24);
-  SET_INSTANCE(swr_inst,      SWR_ID,                 24);
-  SET_INSTANCE(a1_inst,       ADC1_ID,                0);
-  SET_INSTANCE(a2_inst,       ADC2_ID,                0);
-  SET_INSTANCE(a3_inst,       A3_FIRST_ID,            0);
-  SET_INSTANCE(a4_inst,       A4_FIRST_ID,            0);
-  SET_INSTANCE(t1_inst,       T1_FIRST_ID,            0);
-  SET_INSTANCE(t2_inst,       T2_FIRST_ID,            0);
-  SET_INSTANCE(rpm_inst,      RPM_FIRST_ID,           DATA_ID_RPM);
-  SET_INSTANCE(fuel_inst,     FUEL_FIRST_ID,          0);
-  SET_INSTANCE(fuel_qty_inst, FUEL_QTY_FIRST_ID,      0);
-  SET_INSTANCE(aspd_inst,     AIR_SPEED_FIRST_ID,     0);
-  SET_INSTANCE(vvspd_inst,    VARIO_FIRST_ID,         DATA_ID_VARIO);
-  SET_INSTANCE(valt_inst,     ALT_FIRST_ID,           DATA_ID_VARIO);
-  SET_INSTANCE(fasv_inst,     VFAS_FIRST_ID,          DATA_ID_FAS);
-  SET_INSTANCE(fasc_inst,     CURR_FIRST_ID,          DATA_ID_FAS);
-  SET_INSTANCE(cells_inst,    CELLS_FIRST_ID,         DATA_ID_FLVSS);
-  SET_INSTANCE(gpsa_inst,     GPS_ALT_FIRST_ID,       DATA_ID_GPS);
-  SET_INSTANCE(gpss_inst,     GPS_SPEED_FIRST_ID,     DATA_ID_GPS);
-  SET_INSTANCE(gpsc_inst,     GPS_COURS_FIRST_ID,     DATA_ID_GPS);
-  SET_INSTANCE(gpst_inst,     GPS_TIME_DATE_FIRST_ID, DATA_ID_GPS);
-  SET_INSTANCE(gpsll_inst,    GPS_LONG_LATI_FIRST_ID, DATA_ID_GPS);
-  SET_INSTANCE(accx_inst,     ACCX_FIRST_ID,          0);
-  SET_INSTANCE(accy_inst,     ACCY_FIRST_ID,          0);
-  SET_INSTANCE(accz_inst,     ACCZ_FIRST_ID,          0);

+  ui->rxbt_inst->setText(QString::number(simulator->getSensorInstance(BATT_ID)));
  ui->rxbt_ratio->setValue(simulator->getSensorRatio(BATT_ID) / 10.0);
+  ui->rssi_inst->setText(QString::number(simulator->getSensorInstance(RSSI_ID)));
+  ui->swr_inst->setText(QString::number(simulator->getSensorInstance(SWR_ID)));
+  ui->a1_inst->setText(QString::number(simulator->getSensorInstance(ADC1_ID)));
  ui->A1_ratio->setValue(simulator->getSensorRatio(ADC1_ID) / 10.0);
+  ui->a2_inst->setText(QString::number(simulator->getSensorInstance(ADC2_ID)));
  ui->A2_ratio->setValue(simulator->getSensorRatio(ADC2_ID) / 10.0);
+  ui->a3_inst->setText(QString::number(simulator->getSensorInstance(A3_FIRST_ID)));
+  ui->a4_inst->setText(QString::number(simulator->getSensorInstance(A4_FIRST_ID)));
+  ui->t1_inst->setText(QString::number(simulator->getSensorInstance(T1_FIRST_ID)));
+  ui->t2_inst->setText(QString::number(simulator->getSensorInstance(T2_FIRST_ID)));
+  ui->rpm_inst->setText(QString::number(simulator->getSensorInstance(RPM_FIRST_ID)));
+  ui->fuel_inst->setText(QString::number(simulator->getSensorInstance(FUEL_FIRST_ID)));
+  ui->aspd_inst->setText(QString::number(simulator->getSensorInstance(AIR_SPEED_FIRST_ID)));
+  ui->vvspd_inst->setText(QString::number(simulator->getSensorInstance(VARIO_FIRST_ID)));
+  ui->valt_inst->setText(QString::number(simulator->getSensorInstance(ALT_FIRST_ID)));
+  ui->fasv_inst->setText(QString::number(simulator->getSensorInstance(VFAS_FIRST_ID)));
+  ui->fasc_inst->setText(QString::number(simulator->getSensorInstance(CURR_FIRST_ID)));
+  ui->cells_inst->setText(QString::number(simulator->getSensorInstance(CELLS_FIRST_ID)));
+  ui->gpsa_inst->setText(QString::number(simulator->getSensorInstance(GPS_ALT_FIRST_ID)));
+  ui->gpss_inst->setText(QString::number(simulator->getSensorInstance(GPS_SPEED_FIRST_ID)));
+  ui->gpsc_inst->setText(QString::number(simulator->getSensorInstance(GPS_COURS_FIRST_ID)));
+  ui->gpst_inst->setText(QString::number(simulator->getSensorInstance(GPS_TIME_DATE_FIRST_ID)));
+  ui->gpsll_inst->setText(QString::number(simulator->getSensorInstance(GPS_LONG_LATI_FIRST_ID)));
+  ui->accx_inst->setText(QString::number(simulator->getSensorInstance(ACCX_FIRST_ID)));
+  ui->accy_inst->setText(QString::number(simulator->getSensorInstance(ACCY_FIRST_ID)));
+  ui->accz_inst->setText(QString::number(simulator->getSensorInstance(ACCZ_FIRST_ID)));

  ui->Simulate->setChecked(true);
  onSimulateToggled(true); // not sure why this doesn't fire automatically
@@ -196,27 +193,13 @@ void setSportPacketCrc(uint8_t * packet)
  //TRACE("crc set: %x", packet[FRSKY_SPORT_PACKET_SIZE-1]);
 }

-uint8_t getBit(uint8_t position, uint8_t value) 
+void generateSportPacket(uint8_t * packet, uint8_t dataId, uint8_t prim, uint16_t appId, uint32_t data)
 {
-  return (value & (uint8_t)(1 << position)) ? 1 : 0;
-}
-
-bool generateSportPacket(uint8_t * packet, uint8_t dataId, uint8_t prim, uint16_t appId, uint32_t data)
-{
-  if (dataId > 0x1B ) return false;
-  
-  // generate Data ID field
-  uint8_t bit5 = getBit(0, dataId) ^ getBit(1, dataId) ^ getBit(2, dataId);
-  uint8_t bit6 = getBit(2, dataId) ^ getBit(3, dataId) ^ getBit(4, dataId);
-  uint8_t bit7 = getBit(0, dataId) ^ getBit(2, dataId) ^ getBit(4, dataId);
-
-  packet[0] = (bit7 << 7) + (bit6 << 6) + (bit5 << 5) + dataId;
-  // qDebug("dataID: 0x%02x (%d)", packet[0], dataId);
+  packet[0] = dataId;
  packet[1] = prim;
  *((uint16_t *)(packet+2)) = appId;
  *((int32_t *)(packet+4)) = data;
  setSportPacketCrc(packet);
-  return true;
 }

 void TelemetrySimulator::generateTelemetryFrame()
@@ -284,7 +267,7 @@ void TelemetrySimulator::generateTelemetryFrame()

    case 10:
      if (ui->rpm->value() > 0)
-        generateSportPacket(buffer, ui->rpm_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, RPM_FIRST_ID, LIMIT<uint32_t>(0, ui->rpm->value(), 0x7FFFFFFF));
+        generateSportPacket(buffer, ui->rpm_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, RPM_FIRST_ID, LIMIT<uint32_t>(0, ui->rpm->value(), 0xFFFF));
      break;

    case 11:
@@ -384,17 +367,12 @@ void TelemetrySimulator::generateTelemetryFrame()
        generateSportPacket(buffer, ui->accz_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, ACCZ_FIRST_ID, LIMIT<int32_t>(-0x7FFFFFFF, ui->accz->value() * 100.0, 0x7FFFFFFF));
      break;

-    case 26:
-      if (ui->fuel_qty->value() > 0)
-        generateSportPacket(buffer, ui->fuel_qty_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, FUEL_QTY_FIRST_ID, LIMIT<uint32_t>(0, ui->fuel_qty->value() * 100.0, 0xFFFFFF));
-      break;
-
    default:
      item = 0;
      return;
  }

-  if (ok && (buffer[2] || buffer[3]))
+  if (ok && buffer[0])
    simulator->sendTelemetry(buffer, FRSKY_SPORT_PACKET_SIZE);
  else
    onTimerEvent();
@@ -602,7 +580,6 @@ TelemetrySimulator::LogPlaybackController::LogPlaybackController(Ui::TelemetrySi
  colToFuncMap.insert("Tmp2(@F)", T2_DEGF);
  colToFuncMap.insert("RPM(rpm)", RPM);
  colToFuncMap.insert("Fuel(%)", FUEL);
-  colToFuncMap.insert("Fuel(ml)", FUEL_QTY);
  colToFuncMap.insert("VSpd(m/s)", VSPD_MS);
  colToFuncMap.insert("VSpd(f/s)", VSPD_FS);
  colToFuncMap.insert("Alt(ft)", ALT_FEET);
@@ -651,15 +628,14 @@ QDateTime TelemetrySimulator::LogPlaybackController::parseTransmittterTimestamp(
 void TelemetrySimulator::LogPlaybackController::calcLogFrequency()
 {
  // examine up to 20 rows to determine log frequency in seconds
-  // Skip the first entry which contains the file open time
  logFrequency = 25.5; // default value
  QDateTime lastTime;
-  for (int i = 2; (i < 21) && (i < csvRecords.count()); i++)
+  for (int i = 1; (i < 20) && (i < csvRecords.count()); i++)
  {
    QDateTime logTime = parseTransmittterTimestamp(csvRecords[i]);
    // ugh - no timespan in this Qt version
    double timeDiff = (logTime.toMSecsSinceEpoch() - lastTime.toMSecsSinceEpoch()) / 1000.0;
-    if ((timeDiff > 0.1) && (timeDiff < logFrequency)) {
+    if ((timeDiff > 0) && (timeDiff < logFrequency)) {
      logFrequency = timeDiff;
    }
    lastTime = logTime;
@@ -898,9 +874,6 @@ void TelemetrySimulator::LogPlaybackController::setUiDataValues()
      case FUEL:
        ui->fuel->setValue(columnData[info.dataIndex].toDouble());
        break;
-      case FUEL_QTY:
-        ui->fuel_qty->setValue(columnData[info.dataIndex].toDouble());
-        break;
      case VSPD_MS:
        ui->vspeed->setValue(columnData[info.dataIndex].toDouble());
        break;
@@ -80,7 +80,6 @@ class TelemetrySimulator : public QDialog
        ACCX,
        ACCY,
        ACCZ,
-        FUEL_QTY,
      };
      QMap<QString, CONVERT_TYPE> colToFuncMap; // contains all 'known' column headings and how they are to be processed
      Ui::TelemetrySimulator * ui;
@@ -101,6 +100,7 @@ class TelemetrySimulator : public QDialog
      bool stepping;
      QDateTime parseTransmittterTimestamp(QString row);
      void calcLogFrequency();
+      int32_t replayRate;
    };

 private:
@@ -141,6 +141,8 @@ private:
      uint32_t cellData1;
      uint32_t cellData2;
      uint32_t cellData3;
+      uint32_t cellDataTime;
+      double cell[MAXCELLS];
    };

    class GPSEmulator
@@ -162,6 +164,7 @@ private:
      double course;
      double speedKNTS;
      double altitude; // in meters
+      uint32_t nextDataIndex;
      uint32_t encodeLatLon(double latLon, bool isLat);
      uint32_t encodeDateTime(uint8_t yearOrHour, uint8_t monthOrMinute, uint8_t dayOrSecond, bool isDate);
    };
@@ -1360,7 +1360,7 @@ Timestamp</string>
       </font>
      </property>
      <property name="maximum">
-       <number>2147483647</number>
+       <number>65535</number>
      </property>
     </widget>
    </item>
@@ -1520,20 +1520,23 @@ Timestamp</string>
      </property>
     </widget>
    </item>
-   <item row="11" column="0">
-     <widget class="QLabel" name="label_51">
+    <item row="11" column="0">
+     <widget class="QLabel" name="label_11">
      <property name="font">
       <font>
        <pointsize>8</pointsize>
       </font>
      </property>
+      <property name="toolTip">
+       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      </property>
      <property name="text">
-       <string>Fuel Qty</string>
+       <string>VSpd</string>
      </property>
     </widget>
    </item>
    <item row="11" column="1">
-     <widget class="QLineEdit" name="fuel_qty_inst">
+     <widget class="QLineEdit" name="vvspd_inst">
      <property name="font">
       <font>
        <pointsize>8</pointsize>
@@ -1542,26 +1545,35 @@ Timestamp</string>
     </widget>
    </item>
    <item row="11" column="2">
-     <widget class="QSpinBox" name="fuel_qty">
+     <widget class="QDoubleSpinBox" name="vspeed">
      <property name="font">
       <font>
        <pointsize>8</pointsize>
       </font>
      </property>
+      <property name="decimals">
+       <number>2</number>
+      </property>
+      <property name="minimum">
+       <double>-16777215.000000000000000</double>
+      </property>
      <property name="maximum">
-       <double>100000.000000000000000</double>
+       <double>16777215.000000000000000</double>
+      </property>
+      <property name="singleStep">
+       <double>0.100000000000000</double>
      </property>
     </widget>
    </item>
    <item row="11" column="3">
-     <widget class="QLabel" name="label_52">
+     <widget class="QLabel" name="label_48">
      <property name="font">
       <font>
        <pointsize>8</pointsize>
       </font>
      </property>
      <property name="text">
-       <string>ml</string>
+       <string>m/s</string>
      </property>
     </widget>
    </item>
@@ -1620,7 +1632,7 @@ Timestamp</string>
     </widget>
    </item>
    <item row="12" column="0">
-     <widget class="QLabel" name="label_11">
+     <widget class="QLabel" name="label_12">
      <property name="font">
       <font>
        <pointsize>8</pointsize>
@@ -1630,12 +1642,12 @@ Timestamp</string>
       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
-       <string>VSpd</string>
+       <string>Alt</string>
      </property>
     </widget>
    </item>
    <item row="12" column="1">
-     <widget class="QLineEdit" name="vvspd_inst">
+     <widget class="QLineEdit" name="valt_inst">
      <property name="font">
       <font>
        <pointsize>8</pointsize>
@@ -1644,7 +1656,7 @@ Timestamp</string>
     </widget>
    </item>
    <item row="12" column="2">
-     <widget class="QDoubleSpinBox" name="vspeed">
+     <widget class="QDoubleSpinBox" name="valt">
      <property name="font">
       <font>
        <pointsize>8</pointsize>
@@ -1665,14 +1677,14 @@ Timestamp</string>
     </widget>
    </item>
    <item row="12" column="3">
-     <widget class="QLabel" name="label_48">
+     <widget class="QLabel" name="label_49">
      <property name="font">
       <font>
        <pointsize>8</pointsize>
       </font>
      </property>
      <property name="text">
-       <string>m/s</string>
+       <string>Meters</string>
      </property>
     </widget>
    </item>
@@ -1730,64 +1742,7 @@ Timestamp</string>
      </property>
     </widget>
    </item>
-    <item row="13" column="0">
-     <widget class="QLabel" name="label_12">
-      <property name="font">
-       <font>
-        <pointsize>8</pointsize>
-       </font>
-      </property>
-      <property name="toolTip">
-       <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;br/&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-      </property>
-      <property name="text">
-       <string>Alt</string>
-      </property>
-     </widget>
-    </item>
-    <item row="13" column="1">
-     <widget class="QLineEdit" name="valt_inst">
-      <property name="font">
-       <font>
-        <pointsize>8</pointsize>
-       </font>
-      </property>
-     </widget>
-    </item>
-    <item row="13" column="2">
-     <widget class="QDoubleSpinBox" name="valt">
-      <property name="font">
-       <font>
-        <pointsize>8</pointsize>
-       </font>
-      </property>
-      <property name="decimals">
-       <number>2</number>
-      </property>
-      <property name="minimum">
-       <double>-16777215.000000000000000</double>
-      </property>
-      <property name="maximum">
-       <double>16777215.000000000000000</double>
-      </property>
-      <property name="singleStep">
-       <double>0.100000000000000</double>
-      </property>
-     </widget>
-    </item>
-    <item row="13" column="3">
-     <widget class="QLabel" name="label_49">
-      <property name="font">
-       <font>
-        <pointsize>8</pointsize>
-       </font>
-      </property>
-      <property name="text">
-       <string>Meters</string>
-      </property>
-     </widget>
-    </item>
-  </layout>
+   </layout>
  </widget>
 </widget>
 <tabstops>
@@ -1857,8 +1812,6 @@ Timestamp</string>
  <tabstop>accy</tabstop>
  <tabstop>accz_inst</tabstop>
  <tabstop>accz</tabstop>
-  <tabstop>fuel_qty_inst</tabstop>
-  <tabstop>fuel_qty</tabstop>
 </tabstops>
 <resources/>
 <connections/>
@@ -1,82 +1,3 @@
-<h2>Version 2.1.9 / 2016-09-14</h2>
-
-[All]
-<ul>
-<li>Fixed: calculated sensors had persistent value set to zero at every shutdown when persistent option was not active (<a href=https://github.com/opentx/opentx/issues/3454>#3454</a>)</li>
-<li>Show persistent option only for calculated sensors (<a href=https://github.com/opentx/opentx/issues/3454>#3454</a>)</li>
-<li>Fixed: sensors with active filter had invalid negative values (<a href=https://github.com/opentx/opentx/issues/3463>#3463</a>)</li>
-<li>Enabled DSM protocols on several raios (<a href=https://github.com/opentx/opentx/issues/3471>#3471</a>)</li>
-<li>Better representation of negative mixer weight in offset bar widget (<a href=https://github.com/opentx/opentx/issues/3476>#3476</a>)</li>
-<li>Fixed several bugs in curve preset function (<a href=https://github.com/opentx/opentx/issues/3451>#3451</a>)</li>
-<li>Fixed flight modes rotary encoders initialization when creating new model (only for radios with rotary encoders) (<a href=https://github.com/opentx/opentx/issues/3473>#3473</a>)</li>
-<li>Fixed: show value of persistent sensor after power on, before the telemetry is received (<a href=https://github.com/opentx/opentx/issues/3595>#3595</a>)</li>
-<li>Fixed: LSs weren't selectable as input source (<a href=https://github.com/opentx/opentx/issues/3632>#3632>/a>)</li>
-</ul>
-
-
-[Taranis]
-<ul>
-<li>Fixed USB driver changed interrupt grouping which affected interrupt priorities (fix suggested by Michael Blandford), this should fix the SBUS Trainer issue <a href=https://github.com/opentx/opentx/issues/2999>#2999</a> (<a href=https://github.com/opentx/opentx/issues/3178>#3178</a>)</li>
-<li>ADC Jitter Filter improvements, option added in Hardware settings to turn it on/off (<a href=https://github.com/opentx/opentx/issues/3432>#3432</a>)</li>
-</ul>
-
-[9XR-PRO]
-<ul>
-<li>Fixed: Trainer inputs >TR4 not working (<a href=https://github.com/opentx/opentx/issues/3203>#3203</a>)</li>
-<li>External module output type setting was not visible</li>
-</ul>
-
-[Lua]
-<ul>
-<li>Fixed playTone() crash when called with abnormal parameter values (<a href=https://github.com/opentx/opentx/issues/3462>#3462</a>)</li>
-<li>Return proper values for `Cels-` and `Cels+` (<a href=https://github.com/opentx/opentx/issues/2826>#2826</a>)</li>
-<li>Fixed lcd.drawNumber() display when INVERS flag was used (<a href=https://github.com/opentx/opentx/issues/3569>#3569</a>)</li>
-</ul>
-
-<h2>Version 2.1.8 / 2016-04-14</h2>
-
-Notice: EDGE Logical Switch operation has changed. Users should check their setups, if they use EDGE with AND switch. 
-This bug was introduced in version 2.1.2 and has been fixed in 2.1.8. (<a href=https://github.com/opentx/opentx/issues/2939>#2939</a>)
-
-[Taranis]
-<ul>
-<li>Improvements of Statistics screen (<a href=https://github.com/opentx/opentx/issues/3206>#3206</a>)</li>
-<li>Flight Modes screen layout fix (<a href=https://github.com/opentx/opentx/issues/3307>#3307</a>)</li>
-<li>Fixed: left slider was affecting the value of the right slider on X9E (<a href=https://github.com/opentx/opentx/issues/2639>#2639</a>)</li>
-<li>USB Joystick now supports 24 buttons (CH9-32) (<a href=https://github.com/opentx/opentx/issues/3268>#3268</a>)</li>
-<li>Main view adjustments for 3-char switch names (<a href=https://github.com/opentx/opentx/issues/3278>#3278</a>)</li>
-</ul>
-
-[ARM (Taranis, Sky9x, 9XR-PRO, AR9X)]
-<ul>
-<li>Channel jitter reduced (<a href=https://github.com/opentx/opentx/issues/3233>#3233</a>)</li>
-<li>Fixed: EDGE Logical switch internal state was being reset by the AND switch, that affected its function (it looked like AND was applied before the EDGE processing, not after like it is done for other logical switch types) (<a href=https://github.com/opentx/opentx/issues/2939>#2939</a>)</li>
-</ul>
-
-[Lua]
-<ul>
-<li>Some Lua fields were not available to scripts (<a href=https://github.com/opentx/opentx/issues/3223>#3223</a>)</li>
-<li>Fixed: only first 32 input lines (out of 64) were accessible in Lua (<a href=https://github.com/opentx/opentx/issues/3285>#3285</a>)</li>
-<li>playDuration() second parameter is now really optional (<a href=https://github.com/opentx/opentx/issues/3329>#3329</a>)</li>
-<li>Fixed Lua io.open() problem for non-existing files (<a href=https://github.com/opentx/opentx/issues/3342>#3342</a>)</li>
-</ul>
-
-[Mega2560]
-<ul>
-<li>Fixed: First PPM pulse in the frame was longer (<a href=https://github.com/opentx/opentx/issues/2981>#2981</a>)</li>
-</ul>
-
-[All]
-<ul>
-<li>Various texts and translations corrections (se, it, pl, de)</li>
-<li>Text to speech fixes (hu, sp)</li>
-<li>Various small bug-fixes</li>
-<li>PowerBox telemetry sensor names changed</li>
-<li>Removed a few legacy timer limitations, fix non-working limit (<a href=https://github.com/opentx/opentx/issues/3301>#3301</a>)</li>
-<li>Removed the "RF signal low" alert before "Telemetry lost" when powering off the receiver (<a href=https://github.com/opentx/opentx/issues/2616>#2616</a>)</li>
-</ul>
-
-
 <h2>Version 2.1.7 / 2016-01-04</h2>

 Notice: Lua model wizard was fixed (<a href=https://github.com/opentx/opentx/issues/3061>#3061</a>) 
@@ -228,7 +228,11 @@ PXX = NO

 # DSM2 (Spektrum) protocol
 # Values = NO, SERIAL, PPM
-DSM2 = NO
+DSM2 = PPM
+
+# Multimodule support
+# (http://www.rcgroups.com/forums/showthread.php?t=2165676)
+MULTIMODULE = YES

 # HUBSAN protocol
 # Values = NO, YES
@@ -383,10 +387,6 @@ WARNINGS_AS_ERRORS = NO
 # Values = NO, YES
 LUA_COMPILER = NO

-# Enable ADC jitter measurement
-# Values = NO, YES
-JITTER_MEASURE = NO
-
 #------- END BUILD OPTIONS ---------------------------

 # Define programs and commands.
@@ -399,7 +399,7 @@ TRANSLATE = -python ../util/translate.py

 VERSION_MAJOR = 2
 VERSION_MINOR = 1
-VERSION_REVISION = 9
+VERSION_REVISION = 7

 VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_REVISION)$(OPENTX_VERSION_SUFFIX)

@@ -716,7 +716,7 @@ ifeq ($(PCB), MEGA2560)
  TRGT = avr-
  MCU = atmega2560
  OPT = s
-  CPPDEFS = -DF_CPU=$(F_CPU)UL -DPCBMEGA2560 -DCPUM2560 -DEEPROM_RLC -DEEPROM_VARIANT=0
+  CPPDEFS = -DF_CPU=$(F_CPU)UL -DPCBMEGA2560 -DCPUM2560 -DEEPROM_RLC -DEEPROM_VARIANT=0 -DAUDIO
  SDCARD = NO
  BUZZER = YES
  THR_TRACE = YES
@@ -725,7 +725,7 @@ ifeq ($(PCB), MEGA2560)
  BOARDSRC = main_avr.cpp targets/mega2560/board_mega2560.cpp
  EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
  PULSESSRC = pulses/pulses_avr.cpp
-  CPPSRC += debug.cpp
+  CPPSRC += audio_avr.cpp debug.cpp
  BITMAPS += bitmaps/9X/splash.lbm bitmaps/9X/asterisk.lbm bitmaps/9X/about.lbm
  GUIGENERALSRC += gui/$(GUIDIRECTORY)/menu_general_diagkeys.cpp gui/$(GUIDIRECTORY)/menu_general_diaganas.cpp

@@ -962,8 +962,7 @@ ifeq ($(PCB), TARANIS)
  EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp eeprom_conversions.cpp
  PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp pulses/crossfire.cpp
  CPPSRC += tasks_arm.cpp audio_arm.cpp sbus.cpp telemetry/telemetry.cpp
-  CPPSRC += targets/taranis/pulses_driver.cpp targets/taranis/keys_driver.cpp targets/taranis/trainer_driver.cpp targets/taranis/audio_driver.cpp targets/taranis/serial2_driver.cpp targets/taranis/telemetry_driver.cpp
-  EXTRABOARDSRC += targets/taranis/adc_driver.cpp
+  CPPSRC += targets/taranis/pulses_driver.cpp targets/taranis/keys_driver.cpp targets/taranis/adc_driver.cpp targets/taranis/trainer_driver.cpp targets/taranis/audio_driver.cpp targets/taranis/serial2_driver.cpp targets/taranis/telemetry_driver.cpp
  CPPSRC += bmp.cpp gui/$(GUIDIRECTORY)/view_channels.cpp gui/$(GUIDIRECTORY)/view_about.cpp gui/$(GUIDIRECTORY)/view_text.cpp debug.cpp
  CPPSRC += loadboot.cpp
  ifeq ($(PCBREV), REV9E)
@@ -1056,6 +1055,10 @@ ifeq ($(PCB), TARANIS)
  ifeq ($(DSM2), PPM)
    CPPSRC += pulses/dsm2_arm.cpp
  endif
+  ifeq ($(MULTIMODULE), YES)
+	CPPDEFS += -DMULTIMODULE
+    CPPSRC += pulses/multi_arm.cpp
+  endif
  ifeq ($(HUBSAN), YES)
    CPPDEFS += -DHUBSAN
    CPPSRC += pulses/hubsan.cpp
@@ -1072,9 +1075,6 @@ ifeq ($(PCB), TARANIS)
  ifeq ($(WATCHDOG_TEST), YES)
    CPPDEFS += -DWATCHDOG_TEST
  endif
-  ifeq ($(JITTER_MEASURE), YES)
-    CPPDEFS += -DJITTER_MEASURE
-  endif
 endif

 CC      = $(TRGT)gcc
@@ -1526,12 +1526,12 @@ bootloader.lbm: targets/taranis/bootloader/bootloader_ramBoot.bin
 else ifeq ($(PCB), $(filter $(PCB), 9XRPRO AR9X))
 bootloader.lbm:
 	@echo "Fetching Mike's bootloader..."
-	wget https://github.com/MikeBland/OpenRcBootloader/releases/download/V1.9/bootflash8.lbm
+	wget http://ersky9x.googlecode.com/svn/trunk/src/bootloader/bootflash8.lbm
 	mv bootflash8.lbm $@
 else ifeq ($(PCB), SKY9X)
 bootloader.lbm:
 	@echo "Fetching Mike's bootloader..."
-	wget https://github.com/MikeBland/OpenRcBootloader/releases/download/V1.9/bootflash4.lbm
+	wget http://ersky9x.googlecode.com/svn/trunk/src/bootloader/bootflash4.lbm
 	mv bootflash4.lbm $@
 endif

@@ -1666,14 +1666,14 @@ endif

 lua_exports_taranis.inc: myeeprom.h ../util/luaexport.py
 	@echo "Generating a list of Lua exported constants in lua_exports_taranis.txt"
-	@$(PARSER) -DEXPORT -DCPUARM -DPCBTARANIS -DLUA -DVIRTUALINPUTS myeeprom.h | grep LEXP > lua_exports_taranis.txt
+	@$(PARSER) -DEXPORT -DPCBTARANIS -DLUA -DVIRTUALINPUTS myeeprom.h | grep LEXP > lua_exports_taranis.txt
 	@echo "Parsing and generating C Lua exports in lua/lua_exports_taranis.inc"
-	@python ../util/luaexport.py $(VERSION) lua_exports_taranis.txt lua/lua_exports_taranis.inc lua_fields_taranis.txt
+	@$(PYTHON) ../util/luaexport.py $(VERSION) lua_exports_taranis.txt lua/lua_exports_taranis.inc lua_fields_taranis.txt
 	@rm lua_exports_taranis.txt

 lua_exports_taranis_x9e.inc: myeeprom.h ../util/luaexport.py
 	@echo "Generating a list of Lua exported constants in lua_exports_taranis_x9e.txt"
-	@$(PARSER) -DEXPORT -DCPUARM -DPCBTARANIS -DREVPLUS -DREV9E -DLUA -DVIRTUALINPUTS myeeprom.h | grep LEXP > lua_exports_taranis_x9e.txt
+	@$(PARSER) -DEXPORT -DPCBTARANIS -DREVPLUS -DREV9E -DLUA -DVIRTUALINPUTS myeeprom.h | grep LEXP > lua_exports_taranis_x9e.txt
 	@echo "Parsing and generating C Lua exports in lua/lua_exports_taranis_x9e.inc"
 	@python ../util/luaexport.py $(VERSION) lua_exports_taranis_x9e.txt lua/lua_exports_taranis_x9e.inc lua_fields_taranis_x9e.txt
 	@rm lua_exports_taranis_x9e.txt
@@ -672,26 +672,12 @@ int ToneContext::mixBuffer(AudioBuffer *buffer, int volume, unsigned int fade)

    if (fragment.tone.freq != state.freq) {
      state.freq = fragment.tone.freq;
-      state.step = limit<double>(1, double(DIM(sineValues)*fragment.tone.freq) / AUDIO_SAMPLE_RATE, 512);
+      state.step = double(DIM(sineValues)*fragment.tone.freq) / AUDIO_SAMPLE_RATE;
      state.volume = evalVolumeRatio(fragment.tone.freq, volume);
    }

    if (fragment.tone.freqIncr) {
-      int freqChange = AUDIO_BUFFER_DURATION * fragment.tone.freqIncr;
-      if (freqChange > 0) {
-        fragment.tone.freq += freqChange;
-        if (fragment.tone.freq > BEEP_MAX_FREQ) {
-          fragment.tone.freq = BEEP_MAX_FREQ;
-        }
-      }
-      else {
-        if (fragment.tone.freq > BEEP_MIN_FREQ - freqChange) {
-          fragment.tone.freq += freqChange;
-        }
-        else {
-          fragment.tone.freq = BEEP_MIN_FREQ;  
-        }
-      }
+      fragment.tone.freq += AUDIO_BUFFER_DURATION * fragment.tone.freqIncr;
    }

    if (remainingDuration > AUDIO_BUFFER_DURATION) {
@@ -53,7 +53,6 @@
 #endif

 #define BEEP_MIN_FREQ         (150)
-#define BEEP_MAX_FREQ         (15000)
 #define BEEP_DEFAULT_FREQ     (2250)
 #define BEEP_KEY_UP_FREQ      (BEEP_DEFAULT_FREQ+150)
 #define BEEP_KEY_DOWN_FREQ    (BEEP_DEFAULT_FREQ-150)
@@ -226,7 +226,6 @@ int cliDisplay(const char ** argv)
  }

  if (!strcmp(argv[1], "adc")) {
-    extern uint16_t Analog_values[NUMBER_ANALOG];
    for (int i=0; i<NUMBER_ANALOG; i++) {
      serialPrint("adc[%d] = %04X", i, Analog_values[i]);
    }
@@ -160,35 +160,5 @@ void dumpTraceBuffer();
 #endif


-#if defined(JITTER_MEASURE)  && defined(__cplusplus)
-
-template<class T> class JitterMeter {
-public:
-  T min;
-  T max;
-  T measured;
-
-  JitterMeter() : min(~(T)0), max(0), measured(0) {};
-
-  void reset() { 
-    // store mesaurement
-    measured = max - min;
-    //reset - begin new measurement
-    min = ~(T)0; 
-    max = 0; 
-  };
-
-  void measure(T value) { 
-    if (value > max) max = value;
-    if (value < min) min = value;
-  };
-
-  T get() const { 
-    return measured; 
-  };
-};
-
-#endif  // defined(JITTER_MEASURE)
-
 #endif  // #ifndef debug_h

@@ -375,7 +375,6 @@ void eeLoadModel(uint8_t id)
      TelemetrySensor & sensor = g_model.telemetrySensors[i];
      if (sensor.type == TELEM_TYPE_CALCULATED && sensor.persistent) {
        telemetryItems[i].value = sensor.persistentValue;
-        telemetryItems[i].lastReceived = TELEMETRY_VALUE_OLD;   // #3595: make value visible even before the first new value is received)
      }
    }
 #endif
@@ -994,7 +994,6 @@ void eeLoadModel(uint8_t id)
      TelemetrySensor & sensor = g_model.telemetrySensors[i];
      if (sensor.type == TELEM_TYPE_CALCULATED && sensor.persistent) {
        telemetryItems[i].value = sensor.persistentValue;
-        telemetryItems[i].lastReceived = TELEMETRY_VALUE_OLD;   // #3595: make value visible even before the first new value is received)
      }
    }
 #endif
@@ -168,6 +168,7 @@ class RlcFile: public EFile
    uint8_t  m_bRlc;      // control byte for run length decoder
    uint8_t  m_zeroes;

+    uint8_t m_flags;
 #define WRITE_FIRST_LINK               0x01
 #define WRITE_NEXT_LINK_1              0x02
 #define WRITE_NEXT_LINK_2              0x03
@@ -457,9 +457,9 @@ void lcd_outdezNAtt(coord_t x, coord_t y, lcdint_t val, LcdFlags flags, uint8_t
      }
      else if (smlsize) {
        x -= 2;
-        lcd_plot(x, y+5);
+        lcd_plot(x+1, y+5);
        if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
-          lcd_vline(x, y-1, 8);
+          lcd_vline(x+1, y, 7);
        }
      }
      else if (tinsize) {
@@ -625,7 +625,7 @@ void putsTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2

 #if defined(CPUARM)
  char separator = ':';
-  if (tme >= 3600) {
+  if (tme >= 3600 && (~att & DBLSIZE)) {
    qr = div(qr.quot, 60);
    separator = CHR_HOUR;
  }
@@ -633,10 +633,6 @@ void putsTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
 #define separator ':'
 #endif
  lcd_outdezNAtt(x, y, qr.quot, att|LEADING0|LEFT, 2);
-#if defined(CPUARM)
-  if (separator == CHR_HOUR)
-    att &= ~DBLSIZE;
-#endif
 #if defined(CPUARM) && defined(RTCLOCK)
  if (att&TIMEBLINK)
    lcd_putcAtt(lcdLastPos, y, separator, BLINK);
@@ -39,14 +39,6 @@
 #define XPOT_DELTA 10
 #define XPOT_DELAY 10 /* cycles */

-enum CalibrationState {
-  CALIB_START = 0,
-  CALIB_SET_MIDPOINT,
-  CALIB_MOVE_STICKS,
-  CALIB_STORE,
-  CALIB_FINISHED
-};
-
 void menuCommonCalib(uint8_t event)
 {
  for (uint8_t i=0; i<NUM_STICKS+NUM_POTS; i++) { // get low and high vals for sticks and trims
@@ -65,7 +57,7 @@ void menuCommonCalib(uint8_t event)
  switch (event)
  {
    case EVT_ENTRY:
-      reusableBuffer.calib.state = CALIB_START;
+      reusableBuffer.calib.state = 0;
      break;

    case EVT_KEY_BREAK(KEY_ENTER):
@@ -74,14 +66,14 @@ void menuCommonCalib(uint8_t event)
  }

  switch (reusableBuffer.calib.state) {
-    case CALIB_START:
+    case 0:
      // START CALIBRATION
      if (!READ_ONLY()) {
        lcd_putsLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUTOSTART);
      }
      break;

-    case CALIB_SET_MIDPOINT:
+    case 1:
      // SET MIDPOINT
      lcd_putsAtt(0*FW, MENU_HEADER_HEIGHT+FH, STR_SETMIDPOINT, INVERS);
      lcd_putsLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE);
@@ -93,7 +85,7 @@ void menuCommonCalib(uint8_t event)
      }
      break;

-    case CALIB_MOVE_STICKS:
+    case 2:
      // MOVE STICKS/POTS
      STICK_SCROLL_DISABLE();
      lcd_putsAtt(0*FW, MENU_HEADER_HEIGHT+FH, STR_MOVESTICKSPOTS, INVERS);
@@ -110,14 +102,14 @@ void menuCommonCalib(uint8_t event)
      }
      break;

-    case CALIB_STORE:
+    case 3:
      g_eeGeneral.chkSum = evalChkSum();
      eeDirty(EE_GENERAL);
-      reusableBuffer.calib.state = CALIB_FINISHED;
+      reusableBuffer.calib.state = 4;
      break;

    default:
-      reusableBuffer.calib.state = CALIB_START;
+      reusableBuffer.calib.state = 0;
      break;
  }

@@ -129,7 +121,7 @@ void menuGeneralCalib(uint8_t event)
  check_simple(event, e_Calib, menuTabGeneral, DIM(menuTabGeneral), 0);

  if (menuEvent) {
-    calibrationState = CALIB_START;
+    calibrationState = 0;
  }

  TITLE(STR_MENUCALIBRATION);
@@ -138,8 +130,8 @@ void menuGeneralCalib(uint8_t event)

 void menuFirstCalib(uint8_t event)
 {
-  if (event == EVT_KEY_BREAK(KEY_EXIT) || reusableBuffer.calib.state == CALIB_FINISHED) {
-    calibrationState = CALIB_START;
+  if (event == EVT_KEY_BREAK(KEY_EXIT) || reusableBuffer.calib.state == 4) {
+    calibrationState = 0;
    chainMenu(menuMainView);
  }
  else {
@@ -211,7 +211,7 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
 #endif
 #if defined(CPUARM)
          else if (func == FUNC_SET_TIMER) {
-            val_max = 539*60+59;
+            val_max = 59*60+59;
            putsTimer(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT, attr);
          }
 #endif
@@ -419,7 +419,7 @@ void gvarWeightItem(coord_t x, coord_t y, MixData *md, uint8_t attr, uint8_t eve
 void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
 {
  int offset = GET_GVAR(MD_OFFSET(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
-  int weight = GET_GVAR(MD_WEIGHT(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
+  int weight = abs(GET_GVAR(MD_WEIGHT(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode));
  int barMin = offset - weight;
  int barMax = offset + weight;
  if (y > 15) {
@@ -431,10 +431,6 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
    lcd_outdezAtt(x+GAUGE_WIDTH+1, y-8, barMax);
 #endif
  }
-  if (weight < 0) {
-    barMin = -barMin;
-    barMax = -barMax;
-  }
  if (barMin < -101)
    barMin = -101;
  if (barMax > 101)
@@ -116,7 +116,7 @@ void menuModelSetup(uint8_t event)
  #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 EXTERNAL_MODULE_SETTINGS_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 defined(PCBSKY9X) && defined(REVX)
+#if defined(PCBSKY9X) && !defined(REVX)
  #define OUTPUT_TYPE_ROWS()                (IS_MODULE_PPM(EXTERNAL_MODULE) ? (uint8_t)0 : HIDDEN_ROW) ,
 #else
  #define OUTPUT_TYPE_ROWS() 
@@ -220,14 +220,13 @@ void menuModelSetup(uint8_t event)
              break;
            }
            case 1:
-              CHECK_INCDEC_MODELVAR_ZERO(event, qr.quot, 539); // 8:59
+              CHECK_INCDEC_MODELVAR_ZERO(event, qr.quot, 59);
              timer->start = qr.rem + qr.quot*60;
              break;
            case 2:
              qr.rem -= checkIncDecModel(event, qr.rem+2, 1, 62)-2;
              timer->start -= qr.rem ;
              if ((int16_t)timer->start < 0) timer->start=0;
-              if ((int16_t)timer->start > 5999) timer->start=32399; // 8:59:59
              break;
          }
        }
@@ -300,10 +299,7 @@ void menuModelSetup(uint8_t event)
                break;
              case 2:
                qr.rem -= checkIncDecModel(event, qr.rem+2, 1, 62)-2;
-                if (timer->start >= qr.rem) {
-                  timer->start -= qr.rem ;
-                }
-                if ((int32_t)timer->start > 3599) timer->start=3599; // 59:59
+                timer->start -= qr.rem ;
                break;
            }
          }
@@ -278,7 +278,7 @@ bool isSensorAvailable(int sensor)
 #define SENSOR_PARAM4_ROWS     (sensor->type == TELEM_TYPE_CALCULATED && sensor->formula < TELEM_FORMULA_MULTIPLY) ? (uint8_t)0 : HIDDEN_ROW
 #define SENSOR_AUTOOFFSET_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW)
 #define SENSOR_FILTER_ROWS     (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW)
-#define SENSOR_PERSISTENT_ROWS (sensor->type == TELEM_TYPE_CALCULATED ? (uint8_t)0 : HIDDEN_ROW)
+#define SENSOR_PERSISTENT_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW)

 void menuModelSensor(uint8_t event)
 {
@@ -170,11 +170,6 @@ bool isInputSourceAvailable(int source)
  
  if (source>=MIXSRC_FIRST_CH && source<=MIXSRC_LAST_CH)
    return true;
-    
-  if (source>=MIXSRC_FIRST_LOGICAL_SWITCH && source<=MIXSRC_LAST_LOGICAL_SWITCH) {
-    LogicalSwitchData * cs = lswAddress(source-MIXSRC_SW1);
-    return (cs->func != LS_FUNC_NONE);
-  }

  if (source>=MIXSRC_FIRST_TRAINER && source<=MIXSRC_LAST_TRAINER)
    return true;
@@ -421,17 +421,17 @@ void lcd_outdezNAtt(coord_t x, coord_t y, lcdint_t val, LcdFlags flags, uint8_t
      }
      else if (smlsize) {
        x -= 2;
+        lcd_plot(x+1, y+5);
        if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
-          lcd_vlineStip(x, y-1, 8, SOLID, INVERS);
+          lcd_vline(x+1, y, 7);
        }
-        lcd_plot(x, y+5);
      }
      else if (tinsize) {
        x--;
-        if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
-          lcd_vlineStip(x-1, y-1, 7, SOLID, INVERS);
-        }
        lcd_plot(x-1, y+4);
+        if ((flags&INVERS) && ((~flags & BLINK) || BLINK_ON_PHASE)) {
+          lcd_vline(x-1, y-1, 7);
+        }
        x--;
      }
      else {
@@ -593,8 +593,6 @@ void putsTimer(coord_t x, coord_t y, putstime_t tme, LcdFlags att, LcdFlags att2
    qr.quot = qr2.rem;
    if (att & MIDSIZE)
      x += 17;
-    else if (att & BOLD)
-      x += 15;
    else
      x += 13;
  }
@@ -1038,7 +1036,6 @@ void lcd_plot(coord_t x, coord_t y, LcdFlags att)

 void lcd_hlineStip(coord_t x, coord_t y, coord_t w, uint8_t pat, LcdFlags att)
 {
-  if (w < 0) { x += w; w = -w; }
  if (y < 0 || y >= LCD_H) return;
  if (x+w > LCD_W) {
    if (x >= LCD_W ) return;
@@ -41,14 +41,6 @@
 #define BAR_SPACING   12
 #define BAR_HEIGHT    22

-enum CalibrationState {
-  CALIB_START = 0,
-  CALIB_SET_MIDPOINT,
-  CALIB_MOVE_STICKS,
-  CALIB_STORE,
-  CALIB_FINISHED
-};
-
 void drawPotsBars()
 {
  // Optimization by Mike Blandford
@@ -75,8 +67,6 @@ void menuCommonCalib(uint8_t event)
      uint8_t idx = i - POT1;
      int count = reusableBuffer.calib.xpotsCalib[idx].stepsCount;
      if (IS_POT_MULTIPOS(i) && count <= XPOTS_MULTIPOS_COUNT) {
-        // use raw analog value for multipos calibraton, anaIn() already has multipos decoded value
-        vt = getAnalogValue(i) >> 1;
        if (reusableBuffer.calib.xpotsCalib[idx].lastCount == 0 || vt < reusableBuffer.calib.xpotsCalib[idx].lastPosition - XPOT_DELTA || vt > reusableBuffer.calib.xpotsCalib[idx].lastPosition + XPOT_DELTA) {
          reusableBuffer.calib.xpotsCalib[idx].lastPosition = vt;
          reusableBuffer.calib.xpotsCalib[idx].lastCount = 1;
@@ -111,7 +101,7 @@ void menuCommonCalib(uint8_t event)
  {
    case EVT_ENTRY:
    case EVT_KEY_BREAK(KEY_EXIT):
-      reusableBuffer.calib.state = CALIB_START;
+      reusableBuffer.calib.state = 0;
      break;

    case EVT_KEY_BREAK(KEY_ENTER):
@@ -120,14 +110,14 @@ void menuCommonCalib(uint8_t event)
  }

  switch (reusableBuffer.calib.state) {
-    case CALIB_START:
+    case 0:
      // START CALIBRATION
      if (!READ_ONLY()) {
        lcd_putsLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUTOSTART);
      }
      break;

-    case CALIB_SET_MIDPOINT:
+    case 1:
      // SET MIDPOINT
      lcd_putsAtt(0*FW, MENU_HEADER_HEIGHT+FH, STR_SETMIDPOINT, INVERS);
      lcd_putsLeft(MENU_HEADER_HEIGHT+2*FH, STR_MENUWHENDONE);
@@ -143,7 +133,7 @@ void menuCommonCalib(uint8_t event)
      }
      break;

-    case CALIB_MOVE_STICKS:
+    case 2:
      // MOVE STICKS/POTS
      STICK_SCROLL_DISABLE();
      lcd_putsAtt(0*FW, MENU_HEADER_HEIGHT+FH, STR_MOVESTICKSPOTS, INVERS);
@@ -160,7 +150,7 @@ void menuCommonCalib(uint8_t event)
      }
      break;

-    case CALIB_STORE:
+    case 3:
      for (uint8_t i=POT1; i<=POT_LAST; i++) {
        int idx = i - POT1;
        int count = reusableBuffer.calib.xpotsCalib[idx].stepsCount;
@@ -186,11 +176,11 @@ void menuCommonCalib(uint8_t event)
      }
      g_eeGeneral.chkSum = evalChkSum();
      eeDirty(EE_GENERAL);
-      reusableBuffer.calib.state = CALIB_FINISHED;
+      reusableBuffer.calib.state = 4;
      break;

    default:
-      reusableBuffer.calib.state = CALIB_START;
+      reusableBuffer.calib.state = 0;
      break;
  }

@@ -200,7 +190,7 @@ void menuCommonCalib(uint8_t event)
 #if 0
  for (int i=POT1; i<=POT_LAST; i++) {
    uint8_t steps = 0;
-    if (reusableBuffer.calib.state == CALIB_MOVE_STICKS) {
+    if (reusableBuffer.calib.state == 2) {
      steps = reusableBuffer.calib.xpotsCalib[i-POT1].stepsCount;
    }
    else if (IS_POT_MULTIPOS(i)) {
@@ -219,14 +209,14 @@ void menuGeneralCalib(uint8_t event)
  check_simple(STR_MENUCALIBRATION, event, e_Calib, menuTabGeneral, DIM(menuTabGeneral), 0);
  menuCommonCalib(READ_ONLY() ? 0 : event);
  if (menuEvent) {
-    calibrationState = CALIB_START;
+    calibrationState = 0;
  }
 }

 void menuFirstCalib(uint8_t event)
 {
-  if (event == EVT_KEY_BREAK(KEY_EXIT) || reusableBuffer.calib.state == CALIB_FINISHED) {
-    calibrationState = CALIB_START;
+  if (event == EVT_KEY_BREAK(KEY_EXIT) || reusableBuffer.calib.state == 4) {
+    calibrationState = 0;
    chainMenu(menuMainView);
  }
  else {
@@ -43,26 +43,28 @@ void menuGeneralDiagAna(uint8_t event)
  STICK_SCROLL_DISABLE();

  for (int i=0; i<NUM_STICKS+NUM_POTS; i++) {
-    coord_t y = MENU_HEADER_HEIGHT + 1 + (i/2)*FH;
-    uint8_t x = i&1 ? LCD_W/2 + FW : 0;
+#if (NUM_STICKS+NUM_POTS) > 9
+    coord_t y = MENU_HEADER_HEIGHT + 1 + (i/3)*FH;
+    const uint8_t x_coord[] = {0, 70, 154};
+    uint8_t x = x_coord[i%3];
    lcd_outdezNAtt(x, y, i+1, LEADING0|LEFT, 2);
    lcd_putc(x+2*FW-2, y, ':');
-    lcd_outhex4(x+3*FW-1, y, anaIn(i));
-#if defined(JITTER_MEASURE)
-    lcd_outdezAtt(x+10*FW-1, y, rawJitter[i].get());
-    lcd_outdezAtt(x+13*FW-1, y, avgJitter[i].get());
-    lcd_outdez8(x+17*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256);
 #else
-    lcd_outdez8(x+10*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256);
+    coord_t y = MENU_HEADER_HEIGHT + 1 + (i/2)*FH;
+    uint8_t x = i&1 ? 64+5 : 0;
+    putsStrIdx(x, y, PSTR("A"), i+1);
+    lcd_putc(lcdNextPos, y, ':');
 #endif
+    lcd_outhex4(x+3*FW-1, y, anaIn(i));
+    lcd_outdez8(x+10*FW-1, y, (int16_t)calibratedStick[CONVERT_MODE(i)]*25/256);
  }

-  lcd_putsLeft(MENU_HEADER_HEIGHT+1+6*FH, STR_BATT_CALIB);
+  lcd_putsLeft(MENU_HEADER_HEIGHT+1+5*FH, STR_BATT_CALIB);
  static int32_t adcBatt;
  adcBatt = ((adcBatt * 7) + anaIn(TX_VOLTAGE)) / 8;
  uint32_t batCalV = (adcBatt + (adcBatt*g_eeGeneral.txVoltageCalibration)/128) * BATT_SCALE;
  batCalV >>= 11;
  batCalV += 2; // because of the diode
-  putsVolts(LEN_CALIB_FIELDS*FW+4*FW, MENU_HEADER_HEIGHT+1+6*FH, batCalV, s_editMode > 0 ? BLINK|INVERS : INVERS);
+  putsVolts(LEN_CALIB_FIELDS*FW+4*FW, MENU_HEADER_HEIGHT+1+5*FH, batCalV, s_editMode > 0 ? BLINK|INVERS : INVERS);
  if (s_editMode > 0) CHECK_INCDEC_GENVAR(event, g_eeGeneral.txVoltageCalibration, -127, 127);
 }
@@ -72,7 +72,6 @@ enum menuGeneralHwItems {
  CASE_REV9E(ITEM_SETUP_HW_SR)
  CASE_REV9E(ITEM_SETUP_HW_BLUETOOTH)
  ITEM_SETUP_HW_UART3_MODE,
-  ITEM_SETUP_HW_JITTER_FILTER,
  ITEM_SETUP_HW_MAX
 };

@@ -228,12 +227,6 @@ void menuGeneralHardware(uint8_t event)
          serial2Init(g_eeGeneral.serial2Mode, MODEL_TELEMETRY_PROTOCOL());
        }
        break;
-      case ITEM_SETUP_HW_JITTER_FILTER:
-      {
-        uint8_t b = 1-g_eeGeneral.jitterFilter;
-        g_eeGeneral.jitterFilter = 1 - onoffMenuItem(b, RADIO_SETUP_2ND_COLUMN, y, STR_JITTER_FILTER, attr, event);
-        break;
-      }
    }
  }
 }
@@ -95,18 +95,6 @@ bool moveCurve(uint8_t index, int8_t shift)
  return true;
 }

-int8_t getCurveX(int noPoints, int point)
-{
-  return -100 + div10_and_round( (point*2000) / (noPoints-1) );
-}
-
-void resetCustomCurveX(int8_t * points, int noPoints)
-{
-  for (int i=0; i<noPoints-2; i++) {
-    points[noPoints+i] = getCurveX(noPoints, i+1);
-  }
-}
-
 void displayPresetChoice(uint8_t event)
 {
  displayWarning(event);
@@ -117,14 +105,11 @@ void displayPresetChoice(uint8_t event)
    warningResult = 0;
    CurveInfo & crv = g_model.curves[s_curveChan];
    int8_t * points = curveAddress(s_curveChan);
-    int k = 25 * warningInputValue;
-    int dx = 2000 / (5+crv.points-1);
-    for (uint8_t i=0; i<5+crv.points; i++) {
-      int x = -1000 + i * dx;
-      points[i] = div10_and_round(div100_and_round(k * x));
-    }
+    for (uint8_t i=0; i<5+crv.points; i++)
+      points[i] = (i-((5+crv.points)/2)) * warningInputValue * 50 / (4+crv.points);
    if (crv.type == CURVE_TYPE_CUSTOM) {
-      resetCustomCurveX(points, 5+crv.points);
+      for (int i=0; i<3+crv.points; i++)
+        points[crv.points+i] = -100 + ((i+1)*200) / (4+crv.points);
    }
  }
 }
@@ -146,12 +131,12 @@ void onCurveOneMenu(const char *result)
    for (int i=0; i<5+crv.points; i++)
      points[i] = 0;
    if (crv.type == CURVE_TYPE_CUSTOM) {
-      resetCustomCurveX(points, 5+crv.points);
+      for (int i=0; i<3+crv.points; i++)
+        points[crv.points+i] = -100 + ((i+1)*200) / (4+crv.points);
    }
  }
 }

-
 void menuModelCurveOne(uint8_t event)
 {
  static uint8_t pointsOfs = 0;
@@ -173,12 +158,12 @@ void menuModelCurveOne(uint8_t event)
  if (attr) {
    uint8_t newType = checkIncDecModelZero(event, crv.type, CURVE_TYPE_LAST);
    if (newType != crv.type) {
-      for (int i=1; i<4+crv.points; i++) {
-        points[i] = calcRESXto100(applyCustomCurve(calc100toRESX(getCurveX(5+crv.points, i)), s_curveChan));
-      }
+      for (int i=1; i<4+crv.points; i++)
+        points[i] = calcRESXto100(applyCustomCurve(calc100toRESX(-100 + i*200/(4+crv.points)), s_curveChan));
      moveCurve(s_curveChan, checkIncDec_Ret > 0 ? 3+crv.points : -3-crv.points);
      if (newType == CURVE_TYPE_CUSTOM) {
-        resetCustomCurveX(points, 5+crv.points);
+        for (int i=0; i<3+crv.points; i++)
+          points[5+crv.points+i] = -100 + ((i+1)*200) / (4+crv.points);
      }
      crv.type = newType;
    }
@@ -195,12 +180,12 @@ void menuModelCurveOne(uint8_t event)
      newPoints[0] = points[0];
      newPoints[4+count] = points[4+crv.points];
      for (int i=1; i<4+count; i++)
-        newPoints[i] = calcRESXto100(applyCustomCurve(calc100toRESX(getCurveX(5+count, i)), s_curveChan));
+        newPoints[i] = calcRESXto100(applyCustomCurve(calc100toRESX(-100 + (i*200) / (4+count)), s_curveChan));
      moveCurve(s_curveChan, checkIncDec_Ret*(crv.type==CURVE_TYPE_CUSTOM?2:1));
      for (int i=0; i<5+count; i++) {
        points[i] = newPoints[i];
        if (crv.type == CURVE_TYPE_CUSTOM && i!=0 && i!=4+count)
-          points[5+count+i-1] = getCurveX(5+count, i);
+          points[5+count+i-1] = -100 + (i*200) / (4+count);
      }
      crv.points = count;
    }
@@ -247,7 +232,7 @@ void menuModelCurveOne(uint8_t event)
    }

    if (i>=pointsOfs && i<pointsOfs+7) {
-      int8_t x = getCurveX(5+crv.points, i);
+      int8_t x = -100 + 200*i/(5+crv.points-1);
      if (crv.type==CURVE_TYPE_CUSTOM && i>0 && i<5+crv.points-1) x = points[5+crv.points+i-1];
      lcd_outdezAtt(6+8*FW,  posY, i+1, LEFT);
      lcd_outdezAtt(3+12*FW, posY, x, LEFT|(selectionMode==1?attr:0));
@@ -272,8 +272,8 @@ void menuCustomFunctions(uint8_t event, CustomFunctionData * functions, CustomFu
            lcd_putsiAtt(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, "\004Int.Ext.", CFN_PARAM(cfn), attr);
          }
          else if (func == FUNC_SET_TIMER) {
-            val_max = 539*60+59; //8:59:59
-            putsTimer(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT|TIMEHOUR, attr);
+            val_max = 59*60+59;
+            putsTimer(MODEL_CUSTOM_FUNC_3RD_COLUMN, y, val_displayed, attr|LEFT, attr);
          }
          else if (func == FUNC_PLAY_SOUND) {
            val_max = AU_FRSKY_LAST-AU_FRSKY_FIRST-1;
@@ -121,7 +121,7 @@ void menuModelFlightModesAll(uint8_t event)

        case ITEM_FLIGHT_MODES_SWITCH:
          if (k>0) {
-            putsSwitches((4+LEN_FLIGHT_MODE_NAME)*FW+FW/2, y, p->swtch, attr);
+            putsSwitches((5+LEN_FLIGHT_MODE_NAME)*FW+FW/2, y, p->swtch, attr);
            if (active) CHECK_INCDEC_MODELSWITCH(event, p->swtch, SWSRC_FIRST_IN_MIXES, SWSRC_LAST_IN_MIXES, isSwitchAvailableInMixes);
          }
          break;
@@ -449,17 +449,13 @@ void gvarWeightItem(coord_t x, coord_t y, MixData *md, uint8_t attr, uint8_t eve
 void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)
 {
  int offset = GET_GVAR(MD_OFFSET(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
-  int weight = GET_GVAR(MD_WEIGHT(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode);
+  int weight = abs(GET_GVAR(MD_WEIGHT(md), GV_RANGELARGE_NEG, GV_RANGELARGE, mixerCurrentFlightMode));
  int barMin = offset - weight;
  int barMax = offset + weight;
  if (y > 15) {
    lcd_outdezAtt(x-((barMin >= 0) ? 2 : 3), y-6, barMin, TINSIZE|LEFT);
    lcd_outdezAtt(x+GAUGE_WIDTH+1, y-6, barMax, TINSIZE);
  }
-  if (weight < 0) {
-    barMin = -barMin;
-    barMax = -barMax;
-  }
  if (barMin < -101)
    barMin = -101;
  if (barMax > 101)
@@ -95,6 +95,10 @@ enum menuModelSetupItems {
  ITEM_MODEL_EXTERNAL_MODULE_CHANNELS,
  ITEM_MODEL_EXTERNAL_MODULE_BIND,
  ITEM_MODEL_EXTERNAL_MODULE_FAILSAFE,
+#ifdef MULTIMODULE
+  ITEM_MODEL_EXTERNAL_MODULE_AUTOBIND,
+  ITEM_MODEL_EXTERNAL_MODULE_LOWPOWER,
+#endif
  ITEM_MODEL_TRAINER_LABEL,
  ITEM_MODEL_TRAINER_MODE,
  ITEM_MODEL_TRAINER_CHANNELS,
@@ -137,8 +141,8 @@ void editTimerMode(int timerIdx, coord_t y, LcdFlags attr, uint8_t event)
  TimerData * timer = &g_model.timers[timerIdx];
  putsStrIdx(0*FW, y, STR_TIMER, timerIdx+1);
  putsTimerMode(MODEL_SETUP_2ND_COLUMN, y, timer->mode, menuHorizontalPosition==0 ? attr : 0);
-  putsTimer(MODEL_SETUP_2ND_COLUMN+5*FW-2+5*FWNUM+1, y, timer->start, menuHorizontalPosition==1 ? attr|TIMEHOUR : TIMEHOUR, menuHorizontalPosition==2 ? attr|TIMEHOUR : TIMEHOUR);
-  if (attr && menuHorizontalPosition < 0) drawFilledRect(MODEL_SETUP_2ND_COLUMN-1, y-1, 11*FW, FH+1);
+  putsTimer(MODEL_SETUP_2ND_COLUMN+5*FW-2+5*FWNUM+1, y, timer->start, menuHorizontalPosition==1 ? attr : 0, menuHorizontalPosition==2 ? attr : 0);
+  if (attr && menuHorizontalPosition < 0) drawFilledRect(MODEL_SETUP_2ND_COLUMN-1, y-1, LCD_W-MODEL_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH+1, FH+1);
  if (attr && s_editMode>0) {
    div_t qr = div(timer->start, 60);
    switch (menuHorizontalPosition) {
@@ -162,14 +166,13 @@ void editTimerMode(int timerIdx, coord_t y, LcdFlags attr, uint8_t event)
        break;
      }
      case 1:
-        qr.quot = checkIncDec(event, qr.quot, 0, 1439, EE_MODEL | NO_INCDEC_MARKS); // 23h59
+        CHECK_INCDEC_MODELVAR_ZERO(event, qr.quot, 59);
        timer->start = qr.rem + qr.quot*60;
        break;
      case 2:
        qr.rem -= checkIncDecModel(event, qr.rem+2, 1, 62)-2;
        timer->start -= qr.rem ;
        if ((int16_t)timer->start < 0) timer->start=0;
-        if ((int32_t)timer->start > 86399) timer->start=86399; // 23h59:59
        break;
    }
  }
@@ -205,12 +208,27 @@ int getSwitchWarningsCount()
 #define IS_D8_RX(x)                       (g_model.moduleData[x].rfProtocol == RF_PROTO_D8)
 #define IF_EXTERNAL_MODULE_XJT(x)         (IS_MODULE_XJT(EXTERNAL_MODULE) ? (uint8_t)x : HIDDEN_ROW)
 #define INTERNAL_MODULE_CHANNELS_ROWS     IF_INTERNAL_MODULE_ON(1)
-#define EXTERNAL_MODULE_CHANNELS_ROWS     IF_EXTERNAL_MODULE_ON((IS_MODULE_DSM2(EXTERNAL_MODULE) || IS_MODULE_CROSSFIRE(EXTERNAL_MODULE)) ? (uint8_t)0 : (uint8_t)1)
+#define EXTERNAL_MODULE_CHANNELS_ROWS     IF_EXTERNAL_MODULE_ON((IS_MODULE_DSM2(EXTERNAL_MODULE) || IS_MODULE_CROSSFIRE(EXTERNAL_MODULE) || IS_MODULE_MULTIMODULE(EXTERNAL_MODULE)) ? (uint8_t)0 : (uint8_t)1)
 #define TRAINER_CHANNELS_ROWS()           IF_TRAINER_ON(1)
 #define PORT_CHANNELS_ROWS(x)             (x==INTERNAL_MODULE ? INTERNAL_MODULE_CHANNELS_ROWS : (x==EXTERNAL_MODULE ? EXTERNAL_MODULE_CHANNELS_ROWS : TRAINER_CHANNELS_ROWS()))
-#define FAILSAFE_ROWS(x)                  (HAS_RF_PROTOCOL_FAILSAFE(g_model.moduleData[x].rfProtocol) ? (g_model.moduleData[x].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : HIDDEN_ROW)
+#if defined MULTIMODULE
+#define MULTIMODULE_HASOPTIONS(x)         (x == MM_RF_PROTO_HUBSAN || x == MM_RF_PROTO_FRSKY || x == MM_RF_PROTO_DSM2 || x >= MM_RF_PROTO_CUSTOM)
+#define MULTIMODULE_FAILSAFEROWS(x)       (IS_MODULE_MULTIMODULE(x) && (MULTIMODULE_HASOPTIONS(g_model.moduleData[x].multi.rfProtocol))) ? (uint8_t) 1: HIDDEN_ROW
+#else
+#define MULTIMODULE_FAILSAFEROWS(x)       HIDDEN_ROW
+#endif
+#define FAILSAFE_ROWS(x)                  (IS_MODULE_XJT(x) && HAS_RF_PROTOCOL_FAILSAFE(g_model.moduleData[x].rfProtocol) ? (g_model.moduleData[x].failsafeMode==FAILSAFE_CUSTOM ? (uint8_t)1 : (uint8_t)0) : MULTIMODULE_FAILSAFEROWS(x))
 #define TIMER_ROWS                        2|NAVIGATION_LINE_BY_LINE, 0, CASE_PERSISTENT_TIMERS(0) 0, 0
-#define EXTERNAL_MODULE_MODE_ROWS       (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0
+#if defined(MULTIMODULE)
+
+#define MULTIMODULE_HAS_SUBTYPE(x)        (x == MM_RF_PROTO_FLYSKY || x == MM_RF_PROTO_FRSKY || x == MM_RF_PROTO_HISKY || x == MM_RF_PROTO_DSM2 || x == MM_RF_PROTO_YD717 || x == MM_RF_PROTO_KN || x == MM_RF_PROTO_SYMAX || x == MM_RF_PROTO_CX10 || x == MM_RF_PROTO_CG023 || x == MM_RF_PROTO_MT99XX || x == MM_RF_PROTO_MJXQ)
+#define MULTIMODULE_MODE_ROWS(x)          (g_model.moduleData[x].multi.rfProtocol >= MM_RF_PROTO_CUSTOM ) ? (uint8_t) 3 :MULTIMODULE_HAS_SUBTYPE(g_model.moduleData[x].multi.rfProtocol) ? (uint8_t)2 : (uint8_t)1
+#define MULTIMODULE_MODULE_ROWS           IS_MODULE_MULTIMODULE(EXTERNAL_MODULE) ? (uint8_t) 1 : HIDDEN_ROW, IS_MODULE_MULTIMODULE(EXTERNAL_MODULE) ? (uint8_t) 1 : HIDDEN_ROW,
+#else
+#define MULTIMODULE_MODE_ROWS(x) (uint8_t)0
+#define MULTIMODULE_MODULE_ROWS
+#endif
+#define EXTERNAL_MODULE_MODE_ROWS       (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 :  IS_MODULE_MULTIMODULE(EXTERNAL_MODULE) ? MULTIMODULE_MODE_ROWS(EXTERNAL_MODULE) : (uint8_t)0
 #if TIMERS == 1
  #define TIMERS_ROWS                     TIMER_ROWS
 #elif TIMERS == 2
@@ -228,6 +246,7 @@ int getSwitchWarningsCount()
  #define TOPLCD_ROWS
 #endif

+
 void menuModelSetup(uint8_t event)
 {
  horzpos_t l_posHorz = menuHorizontalPosition;
@@ -239,12 +258,12 @@ void menuModelSetup(uint8_t event)
    INTERNAL_MODULE_MODE_ROWS, 
    INTERNAL_MODULE_CHANNELS_ROWS,
    IF_INTERNAL_MODULE_ON(IS_MODULE_XJT(INTERNAL_MODULE) ? (HAS_RF_PROTOCOL_MODELINDEX(g_model.moduleData[INTERNAL_MODULE].rfProtocol) ? (uint8_t)2 : (uint8_t)1) : (IS_MODULE_PPM(INTERNAL_MODULE) ? (uint8_t)1 : HIDDEN_ROW)),
-    IF_INTERNAL_MODULE_ON((IS_MODULE_XJT(INTERNAL_MODULE)) ? FAILSAFE_ROWS(INTERNAL_MODULE) : HIDDEN_ROW), 
-    LABEL(ExternalModule), 
-    (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, 
+    IF_INTERNAL_MODULE_ON((IS_MODULE_XJT(INTERNAL_MODULE)) ? FAILSAFE_ROWS(INTERNAL_MODULE) : HIDDEN_ROW),
+    LABEL(ExternalModule),
+    (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE) || IS_MODULE_MULTIMODULE(EXTERNALE_MODULE)) ? (uint8_t)1 : (uint8_t)0,
    EXTERNAL_MODULE_CHANNELS_ROWS,
-    (IS_MODULE_XJT(EXTERNAL_MODULE) && !HAS_RF_PROTOCOL_MODELINDEX(g_model.moduleData[EXTERNAL_MODULE].rfProtocol)) ? (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)), 
+    (IS_MODULE_XJT(EXTERNAL_MODULE) && !HAS_RF_PROTOCOL_MODELINDEX(g_model.moduleData[EXTERNAL_MODULE].rfProtocol)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE) || IS_MODULE_MULTIMODULE(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW,
+    IF_EXTERNAL_MODULE_XJT(FAILSAFE_ROWS(EXTERNAL_MODULE)),
    LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)});
 #else
  MENU_TAB({ 0, 0, TIMERS_ROWS, TOPLCD_ROWS 0, 1, 0, 0, LABEL(Throttle), 0, 0, 0, LABEL(PreflightCheck), 0, 0, SW_WARN_ITEMS(), POT_WARN_ITEMS(),
@@ -257,8 +276,8 @@ void menuModelSetup(uint8_t event)
    LABEL(ExternalModule),
    EXTERNAL_MODULE_MODE_ROWS,
    EXTERNAL_MODULE_CHANNELS_ROWS,
-    (IS_MODULE_XJT(EXTERNAL_MODULE) && !HAS_RF_PROTOCOL_MODELINDEX(g_model.moduleData[EXTERNAL_MODULE].rfProtocol)) ? (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)),
+    (IS_MODULE_XJT(EXTERNAL_MODULE) && !HAS_RF_PROTOCOL_FAILSAFE(g_model.moduleData[EXTERNAL_MODULE].rfProtocol)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE) || IS_MODULE_MULTIMODULE(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW,
+    FAILSAFE_ROWS(EXTERNAL_MODULE), MULTIMODULE_MODULE_ROWS
    LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)});
 #endif
  MENU_CHECK(STR_MENUSETUP, menuTabModel, e_ModelSetup, ITEM_MODEL_SETUP_MAX);
@@ -679,6 +698,52 @@ void menuModelSetup(uint8_t event)
          lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_XJT_PROTOCOLS, 1+g_model.moduleData[EXTERNAL_MODULE].rfProtocol, menuHorizontalPosition==1 ? attr : 0);
        else if (IS_MODULE_DSM2(EXTERNAL_MODULE))
          lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_DSM_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].rfProtocol, menuHorizontalPosition==1 ? attr : 0);
+#if defined(MULTIMODULE)
+        else if (IS_MODULE_MULTIMODULE(EXTERNAL_MODULE)) {
+          int8_t multi_rfProto = min(g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol, (uint8_t) MM_RF_PROTO_CUSTOM);
+          lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+5*FW, y, STR_MULTI_PROTOCOLS, multi_rfProto, menuHorizontalPosition==1 ? attr : 0);
+
+          switch(multi_rfProto) {
+            case MM_RF_PROTO_FLYSKY:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_SUBTYPE_FLYSKY, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_FRSKY:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_XJT_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].subType+1, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_HISKY:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+10*FW, y, STR_SUBTYPE_HISKY, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_DSM2:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_DSM_PROTOCOLS, g_model.moduleData[EXTERNAL_MODULE].subType+1, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_YD717:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+10*FW, y, STR_SUBTYPE_YD717, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_KN:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_SUBTYPE_KN, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_SYMAX:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_SUBTYPE_SYMAX, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_CX10:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+10*FW, y, STR_SUBTYPE_CX10, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_CG023:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+10*FW, y, STR_SUBTYPE_CG023, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_MT99XX:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_SUBTYPE_MT99, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_MJXQ:
+              lcd_putsiAtt(MODEL_SETUP_2ND_COLUMN+11*FW, y, STR_SUBTYPE_MJXQ, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==2 ? attr : 0);
+              break;
+            case MM_RF_PROTO_CUSTOM:
+              lcd_outdezNAtt(MODEL_SETUP_2ND_COLUMN+14*FW, y, g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol & 0x1f, menuHorizontalPosition==2 ? attr : 0, 2);
+              lcd_outdezNAtt(MODEL_SETUP_2ND_COLUMN+16*FW, y, g_model.moduleData[EXTERNAL_MODULE].subType, menuHorizontalPosition==3 ? attr : 0, 2);
+              break;
+          }
+        }
+#endif
        if (attr && s_editMode>0) {
          switch (menuHorizontalPosition) {
            case 0:
@@ -686,18 +751,58 @@ void menuModelSetup(uint8_t event)
              if (checkIncDec_Ret) {
                g_model.moduleData[EXTERNAL_MODULE].rfProtocol = 0;
                g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
-                g_model.moduleData[EXTERNAL_MODULE].channelsCount = min<int8_t>(0, MAX_EXTERNAL_MODULE_CHANNELS());
+                g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0;
              }
              break;
            case 1:
              if (IS_MODULE_DSM2(EXTERNAL_MODULE))
                CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].rfProtocol, DSM2_PROTO_LP45, DSM2_PROTO_DSMX);
+              else if (IS_MODULE_MULTIMODULE(EXTERNAL_MODULE)) {
+                CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol, MM_RF_PROTO_FIRST, MM_RF_PROTO_LAST);
+                if (checkIncDec_Ret)
+                  g_model.moduleData[EXTERNAL_MODULE].subType=0;
+              }
              else
                g_model.moduleData[EXTERNAL_MODULE].rfProtocol = checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].rfProtocol, RF_PROTO_X16, RF_PROTO_LAST, EE_MODEL, isRfProtocolAvailable);
              if (checkIncDec_Ret) {
                g_model.moduleData[EXTERNAL_MODULE].channelsStart = 0;
                g_model.moduleData[EXTERNAL_MODULE].channelsCount = 0;
              }
+              break;
+#if defined(MULTIMODULE)
+            case 2:
+              switch (min(g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol, (uint8_t) MM_RF_PROTO_CUSTOM)) {
+                case MM_RF_PROTO_HISKY:
+                case MM_RF_PROTO_DSM2:
+                case MM_RF_PROTO_SYMAX:
+                case MM_RF_PROTO_KN:
+                case MM_RF_PROTO_FRSKY:
+                  CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 1);
+                  break;
+                case MM_RF_PROTO_CG023:
+                case MM_RF_PROTO_MT99XX:
+                  CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 2);
+                  break;
+                case MM_RF_PROTO_FLYSKY:
+                case MM_RF_PROTO_MJXQ:
+                  CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 3);
+                  break;
+                case MM_RF_PROTO_YD717:
+                  CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 4);
+                  break;
+                case MM_RF_PROTO_CX10:
+                  CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 7);
+                  break;
+                case MM_RF_PROTO_CUSTOM:
+                  g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol = 0x20 | checkIncDec(event, g_model.moduleData[EXTERNAL_MODULE].multi.rfProtocol & 0x1f, 1, 31, EE_MODEL);
+                  break;
+              }
+              break;
+            case 3:
+              // Custom protocol, third column is subtype
+              CHECK_INCDEC_MODELVAR(event, g_model.moduleData[EXTERNAL_MODULE].subType, 0, 7);
+              break;
+#endif
          }
        }
        break;
@@ -781,11 +886,13 @@ void menuModelSetup(uint8_t event)
          else {
            lcd_putsLeft(y, STR_RXNUM);
          }
-          if (IS_MODULE_XJT(moduleIdx) || IS_MODULE_DSM2(moduleIdx)) {
+          if (IS_MODULE_XJT(moduleIdx) || IS_MODULE_DSM2(moduleIdx) || IS_MODULE_MULTIMODULE(moduleIdx)) {
            if (xOffsetBind) lcd_outdezNAtt(MODEL_SETUP_2ND_COLUMN, y, g_model.header.modelId[moduleIdx], (l_posHorz==0 ? attr : 0) | LEADING0|LEFT, 2);
            if (attr && l_posHorz==0) {
              if (s_editMode>0) {
-                CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[moduleIdx], IS_MODULE_DSM2(moduleIdx) ? 20 : 63);
+                CHECK_INCDEC_MODELVAR_ZERO(event, g_model.header.modelId[moduleIdx],
+                                           IS_MODULE_DSM2(moduleIdx) ? 20 :
+                                           IS_MODULE_MULTIMODULE(moduleIdx) ? 15 : 63);
                if (checkIncDec_Ret) {
                  modelHeaders[g_eeGeneral.currModel].modelId[moduleIdx] = g_model.header.modelId[moduleIdx];
                }
@@ -841,8 +948,39 @@ void menuModelSetup(uint8_t event)
            }
          }
        }
+#if defined(MULTIMODULE)
+        else if (IS_MODULE_MULTIMODULE(moduleIdx)) {
+          switch (g_model.moduleData[moduleIdx].multi.rfProtocol) {
+            case MM_RF_PROTO_FRSKY:
+              lcd_putsLeft(y, STR_MULTI_RFTUNE);
+              break;
+            case MM_RF_PROTO_HUBSAN:
+              lcd_putsLeft(y, STR_MULTI_VIDFREQ);
+              break;
+            case MM_RF_PROTO_DSM2:
+              g_model.moduleData[moduleIdx].multi.optionValue = selectMenuItem(MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_DSMFRAME, STR_OPTIONS_DSM, g_model.moduleData[moduleIdx].multi.optionValue, 0, 12, attr, event);
+              break;
+            default:
+              lcd_putsLeft(y, STR_MULTI_OPTION);
+              break;
+          }
+          if (g_model.moduleData[moduleIdx].multi.rfProtocol != MM_RF_PROTO_DSM2) {
+            lcd_outdezNAtt(MODEL_SETUP_2ND_COLUMN, y, g_model.moduleData[moduleIdx].multi.optionValue, LEFT | attr);
+            if (attr)
+              CHECK_INCDEC_MODELVAR(event, g_model.moduleData[moduleIdx].multi.optionValue, -128, 127);
+          }
+        }
+#endif
        break;
      }
+#if defined(MULTIMODULE)
+    case ITEM_MODEL_EXTERNAL_MODULE_AUTOBIND:
+      g_model.moduleData[EXTERNAL_MODULE].multi.autoBindMode = onoffMenuItem(g_model.moduleData[EXTERNAL_MODULE].multi.autoBindMode, MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_AUTOBIND, attr, event);
+      break;
+    case  ITEM_MODEL_EXTERNAL_MODULE_LOWPOWER:
+      g_model.moduleData[EXTERNAL_MODULE].multi.lowPowerMode = onoffMenuItem(g_model.moduleData[EXTERNAL_MODULE].multi.lowPowerMode, MODEL_SETUP_2ND_COLUMN, y, STR_MULTI_LOWPOWER, attr, event);
+      break;
+#endif
    }
  }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Arne Schwabe	eefbf6cc21	Copy strings for multimode support from en.h.txt to other languages	2016-03-27 22:46:53 +02:00
Arne Schwabe	0c0d0ded91	Add FY326 protocol	2016-03-27 22:45:24 +02:00
Arne Schwabe	cbaae312c9	Implement DSM2/DSMX frame format options	2016-03-27 22:45:21 +02:00
Arne Schwabe	b7a4f6632f	Implement autobind and low power setting and specifying a custom protocol for the multi module Specifying a custom prtocol is useful if OpenTX firmware is older than the multi module firmware and the protocol in question is not yet in the protocol list of the OpenTX firmware.	2016-03-27 22:31:56 +02:00
Arne Schwabe	49c25df507	Multi module support for Taranis Reuse some of the DSM2 routines to avoid code duplication. This first version only implements the protocol on the Taranis. (and not Telemetry code is currently untested and will not work (Polarity mismatch). The main protocols to use telemetry are FrSky protocols and not a high priority on the Taranis. Patch v3: Fix myeeprom.h, include option value in menu. Patch v4: Fix identing, name substructs of modeldata	2016-03-27 22:20:41 +02:00