OpenTX 2.1.9

Update DONATIONS.txt
Release notes updated
2016-09-14 08:00:32 +02:00 · 2016-09-13 06:37:23 +02:00 · 2016-09-12 21:53:28 +02:00 · 2016-09-12 19:00:03 +02:00 · 2016-09-11 23:31:37 +02:00 · 2016-09-11 18:45:16 +02:00
535 changed files with 68627 additions and 77150 deletions
@@ -6,3 +6,4 @@ radio/src/bootloader/bootloader_ramBoot*
 *.lbm
 *.o
 /doc/
+*.inc
@@ -0,0 +1,14 @@
+language: cpp
+
+before_install:
+    - sudo apt-get remove cmake cmake-data --yes
+    - sudo add-apt-repository ppa:george-edison55/precise-backports --yes
+    - sudo add-apt-repository ppa:terry.guo/gcc-arm-embedded --yes
+    - 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
+
+script:
+  - radio/util/commit-tests.sh
+  - mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug ../companion/src && cmake --build .
@@ -7,6 +7,9 @@
 <a href="http://aerialtechhobbies.com">Aerial Tech Hobbies</a>
 <a href="http://litepilots.com">LitePilots</a>
 <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
@@ -24,7 +27,6 @@ Chris Guy
 Adrien Gravouille
 Thomas Black
 Marc Lucht
-Michel Baily
 Zdenek Trojanek
 Martin Hotar
 Stefan Grundevik
@@ -47,11 +49,9 @@ R. Scott Page
 Johan Cronje
 Renato Aranghelovici
 Jeffrey Irvin
-John Rodgers
 Kenneth Crump
 Damjan Adamic
 Martin Wilson
-Joe Street
 John Holdsworth
 Daniel Schwartz
 Dean Church (monthly)
@@ -111,7 +111,6 @@ Erhard Werner
 Stig Jøran Moen
 Keith Hertzog
 Christophe Dauvergne
-Michel Baily
 Tauno Rautakorpi
 Sven Assmus
 Paul Dittman
@@ -148,7 +147,6 @@ Mike Matheny
 Martin Sniedze
 Fernando Rimoldi
 Sidney Fisher
-Bruce Anderson
 John Rodgers
 Ed Pare
 Thomas Kilduff
@@ -335,7 +333,6 @@ Jose Sobral
 Heung Jin Choi
 Tomasz Janiak
 Fabien Gagné
-Joe Street
 Micha Ronen
 Albert Blondin
 Klaus Schuebel
@@ -400,7 +397,6 @@ Colin Rycroft
 Emanuel Stassar
 Michael Gregory
 Robert Russell
-Gordon Stahl
 Felix Kaiser
 Joshua Bardwell
 Davd Goodall
@@ -416,7 +412,6 @@ Andrea Montefusco
 Paul Luby
 Donald L Webster
 Kenneth Frehafer 
-Peter McHenry 
 Matthias Hase 
 Markus Wolf
 Andrew Fazio
@@ -587,7 +582,6 @@ Dietmar Drees
 Jürgen Monden
 David Morgan
 Andrew Fernie
-Michel Baily
 Donald Burke
 Ronald Donker
 Fredie Singh
@@ -598,7 +592,6 @@ Julien Gérard
 Alexandre d'Alton
 Peter Mergaerts
 Jan Houwers
-Gordon Stahl
 Christian Grandjean
 Roger Bergevin
 NorthSide
@@ -770,3 +763,251 @@ Ron Powell
 Alain Labonne
 Carol Sills
 Franck Aßmann
+Larry Anderson
+Mikael Wallbäck
+Wes Warner
+Christoffer H Henni
+Donna Bayer
+Garry Ogilvie
+Karlheinz Sirsch
+Fred Larssen
+Rob Coppock 
+Franz Josef Hahn
+Serge Ribault
+Tanguy Le Moign
+Barrett Powell
+Patrice Lafeuille
+Martin Blume
+Marek Kopyto
+Marco Lange
+Gary Nix
+Jack Oliphant
+John Lever 
+Adolphe Montefiore
+Steven De Weerdt
+Håkan Berggen
+Ayelet Egosi
+Jean-Frederic Gaudreault
+Jim Wagner
+Lee Scott
+Roger Keatley
+Sherman Lovell
+Hugh Caldwell
+JB Fisher Company
+Michels Bernhard 
+Pietro Rossin
+Carsten Wache
+Brock White 
+Steven Poretz
+David Huelster
+Gordon Stahl (monthly)
+John Mathison
+Richard Duczmal
+Gregory Barron
+Marcel Fischer
+Klas Mälman
+Viljo Liukku
+Eric Smith
+Sven Assmus
+Luke Mole
+NorthSide
+Hannes Mössler 
+James Kaufman
+Ravi Gupta
+Lexington S Morley
+Ralph Segar 
+Frédéric Devillard
+Cory Theurer
+Valentinos Zachariou
+Garrett Paquette 
+Heung Jin Choi
+Kerry Cochrell
+Doug Miller
+Andrzej Weydmann
+Chair-man.nl
+Eric Beier	
+Jay Warren
+Marian Matej 
+Alastair Smith
+Timothy Senecal
+Dietmar Drees
+Bruce Jones
+Adil Busaidy
+Herman Hofman
+Jean Paul Michel
+Peter McHenry
+Julien lecoquierre
+Jean-Marie Clay
+Robert Nicoll
+Dan Nixon
+Ewald Moehring
+Giovanni Carnesecchi 
+Paul Dumsday
+Tadeusz Adamowski
+Andrew Newton
+Neil Horne
+Kerstin Appelqvist
+John Curran
+Gerald Thiel 
+Jürg Bingisser
+George Emer
+Jerzy Manarczyk
+Gerard Braakhuis
+Nicolas Leblond
+Burt Pickard-Richardson
+Jiri Petrzelka
+RK Custom Homes
+David Semeria
+Philip Lewis
+William Kim
+Dean Berg
+Tim Spurr
+Clifton Hipsher
+Mike Frizell
+Oliver Jacob
+Pawel Stepien
+Thomas Kilduff
+Barry Fox
+Anatoly Bakalenko
+Bruce Anderson
+Jeremy Cowgar
+Edward Hauser
+Stuart Brown
+Anton Glock
+Roger Ritchie
+George Carnie
+Philippe Stofleth
+Tim Dzugan 
+Illia Izotov
+Richard Miles (monthly)
+Attila Kapolnai
+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,8 +1,16 @@
-##OpenTX Next Branch
+##OpenTX 2.1 Branch

-You have found your way to the GitHub repository site for the OpenTX Next Branch. This code branch holds the source code for the ongoing development.    
+[![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)
+[![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 stable release code is not here, it is in the master branch.  
-Under no circumstances build and use software from this branch for real world application. At times you will be more or less guaranteed to crash your plane and destroy all your model settings.  
+The ongoing development on 2.1.x is done in this branch.

-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.
+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
@@ -1,3 +1,160 @@
+<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>
+<li>Lua 'execute' failed in non-root directory (in Simulator) (<a href=https://github.com/opentx/opentx/issues/3024>#3024</a>)</li>
+<!-- this is disabled until the speed problem is fixed <li>Header line always visible in Outputs, Logical Switches and Special Functions (<a href=https://github.com/opentx/opentx/issues/2861>#2861</a>)</li> -->
+<li>LR12 changes: removed option for remote failsafe configuration, added in EU firmware variant</li>
+<li>Added Clear option to the flight mode context menu (right click on the Name label) (<a href=https://github.com/opentx/opentx/issues/3026>#3026</a>)</li>
+<li>New features for Telemetry Simulator: log replay, user friendly sensor values (<a href=https://github.com/opentx/opentx/issues/3124>#3124</a>)</li>
+<li>Added F7 key to reload LUA permanent scripts in radio simulator (<a href=https://github.com/opentx/opentx/issues/3141>#3141</a>)</li>
+<li>AR9X firmware flashing fall-back was wrong</li>
+<li>Command line options support added to standalone simulator (try "./simulator21 --help" on Linux and "simulator.exe /help" on Windows for usage) (<a href=https://github.com/opentx/opentx/issues/3160>#3160</a>)</li>
+<li>Various rounding problem fixed: Telemetry sensor Ratio parameter (<a href=https://github.com/opentx/opentx/issues/3117>#3117</a>),
+  Outputs Sub-trim, Min and Max values (<a href=https://github.com/opentx/opentx/issues/3156>#3156</a>)</li>
+<li>Fixed: telemetry sensors Ratio and Offset value increment/decrement step (<a href=https://github.com/opentx/opentx/issues/3121>#3121</a>)</li>
+<li>Hardware/Calibration tab split int two tabs (<a href=https://github.com/opentx/opentx/issues/2974>#2974</a>)</li>
+<li>Fixed Fahrenheit temperature conversion error (if PREC was not 0) (<a href=https://github.com/opentx/opentx/issues/3146>#3146</a>)</li>
+<li>Application Setting 'Enable automatic backup before writing firmware' was not saved (<a href=https://github.com/opentx/opentx/issues/3040>#3040</a>)</li>
+<li>Fixed RPM package problem on Fedora (<a href=https://github.com/opentx/opentx/issues/3130>#3130</a>)</li>
+<li>Fixed conversion errors when loading 2.0.x EEPE (<a href=https://github.com/opentx/opentx/issues/3177>#3177</a>)</li>
+<li>Various texts and translations corrections</li>
+</ul>
+
+
+<h2>Version 2.1.6 / 2015-11-11</h2>
+
+<ul>
+<li>Telemetry custom screen changes didn't emit modified signal (<a href=https://github.com/opentx/opentx/issues/3029>#3029</a>)</li>
+<li>Hide D8/LR12 when eu firmware option is selected</li>
+</ul>
+
+
+<h2>Version 2.1.5 / 2015-11-05</h2>
+
+Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrSky's release of OpenTX 2.1.4
+
+<ul>
+<li>Fixed: changing any setting on the telemetry panel does not set the file as being modified (<a href=https://github.com/opentx/opentx/issues/2875>#2875</a>)</li>
+<li>Print model fix for "Play value.... not on startup" (<a href=https://github.com/opentx/opentx/issues/2736>#2736</a>)</li>
+<li>Top LCD Timer could not be selected for X9E  (<a href=https://github.com/opentx/opentx/issues/2850>#2850</a>)</li>
+<li>More informative error/info messages when openin eepe files (<a href=https://github.com/opentx/opentx/issues/2778>#2778</a>)</li>
+<li>Print model fix for curves (<a href=https://github.com/opentx/opentx/issues/2896>#2896</a>)</li>
+<li>Added missing special functions (bind, range check, set failsafe) (<a href=https://github.com/opentx/opentx/issues/2753>#2753</a>)</li>
+<li>Some defaults missing when changing telemetry formula, update propagation issues (<a href=https://github.com/opentx/opentx/issues/2928>#2928</a>)</li>
+<li>Fixed wrong import of Logical switches from OpenTX 2.0.x version (<a href=https://github.com/opentx/opentx/issues/2942>#2942</a>)</li>
+<li>Fixed a problem with updates path on Windows (<a href=https://github.com/opentx/opentx/issues/2876>#2876</a>)</li>
+<li>Edge representation unified (changed from "no release" to "instant") (<a href=https://github.com/opentx/opentx/issues/2837>#2837</a>)</li>
+<li>Added channel names on failsafe sliders (<a href=https://github.com/opentx/opentx/issues/3021>#3021</a>)</li>
+<li>Corrected failsafe mapping when using Custom failsafe mode, D16 protocol and channel range different from from 1-8. 
+  Users with such setups are advised to re-check their failsafe settings (<a href=https://github.com/opentx/opentx/issues/2975>#2975</a>)</li>
+<li>Various texts and translations corrections</li>
+<li>Various small bug-fixes: <a href=https://github.com/opentx/opentx/issues/2994>#2994</a>, 
+                             <a href=https://github.com/opentx/opentx/issues/3016>#3016</a>,
+                             <a href=https://github.com/opentx/opentx/issues/3012>#3012</a>
+</li>
+</ul>
+
+
+<h2>Version 2.1.3 / 2015-09-09</h2>
+
+<ul>
+<li>Fix missing translations in inputs/mixes tabs, print and compare dialogs (<a href=https://github.com/opentx/opentx/issues/2847>#2847</a>)</li>
+</ul>
+
+
+<h2>Version 2.1.2 / 2015-09-07</h2>
+
+<ul>
+<li>Fixed: Lua model scripts outputs not working in a simulator (<a href=https://github.com/opentx/opentx/issues/2684>#2684</a>)</li>
+<li>Fixed a problem of Companion 2.1 trying to install into 2.0 path. 
+    The effect will only be visible for the users that did not install any of the previous 2.1.x versions. 
+    (<a href=https://github.com/opentx/opentx/issues/2645>#2645</a>)</li>
+<li>Added missing SDL libraries to MAC package  (<a href=https://github.com/opentx/opentx/issues/2678>#2678</a>)</li>
+<li>Added used channels check/warning in Wizard (<a href=https://github.com/opentx/opentx/issues/2091>#2091</a>)</li>
+<li>Model Print and Model Compare improvements and fixes (<a href=https://github.com/opentx/opentx/issues/2734>#2734</a>, <a href=https://github.com/opentx/opentx/issues/2737>#2737</a>, <a href=https://github.com/opentx/opentx/issues/2576>#2576</a>)</li>
+<li>Negative telemetry offset value was reset when writing back to radio (<a href=https://github.com/opentx/opentx/issues/2738>#2738</a>)</li>
+<li>Telemetry sensor names were not displayed (<a href=https://github.com/opentx/opentx/issues/2807>#2807</a>)</li>
+<li>Mixes multiplex representation now the same as on the radio (<a href=https://github.com/opentx/opentx/issues/2808>#2808</a>)</li>
+<li>Fixed language-related startup crash on Mac  (<a href=https://github.com/opentx/opentx/issues/2815>#2815</a>)</li>
+<li>Fixed issues with conversion from 2.0 (<a href=https://github.com/opentx/opentx/issues/2809>#2809</a>, <a href=https://github.com/opentx/opentx/issues/2800>#2800</a>)</li>
+<li>Fixed Throttle source export issue on X9E  (<a href=https://github.com/opentx/opentx/issues/2844>#2844</a>)</li>
+<li>Added support for the AR9X replacement board (prototype) for the Turnigy 9X radio, info <a href=http://www.rcgroups.com/forums/showthread.php?t=2479552>here</a></li>
+</ul>
+
+
+<h2>Version 2.1.1 / 2015-08-06</h2>
+<ul>
+<li>Vario source and center silent options were not saved(<a href=https://github.com/opentx/opentx/issues/2476>#2476</a>)</li>
+<li>DSM receiver numbers for external module were not converted from previous version EEPROM (<a href=https://github.com/opentx/opentx/issues/2474>#2474</a>)</li>
+<li>Precision incorrectly set for Calculated->Cells sensor (<a href=https://github.com/opentx/opentx/issues/2479>#2479</a>)</li>
+<li>Unit incorrectly set for Calculated->Cells sensor (<a href=https://github.com/opentx/opentx/issues/2485>#2485</a>)</li>
+<li>Fixed import/export of trim values (<a href=https://github.com/opentx/opentx/issues/2484>#2484</a>)</li>
+<li>Removed constant access to floppy disk (<a href=https://github.com/opentx/opentx/issues/2160>#2160</a>)</li>
+<li>Telemetry view script combo box list was empty (<a href=https://github.com/opentx/opentx/issues/2465>#2465</a>)</li>
+<li>Telemetry view bars ranges not transfered to radio (<a href=https://github.com/opentx/opentx/issues/2491>#2491</a>)</li>
+<li>Fixed Standalone simulator radio selection display problem (<a href=https://github.com/opentx/opentx/issues/2503>#2503</a>)</li>
+<li>Added missing simulation libraries and enabled side by side installation of Companion 2.0 and 2.1 on Linux (<a href=https://github.com/opentx/opentx/issues/2500>#2500</a>)</li>
+<li>Standalone simulator now remembers which radio was simulated in previous session (<a href=https://github.com/opentx/opentx/issues/2503>#2503</a>)</li>
+<li>Radio calibration value were not displayed (<a href=https://github.com/opentx/opentx/issues/2502>#2502</a>)</li>
+<li>Fixed Vario / Voltage / Current sources export problem</li>
+<li>Writing model settings to 9XR-PRO did not work (<a href=https://github.com/opentx/opentx/issues/2402>#2402</a>, <a href=https://github.com/opentx/opentx/issues/2517>#2517</a>)</li>
+<li>Model Print and Model Compare improvements</li>
+<li>Fixed Companion OSX version (<a href=https://github.com/opentx/opentx/issues/2549>#2549</a>)</li>
+<li>Firmware nightly builds are now downloadable from nightly builds of Companion (<a href=https://github.com/opentx/opentx/issues/2526>#2526</a>, <a href=https://github.com/opentx/opentx/issues/2634>#2634</a>)</li>
+<li>Fixed telemetry item lists (<a href=https://github.com/opentx/opentx/issues/2541>#2541</a>)</li>
+<li>Fixed missing pots P1..P3 for 9X (<a href=https://github.com/opentx/opentx/issues/2543>#2543</a>)</li>
+<li>Fixed "Invalid model and settings" error message when writing models and settings to the radio (<a href=https://github.com/opentx/opentx/issues/2544>#2544</a>)</li>
+<li>Global Functions fixes (<a href=https://github.com/opentx/opentx/issues/2558>#2558</a>)</li>
+<li>Export to Google Earth now working (only) with the new telemetry fields (GPS, GAlt and GSpd) (<a href=https://github.com/opentx/opentx/issues/2546>#2546</a>)</li>
+<li>Fixed unsuccessful writing of setting to the radio for 9XR PRO (<a href=https://github.com/opentx/opentx/issues/2605>#2605</a>)</li>
+<li>Fixed missing LUA script outputs in special function "Play Value" (<a href=https://github.com/opentx/opentx/issues/2649>#2649</a>)</li>
+<li>Various texts and translations corrections</li>
+<li>Various small bug-fixes</li>
+</ul>
+
+
 <h2>Version 2.1.0 / 2015-07-16</h2>
 <ul>
 <li>SD card synchronizaton tool</li>
@@ -1,22 +1,44 @@
 PROJECT( companion )

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

-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})
+MESSAGE(STATUS "OpenTX Companion ${C9X_VERSION}")
+
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )

 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  SET(C9X_NAME_SUFFIX ${C9X_VERSION_MAJOR}${C9X_VERSION_MINOR})
+  SET(COMPANION_NAME "companion${C9X_NAME_SUFFIX}")
+  SET(SIMULATOR_NAME "simulator${C9X_NAME_SUFFIX}")
+  SET( SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX} )
+ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  SET(COMPANION_NAME "companion")
+  SET(SIMULATOR_NAME "simulator")
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

-OPTION(DEBUG_IMPORT "Turns on debug output for EEPROM import") # Disabled by default
+OPTION(ALLOW_NIGHTLY_BUILDS "Allow nightly builds download / update") # Disabled by default 
+IF(ALLOW_NIGHTLY_BUILDS)
+	ADD_DEFINITIONS(-DALLOW_NIGHTLY_BUILDS)
+ENDIF(ALLOW_NIGHTLY_BUILDS)

+OPTION(DEBUG_IMPORT "Turn on debug output for EEPROM import") # Disabled by default
 IF(DEBUG_IMPORT)
    ADD_DEFINITIONS( -DDEBUG_MODEL_IMPORT)
    MESSAGE( STATUS "EEPROM import debugging enabled" )
 ENDIF(DEBUG_IMPORT)

+OPTION(TABLE_LAYOUT "Use QTableWidget for grid layouts") # Disabled by default
+IF(TABLE_LAYOUT)
+    ADD_DEFINITIONS( -DTABLE_LAYOUT)
+    MESSAGE( STATUS "Using QTableWidget" )
+ENDIF(TABLE_LAYOUT)
+
 MESSAGE( STATUS "Looking for XercesC " )
 FIND_PACKAGE(XercesC)
 IF ( XERCESC_FOUND )
@@ -46,7 +68,7 @@ ELSE()
    MESSAGE( "SDL not found! Joysticks support will be disabled. Simulator audio will not work." )
 ENDIF()

-FIND_PACKAGE(Qt4 4.8.4 REQUIRED)
+FIND_PACKAGE(Qt4 4.8.1 REQUIRED)
 SET( QT_USE_QTNETWORK True )
 SET( QT_USE_QTXML True )
 INCLUDE( ${QT_USE_FILE} )
@@ -69,6 +91,8 @@ ELSE()
  MESSAGE( "QT lupdate not found!" )
 ENDIF()

+ADD_DEFINITIONS(-DQXT_STATIC)
+
 ADD_CUSTOM_COMMAND(
  COMMAND ${XSDCXX_EXECUTABLE} cxx-tree --root-element-all --generate-serialization --output-dir ${PROJECT_BINARY_DIR}/ ${PROJECT_SOURCE_DIR}/radio.xsd
  OUTPUT ${PROJECT_BINARY_DIR}/radio.hxx ${PROJECT_BINARY_DIR}/radio.cxx
@@ -77,6 +101,7 @@ ADD_CUSTOM_COMMAND(

 IF( MSVC )
  SET(CMAKE_CXX_FLAGS "/EHsc /LD")
+  set(INTTYPES_INCLUDE_OPTION -IC:/Programs/msinttypes)
  INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes)
  LINK_DIRECTORIES( C:/Programs/pthreads/Pre-built.2/lib/ )
  SET( PTHREAD_LIBRARY pthreadVC2.lib )
@@ -86,6 +111,11 @@ ELSE( )
  LINK_DIRECTORIES( /usr/local/lib )
 ENDIF( )

+IF( MSVC )
+  MESSAGE( STATUS "Adding include C:/Programs/dirent/include for dirent.h" )
+  INCLUDE_DIRECTORIES( C:/programs/dirent/include )
+ENDIF( )
+
 set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src)
 set(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/simulation)
 set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR})
@@ -96,6 +126,7 @@ include_directories(
  ${PROJECT_SOURCE_DIR}/shared
  ${SIMU_SRC_DIRECTORY}
  ${XSD_INCLUDE_DIR}
+  ${PROJECT_SOURCE_DIR}/qxtcommandoptions
 )

 add_subdirectory(shared)
@@ -104,6 +135,7 @@ add_subdirectory(generaledit)
 add_subdirectory(simulation)
 add_subdirectory(firmwares/opentx/simulator)
 add_subdirectory(qcustomplot)
+add_subdirectory(qxtcommandoptions)

 set(common_SRCS
  eeprominterface.cpp
@@ -142,6 +174,7 @@ set(companion_SRCS
  apppreferencesdialog.cpp
  fwpreferencesdialog.cpp
  burnconfigdialog.cpp
+  multimodelprinter.cpp
  comparedialog.cpp
  contributorsdialog.cpp
  releasenotesdialog.cpp
@@ -156,10 +189,11 @@ set(companion_SRCS
  flashfirmwaredialog.cpp
  flasheepromdialog.cpp
  printdialog.cpp
+  modelprinter.cpp
  fusesdialog.cpp
  logsdialog.cpp
  downloaddialog.cpp
-  splashlibrary.cpp
+  splashlibrarydialog.cpp
  mainwindow.cpp
  companion.cpp
  radionotfound.cpp
@@ -179,7 +213,7 @@ set(companion_MOC_HDRS
  releasenotesdialog.h
  releasenotesfirmwaredialog.h
  customizesplashdialog.h
-  splashlibrary.h
+  splashlibrarydialog.h
  splashlabel.h
  progresswidget.h
  progressdialog.h
@@ -195,6 +229,8 @@ set(companion_MOC_HDRS
  radionotfound.h
  helpers.h
  wizarddialog.h
+  modelprinter.h
+  multimodelprinter.h
 )

 set(companion_UIS
@@ -209,7 +245,7 @@ set(companion_UIS
  printdialog.ui
  htmldialog.ui
  customizesplashdialog.ui
-  splashlibrary.ui
+  splashlibrarydialog.ui
  progresswidget.ui
  progressdialog.ui
  flashfirmwaredialog.ui
@@ -253,7 +289,8 @@ NOW(TIME)

 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc @ONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/firmwares/opentx/stamp-opentx.h.in ${CMAKE_CURRENT_BINARY_DIR}/stamp-opentx.h @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/companion.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/simulator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop @ONLY)

 IF( WIN32 )
  SET( companion_SRCS ${companion_SRCS} icon.rc )
@@ -279,14 +316,14 @@ QT4_ADD_RESOURCES( companion_SRCS ${companion_RCS} )
 ADD_DEFINITIONS( -DQT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}" )

 IF( APPLE )
-    ADD_EXECUTABLE( ${PROJECT_NAME} MACOSX_BUNDLE ${companion_SRCS} ${companion_QM} )
+    ADD_EXECUTABLE( ${COMPANION_NAME} MACOSX_BUNDLE ${companion_SRCS} ${companion_QM} )
    # OS X compiler no longer automatically includes /Library/Frameworks in search path
    SET( CMAKE_EXE_LINKER_FLAGS -F/Library/Frameworks )
 ELSE( )
-    ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion_SRCS} ${companion_QM} )
+    ADD_EXECUTABLE( ${COMPANION_NAME} WIN32 ${companion_SRCS} ${companion_QM} )
 ENDIF( )

-target_link_libraries(companion generaledit modeledit simulation common qcustomplot shared ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})
+target_link_libraries(${COMPANION_NAME} generaledit modeledit simulation common qcustomplot shared ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})

 ############# Standalone simu ###############

@@ -309,33 +346,34 @@ if(WIN32)
 endif()

 if(APPLE)
-  add_executable(simulator MACOSX_BUNDLE ${simu_SRCS})
+  add_executable(${SIMULATOR_NAME} MACOSX_BUNDLE ${simu_SRCS})
 else()
-  add_executable(simulator WIN32 ${simu_SRCS})
+  add_executable(${SIMULATOR_NAME} WIN32 ${simu_SRCS})
 endif()

-target_link_libraries(simulator simulation common ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} ${OPENTX_SIMULATOR_LIBS})
+target_link_libraries(${SIMULATOR_NAME} simulation common qxtcommandoptions ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} ${OPENTX_SIMULATOR_LIBS})

 ############# Packaging ####################

 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
-    INSTALL( TARGETS simulator DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
-    INSTALL( FILES companion.desktop DESTINATION share/applications )
-    INSTALL( FILES images/linuxicons/16x16/companion.png    DESTINATION /usr/share/icons/hicolor/16x16/apps )
-    INSTALL( FILES images/linuxicons/22x22/companion.png    DESTINATION /usr/share/icons/hicolor/22x22/apps )
-    INSTALL( FILES images/linuxicons/24x24/companion.png    DESTINATION /usr/share/icons/hicolor/24x24/apps )
-    INSTALL( FILES images/linuxicons/32x32/companion.png    DESTINATION /usr/share/icons/hicolor/32x32/apps )
-    INSTALL( FILES images/linuxicons/48x48/companion.png    DESTINATION /usr/share/icons/hicolor/48x48/apps )
-    INSTALL( FILES images/linuxicons/128x128/companion.png  DESTINATION /usr/share/icons/hicolor/128x128/apps )
-    INSTALL( FILES images/linuxicons/256x256/companion.png  DESTINATION /usr/share/icons/hicolor/256x256/apps )
-    INSTALL( FILES images/linuxicons/512x512/companion.png  DESTINATION /usr/share/icons/hicolor/512x512/apps )
-    INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps )
-    INSTALL( FILES ../targets/linux/45-companion-taranis.rules DESTINATION /etc/udev/rules.d/ )
+    INSTALL( TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+    INSTALL( TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+    INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop DESTINATION share/applications RENAME companion${C9X_NAME_SUFFIX}.desktop)
+    INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop DESTINATION share/applications RENAME simulator${C9X_NAME_SUFFIX}.desktop)
+    INSTALL( FILES images/linuxicons/16x16/companion.png    DESTINATION /usr/share/icons/hicolor/16x16/apps    RENAME companion${C9X_NAME_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/22x22/companion.png    DESTINATION /usr/share/icons/hicolor/22x22/apps    RENAME companion${C9X_NAME_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/24x24/companion.png    DESTINATION /usr/share/icons/hicolor/24x24/apps    RENAME companion${C9X_NAME_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/32x32/companion.png    DESTINATION /usr/share/icons/hicolor/32x32/apps    RENAME companion${C9X_NAME_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/48x48/companion.png    DESTINATION /usr/share/icons/hicolor/48x48/apps    RENAME companion${C9X_NAME_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/128x128/companion.png  DESTINATION /usr/share/icons/hicolor/128x128/apps  RENAME companion${C9X_NAME_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/256x256/companion.png  DESTINATION /usr/share/icons/hicolor/256x256/apps  RENAME companion${C9X_NAME_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/512x512/companion.png  DESTINATION /usr/share/icons/hicolor/512x512/apps  RENAME companion${C9X_NAME_SUFFIX}.png )
+    INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps RENAME companion${C9X_NAME_SUFFIX}.svg )
+    INSTALL( FILES ../targets/linux/45-companion-taranis.rules DESTINATION /lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-taranis.rules)
    # Linux specific code
    SET(OperatingSystem "Linux")
 ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${QT_BINARY_DIR} )
+    INSTALL( TARGETS ${COMPANION_NAME} DESTINATION ${QT_BINARY_DIR} )
 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

 IF( WIN32 )
@@ -357,51 +395,51 @@ IF( WIN32 )
    "C:/Programs/NSIS"
  )

-  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companionInstall.exe
+  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companion-windows.exe
                     COMMAND "${NSIS_EXE}" ARGS companion.nsi
                     DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion.nsi
                     COMMENT "Companion Windows NSIS Installer")

-  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/simulatorInstall.exe
+  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/simulator-install.exe
                     COMMAND "${NSIS_EXE}" ARGS simulator.nsi
                     DEPENDS simulator opentx-simulators ${PROJECT_BINARY_DIR}/simulator.nsi
                     COMMENT "Simulator Windows NSIS Installer")

  ADD_CUSTOM_TARGET( installer
-    DEPENDS ${PROJECT_BINARY_DIR}/companionInstall.exe
-    DEPENDS ${PROJECT_BINARY_DIR}/simulatorInstall.exe
+    DEPENDS ${PROJECT_BINARY_DIR}/companion-windows.exe
+    DEPENDS ${PROJECT_BINARY_DIR}/simulator-windows.exe
    SOURCES ${PROJECT_BINARY_DIR}/companion.nsi
    SOURCES ${PROJECT_BINARY_DIR}/simulator.nsi
  )
 ENDIF( )

 IF( APPLE )
-    SET(MACOSX_BUNDLE_ICON_FILE iconmac.icns)
+  SET(MACOSX_BUNDLE_ICON_FILE iconmac.icns)
  IF( CMAKE_GENERATOR STREQUAL Xcode )
    SET( WORK_DIR ${CMAKE_BINARY_DIR}/Debug )
  ELSE( )
    SET( WORK_DIR ${PROJECT_BINARY_DIR} )
  ENDIF()

-  ADD_CUSTOM_TARGET( addframeworks ALL
+  ADD_CUSTOM_TARGET( addframeworks
                     COMMAND mkdir -p companion.app/Contents/Frameworks
                     COMMAND mkdir -p companion.app/Contents/Resources
                     COMMAND mkdir -p companion.app/Contents/translations
                     COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
-                     #COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/lib* companion.app/Contents/Frameworks
-                     #COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/libcrypto.1.0.0.dylib companion.app/Contents/Frameworks
                     COMMAND rsync -r --exclude=.svn  ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/
                     COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
+                     COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
+                     COMMAND rsync -r ${XSD_INCLUDE_DIR}/.. companion.app/Contents/Frameworks/
+                     COMMAND rsync -r /Library/Frameworks/SDL.framework companion.app/Contents/Frameworks/
                     COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
+                     COMMAND install_name_tool -change @rpath/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL companion.app/Contents/MacOS/companion
                     WORKING_DIRECTORY ${WORK_DIR}
-                     DEPENDS ${PROJECT_NAME} )
-
+                     DEPENDS ${COMPANION_NAME} )

  ADD_CUSTOM_TARGET( makedmg
                     COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
                     WORKING_DIRECTORY ${WORK_DIR}
-                     DEPENDS addframeworks )
-
+                     DEPENDS addframeworks opentx-simulators-bundle)
 ENDIF( )

 ADD_CUSTOM_TARGET( stamp
@@ -411,7 +449,7 @@ ADD_CUSTOM_TARGET( stamp
 IF( LUPDATE_FOUND )
  ADD_CUSTOM_TARGET( translations
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -ts ${companion_TS}
+    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
  )
 ELSE()
  ADD_CUSTOM_TARGET( translations
@@ -419,9 +457,14 @@ ELSE()
  )
 ENDIF()

-SET(CPACK_PACKAGE_NAME "COMPANION")
+SET(CPACK_PACKAGE_NAME "companion${C9X_NAME_SUFFIX}")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
 string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
+
+# The file stripping is deliberately disabled, with the stripped file we get 
+# very poor trace-backs from the users when they report Companion crash
+SET( CPACK_STRIP_FILES FALSE )
+
 find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
 if(DPKG_PROGRAM)
  SET(CPACK_GENERATOR "DEB")
@@ -442,6 +485,7 @@ else(DPKG_PROGRAM)
  SET(CPACK_RPM_PACKAGE_VERSION ${C9X_VERSION})
  SET(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}-${C9X_VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
+  SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib /lib/udev /lib/udev/rules.d")
 endif(DPKG_PROGRAM)

 INCLUDE(CPack)
@@ -312,10 +312,12 @@ QString Profile::speaker()       const { return _speaker;       }
 QString Profile::stickPotCalib() const { return _stickPotCalib; }
 QString Profile::timeStamp()     const { return _timeStamp;     }
 QString Profile::trainerCalib()  const { return _trainerCalib;  }
-int     Profile::currentCalib()  const { return _currentCalib;  }
+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; }
-int     Profile::vBatCalib()     const { return _vBatCalib;     }
+int     Profile::txVoltageCalibration()     const { return _txVoltageCalibration;     }
 int     Profile::vBatWarn()      const { return _vBatWarn;      }
 int     Profile::vBatMin()       const { return _vBatMin;       }
 int     Profile::vBatMax()       const { return _vBatMax;       }
@@ -342,10 +344,12 @@ 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::currentCalib  (const int     x) { store(x, _currentCalib,  "currentCalib"          ,"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));}
-void Profile::vBatCalib     (const int     x) { store(x, _vBatCalib,     "VbatCalib"             ,"Profiles", QString("profile%1").arg(index));}
+void Profile::txVoltageCalibration     (const int x) { store(x, _txVoltageCalibration, "VbatCalib","Profiles", QString("profile%1").arg(index));}
 void Profile::vBatWarn      (const int     x) { store(x, _vBatWarn,      "vBatWarn"              ,"Profiles", QString("profile%1").arg(index));}
 void Profile::vBatMin       (const int     x) { store(x, _vBatMin,       "VbatMin"               ,"Profiles", QString("profile%1").arg(index));}
 void Profile::vBatMax       (const int     x) { store(x, _vBatMax,       "VbatMax"               ,"Profiles", QString("profile%1").arg(index));}
@@ -378,10 +382,12 @@ Profile& Profile::operator=(const Profile& rhs)
    speaker      ( rhs.speaker()       );
    stickPotCalib( rhs.stickPotCalib() );
    trainerCalib ( rhs.trainerCalib()  );
-    currentCalib ( rhs.currentCalib()  );
+    controlTypes ( rhs.controlTypes()  );
+    controlNames ( rhs.controlNames()  );
+    txCurrentCalibration ( rhs.txCurrentCalibration()  );
    gsStickMode  ( rhs.gsStickMode()   );
    ppmMultiplier( rhs.ppmMultiplier() );
-    vBatCalib    ( rhs.vBatCalib()     );
+    txVoltageCalibration    ( rhs.txVoltageCalibration()     );
    vBatWarn     ( rhs.vBatWarn()      );
    vBatMin      ( rhs.vBatMin()       );
    vBatMax      ( rhs.vBatMax()       );
@@ -423,11 +429,13 @@ void Profile::initFwVariables()
    _stickPotCalib = "";
    _timeStamp =     "";
    _trainerCalib =  "";
+    _controlTypes =  "";
+    _controlNames =  "";

-    _currentCalib =  0;
+    _txCurrentCalibration =  0;
    _gsStickMode =   0;
    _ppmMultiplier = 0;
-    _vBatCalib =     0;
+    _txVoltageCalibration =     0;
    _vBatWarn =      0;
    _vBatMin =       0;
    _vBatMax =       0;
@@ -483,10 +491,12 @@ 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( _currentCalib,  "currentCalib"          ,0      ,"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));
-    getset( _vBatCalib,     "VbatCalib"             ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _txVoltageCalibration,     "VbatCalib"             ,0      ,"Profiles", QString("profile%1").arg(index));
    getset( _vBatWarn,      "vBatWarn"              ,0      ,"Profiles", QString("profile%1").arg(index));
    getset( _vBatMin,       "VbatMin"               ,0      ,"Profiles", QString("profile%1").arg(index));
    getset( _vBatMax,       "VbatMax"               ,0      ,"Profiles", QString("profile%1").arg(index));
@@ -512,6 +522,7 @@ QString AppData::mcu()             { return _mcu;             }
 QString AppData::programmer()      { return _programmer;      }
 QString AppData::sambaLocation()   { return _sambaLocation;   }
 QString AppData::sambaPort()       { return _sambaPort;       }
+QString AppData::lastSimulator()   { return _lastSimulator;   }

 QString AppData::backupDir()       { return _backupDir;       }
 QString AppData::gePath()          { return _gePath;          }
@@ -560,6 +571,7 @@ void AppData::mcu             (const QString     x) { store(x, _mcu,
 void AppData::programmer      (const QString     x) { store(x, _programmer,      "programmer"              );}
 void AppData::sambaLocation   (const QString     x) { store(x, _sambaLocation,   "samba_location"          );}
 void AppData::sambaPort       (const QString     x) { store(x, _sambaPort,       "samba_port"              );}
+void AppData::lastSimulator   (const QString     x) { store(x, _lastSimulator,   "last_simulator"          );}

 void AppData::backupDir       (const QString     x) { store(x, _backupDir,       "backupPath"              );}
 void AppData::gePath          (const QString     x) { store(x, _gePath,          "gePath"                  );}
@@ -611,7 +623,10 @@ AppData::AppData()
        QStringList keys = settings20.allKeys();
        for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
        {
-            settings.setValue(*i, settings20.value(*i));
+            if (settings20.value(*i) != QString("") && settings20.value(*i) != QString("Start Menu Folder"))
+            {
+                settings.setValue(*i, settings20.value(*i));
+            }
        }

        //Reload profiles
@@ -627,7 +642,10 @@ AppData::AppData()
        QStringList keys = pre2016settings.allKeys();
        for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
        {
-            settings.setValue(*i, pre2016settings.value(*i));
+            if (pre2016settings.value(*i) != QString("") && pre2016settings.value(*i) != QString("Start Menu Folder"))
+            {
+                settings.setValue(*i, pre2016settings.value(*i));
+            }
        }

        //Reload profiles
@@ -716,6 +734,7 @@ AppData::AppData()
    getset( _programmer,      "programmer"              ,"usbasp" );
    getset( _sambaLocation,   "samba_location"          ,"" );
    getset( _sambaPort,       "samba_port"              ,"\\USBserial\\COM23" );
+    getset( _lastSimulator,   "last_simulator"          ,"" );

    getset( _backupDir,       "backupPath"              ,"" );
    getset( _gePath,          "gePath"                  ,"" );
@@ -728,10 +747,13 @@ AppData::AppData()
    getset( _updatesDir,      "lastUpdatesDir"          ,"" );

    getset( _outputDisplayDetails,  "outputDisplayDetails"     ,false );
-    getset( _enableBackup,    "backupEnable"            ,false );
+    getset( _enableBackup,    "enableBackup"            ,false );
    getset( _backupOnFlash,   "backupOnFlash"           ,true  );
    getset( _checkHardwareCompatibility,   "checkHardwareCompatibility"           ,true  );

+    getset( _useCompanionNightlyBuilds,   "useCompanionNightlyBuilds"           ,false  );
+    getset( _useFirmwareNightlyBuilds,   "useFirmwareNightlyBuilds"           ,false  );
+
    getset( _jsSupport,       "js_support"              ,false );
    getset( _maximized,       "maximized"               ,false );
    getset( _showSplash,      "show_splash"             ,true  );
@@ -125,10 +125,12 @@ class Profile: protected CompStoreObj
    QString _stickPotCalib;
    QString _timeStamp;
    QString _trainerCalib;
-    int     _currentCalib;
+    QString _controlTypes;
+    QString _controlNames;
+    int     _txCurrentCalibration;
    int     _gsStickMode;
    int     _ppmMultiplier;
-    int     _vBatCalib;
+    int     _txVoltageCalibration;
    int     _vBatWarn;
    int     _vBatMin;
    int     _vBatMax;
@@ -156,10 +158,12 @@ class Profile: protected CompStoreObj
    QString stickPotCalib() const;
    QString timeStamp() const;
    QString trainerCalib() const;
-    int     currentCalib() const;
+    QString controlTypes() const;
+    QString controlNames() const;
+    int     txCurrentCalibration() const;
    int     gsStickMode() const;
    int     ppmMultiplier() const;
-    int     vBatCalib() const;
+    int     txVoltageCalibration() const;
    int     vBatWarn() const;
    int     vBatMin() const;
    int     vBatMax() const;
@@ -186,10 +190,12 @@ class Profile: protected CompStoreObj
    void stickPotCalib (const QString);
    void timeStamp     (const QString);
    void trainerCalib  (const QString);
-    void currentCalib  (const int);
+    void controlTypes  (const QString);
+    void controlNames  (const QString);
+    void txCurrentCalibration  (const int);
    void gsStickMode   (const int);
    void ppmMultiplier (const int);
-    void vBatCalib     (const int);
+    void txVoltageCalibration     (const int);
    void vBatWarn      (const int);
    void vBatMin       (const int);
    void vBatMax       (const int);
@@ -216,6 +222,8 @@ class AppData: protected CompStoreObj
  BOOL_PROPERTY(outputDisplayDetails, false)
  BOOL_PROPERTY(backupOnFlash, true)
  BOOL_PROPERTY(checkHardwareCompatibility, true)
+  BOOL_PROPERTY(useCompanionNightlyBuilds, false)
+  BOOL_PROPERTY(useFirmwareNightlyBuilds, false)

  // All the global variables
  public:
@@ -240,6 +248,7 @@ class AppData: protected CompStoreObj
    QString _programmer;
    QString _sambaLocation;
    QString _sambaPort;
+    QString _lastSimulator;

    QString _backupDir;
    QString _gePath;
@@ -290,6 +299,7 @@ class AppData: protected CompStoreObj
    QString programmer();
    QString sambaLocation();
    QString sambaPort();
+    QString lastSimulator();

    QString backupDir();
    QString gePath();
@@ -339,6 +349,7 @@ class AppData: protected CompStoreObj
    void programmer      (const QString);
    void sambaLocation   (const QString);
    void sambaPort       (const QString);
+    void lastSimulator   (const QString);

    void backupDir       (const QString);
    void gePath          (const QString);
@@ -41,8 +41,10 @@ AppPreferencesDialog::~AppPreferencesDialog()

 void AppPreferencesDialog::writeValues()
 {
-  g.autoCheckApp(ui->startupCheck_companion9x->isChecked());
-  g.autoCheckFw(ui->startupCheck_fw->isChecked());
+  g.useCompanionNightlyBuilds(ui->useCompanionNightlyBuilds->isChecked());
+  g.autoCheckApp(ui->autoCheckCompanion->isChecked());
+  g.useFirmwareNightlyBuilds(ui->useFirmwareNightlyBuilds->isChecked());
+  g.autoCheckFw(ui->autoCheckFirmware->isChecked());
  g.showSplash(ui->showSplash->isChecked());
  g.simuSW(ui->simuSW->isChecked());
  g.useWizard(ui->modelWizard_CB->isChecked());
@@ -107,8 +109,15 @@ void AppPreferencesDialog::initSettings()
    ui->snapshotPath->setDisabled(true);
    ui->snapshotPathButton->setDisabled(true);
  }
-  ui->startupCheck_companion9x->setChecked(g.autoCheckApp());
-  ui->startupCheck_fw->setChecked(g.autoCheckFw());
+#if defined(ALLOW_NIGHTLY_BUILDS)
+  ui->useCompanionNightlyBuilds->setChecked(g.useCompanionNightlyBuilds());
+  ui->useFirmwareNightlyBuilds->setChecked(g.useFirmwareNightlyBuilds());
+#else
+  ui->useCompanionNightlyBuilds->hide();
+  ui->useFirmwareNightlyBuilds->hide();
+#endif
+  ui->autoCheckCompanion->setChecked(g.autoCheckApp());
+  ui->autoCheckFirmware->setChecked(g.autoCheckFw());
  ui->showSplash->setChecked(g.showSplash());
  ui->historySize->setValue(g.historySize());
  ui->backLightColor->setCurrentIndex(g.backLight());
@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>686</width>
-    <height>619</height>
+    <height>713</height>
   </rect>
  </property>
  <property name="sizePolicy">
@@ -233,7 +233,7 @@ May be different from firmware language</string>
          </size>
         </property>
         <property name="frameShape">
-          <enum>QFrame::Panel</enum>
+          <enum>QFrame::StyledPanel</enum>
         </property>
         <property name="frameShadow">
          <enum>QFrame::Plain</enum>
@@ -290,6 +290,9 @@ May be different from firmware language</string>
         <property name="enabled">
          <bool>true</bool>
         </property>
+         <property name="text">
+          <string/>
+         </property>
         <property name="readOnly">
          <bool>false</bool>
         </property>
@@ -624,7 +627,7 @@ Mode 4:
       <item row="10" column="2" colspan="2">
        <widget class="QPushButton" name="sdPathButton">
         <property name="text">
-          <string>Open Folder</string>
+          <string>Select Folder</string>
         </property>
        </widget>
       </item>
@@ -634,7 +637,7 @@ Mode 4:
          <string>The profile specific folder,  if set, will override general Backup folder</string>
         </property>
         <property name="text">
-          <string>Open Folder</string>
+          <string>Select Folder</string>
         </property>
        </widget>
       </item>
@@ -645,8 +648,8 @@ Mode 4:
       <string>Application Settings</string>
      </attribute>
      <layout class="QGridLayout" name="gridLayout_3">
-       <item row="7" column="1" colspan="3">
-        <widget class="QCheckBox" name="startupCheck_companion9x">
+       <item row="10" column="1" colspan="3">
+        <widget class="QCheckBox" name="autoCheckCompanion">
         <property name="text">
          <string>Automatic check for Companion updates</string>
         </property>
@@ -665,7 +668,7 @@ Mode 4:
         </property>
        </widget>
       </item>
-       <item row="10" column="1" colspan="3">
+       <item row="13" column="1" colspan="3">
        <widget class="QCheckBox" name="backupEnable">
         <property name="text">
          <string>Enable automatic backup before writing firmware</string>
@@ -679,24 +682,7 @@ Mode 4:
         </property>
        </widget>
       </item>
-       <item row="8" column="1" colspan="3">
-        <widget class="Line" name="line_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="1" colspan="3">
-        <widget class="QCheckBox" name="startupCheck_fw">
-         <property name="text">
-          <string>Automatic check for OpenTX firmware updates</string>
-         </property>
-         <property name="checked">
-          <bool>true</bool>
-         </property>
-        </widget>
-       </item>
-       <item row="15" column="1">
+       <item row="18" column="1">
        <spacer name="verticalSpacer_2">
         <property name="orientation">
          <enum>Qt::Vertical</enum>
@@ -709,7 +695,24 @@ Mode 4:
         </property>
        </spacer>
       </item>
-       <item row="12" column="0">
+       <item row="11" column="1" colspan="3">
+        <widget class="Line" name="line_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1" colspan="3">
+        <widget class="QCheckBox" name="autoCheckFirmware">
+         <property name="text">
+          <string>Automatic check for OpenTX firmware updates</string>
+         </property>
+         <property name="checked">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="15" column="0">
        <widget class="QLabel" name="label_10">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -749,7 +752,7 @@ Mode 4:
         </property>
        </widget>
       </item>
-       <item row="13" column="0">
+       <item row="16" column="0">
        <widget class="QLabel" name="label_9">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
@@ -784,14 +787,14 @@ Mode 4:
         </property>
        </widget>
       </item>
-       <item row="9" column="0">
+       <item row="12" column="0">
        <widget class="QLabel" name="label_17">
         <property name="text">
          <string>Automatic Backup Folder</string>
         </property>
        </widget>
       </item>
-       <item row="11" column="1" colspan="3">
+       <item row="14" column="1" colspan="3">
        <widget class="Line" name="line_5">
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -805,7 +808,7 @@ Mode 4:
         </property>
        </widget>
       </item>
-       <item row="13" column="1">
+       <item row="16" column="1">
        <widget class="QLineEdit" name="libraryPath">
         <property name="enabled">
          <bool>true</bool>
@@ -815,7 +818,7 @@ Mode 4:
         </property>
        </widget>
       </item>
-       <item row="12" column="1">
+       <item row="15" column="1">
        <widget class="QComboBox" name="splashincludeCB">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -835,7 +838,7 @@ Mode 4:
         </item>
        </widget>
       </item>
-       <item row="9" column="1">
+       <item row="12" column="1">
        <widget class="QLineEdit" name="backupPath">
         <property name="minimumSize">
          <size>
@@ -848,10 +851,10 @@ Mode 4:
         </property>
        </widget>
       </item>
-       <item row="9" column="2" colspan="2">
+       <item row="12" column="2" colspan="2">
        <widget class="QPushButton" name="backupPathButton">
         <property name="text">
-          <string>Open Folder</string>
+          <string>Select Folder</string>
         </property>
        </widget>
       </item>
@@ -871,14 +874,34 @@ Mode 4:
       <item row="0" column="2" colspan="2">
        <widget class="QPushButton" name="ge_pathButton">
         <property name="text">
-          <string>Find Executable</string>
+          <string>Select Executable</string>
         </property>
        </widget>
       </item>
-       <item row="13" column="2" colspan="2">
+       <item row="16" column="2" colspan="2">
        <widget class="QPushButton" name="libraryPathButton">
         <property name="text">
-          <string>Open Folder</string>
+          <string>Select Folder</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QCheckBox" name="useFirmwareNightlyBuilds">
+         <property name="text">
+          <string>Use OpenTX firmware nightly builds</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="9" column="1">
+        <widget class="QCheckBox" name="useCompanionNightlyBuilds">
+         <property name="text">
+          <string>Use Companion nightly builds</string>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
         </property>
        </widget>
       </item>
@@ -889,7 +912,17 @@ Mode 4:
       <string>Simulator Settings</string>
      </attribute>
      <layout class="QGridLayout" name="gridLayout_4">
-       <item row="5" column="4">
+       <item row="5" column="1">
+        <widget class="QComboBox" name="joystickCB">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="3">
        <widget class="QPushButton" name="joystickcalButton">
         <property name="text">
          <string>Calibrate</string>
@@ -951,7 +984,7 @@ Mode 4:
         </property>
        </spacer>
       </item>
-       <item row="1" column="1" colspan="4">
+       <item row="1" column="1" colspan="3">
        <widget class="QCheckBox" name="snapshotClipboardCKB">
         <property name="text">
          <string>Only capture to clipboard</string>
@@ -966,32 +999,9 @@ Mode 4:
        </widget>
       </item>
       <item row="0" column="3">
-        <spacer name="horizontalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="5" column="1">
-        <widget class="QComboBox" name="joystickCB">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="4">
        <widget class="QPushButton" name="snapshotPathButton">
         <property name="text">
-          <string>Open Folder</string>
+          <string>Select Folder</string>
         </property>
         <property name="flat">
          <bool>false</bool>
@@ -1032,9 +1042,15 @@ Mode 4:
         <property name="enabled">
          <bool>true</bool>
         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
         <property name="minimumSize">
          <size>
-           <width>350</width>
+           <width>0</width>
           <height>0</height>
          </size>
         </property>
@@ -1043,7 +1059,7 @@ Mode 4:
         </property>
        </widget>
       </item>
-       <item row="2" column="1" colspan="4">
+       <item row="2" column="1" colspan="3">
        <widget class="QCheckBox" name="simuSW">
         <property name="text">
          <string>Remember simulator switch values</string>
@@ -1112,8 +1128,8 @@ Mode 4:
  <tabstop>historySize</tabstop>
  <tabstop>showSplash</tabstop>
  <tabstop>modelWizard_CB</tabstop>
-  <tabstop>startupCheck_fw</tabstop>
-  <tabstop>startupCheck_companion9x</tabstop>
+  <tabstop>autoCheckFirmware</tabstop>
+  <tabstop>autoCheckCompanion</tabstop>
  <tabstop>backupPath</tabstop>
  <tabstop>backupPathButton</tabstop>
  <tabstop>backupEnable</tabstop>
@@ -53,6 +53,7 @@
  #undef main
 #endif
 #include "mainwindow.h"
+#include "version.h"
 #include "eeprominterface.h"
 #include "appdata.h"

@@ -87,6 +88,13 @@ int main(int argc, char *argv[])
  app.setOrganizationDomain("open-tx.org");
  app.setAttribute(Qt::AA_DontShowIconsInMenus, false);

+  QStringList strl = QApplication::arguments();
+  if (strl.contains("--version")) {
+    printf("%s\n", C9X_VERSION);
+    fflush(stdout);
+    exit(0);
+  }
+
 #ifdef __APPLE__
  app.setStyle(new MyProxyStyle);
 #endif
@@ -148,7 +156,8 @@ int main(int argc, char *argv[])
  delete splash;
  delete mainWin;

-  unregisterFirmwares();
+  unregisterSimulators();
+  unregisterOpenTxFirmwares();
  unregisterEEpromInterfaces();

 #if defined(JOYSTICKS) || defined(SIMU_AUDIO)
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=Application
 Encoding=UTF-8
-Name=Companion
+Name=Companion @C9X_VERSION@
 GenericName=Transmitter Companion App
 Comment=The Ultimate Transmitter Companion
-Icon=companion
-Exec='companion'
+Icon=@COMPANION_NAME@
+Exec='@COMPANION_NAME@'
 Terminal=false
 StartupNotify=false
 Categories=Application
@@ -100,6 +100,8 @@
    <file>images/library/00018.png</file>
    <file>images/library/00019.png</file>
    <file>images/library/00020.png</file>
+    <file>images/library/00021.png</file>
+    <file>images/library/00022.png</file>
    <file>images/library/00050.png</file>
    <file>images/library/00051.png</file>
    <file>images/library/00052.png</file>
@@ -1,10 +1,9 @@
-#ifndef COMPAREDIALOG_H
-#define COMPAREDIALOG_H
+#ifndef _COMPAREDIALOG_H
+#define _COMPAREDIALOG_H

 #include <QDialog>
-#include <QtGui>
-#include <QDir>
-#include "eeprominterface.h"
+#include <QLabel>
+#include "multimodelprinter.h"

 namespace Ui {
  class CompareDialog;
@@ -12,80 +11,32 @@ namespace Ui {

 class CompareDialog : public QDialog
 {
-    Q_OBJECT
+  Q_OBJECT

  public:
    CompareDialog(QWidget *parent, Firmware * firmware);
    ~CompareDialog();
-    Firmware * firmware;
    
  protected:
-    GeneralSettings * settings;
-    ModelData * g_model1;
-    ModelData * g_model2;
-    ModelData * modeltemp;
-    int model1;
-    int model2;
-  
-  private:
-    void  closeEvent(QCloseEvent *event);
-    Ui::CompareDialog *ui;
-    template<class T> QString getColor1(T val1, T val2) {
-      if (val1!=val2)
-        return "green";
-      else
-        return "grey";
-    }
-    template<class T> QString getColor2(T val1, T val2) {
-      if (val1!=val2)
-        return "red";
-      else
-        return "grey";
-    }
-    QString getColor1(char * val1, char * val2) {
-      if (strcmp(val1,val2)!=0)
-        return "green";
-      else
-        return "grey";
-    }
-    QString getColor2(char * val1, char * val2) {
-      if (strcmp(val1,val2)!=0)
-        return "red";
-      else
-        return "grey";
-    }
-
-    int ModelHasExpo(ExpoData * ExpoArray, ExpoData expo, bool * expoused);
-    bool ChannelHasExpo(ExpoData * expoArray, uint8_t destCh);
-    int ModelHasMix(MixData * mixArray, MixData mix, bool * mixused);
-    bool ChannelHasMix(MixData * mixArray, uint8_t destCh);
+    MultiModelPrinter multimodelprinter;
+    ModelData model1;
+    ModelData model2;
+    bool model1Valid;
+    bool model2Valid;
+    Ui::CompareDialog * ui;
    
-    QTextEdit * te;
-    QString curvefile1;
-    QString curvefile2;
-    QDir *qd;
-    
-private slots:
+  protected slots:
    void on_printButton_clicked();
    void on_printFileButton_clicked();
    
-protected:
+  protected:
+    void closeEvent(QCloseEvent * event);
+    bool handleDroppedModel(const QMimeData * mimeData, ModelData & model, QLabel * label);
    void dropEvent(QDropEvent *event);
    void dragMoveEvent(QDragMoveEvent *event);
    void dragEnterEvent(QDragEnterEvent *event);
    void dragLeaveEvent(QDragLeaveEvent *event);
    void printDiff();
-    void printSetup();
-    void printPhases();
-    void printLimits();
-    void printExpos();
-    void printMixers();
-    void printCurves();
-    void printGvars();
-    void printSwitches();
-    void printSafetySwitches();
-    void printFSwitches();
-    void printFrSky();
 };

-#endif // COMPAREDIALOG_H
+#endif // _COMPAREDIALOG_H
@@ -8,6 +8,7 @@ enum BoardEnum {
  BOARD_GRUVIN9X,
  BOARD_SKY9X,
  BOARD_9XRPRO,
+  BOARD_AR9X,
  BOARD_TARANIS,
  BOARD_TARANIS_PLUS,
  BOARD_TARANIS_X9E
@@ -59,11 +59,18 @@ ContributorsDialog::ContributorsDialog(QWidget * parent):
    str.append(formatTable(tr("People who have donated to OpenTX"), names, 6));
  }

-  str.append("  <tr><td class=\"normal\">&nbsp;</td></tr>" \
-             "  <tr><td colspan=3 class=\"normal\">" + tr("Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)") + "<br/></td></tr>" \
-             "  <tr><td colspan=3 class=\"normal\">" + tr("Thank you all !!!") + "</td></tr>" \
+  str.append("<table><tr><td class=\"normal\">&nbsp;</td></tr>" \
+             "  <tr><td class=\"normal\">" + tr("Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)") + "<br/></td></tr>" \
             "</table>");

+#if 0
+  QFile blacklist(":/BLACKLIST.txt");
+  if (blacklist.open(QIODevice::ReadOnly | QIODevice::Text)) {
+	QStringList names;
+	names << blacklist.readAll();
+	str.append(formatTable(tr("OpenTX Blacklist"), names, 1));
+  }
+#endif

  str.append("</body></html>");
  ui->textEditor->setHtml(str);
@@ -26,8 +26,11 @@ bool convertEEprom(const QString &sourceEEprom, const QString &destinationEEprom
  sourceFile.close();

  QSharedPointer<RadioData> radioData = QSharedPointer<RadioData>(new RadioData());
-  if (!loadEEprom(*radioData, (uint8_t *)eeprom.data(), eeprom_size) || !currentFirmware->saveEEPROM((uint8_t *)eeprom.data(), *radioData, variant, version))
+  std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEeprom(*radioData, (uint8_t *)eeprom.data(), eeprom_size));
+  if (!errors.test(NO_ERROR)
+    || !currentFirmware->saveEEPROM((uint8_t *)eeprom.data(), *radioData, variant, version)) {
    return false;
+  }

  QFile destinationFile(destinationEEprom);
  if (!destinationFile.open(QIODevice::WriteOnly))
@@ -3,8 +3,8 @@
 #include "flashfirmwaredialog.h"
 #include "appdata.h"
 #include "helpers.h"
-#include "splashlibrary.h"
 #include "firmwareinterface.h"
+#include "splashlibrarydialog.h"

 //*** Side Class ***

@@ -233,7 +233,7 @@ void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicke
 void customizeSplashDialog::libraryButton_clicked( Side side )
 {
  QString fileName;
-  splashLibrary *ld = new splashLibrary(this,&fileName);
+  SplashLibraryDialog *ld = new SplashLibraryDialog(this,&fileName);
  ld->exec();
  if (!fileName.isEmpty()) {
    if (!side.displayImage( fileName, UNDEFINED ))
@@ -123,23 +123,23 @@ QString SensorData::unitString() const
    case UNIT_FEET:
      return QObject::tr("f");
    case UNIT_CELSIUS:
-      return QObject::tr("°C");
+      return QObject::trUtf8("°C");
    case UNIT_FAHRENHEIT:
-      return QObject::tr("%F");
+      return QObject::trUtf8("°F");
    case UNIT_PERCENT:
      return QObject::tr("%");
    case UNIT_MAH:
      return QObject::tr("mAh");
    case UNIT_WATTS:
      return QObject::tr("W");
-    case UNIT_DBM:
+    case UNIT_DB:
      return QObject::tr("dB");
    case UNIT_RPMS:
      return QObject::tr("rpms");
    case UNIT_G:
      return QObject::tr("g");
    case UNIT_DEGREE:
-      return QObject::tr("°");
+      return QObject::trUtf8("°");
    case UNIT_HOURS:
      return QObject::tr("hours");
    case UNIT_MINUTES:
@@ -161,6 +161,14 @@ bool RawSource::isTimeBased() const
    return (type==SOURCE_TYPE_TELEMETRY && (index==TELEMETRY_SOURCE_TX_TIME || index==TELEMETRY_SOURCE_TIMER1 || index==TELEMETRY_SOURCE_TIMER2 || index==TELEMETRY_SOURCE_TIMER3));
 }

+float RawSourceRange::getValue(int value)
+{
+  if (IS_ARM(GetCurrentFirmware()->getBoard()))
+    return float(value) * step;
+  else
+    return min + float(value) * step;
+}
+
 RawSourceRange RawSource::getRange(const ModelData * model, const GeneralSettings & settings, unsigned int flags) const
 {
  RawSourceRange result;
@@ -473,7 +481,7 @@ QString RawSource::toString(const ModelData * model) const
    QObject::tr("L21"), QObject::tr("L22"), QObject::tr("L23"), QObject::tr("L24"), QObject::tr("L25"), QObject::tr("L26"), QObject::tr("L27"), QObject::tr("L28"), QObject::tr("L29"), QObject::tr("L30"),
    QObject::tr("L31"), QObject::tr("L32")
  };
-  
+
  if (index<0) {
    return QObject::tr("----");
  }
@@ -520,7 +528,7 @@ QString RawSource::toString(const ModelData * model) const
        return CHECK_IN_ARRAY(telemetry, index);
      }
    case SOURCE_TYPE_GVAR:
-      return QObject::tr("GV%1").arg(index+1);      
+      return QObject::tr("GV%1").arg(index+1);
    default:
      return QObject::tr("----");
  }
@@ -528,15 +536,15 @@ QString RawSource::toString(const ModelData * model) const

 bool RawSource::isPot() const
 {
-  return (type == SOURCE_TYPE_STICK && 
-          index >= NUM_STICKS && 
+  return (type == SOURCE_TYPE_STICK &&
+          index >= NUM_STICKS &&
          index < NUM_STICKS+GetCurrentFirmware()->getCapability(Pots));
 }

 bool RawSource::isSlider() const
 {
-  return (type == SOURCE_TYPE_STICK && 
-          index >= NUM_STICKS+GetCurrentFirmware()->getCapability(Pots) && 
+  return (type == SOURCE_TYPE_STICK &&
+          index >= NUM_STICKS+GetCurrentFirmware()->getCapability(Pots) &&
          index < NUM_STICKS+GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders));
 }

@@ -553,7 +561,7 @@ QString SwitchDn(const char sw)
  return QString::fromUtf8(result);
 }

-QString RawSwitch::toString()
+QString RawSwitch::toString() const
 {
  static const QString switches9X[] = {
    QString("THR"), QString("RUD"), QString("ELE"),
@@ -651,7 +659,7 @@ QString RawSwitch::toString()
  }
 }

-QString CurveReference::toString()
+QString CurveReference::toString() const
 {
  if (value == 0) {
    return "----";
@@ -670,7 +678,7 @@ QString CurveReference::toString()
  }
 }

-CSFunctionFamily LogicalSwitchData::getFunctionFamily()
+CSFunctionFamily LogicalSwitchData::getFunctionFamily() const
 {
  if (func == LS_FN_EDGE)
    return LS_FAMILY_EDGE;
@@ -686,7 +694,7 @@ CSFunctionFamily LogicalSwitchData::getFunctionFamily()
    return LS_FAMILY_VCOMP;
 }

-unsigned int LogicalSwitchData::getRangeFlags()
+unsigned int LogicalSwitchData::getRangeFlags() const
 {
  if (func == LS_FN_DPOS)
    return RANGE_DELTA_FUNCTION;
@@ -696,7 +704,7 @@ unsigned int LogicalSwitchData::getRangeFlags()
    return 0;
 }

-QString LogicalSwitchData::funcToString()
+QString LogicalSwitchData::funcToString() const
 {
  switch (func) {
    case LS_FN_OFF:
@@ -746,123 +754,6 @@ QString LogicalSwitchData::funcToString()
  }
 }

-QString LogicalSwitchData::toString(const ModelData & model, const GeneralSettings & settings)
-{
-  QString result = "";
-
-  if (!func)
-    return result;
-
-  if (andsw!=0) {
-    result +="( ";
-  }
-  switch (getFunctionFamily()) {
-    case LS_FAMILY_EDGE:
-      result += QObject::tr("Edge(%1, [%2:%3])").arg(RawSwitch(val1).toString()).arg(ValToTim(val2)).arg(ValToTim(val2+val3));
-      break;
-    case LS_FAMILY_STICKY:
-      result += QObject::tr("Sticky(%1, %2)").arg(RawSwitch(val1).toString()).arg(RawSwitch(val2).toString());
-      break;
-    case LS_FAMILY_TIMER:
-      result += QObject::tr("Timer(%1, %2)").arg(ValToTim(val1)).arg(ValToTim(val2));
-      break;
-    case LS_FAMILY_VOFS: {
-      RawSource source = RawSource(val1);
-      RawSourceRange range = source.getRange(&model, settings);
-      QString res;
-      if (val1)
-        res += source.toString(&model);
-      else
-        res += "0";
-      res.remove(" ");
-      if (func == LS_FN_APOS || func == LS_FN_ANEG)
-        res = "|" + res + "|";
-      else if (func == LS_FN_DAPOS)
-        res = "|d(" + res + ")|";
-      else if (func == LS_FN_DPOS) result = "d(" + res + ")";
-      result += res;
-
-      if (func == LS_FN_APOS || func == LS_FN_VPOS || func == LS_FN_DPOS || func == LS_FN_DAPOS)
-        result += " &gt; ";
-      else if (func == LS_FN_ANEG || func == LS_FN_VNEG)
-        result += " &lt; ";
-      else if (func == LS_FN_VALMOSTEQUAL)
-        result += " ~ ";
-      else
-        result += " missing";
-      result += QString::number(range.step * (val2 /*TODO+ source.getRawOffset(model)*/) + range.offset);
-      break;
-    }
-    case LS_FAMILY_VBOOL:
-      result += RawSwitch(val1).toString();
-      switch (func) {
-        case LS_FN_AND:
-          result += " AND ";
-          break;
-        case LS_FN_OR:
-          result += " OR ";
-          break;
-        case LS_FN_XOR:
-          result += " XOR ";
-          break;
-       default:
-          result += " bar ";
-          break;
-      }
-      result += RawSwitch(val2).toString();
-      break;
-
-    case LS_FAMILY_VCOMP:
-      if (val1)
-        result += RawSource(val1).toString(&model);
-      else
-        result += "0";
-      switch (func) {
-        case LS_FN_EQUAL:
-        case LS_FN_VEQUAL:
-          result += " = ";
-          break;
-        case LS_FN_NEQUAL:
-          result += " != ";
-          break;
-        case LS_FN_GREATER:
-          result += " &gt; ";
-          break;
-        case LS_FN_LESS:
-          result += " &lt; ";
-          break;
-        case LS_FN_EGREATER:
-          result += " &gt;= ";
-          break;
-        case LS_FN_ELESS:
-          result += " &lt;= ";
-          break;
-        default:
-          result += " foo ";
-          break;
-      }
-      if (val2)
-        result += RawSource(val2).toString(&model);
-      else
-        result += "0";
-      break;
-  }
-
-  if (andsw!=0) {
-    result +=" ) AND ";
-    result += RawSwitch(andsw).toString();
-  }
-
-  if (GetCurrentFirmware()->getCapability(LogicalSwitchesExt)) {
-    if (duration)
-      result += QObject::tr(" Duration (%1s)").arg(duration/10.0);
-    if (delay)
-      result += QObject::tr(" Delay (%1s)").arg(delay/10.0);
-  }
-
-  return result;
-}
-
 void CustomFunctionData::clear()
 {
  memset(this, 0, sizeof(CustomFunctionData));
@@ -871,7 +762,7 @@ void CustomFunctionData::clear()
  }
 }

-QString CustomFunctionData::funcToString()
+QString CustomFunctionData::funcToString() const
 {
  if (func >= FuncOverrideCH1 && func <= FuncOverrideCH32)
    return QObject::tr("Override %1").arg(RawSource(SOURCE_TYPE_CH, func).toString());
@@ -890,7 +781,7 @@ QString CustomFunctionData::funcToString()
  else if (func == FuncPlaySound)
    return QObject::tr("Play Sound");
  else if (func == FuncPlayHaptic)
-    return QObject::tr("Play Haptic");
+    return QObject::tr("Haptic");
  else if (func == FuncReset)
    return QObject::tr("Reset");
  else if (func >= FuncSetTimer1 && func <= FuncSetTimer3)
@@ -906,7 +797,7 @@ QString CustomFunctionData::funcToString()
  else if (func == FuncPlayScript)
    return QObject::tr("Play Script");
  else if (func == FuncLogs)
-    return QObject::tr("Start Logs");
+    return QObject::tr("SD Logs");
  else if (func == FuncVolume)
    return QObject::tr("Volume");
  else if (func == FuncBacklight)
@@ -919,46 +810,106 @@ QString CustomFunctionData::funcToString()
    return QObject::tr("Background Music Pause");
  else if (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast)
    return QObject::tr("Adjust GV%1").arg(func-FuncAdjustGV1+1);
+  else if (func == FuncSetFailsafeInternalModule)
+    return QObject::tr("SetFailsafe Int. Module");
+  else if (func == FuncSetFailsafeExternalModule)
+    return QObject::tr("SetFailsafe Ext. Module");
+  else if (func == FuncRangeCheckInternalModule)
+    return QObject::tr("RangeCheck Int. Module");
+  else if (func == FuncRangeCheckExternalModule)
+    return QObject::tr("RangeCheck Ext. Module");
+  else if (func == FuncBindInternalModule)
+    return QObject::tr("Bind Int. Module");
+  else if (func == FuncBindExternalModule)
+    return QObject::tr("Bind Ext. Module");
  else {
    return QString("???"); // Highlight unknown functions with output of question marks.(BTW should not happen that we do not know what a function is)
  }
 }

-QString CustomFunctionData::paramToString()
+void CustomFunctionData::populateResetParams(const ModelData * model, QComboBox * b, unsigned int value = 0)
+{
+  int val = 0;
+  Firmware * firmware = GetCurrentFirmware();
+  BoardEnum board = GetEepromInterface()->getBoard();
+
+  b->addItem(QObject::tr("Timer1"), val++);
+  b->addItem(QObject::tr("Timer2"), val++);
+  if (IS_ARM(board)) {
+    b->addItem( QObject::tr("Timer3"), val++);
+  }
+  b->addItem(QObject::tr("Flight"), val++);
+  b->addItem(QObject::tr("Telemetry"), val++);
+  int reCount = firmware->getCapability(RotaryEncoders);
+  if (reCount == 1) {
+    b->addItem(QObject::tr("Rotary Encoder"), val++);
+  }
+  else if (reCount == 2) {
+    b->addItem(QObject::tr("REa"), val++);
+    b->addItem(QObject::tr("REb"), val++);
+  }
+  if ((int)value < b->count()) {
+    b->setCurrentIndex(value);
+  }
+  if (model && IS_ARM(board)) {
+    for (int i=0; i<C9X_MAX_SENSORS; ++i) {
+      if (model->sensorData[i].isAvailable()) {
+        RawSource item = RawSource(SOURCE_TYPE_TELEMETRY, 3*i);
+        b->addItem(item.toString(model), val+i);
+        if ((int)value == val+i) {
+          b->setCurrentIndex(b->count()-1);
+        }
+      }
+    }
+  }
+}
+
+void CustomFunctionData::populatePlaySoundParams(QStringList & qs)
+{
+  qs <<"Beep 1" << "Beep 2" << "Beep 3" << "Warn1" << "Warn2" << "Cheep" << "Ratata" << "Tick" << "Siren" << "Ring" ;
+  qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt"  << "AlmClk"  ;
+}
+
+void CustomFunctionData::populateHapticParams(QStringList & qs)
+{
+  qs << "0" << "1" << "2" << "3";
+}
+
+QString CustomFunctionData::paramToString(const ModelData * model) const
 {
  QStringList qs;
  if (func <= FuncInstantTrim) {
    return QString("%1").arg(param);
  }
+  else if (func==FuncLogs) {
+    return QString("%1").arg(param/10.0) + QObject::tr("s");
+  }
  else if (func==FuncPlaySound) {
-    qs <<"Beep 1" << "Beep 2" << "Beep 3" << "Warn1" << "Warn2" << "Cheep" << "Ratata" << "Tick" << "Siren" << "Ring" ;
-    qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt"  << "AlmClk"  ;
+    CustomFunctionData::populatePlaySoundParams(qs);
    if (param>=0 && param<(int)qs.count())
      return qs.at(param);
    else
      return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
  }
  else if (func==FuncPlayHaptic) {
-    qs << "0" << "1" << "2" << "3";
+    CustomFunctionData::populateHapticParams(qs);
    if (param>=0 && param<(int)qs.count())
      return qs.at(param);
    else
      return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
  }
  else if (func==FuncReset) {
-    qs.append( QObject::tr("Timer1"));
-    qs.append( QObject::tr("Timer2"));
-    qs.append( QObject::tr("Timer3"));
-    qs.append( QObject::tr("All"));
-    qs.append( QObject::tr("Telemetry"));
-    if (param>=0 && param<(int)qs.count())
-      return qs.at(param);
+    QComboBox cb;
+    CustomFunctionData::populateResetParams(model, &cb);
+    int pos = cb.findData(param);
+    if (pos >= 0)
+      return cb.itemText(pos);
    else
      return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
  }
  else if ((func==FuncVolume)|| (func==FuncPlayValue)) {
    RawSource item(param);
-    return item.toString();
+    return item.toString(model);
  }
  else if ((func==FuncPlayPrompt) || (func==FuncPlayBoth)) {
    if ( GetCurrentFirmware()->getCapability(VoicesAsNumbers)) {
@@ -968,54 +919,87 @@ QString CustomFunctionData::paramToString()
      return paramarm;
    }
  }
-  else if ((func>FuncBackgroundMusicPause) && (func<FuncCount)) {
+  else if ((func>=FuncAdjustGV1) && (func<FuncCount)) {
    switch (adjustMode) {
      case 0:
        return QObject::tr("Value ")+QString("%1").arg(param);
-        break;
      case 1:
-        return RawSource(param).toString();
-        break;
      case 2:
        return RawSource(param).toString();
-        break;
      case 3:
-        if (param==0) {
-          return QObject::tr("Decr:")+QString(" -1");
-        }
-        else {
-          return QObject::tr("Incr:")+QString(" +1");
-        }
-        break;
-      default:
-        return "";
+        if (param==0) return QObject::tr("Decr:") + " -1";
+        else          return QObject::tr("Incr:") + " +1";
    }
  }
  return "";
 }

-QString CustomFunctionData::repeatToString()
+QString CustomFunctionData::repeatToString() const
 {
-  if (repeatParam==0) {
-    return QObject::tr("No repeat");
+  if (repeatParam == -1) {
+    return QObject::tr("played once, not during startup");
+  }
+  else if (repeatParam == 0) {
+    return "";
  }
  else {
-    unsigned int step = IS_ARM(GetEepromInterface()->getBoard()) ? 5 : 10;
-    return QObject::tr("%1 sec").arg(step*repeatParam);
+    unsigned int step = IS_ARM(GetEepromInterface()->getBoard()) ? 1 : 10;
+    return QObject::tr("repeat(%1s)").arg(step*repeatParam);
  }
 }

-QString LimitData::minToString()
+QString CustomFunctionData::enabledToString() const
+{
+  if ((func>=FuncOverrideCH1 && func<=FuncOverrideCH32) ||
+      (func>=FuncAdjustGV1 && func<=FuncAdjustGVLast) ||
+      (func==FuncReset) ||
+      (func>=FuncSetTimer1 && func<=FuncSetTimer2) ||
+      (func==FuncVolume) ||
+      (func <= FuncInstantTrim)) {
+    if (!enabled) {
+      return QObject::tr("DISABLED");
+    }
+  }
+  return "";
+}
+
+CurveData::CurveData()
+{
+  clear(5);
+}
+
+void CurveData::clear(int count)
+{
+  memset(this, 0, sizeof(CurveData));
+  this->count = count;
+}
+
+bool CurveData::isEmpty() const
+{
+  for (int i=0; i<count; i++) {
+    if (points[i].y != 0) {
+      return false;
+    }
+  }
+  return true;
+}
+
+QString LimitData::minToString() const
 {
  return QString::number((qreal)min/10);
 }

-QString LimitData::maxToString()
+QString LimitData::maxToString() const
 {
  return QString::number((qreal)max/10);
 }

-QString LimitData::offsetToString()
+QString LimitData::revertToString() const
+{
+  return revert ? QObject::tr("INV") : QObject::tr("NOR");
+}
+
+QString LimitData::offsetToString() const
 {
  return QString::number((qreal)offset/10, 'f', 1);
 }
@@ -1052,13 +1036,13 @@ bool GeneralSettings::switchSourceAllowedTaranis(int index) const

 bool GeneralSettings::isPotAvailable(int index) const
 {
-  if (index<0 || index>4) return false;
+  if (index<0 || index>GetCurrentFirmware()->getCapability(Pots)) return false;
  return potConfig[index] != POT_NONE;
 }

 bool GeneralSettings::isSliderAvailable(int index) const
 {
-  if (index<0 || index>4) return false;
+  if (index<0 || index>GetCurrentFirmware()->getCapability(Sliders)) return false;
  return sliderConfig[index] != SLIDER_NONE;
 }

@@ -1090,6 +1074,11 @@ GeneralSettings::GeneralSettings()
    switchConfig[6] = SWITCH_3POS;
    switchConfig[7] = SWITCH_TOGGLE;
  }
+  else {
+    for (int i=0; i<3; i++) {
+      potConfig[i] = POT_WITHOUT_DETENT;
+    }
+  }

  if (IS_ARM(board)) {
    speakerVolume = 12;
@@ -1109,8 +1098,8 @@ GeneralSettings::GeneralSettings()
  }
  else {
    QString t_trainercalib=g.profile[g.id()].trainerCalib();
-    int8_t t_vBatCalib=(int8_t)g.profile[g.id()].vBatCalib();
-    int8_t t_currentCalib=(int8_t)g.profile[g.id()].currentCalib();
+    int8_t t_txVoltageCalibration=(int8_t)g.profile[g.id()].txVoltageCalibration();
+    int8_t t_txCurrentCalibration=(int8_t)g.profile[g.id()].txCurrentCalibration();
    int8_t t_PPM_Multiplier=(int8_t)g.profile[g.id()].ppmMultiplier();
    uint8_t t_stickMode=(uint8_t)g.profile[g.id()].gsStickMode();
    uint8_t t_vBatWarn=(uint8_t)g.profile[g.id()].vBatWarn();
@@ -1144,8 +1133,8 @@ GeneralSettings::GeneralSettings()
        if (ok)
          trainer.calib[i]=byte16;
      }
-      currentCalib=t_currentCalib;
-      vBatCalib=t_vBatCalib;
+      txCurrentCalibration=t_txCurrentCalibration;
+      txVoltageCalibration=t_txVoltageCalibration;
      vBatWarn=t_vBatWarn;
      PPM_Multiplier=t_PPM_Multiplier;
      stickMode = t_stickMode;
@@ -1314,6 +1303,52 @@ bool ModelData::isInputValid(const unsigned int idx) const
  return false;
 }

+bool ModelData::hasExpos(uint8_t inputIdx) const
+{
+  for (int i=0; i<C9X_MAX_EXPOS; i++) {
+    const ExpoData & expo = expoData[i];
+    if (expo.chn==inputIdx && expo.mode!=0) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool ModelData::hasMixes(uint8_t channelIdx) const
+{
+  channelIdx += 1;
+  for (int i=0; i<C9X_MAX_MIXERS; i++) {
+    if (mixData[i].destCh == channelIdx) {
+      return true;
+    }
+  }
+  return false;
+}
+
+QVector<const ExpoData *> ModelData::expos(int input) const
+{
+  QVector<const ExpoData *> result;
+  for (int i=0; i<C9X_MAX_EXPOS; i++) {
+    const ExpoData * ed = &expoData[i];
+    if ((int)ed->chn==input && ed->mode!=0) {
+      result << ed;
+    }
+  }
+  return result;
+}
+
+QVector<const MixData *> ModelData::mixes(int channel) const
+{
+  QVector<const MixData *> result;
+  for (int i=0; i<C9X_MAX_MIXERS; i++) {
+    const MixData * md = &mixData[i];
+    if ((int)md->destCh == channel+1) {
+      result << md;
+    }
+  }
+  return result;
+}
+
 void ModelData::removeInput(const int idx)
 {
  unsigned int chn = expoData[idx].chn;
@@ -1363,15 +1398,19 @@ void ModelData::clear()
  moduleData[2].ppmDelay = 300;
  int board = GetEepromInterface()->getBoard();
  if (IS_TARANIS(board)) {
-    moduleData[0].protocol=PXX_XJT_X16;
-    moduleData[1].protocol=OFF;
+    moduleData[0].protocol = PULSES_PXX_XJT_X16;
+    moduleData[1].protocol = PULSES_OFF;
+  }
+  else if (IS_SKY9X(board)) {
+    moduleData[0].protocol = PULSES_PPM;
+    moduleData[1].protocol = PULSES_PPM;
  }
  else {
-    moduleData[0].protocol=PPM;
-    moduleData[1].protocol=OFF;      
+    moduleData[0].protocol = PULSES_PPM;
+    moduleData[1].protocol = PULSES_OFF;
  }
  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    flightModeData[i].clear();
+    flightModeData[i].clear(i);
  }
  clearInputs();
  clearMixes();
@@ -1393,7 +1432,7 @@ void ModelData::clear()
    sensorData[i].clear();
 }

-bool ModelData::isempty()
+bool ModelData::isEmpty() const
 {
  return !used;
 }
@@ -1484,9 +1523,7 @@ int ModelData::getTrimValue(int phaseIdx, int trimIdx)
      }
      else {
        phaseIdx = phase.trimRef[trimIdx];
-        if (phase.trimMode[trimIdx] == 0)
-          result = 0;
-        else
+        if (phase.trimMode[trimIdx] != 0)
          result += phase.trim[trimIdx];
      }
    }
@@ -1499,16 +1536,57 @@ bool ModelData::isGVarLinked(int phaseIdx, int gvarIdx)
  return flightModeData[phaseIdx].gvars[gvarIdx] > 1024;
 }

-int ModelData::getGVarValue(int phaseIdx, int gvarIdx)
+bool ModelData::isGVarLinkedCircular(int phaseIdx, int gvarIdx)
 {
-  int idx = flightModeData[phaseIdx].gvars[gvarIdx];
-  for (int i=0; idx>1024 && i<C9X_MAX_FLIGHT_MODES; i++) {
-    int nextPhase = idx - 1025;
+  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;
-    idx = flightModeData[phaseIdx].gvars[gvarIdx];
  }
-  return idx;
+  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;
+    if (nextPhase >= phaseIdx) nextPhase += 1;
+    phaseIdx = nextPhase;
+  }
+  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
 }

 void ModelData::setTrimValue(int phaseIdx, int trimIdx, int value)
@@ -1581,7 +1659,7 @@ void registerEEpromInterfaces()
  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_SKY9X));
  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_9XRPRO));
  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS));
-  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_PLUS));  
+  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_PLUS));
  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_X9E));
  eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_STOCK));
  eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_GRUVIN9X));
@@ -1595,7 +1673,7 @@ void unregisterEEpromInterfaces()
  foreach(EEPROMInterface * intf, eepromInterfaces) {
    // qDebug() << "UnregisterEepromInterfaces(): deleting " <<  QString::number( reinterpret_cast<uint64_t>(intf), 16 );
    delete intf;
-  } 
+  }
  OpenTxEepromCleanup();
 }

@@ -1603,42 +1681,116 @@ QList<Firmware *> firmwares;
 Firmware * default_firmware_variant;
 Firmware * current_firmware_variant;

-void unregisterFirmwares()
+void ShowEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound)
 {
-  foreach (Firmware * f, firmwares) {
-    delete f;
+  std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
+  QStringList errorsList;
+
+  errorsList << QT_TRANSLATE_NOOP("EepromInterface", "Possible causes for this:");
+
+  if (errors.test(UNSUPPORTED_NEWER_VERSION)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is from a newer version of OpenTX"); }
+  if (errors.test(NOT_OPENTX)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from OpenTX"); }
+  if (errors.test(NOT_TH9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from Th9X"); }
+  if (errors.test(NOT_GRUVIN9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from Gruvin9X"); }
+  if (errors.test(NOT_ERSKY9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from ErSky9X"); }
+  if (errors.test(NOT_ER9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from Er9X"); }
+  if (errors.test(WRONG_SIZE)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom size is invalid"); }
+  if (errors.test(WRONG_FILE_SYSTEM)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom file system is invalid"); }
+  if (errors.test(UNKNOWN_BOARD)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is from a unknown board"); }
+  if (errors.test(WRONG_BOARD)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is from the wrong board"); }
+  if (errors.test(BACKUP_NOT_SUPPORTED)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom backup not supported"); }
+
+  if (errors.test(UNKNOWN_ERROR)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Something that couldn't be guessed, sorry"); }
+
+  if (errors.test(HAS_WARNINGS)) {
+    errorsList << QT_TRANSLATE_NOOP("EepromInterface", "Warning:");
+    if (errors.test(WARNING_WRONG_FIRMWARE)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"); }
  }
+
+  QMessageBox msgBox(parent);
+  msgBox.setWindowTitle(title);
+  msgBox.setIcon(QMessageBox::Critical);
+  msgBox.setText(mainMessage);
+  msgBox.setInformativeText(errorsList.join("\n"));
+  msgBox.setStandardButtons(QMessageBox::Ok);
+  msgBox.exec();
 }

-bool loadEEprom(RadioData &radioData, const uint8_t *eeprom, const int size)
+void ShowEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound)
 {
-  foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
-    if (eepromInterface->load(radioData, eeprom, size))
-      return true;
-  }
+  std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
+  QStringList warningsList;
+  if (errors.test(WARNING_WRONG_FIRMWARE)) { warningsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"); }
+  if (errors.test(OLD_VERSION)) { warningsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your eeprom is from an old version of OpenTX, upgrading!\n You should 'save as' to keep the old file as a backup."); }

-  return false;
+  QMessageBox msgBox(parent);
+  msgBox.setWindowTitle(title);
+  msgBox.setIcon(QMessageBox::Warning);
+  msgBox.setText(QT_TRANSLATE_NOOP("EepromInterface", "Warnings!"));
+  msgBox.setInformativeText(warningsList.join("\n"));
+  msgBox.setStandardButtons(QMessageBox::Ok);
+  msgBox.exec();
 }

-bool loadBackup(RadioData &radioData, uint8_t *eeprom, int size, int index)
+unsigned long LoadEeprom(RadioData &radioData, const uint8_t *eeprom, const int size)
 {
+  std::bitset<NUM_ERRORS> errors;
+
  foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
-    if (eepromInterface->loadBackup(radioData, eeprom, size, index))
-      return true;
+    std::bitset<NUM_ERRORS> result((unsigned long long)eepromInterface->load(radioData, eeprom, size));
+    if (result.test(NO_ERROR)) {
+      return result.to_ulong();
+    }
+    else {
+      errors |= result;
+    }
  }

-  return false;
+  if (errors.none()) {
+    errors.set(UNKNOWN_ERROR);
+  }
+  return errors.to_ulong();
+}
+
+unsigned long LoadBackup(RadioData & radioData, uint8_t * eeprom, int size, int index)
+{
+  std::bitset<NUM_ERRORS> errors;
+
+  foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
+    std::bitset<NUM_ERRORS> result((unsigned long long)eepromInterface->loadBackup(radioData, eeprom, size, index));
+    if (result.test(NO_ERROR)) {
+      return result.to_ulong();
+    }
+    else {
+      errors |= result;
+    }
+  }
+
+  if (errors.none()) {
+    errors.set(UNKNOWN_ERROR);
+  }
+  return errors.to_ulong();
 }


-bool loadEEpromXml(RadioData &radioData, QDomDocument &doc)
+unsigned long LoadEepromXml(RadioData & radioData, QDomDocument & doc)
 {
+  std::bitset<NUM_ERRORS> errors;
+
  foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
-    if (eepromInterface->loadxml(radioData, doc))
-      return true;
+    std::bitset<NUM_ERRORS> result((unsigned long long)eepromInterface->loadxml(radioData, doc));
+    if (result.test(NO_ERROR)) {
+      return result.to_ulong();
+    }
+    else {
+      errors |= result;
+    }
  }

-  return false;
+  if (errors.none()) {
+    errors.set(UNKNOWN_ERROR);
+  }
+  return errors.to_ulong();
 }

 QString getBoardName(BoardEnum board)
@@ -1660,6 +1812,8 @@ QString getBoardName(BoardEnum board)
      return "Sky9x";
    case BOARD_9XRPRO:
      return "9XR-PRO";
+    case BOARD_AR9X:
+      return "AR9X";
    default:
      return "Unknown";
  }
@@ -1728,3 +1882,17 @@ 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;
+    }
+  }
+}
+
@@ -22,24 +22,26 @@
 #include <QStringList>
 #include <QList>
 #include <QtXml>
+#include <QComboBox>
 #include <iostream>
+#include <bitset>
 #include "constants.h"
 #include "simulatorinterface.h"

-#define EESIZE_STOCK          2048
-#define EESIZE_M128           4096
-#define EESIZE_GRUVIN9X       4096
-#define EESIZE_TARANIS        (32*1024)
-#define EESIZE_SKY9X          (128*4096)
-#define EESIZE_9XRPRO         (128*4096)
-#define EESIZE_RLC_MAX        EESIZE_TARANIS
+#define EESIZE_STOCK           2048
+#define EESIZE_M128            4096
+#define EESIZE_GRUVIN9X        4096
+#define EESIZE_TARANIS         (32*1024)
+#define EESIZE_SKY9X           (128*4096)
+#define EESIZE_9XRPRO          (128*4096)
+#define EESIZE_MAX             EESIZE_9XRPRO

 QString getBoardName(BoardEnum board);

 #define IS_9X(board)           (board==BOARD_STOCK || board==BOARD_M128)
 #define IS_STOCK(board)        (board==BOARD_STOCK)
 #define IS_2560(board)         (board==BOARD_GRUVIN9X || board==BOARD_MEGA2560)
-#define IS_SKY9X(board)        (board==BOARD_SKY9X || board==BOARD_9XRPRO)
+#define IS_SKY9X(board)        (board==BOARD_SKY9X || board==BOARD_9XRPRO || board==BOARD_AR9X)
 #define IS_9XRPRO(board)       (board==BOARD_9XRPRO)
 #define IS_TARANIS(board)      (board==BOARD_TARANIS  || board==BOARD_TARANIS_PLUS || board==BOARD_TARANIS_X9E)
 #define IS_TARANIS_PLUS(board) (board==BOARD_TARANIS_PLUS || board==BOARD_TARANIS_X9E)
@@ -182,19 +184,6 @@ extern const char downArrow[];
 class ModelData;
 class GeneralSettings;

-enum ThrottleSource {
-  THROTTLE_SOURCE_THR,
-  THROTTLE_SOURCE_P1,
-  THROTTLE_SOURCE_P2,
-  THROTTLE_SOURCE_P3,
-  THROTTLE_SOURCE_S1 = THROTTLE_SOURCE_P1,
-  THROTTLE_SOURCE_S2,
-  THROTTLE_SOURCE_S3,
-  THROTTLE_SOURCE_LS,
-  THROTTLE_SOURCE_RS,
-  THROTTLE_SOURCE_FIRST_CHANNEL,
-};
-
 enum TelemetrySource {
  TELEMETRY_SOURCE_TX_BATT,
  TELEMETRY_SOURCE_TX_TIME,
@@ -292,9 +281,7 @@ class RawSourceRange
    {
    }

-    float getValue(int value) {
-      return min + float(value) * step;
-    }
+    float getValue(int value);

    int decimals;
    double min;
@@ -392,7 +379,7 @@ class RawSwitch {
      return index >= 0 ? (type * 256 + index) : -(type * 256 - index);
    }

-    QString toString();
+    QString toString() const;

    bool operator== ( const RawSwitch& other) {
      return (this->type == other.type) && (this->index == other.index);
@@ -428,7 +415,7 @@ class CurveReference {
    CurveRefType type;
    int value;

-    QString toString();
+    QString toString() const;
 };

 enum InputMode {
@@ -446,7 +433,7 @@ class ExpoData {
    unsigned int mode;
    unsigned int chn;
    RawSwitch swtch;
-    unsigned int phases;        // -5=!FP4, 0=normal, 5=FP4
+    unsigned int flightModes;        // -5=!FP4, 0=normal, 5=FP4
    int  weight;
    int offset;
    CurveReference curve;
@@ -469,14 +456,14 @@ class CurveData {
      CURVE_TYPE_LAST = CURVE_TYPE_CUSTOM
    };

-    CurveData() { clear(5); }
-
+    CurveData();
+    void clear(int count);
+    bool isEmpty() const;
    CurveType type;
    bool smooth;
    int  count;
    CurvePoint points[C9X_MAX_POINTS];
    char name[6+1];
-    void clear(int count) { memset(this, 0, sizeof(CurveData)); this->count = count; }
 };

 class LimitData {
@@ -490,9 +477,10 @@ class LimitData {
    bool  symetrical;
    char  name[6+1];
    CurveReference curve;
-    QString minToString();
-    QString maxToString();
-    QString offsetToString();
+    QString minToString() const;
+    QString maxToString() const;
+    QString offsetToString() const;
+    QString revertToString() const;
    void clear();
 };

@@ -520,7 +508,7 @@ class MixData {
    bool noExpo;
    MltpxValue mltpx;          // multiplex method 0=+ 1=* 2=replace
    unsigned int mixWarn;           // mixer warning
-    unsigned int phases;             // -5=!FP4, 0=normal, 5=FP4
+    unsigned int flightModes;             // -5=!FP4, 0=normal, 5=FP4
    int    sOffset;
    char   name[MIXDATA_NAME_LEN+1];

@@ -577,10 +565,9 @@ class LogicalSwitchData { // Logical Switches data
    unsigned int duration;
    int andsw;
    void clear() { memset(this, 0, sizeof(LogicalSwitchData)); }
-    CSFunctionFamily getFunctionFamily();
-    unsigned int getRangeFlags();
-    QString funcToString();
-    QString toString(const ModelData & model, const GeneralSettings & settings);
+    CSFunctionFamily getFunctionFamily() const;
+    unsigned int getRangeFlags() const;
+    QString funcToString() const;
 };

 enum AssignFunc {
@@ -611,6 +598,12 @@ enum AssignFunc {
  FuncBackgroundMusicPause,
  FuncAdjustGV1,
  FuncAdjustGVLast = FuncAdjustGV1+C9X_MAX_GVARS-1,
+  FuncSetFailsafeInternalModule,
+  FuncSetFailsafeExternalModule,
+  FuncRangeCheckInternalModule,
+  FuncRangeCheckExternalModule,
+  FuncBindInternalModule,
+  FuncBindExternalModule,
  FuncCount,
  FuncReserve = -1
 };
@@ -626,15 +619,20 @@ class CustomFunctionData { // Function Switches data
    unsigned int adjustMode;
    int repeatParam;
    void clear();
-    QString funcToString();
-    QString paramToString();
-    QString repeatToString();
-    QStringList toStringList();
+    QString funcToString() const;
+    QString paramToString(const ModelData * model) const;
+    QString repeatToString() const;
+    QString enabledToString() const;
+
+    static void populateResetParams(const ModelData * model, QComboBox * b, unsigned int value);
+    static void populatePlaySoundParams(QStringList & qs);
+    static void populateHapticParams(QStringList & qs);
+
 };

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

 class SwashRingData { // Swash Ring data
@@ -757,6 +755,22 @@ enum TelemetryCurrentSources {
  TELEMETRY_CURRENT_SOURCE_FAS
 };

+enum UartModes {
+  UART_MODE_NONE,
+  UART_MODE_TELEMETRY_MIRROR,
+  UART_MODE_TELEMETRY,
+  UART_MODE_SBUS_TRAINER,
+  UART_MODE_DEBUG
+};
+
+enum TrainerMode {
+  TRAINER_MODE_MASTER_TRAINER_JACK,
+  TRAINER_MODE_SLAVE,
+  TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE,
+  TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE,
+  TRAINER_MODE_MASTER_BATTERY_COMPARTMENT,
+};
+
 class FrSkyData {
  public:
    FrSkyData() { clear(); }
@@ -769,6 +783,7 @@ class FrSkyData {
    FrSkyScreenData screens[4];
    FrSkyRSSIAlarm rssiAlarms[2];
    unsigned int varioSource;
+    bool varioCenterSilent;
    int varioMin;
    int varioCenterMin;    // if increment in 0.2m/s = 3.0m/s max
    int varioCenterMax;
@@ -776,6 +791,7 @@ class FrSkyData {
    bool mAhPersistent;
    unsigned int storedMah;
    int fasOffset;
+    bool ignoreSensorIds;

    void clear();
 };
@@ -792,6 +808,12 @@ class MavlinkData {

 class TimerData {
  public:
+    enum CountDownMode {
+      COUNTDOWN_SILENT,
+      COUNTDOWN_BEEPS,
+      COUNTDOWN_VOICE,
+      COUNTDOWN_HAPTIC
+    };
    TimerData() { clear(); }
    RawSwitch    mode;
    char         name[TIMER_NAME_LEN+1];
@@ -803,31 +825,33 @@ class TimerData {
    void clear() { memset(this, 0, sizeof(TimerData)); mode = RawSwitch(SWITCH_TYPE_TIMER_MODE, 0); }
 };

-enum Protocol {
-  OFF,
-  PPM,
-  SILV_A,
-  SILV_B,
-  SILV_C,
-  CTP1009,
-  LP45,
-  DSM2,
-  DSMX,
-  PPM16,
-  PPMSIM,
-  PXX_XJT_X16,
-  PXX_XJT_D8,
-  PXX_XJT_LR12,
-  PXX_DJT,
-  PROTO_LAST
+enum PulsesProtocol {
+  PULSES_OFF,
+  PULSES_PPM,
+  PULSES_SILV_A,
+  PULSES_SILV_B,
+  PULSES_SILV_C,
+  PULSES_CTP1009,
+  PULSES_LP45,
+  PULSES_DSM2,
+  PULSES_DSMX,
+  PULSES_PPM16,
+  PULSES_PPMSIM,
+  PULSES_PXX_XJT_X16,
+  PULSES_PXX_XJT_D8,
+  PULSES_PXX_XJT_LR12,
+  PULSES_PXX_DJT,
+  PULSES_CROSSFIRE,
+  PULSES_MULTIMODULE,
+  PULSES_PROTOCOL_LAST
 };

 enum TrainerProtocol {
-  MASTER_JACK,
-  SLAVE_JACK,
-  MASTER_SBUS_MODULE,
-  MASTER_CPPM_MODULE,
-  MASTER_SBUS_BATT_COMPARTMENT
+  TRAINER_MASTER_JACK,
+  TRAINER_SLAVE_JACK,
+  TRAINER_MASTER_SBUS_MODULE,
+  TRAINER_MASTER_CPPM_MODULE,
+  TRAINER_MASTER_SBUS_BATT_COMPARTMENT
 };

 class ModuleData {
@@ -842,10 +866,10 @@ class ModuleData {
    int          failsafeChannels[C9X_NUM_CHNOUT];
    int          ppmDelay;
    bool         ppmPulsePol;           // false = positive
-    bool         ppmOutputType;         // false = open drain, true = push pull 
+    bool         ppmOutputType;         // false = open drain, true = push pull
    int          ppmFrameLength;
    void clear() { memset(this, 0, sizeof(ModuleData)); }
-    QString polarityToString() { return ppmPulsePol ? QObject::tr("Positive") : QObject::tr("Negative"); }
+    QString polarityToString() const { return ppmPulsePol ? QObject::tr("Positive") : QObject::tr("Negative"); } // TODO ModelPrinter
 };

 #define C9X_MAX_SCRIPTS       7
@@ -914,7 +938,7 @@ class SensorData {
      UNIT_PERCENT,
      UNIT_MAH,
      UNIT_WATTS,
-      UNIT_DBM,
+      UNIT_DB,
      UNIT_RPMS,
      UNIT_G,
      UNIT_DEGREE,
@@ -987,6 +1011,11 @@ class ModelData {
    void removeInput(const int idx);

    bool isInputValid(const unsigned int idx) const;
+    bool hasExpos(uint8_t inputIdx) const;
+    bool hasMixes(uint8_t output) const;
+
+    QVector<const ExpoData *> expos(int input) const;
+    QVector<const MixData *> mixes(int channel) const;

    bool      used;
    char      name[12+1];
@@ -1037,8 +1066,10 @@ class ModelData {

    SensorData sensorData[C9X_MAX_SENSORS];

+    unsigned int toplcdTimer;
+
    void clear();
-    bool isempty();
+    bool isEmpty() const;
    void setDefaultInputs(const GeneralSettings & settings);
    void setDefaultMixes(const GeneralSettings & settings);
    void setDefaultValues(unsigned int id, const GeneralSettings & settings);
@@ -1047,8 +1078,13 @@ 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();
@@ -1122,7 +1158,8 @@ class GeneralSettings {
    unsigned int  currModel; // 0..15
    unsigned int   contrast;
    unsigned int   vBatWarn;
-    int    vBatCalib;
+    int    txVoltageCalibration;
+    int    txCurrentCalibration;
    int    vBatMin;
    int    vBatMax;
    int   backlightMode;
@@ -1170,7 +1207,6 @@ class GeneralSettings {
    int     speakerVolume;
    unsigned int   backlightBright;
    int switchesDelay;
-    int    currentCalib;
    int    temperatureCalib;
    int    temperatureWarn;
    unsigned int mAhWarn;
@@ -1271,7 +1307,6 @@ enum Capability {
  HasExpoNames,
  HasNoExpo,
  HasMixerNames,
-  HasChNames,
  HasCvNames,
  HasPxxCountry,
  HasPPMStart,
@@ -1301,7 +1336,7 @@ enum Capability {
  PPMCenter,
  PPMUnitMicroseconds,
  SYMLimits,
-  HasCurrentCalibration,
+  HastxCurrentCalibration,
  HasVolume,
  HasBrightness,
  PerModelTimers,
@@ -1313,6 +1348,8 @@ enum Capability {
  LCDWidth,
  GetThrSwitch,
  HasDisplayText,
+  HasTopLcd,
+  GlobalFunctions,
  VirtualInputs,
  TrainerInputs,
  RtcTime,
@@ -1331,7 +1368,8 @@ enum Capability {
  HasInputDiff,
  HasMixerExpo,
  MixersMonitor,
-  HasBatMeterRange
+  HasBatMeterRange,
+  DangerousFunctions,
 };

 class SimulatorInterface;
@@ -1348,19 +1386,17 @@ class EEPROMInterface

    inline BoardEnum getBoard() { return board; }

-    virtual bool load(RadioData &radioData, const uint8_t *eeprom, int size) = 0;
+    virtual unsigned long load(RadioData &radioData, const uint8_t *eeprom, int size) = 0;

-    virtual bool loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index) = 0;
+    virtual unsigned long loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index) = 0;

-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc) = 0;
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc) = 0;

    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0) = 0;

-    virtual int getSize(ModelData &) = 0;
+    virtual int getSize(const ModelData &) = 0;

-    virtual int getSize(GeneralSettings &) = 0;
-
-    virtual int isAvailable(Protocol proto, int port=0) = 0;
+    virtual int getSize(const GeneralSettings &) = 0;

    virtual const int getEEpromSize() = 0;

@@ -1473,11 +1509,37 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
 void registerEEpromInterfaces();
 void unregisterEEpromInterfaces();
 void registerOpenTxFirmwares();
-void unregisterFirmwares();
+void unregisterOpenTxFirmwares();

-bool loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index);
-bool loadEEprom(RadioData &radioData, const uint8_t *eeprom, int size);
-bool loadEEpromXml(RadioData &radioData, QDomDocument &doc);
+enum EepromLoadErrors {
+  NO_ERROR,
+
+  UNKNOWN_ERROR,
+  UNSUPPORTED_NEWER_VERSION,
+  WRONG_SIZE,
+  WRONG_FILE_SYSTEM,
+  NOT_OPENTX,
+  NOT_TH9X,
+  NOT_GRUVIN9X,
+  NOT_ERSKY9X,
+  NOT_ER9X,
+  UNKNOWN_BOARD,
+  WRONG_BOARD,
+  BACKUP_NOT_SUPPORTED,
+
+  HAS_WARNINGS,
+  OLD_VERSION,
+  WARNING_WRONG_FIRMWARE,
+
+  NUM_ERRORS
+};
+
+void ShowEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound);
+void ShowEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound);
+
+unsigned long LoadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index);
+unsigned long LoadEeprom(RadioData &radioData, const uint8_t *eeprom, int size);
+unsigned long LoadEepromXml(RadioData &radioData, QDomDocument &doc);

 struct Option {
  const char * name;
@@ -1568,9 +1630,13 @@ 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;
+
  public:
    QList<const char *> languages;
    QList<const char *> ttslanguages;
@@ -52,7 +52,8 @@ void RleFile::EeFsCreate(uint8_t *eeprom, int size, BoardEnum board, unsigned in
  if (IS_SKY9X(board)) {
    memset(eeprom, 0xFF, size);
    if (version >= 217) {
-      eepromFatHeader = (EepromHeader *)eeprom;
+      memset(eeprom, 0, EEPROM_FAT_SIZE);
+      eepromFatHeader = (EepromHeader *)(eeprom + EEPROM_FAT_SIZE);
      eepromFatHeader->mark = EEPROM_MARK;
      eepromFatHeader->index = 1;
      for (int i=0; i<EEPROM_MAX_FILES; i++) {
@@ -121,20 +122,16 @@ PACK(struct EepromFileHeader

 bool RleFile::searchFat()
 {
-  int bestFatIndex = -1;
+  eepromFatHeader = NULL;
+  uint32_t bestFatIndex = 0;
  for (int i=0; i<EEPROM_ZONE_SIZE/EEPROM_FAT_SIZE; i++) {
    EepromHeader * header = (EepromHeader *)(eeprom+i*EEPROM_FAT_SIZE);
    if (header->mark == EEPROM_MARK && (int)header->index >= bestFatIndex) {
-      bestFatIndex = i;
+      eepromFatHeader = header;
+      bestFatIndex = header->index;
    }
  }
-  if (bestFatIndex >= 0) {
-    eepromFatHeader = (EepromHeader *)(eeprom+bestFatIndex*EEPROM_FAT_SIZE);;
-    return true;
-  }
-  else {
-    return false;
-  }
+  return (eepromFatHeader != NULL);
 }

 bool RleFile::EeFsOpen(uint8_t *eeprom, int size, BoardEnum board)
@@ -20,6 +20,7 @@
 #include "firmwareinterface.h"
 #include "helpers.h"

+#define FW_MARK     "FW"
 #define VERS_MARK   "VERS"
 #define DATE_MARK   "DATE"
 #define TIME_MARK   "TIME"
@@ -44,30 +45,34 @@ int getFileType(const QString &fullFileName)

 FirmwareInterface::FirmwareInterface(const QString &filename):
  flash(MAX_FSIZE, 0),
-  flash_size(0),
+  flashSize(0),
  versionId(0),
-  splash_offset(0),
-  splash_size(0),
-  splash_width(0),
-  splash_height(0),
+  eepromVersion(0),
+  eepromVariant(0),
+  splashOffset(0),
+  splashSize(0),
+  splashWidth(0),
+  splashHeight(0),
  isValidFlag(false)
 {
  if (!filename.isEmpty()) {
    QFile file(filename);
    if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { // reading HEX TEXT file
      QTextStream inputStream(&file);
-      flash_size = HexInterface(inputStream).load((uint8_t *)flash.data(), MAX_FSIZE);
+      flashSize = HexInterface(inputStream).load((uint8_t *)flash.data(), MAX_FSIZE);
      file.close();
-      if (flash_size == 0) {
+      if (flashSize == 0) {
        file.open(QIODevice::ReadOnly);
-        flash_size = file.read((char *)flash.data(), MAX_FSIZE);
+        flashSize = file.read((char *)flash.data(), MAX_FSIZE);
      }
    }
  }

-  if (flash_size > 0) {
+  if (flashSize > 0) {
+    flavour = seekLabel(FW_MARK);
    version = seekLabel(VERS_MARK);
    if (version.startsWith("opentx-")) {
+      // old version format
      int index = version.lastIndexOf('-');
      flavour = version.mid(0, index);
      version = version.mid(index+1);
@@ -150,8 +155,8 @@ bool FirmwareInterface::SeekSplash(QByteArray splash)
 {
  int start = flash.indexOf(splash);
  if (start>0) {
-    splash_offset = start;
-    splash_size = splash.size();
+    splashOffset = start;
+    splashSize = splash.size();
    return true;
  }
  else {
@@ -167,8 +172,8 @@ bool FirmwareInterface::SeekSplash(QByteArray sps, QByteArray spe, int size)
    if (start>0) {
      int end = start + sps.size() + size;
      if (end == flash.indexOf(spe, end)) {
-        splash_offset = start + sps.size();
-        splash_size = end - start - sps.size();
+        splashOffset = start + sps.size();
+        splashSize = end - start - sps.size();
        return true;
      }
      else {
@@ -187,10 +192,10 @@ bool FirmwareInterface::SeekSplash(QByteArray sps, QByteArray spe, int size)

 void FirmwareInterface::SeekSplash(void) 
 {
-  splash_size = 0;
-  splash_offset = 0;
-  splash_width = SPLASH_WIDTH;
-  splash_height = SPLASH_HEIGHT;
+  splashSize = 0;
+  splashOffset = 0;
+  splashWidth = SPLASH_WIDTH;
+  splashHeight = SPLASH_HEIGHT;
  splash_format = QImage::Format_Mono;

  if (SeekSplash(QByteArray((const char *)gr9x_splash, sizeof(gr9x_splash))) || SeekSplash(QByteArray((const char *)gr9xv4_splash, sizeof(gr9xv4_splash)))) {
@@ -206,8 +211,8 @@ void FirmwareInterface::SeekSplash(void)
  }

  if (SeekSplash(QByteArray((const char *)opentxtaranis_splash, sizeof(opentxtaranis_splash)))) {
-    splash_width = SPLASHX9D_WIDTH;
-    splash_height = SPLASHX9D_HEIGHT;
+    splashWidth = SPLASHX9D_WIDTH;
+    splashHeight = SPLASHX9D_HEIGHT;
    splash_format = QImage::Format_Indexed8;
    return;
  }
@@ -221,8 +226,8 @@ void FirmwareInterface::SeekSplash(void)
  }

  if (SeekSplash(QByteArray(OTX_SPS_TARANIS, OTX_SPS_SIZE), QByteArray(OTX_SPE, OTX_SPE_SIZE), 6784)) {
-    splash_width = SPLASHX9D_WIDTH;
-    splash_height = SPLASHX9D_HEIGHT;
+    splashWidth = SPLASHX9D_WIDTH;
+    splashHeight = SPLASHX9D_HEIGHT;
    splash_format = QImage::Format_Indexed8;
    return;
  }
@@ -232,14 +237,14 @@ void FirmwareInterface::SeekSplash(void)
  }

  if (SeekSplash(QByteArray(ERSPLASH_MARKER, sizeof(ERSPLASH_MARKER)))) {
-    splash_offset += sizeof(ERSPLASH_MARKER);
-    splash_size = sizeof(er9x_splash);
+    splashOffset += sizeof(ERSPLASH_MARKER);
+    splashSize = sizeof(er9x_splash);
  }
 }

 bool FirmwareInterface::setSplash(const QImage & newsplash)
 {
-  if (splash_offset == 0 || splash_size == 0) {
+  if (splashOffset == 0 || splashSize == 0) {
    return false;
  }

@@ -247,9 +252,9 @@ bool FirmwareInterface::setSplash(const QImage & newsplash)
  QColor color;
  QByteArray splash;
  if (splash_format == QImage::Format_Indexed8) {
-    for (unsigned int y=0; y<splash_height; y++) {
-      unsigned int idx = (y/2)*splash_width;
-      for (unsigned int x=0; x<splash_width; x++, idx++) {
+    for (unsigned int y=0; y<splashHeight; y++) {
+      unsigned int idx = (y/2)*splashWidth;
+      for (unsigned int x=0; x<splashWidth; x++, idx++) {
        QRgb gray = qGray(newsplash.pixel(x, y));
        uint8_t z = ((255-gray)*15)/255;
        if (y & 1) z <<= 4;
@@ -260,27 +265,27 @@ bool FirmwareInterface::setSplash(const QImage & newsplash)
  else {
    QColor black = QColor(0,0,0);
    QImage blackNwhite = newsplash.convertToFormat(QImage::Format_MonoLSB);
-    for (uint y=0; y<splash_height; y++) {
-      for (uint x=0; x<splash_width; x++) {
+    for (uint y=0; y<splashHeight; y++) {
+      for (uint x=0; x<splashWidth; x++) {
        color = QColor(blackNwhite.pixel(x,y));
-        b[splash_width*(y/8) + x] |= ((color==black ? 1: 0)<<(y % 8));
+        b[splashWidth*(y/8) + x] |= ((color==black ? 1: 0)<<(y % 8));
      }
    }
  }
  splash.clear();
-  splash.append(b, splash_size);
-  flash.replace(splash_offset, splash_size, splash);
+  splash.append(b, splashSize);
+  flash.replace(splashOffset, splashSize, splash);
  return true;
 }

 int FirmwareInterface::getSplashWidth()
 {
-  return splash_width;
+  return splashWidth;
 }

 uint FirmwareInterface::getSplashHeight()
 {
-  return splash_height;
+  return splashHeight;
 }

 QImage::Format FirmwareInterface::getSplashFormat()
@@ -290,17 +295,17 @@ QImage::Format FirmwareInterface::getSplashFormat()

 QImage FirmwareInterface::getSplash()
 {
-  if (splash_offset == 0 || splash_size == 0) {
+  if (splashOffset == 0 || splashSize == 0) {
    return QImage(); // empty image
  }

  if (splash_format == QImage::Format_Indexed8) {
-    QImage image(splash_width, splash_height, QImage::Format_RGB888);
-    if (splash_offset > 0) {
-      for (unsigned int y=0; y<splash_height; y++) {
-        unsigned int idx = (y/2)*splash_width;
-        for (unsigned int x=0; x<splash_width; x++, idx++) {
-          uint8_t byte = flash.at(splash_offset+idx);
+    QImage image(splashWidth, splashHeight, QImage::Format_RGB888);
+    if (splashOffset > 0) {
+      for (unsigned int y=0; y<splashHeight; y++) {
+        unsigned int idx = (y/2)*splashWidth;
+        for (unsigned int x=0; x<splashWidth; x++, idx++) {
+          uint8_t byte = flash.at(splashOffset+idx);
          unsigned int z = (y & 1) ? (byte >> 4) : (byte & 0x0F);
          z = 255-(z*255)/15;
          QRgb rgb = qRgb(z, z, z);
@@ -311,11 +316,11 @@ QImage FirmwareInterface::getSplash()
    return image;
  }
  else {
-    QImage image(splash_width, splash_height, QImage::Format_Mono);
-    if (splash_offset > 0) {
-      for (unsigned int y=0; y<splash_height; y++) {
-        for(unsigned int x=0; x<splash_width; x++) {
-          image.setPixel(x, y, (flash.at(splash_offset+(splash_width*(y/8)+x)) & (1<<(y % 8))) ? 0 : 1);
+    QImage image(splashWidth, splashHeight, QImage::Format_Mono);
+    if (splashOffset > 0) {
+      for (unsigned int y=0; y<splashHeight; y++) {
+        for(unsigned int x=0; x<splashWidth; x++) {
+          image.setPixel(x, y, (flash.at(splashOffset+(splashWidth*(y/8)+x)) & (1<<(y % 8))) ? 0 : 1);
        }
      }
    }
@@ -325,7 +330,7 @@ QImage FirmwareInterface::getSplash()

 bool FirmwareInterface::hasSplash()
 {
-  return (splash_offset > 0 ? true : false);
+  return (splashOffset > 0 ? true : false);
 }

 bool FirmwareInterface::isValid()
@@ -336,7 +341,7 @@ bool FirmwareInterface::isValid()
 unsigned int FirmwareInterface::save(QString fileName)
 {
  uint8_t binflash[MAX_FSIZE];
-  memcpy(&binflash, flash.constData(), flash_size);
+  memcpy(&binflash, flash.constData(), flashSize);
  QFile file(fileName);
  
  int fileType = getFileType(fileName);
@@ -347,16 +352,16 @@ unsigned int FirmwareInterface::save(QString fileName)
    }
    QTextStream outputStream(&file);
    HexInterface hex=HexInterface(outputStream);
-    hex.save(binflash, flash_size);
+    hex.save(binflash, flashSize);
  }
  else {
    if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate)) { //reading HEX TEXT file
      return -1;
    }
-    file.write((char*)binflash, flash_size);
+    file.write((char*)binflash, flashSize);
  }

  file.close();

-  return flash_size;
+  return flashSize;
 }
@@ -45,7 +45,7 @@ class FirmwareInterface
    FirmwareInterface(const QString &filename);
    inline QString getDate() { return date; }
    inline QString getTime() { return time; }
-    int getSize() { return flash_size; }
+    int getSize() { return flashSize; }
    QString getFlavour() const;
    bool isHardwareCompatible(const FirmwareInterface &previousFirmware) const;
    inline QString getVersion() { return version; }
@@ -64,7 +64,7 @@ class FirmwareInterface

  private:
    QByteArray flash;
-    uint flash_size;
+    uint flashSize;
    QString seekString(const QString & string);
    QString seekLabel(const QString & label);
    void SeekSplash();
@@ -80,10 +80,10 @@ class FirmwareInterface
    int eepromVersion;
    int eepromVariant;
    QByteArray splash;
-    uint splash_offset;
-    uint splash_size;
-    uint splash_width;
-    uint splash_height;
+    uint splashOffset;
+    uint splashSize;
+    uint splashWidth;
+    uint splashHeight;
    QImage::Format splash_format;
    bool isValidFlag;
 };
@@ -70,7 +70,7 @@ Er9xGeneral::operator GeneralSettings ()
  result.currModel = currModel;
  result.contrast = contrast;
  result.vBatWarn = vBatWarn;
-  result.vBatCalib = vBatCalib;
+  result.txVoltageCalibration = txVoltageCalibration;
  result.trainer = trainer;
  result.blightinv=blightinv;
  result.stickScroll=stickScroll;
@@ -361,16 +361,16 @@ t_Er9xModelData::operator ModelData ()
  c9x.timers[0].val = tmrVal;
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
@@ -61,7 +61,7 @@ PACK(typedef struct t_Er9xGeneral {
  uint8_t   currModel; //0..15
  uint8_t   contrast;
  uint8_t   vBatWarn;
-  int8_t    vBatCalib;
+  int8_t    txVoltageCalibration;
  int8_t    lightSw;
  Er9xTrainerData trainer;
  uint8_t   view;
@@ -17,7 +17,6 @@
 #include <iostream>
 #include "er9xinterface.h"
 #include "er9xeeprom.h"
-#include "simulator/er9xsimulator.h"
 #include "file.h"
 #include "appdata.h"

@@ -89,14 +88,17 @@ inline void applyStickModeToModel(Er9xModelData & model, unsigned int mode)
  model.swashCollectiveSource = applyStickMode(model.swashCollectiveSource, mode);
 }

-bool Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
  std::cout << "trying er9x xml import... ";

+  std::bitset<NUM_ERRORS> errors;
+
  Er9xGeneral er9xGeneral;
  memset(&er9xGeneral,0,sizeof(er9xGeneral));
  if(!loadGeneralDataXML(&doc, &er9xGeneral)) {
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
  } else {
    radioData.generalSettings=er9xGeneral;
    std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
@@ -111,21 +113,26 @@ bool Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
    }
  }
  std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }

-bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
  std::cout << "trying er9x import... ";

+  std::bitset<NUM_ERRORS> errors;
+
  if (size != getEEpromSize()) {
    std::cout << "wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
  }

  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
    std::cout << "wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
  }
    
  efile->openRd(FILE_GENERAL);
@@ -133,7 +140,8 @@ bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)

  if (efile->readRlc1((uint8_t*)&er9xGeneral, 1) != 1) {
    std::cout << "no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
  }

  std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
@@ -151,13 +159,16 @@ bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
      break;
    default:
      std::cout << "not er9x\n";
-      return false;
+      errors.set(NOT_ER9X);
+      return errors.to_ulong();
  }

  efile->openRd(FILE_GENERAL);
  if (!efile->readRlc1((uint8_t*)&er9xGeneral, sizeof(Er9xGeneral))) {
    std::cout << "ko\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
+
  }
  radioData.generalSettings = er9xGeneral;
  
@@ -174,12 +185,15 @@ bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
  }

  std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }

-bool Er9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long Er9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }

 int Er9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
@@ -190,23 +204,23 @@ int Er9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant,
  return 0;
 }

-int Er9xInterface::getSize(ModelData &model)
+int Er9xInterface::getSize(const ModelData &model)
 {
  return 0;
 }

-int Er9xInterface::getSize(GeneralSettings &settings)
+int Er9xInterface::getSize(const GeneralSettings &settings)
 {
  return 0;
 }

-int Er9xInterface::isAvailable(Protocol prot, int port)
+int Er9xInterface::isAvailable(PulsesProtocol prot, int port)
 {
  switch (prot) {
-    case PPM:
-    case DSM2:
-    case PXX_DJT:
-    case PPM16:
+    case PULSES_PPM:
+    case PULSES_DSM2:
+    case PULSES_PXX_DJT:
+    case PULSES_PPM16:
      return 1;
    default:
      return 0;
@@ -1,6 +1,6 @@
 /*
 * 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
@@ -29,24 +29,24 @@ class Er9xInterface : public EEPROMInterface
    virtual ~Er9xInterface();

    virtual const char * getName();
-    
+
    virtual const int getEEpromSize();

    virtual const int getMaxModels();

-    virtual bool load(RadioData &, const uint8_t * eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t * eeprom, int size);

-    virtual bool loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
-    
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);

    virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);

-    virtual int getSize(ModelData &);
-    
-    virtual int getSize(GeneralSettings &settings);
+    virtual int getSize(const ModelData &);

-    virtual int isAvailable(Protocol proto, int port=0);
+    virtual int getSize(const GeneralSettings &settings);
+
+    virtual int isAvailable(PulsesProtocol proto, int port=0);

  protected:

@@ -54,17 +54,17 @@ class Er9xInterface : public EEPROMInterface

  private:
    void appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value);
-    
+
    void appendNumberElement(QDomDocument * qdoc, QDomElement * pe,QString name, int value, bool forceZeroWrite = false);
-    
+
    void appendCDATAElement(QDomDocument * qdoc, QDomElement * pe,QString name, const char * data, int size);
-    
+
    QDomElement getGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen);   //parse out data to XML format
-    
+
    QDomElement getModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum, int mdver); //parse out data to XML format
-    
+
    bool loadGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen); // get data from XML
-    
+
    bool loadModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum = -1); // get data from XML

 };
@@ -1,15 +0,0 @@
-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)
@@ -1,224 +0,0 @@
-/*
- * 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"
-}
@@ -1,64 +0,0 @@
-/*
- * 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 void setTrainerInput(unsigned int inputNumber, int16_t value) {};
-
-  protected:
-
-    Er9xInterface * er9xInterface;
-};
-
-#endif
@@ -82,7 +82,7 @@ Ersky9xGeneral::operator GeneralSettings ()
  result.currModel = currModel;
  result.contrast = contrast;
  result.vBatWarn = vBatWarn;
-  result.vBatCalib = vBatCalib;
+  result.txVoltageCalibration = txVoltageCalibration;

  result.backlightMode = 0;
  if (lightSw == 22) {
@@ -135,7 +135,7 @@ Ersky9xGeneral::operator GeneralSettings ()
  result.switchWarningStates = switchWarningStates;
  result.speakerVolume = volume;
  result.backlightBright = bright ;
-  result.currentCalib = current_calib;
+  result.txCurrentCalibration = current_calib;
  return result;
 }

@@ -493,16 +493,16 @@ t_Ersky9xModelData_v10::operator ModelData ()
  }
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
@@ -608,16 +608,16 @@ t_Ersky9xModelData_v11::operator ModelData ()
  }
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
@@ -69,7 +69,7 @@ PACK(typedef struct t_Ersky9xGeneral {
  uint8_t   currModel; //0..15
  uint8_t   contrast;
  uint8_t   vBatWarn;
-  int8_t    vBatCalib;
+  int8_t    txVoltageCalibration;
  int8_t    lightSw;
  Ersky9xTrainerData trainer;
  uint8_t   view;
@@ -15,10 +15,8 @@
 */

 #include <iostream>
-#include <QMessageBox>
 #include "ersky9xinterface.h"
 #include "ersky9xeeprom.h"
-#include "simulator/ersky9xsimulator.h"
 #include "file.h"

 #define FILE_TYP_GENERAL 1
@@ -120,14 +118,17 @@ inline void applyStickModeToModel(Ersky9xModelData_v11 & model, unsigned int mod
  model.swashCollectiveSource = applyStickMode(model.swashCollectiveSource, mode);
 }

-bool Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
  std::cout << "trying ersky9x xml import... ";

+  std::bitset<NUM_ERRORS> errors;
+
  Ersky9xGeneral ersky9xGeneral;
  memset(&ersky9xGeneral,0,sizeof(ersky9xGeneral));
  if(!loadGeneralDataXML(&doc, &ersky9xGeneral)) {
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
  }
  else {
    radioData.generalSettings=ersky9xGeneral;
@@ -137,32 +138,39 @@ bool Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
    if (ersky9xGeneral.myVers == 10) {
      if (!loadModelDataXML<Ersky9xModelData_v10>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
        std::cout << "ko\n";
-        return false;
+        errors.set(UNKNOWN_ERROR);
+        return errors.to_ulong();
      }
    }
    else {
      if (!loadModelDataXML<Ersky9xModelData_v11>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
        std::cout << "ko\n";
-        return false;
+        errors.set(UNKNOWN_ERROR);
+        return errors.to_ulong();
      }
    }
  }
  std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }

-bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
  std::cout << "trying ersky9x import... ";

+  std::bitset<NUM_ERRORS> errors;
+
  if (size != EESIZE_SKY9X) {
    std::cout << "wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
  }

  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_SKY9X)) {
    std::cout << "wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
  }
    
  efile->openRd(FILE_GENERAL);
@@ -170,7 +178,8 @@ bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int siz

  if (efile->readRlc2((uint8_t*)&ersky9xGeneral, 1) != 1) {
    std::cout << "no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
  }

  std::cout << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
@@ -182,12 +191,14 @@ bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int siz
      break;
    default:
      std::cout << "not ersky9x\n";
-      return false;
+      errors.set(NOT_ERSKY9X);
+      return errors.to_ulong();
  }
  efile->openRd(FILE_GENERAL);
  if (!efile->readRlc2((uint8_t*)&ersky9xGeneral, sizeof(Ersky9xGeneral))) {
    std::cout << "ko\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
  }
  radioData.generalSettings = ersky9xGeneral;
  
@@ -218,12 +229,15 @@ bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int siz
  }

  std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }

-bool Ersky9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long Ersky9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }

 int Ersky9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
@@ -234,23 +248,23 @@ int Ersky9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t varia
  return 0;
 }

-int Ersky9xInterface::getSize(ModelData &model)
+int Ersky9xInterface::getSize(const ModelData & model)
 {
  return 0;
 }

-int Ersky9xInterface::getSize(GeneralSettings &settings)
+int Ersky9xInterface::getSize(const GeneralSettings & settings)
 {
  return 0;
 }

-int Ersky9xInterface::isAvailable(Protocol prot, int port)
+int Ersky9xInterface::isAvailable(PulsesProtocol prot, int port)
 {
  switch (prot) {
-    case PPM:
-    case DSM2:
-    case PXX_DJT:
-    case PPM16:
+    case PULSES_PPM:
+    case PULSES_DSM2:
+    case PULSES_PXX_DJT:
+    case PULSES_PPM16:
      return 1;
    default:
      return 0;
@@ -34,19 +34,19 @@ class Ersky9xInterface : public EEPROMInterface

    virtual const int getMaxModels();

-    virtual bool load(RadioData &, const uint8_t * eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t * eeprom, int size);

-    virtual bool loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
+    virtual unsigned long loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);

-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);

    virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);

-    virtual int getSize(ModelData &);
+    virtual int getSize(const ModelData &);
    
-    virtual int getSize(GeneralSettings &settings);
+    virtual int getSize(const GeneralSettings & settings);

-    virtual int isAvailable(Protocol proto, int port=0);
+    virtual int isAvailable(PulsesProtocol proto, int port=0);

  protected:

@@ -1,15 +0,0 @@
-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)
@@ -1,247 +0,0 @@
-/*
- * 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"
-}
@@ -1,64 +0,0 @@
-/*
- * 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 void setTrainerInput(unsigned int inputNumber, int16_t value) {};
-
-  protected:
-
-    Ersky9xInterface * ersky9xInterface;
-};
-
-#endif
@@ -70,7 +70,7 @@ Gruvin9xGeneral_v103::operator GeneralSettings ()
  result.currModel = currModel;
  result.contrast = contrast;
  result.vBatWarn = vBatWarn;
-  result.vBatCalib = vBatCalib;
+  result.txVoltageCalibration = txVoltageCalibration;

  result.backlightMode = 0;
  if (lightSw == 22) {
@@ -127,7 +127,7 @@ Gruvin9xGeneral_v104::operator GeneralSettings ()
  result.currModel = currModel;
  result.contrast = contrast;
  result.vBatWarn = vBatWarn;
-  result.vBatCalib = vBatCalib;
+  result.txVoltageCalibration = txVoltageCalibration;

  result.backlightMode = 0;
  if (lightSw == 22) {
@@ -170,12 +170,12 @@ t_Gruvin9xExpoData::operator ExpoData ()
  c9x.chn = chn;
  c9x.swtch = gruvin9xToSwitch(swtch);
  if (negPhase) {
-    c9x.phases= 1 << (phase -1);
+    c9x.flightModes= 1 << (phase -1);
  } else if (phase==0) {
-    c9x.phases=0;
+    c9x.flightModes=0;
  } else {
-    c9x.phases=63;
-    c9x.phases &= ~(1 << (phase -1));
+    c9x.flightModes=63;
+    c9x.flightModes &= ~(1 << (phase -1));
  }  
  c9x.weight = weight;
  if (expo) {
@@ -423,25 +423,25 @@ t_Gruvin9xModelData_v102::operator ModelData ()

  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = SILV_A;
+      c9x.moduleData[0].protocol = PULSES_SILV_A;
      break;
    case 4:
-      c9x.moduleData[0].protocol = SILV_B;
+      c9x.moduleData[0].protocol = PULSES_SILV_B;
      break;
    case 5:
-      c9x.moduleData[0].protocol = SILV_C;
+      c9x.moduleData[0].protocol = PULSES_SILV_C;
      break;
    case 6:
-      c9x.moduleData[0].protocol = CTP1009;
+      c9x.moduleData[0].protocol = PULSES_CTP1009;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -493,25 +493,25 @@ t_Gruvin9xModelData_v103::operator ModelData ()
  c9x.timers[1] = timer2;
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = SILV_A;
+      c9x.moduleData[0].protocol = PULSES_SILV_A;
      break;
    case 4:
-      c9x.moduleData[0].protocol = SILV_B;
+      c9x.moduleData[0].protocol = PULSES_SILV_B;
      break;
    case 5:
-      c9x.moduleData[0].protocol = SILV_C;
+      c9x.moduleData[0].protocol = PULSES_SILV_C;
      break;
    case 6:
-      c9x.moduleData[0].protocol = CTP1009;
+      c9x.moduleData[0].protocol = PULSES_CTP1009;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -563,25 +563,25 @@ t_Gruvin9xModelData_v105::operator ModelData ()
  c9x.timers[1] = timer2;
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = SILV_A;
+      c9x.moduleData[0].protocol = PULSES_SILV_A;
      break;
    case 4:
-      c9x.moduleData[0].protocol = SILV_B;
+      c9x.moduleData[0].protocol = PULSES_SILV_B;
      break;
    case 5:
-      c9x.moduleData[0].protocol = SILV_C;
+      c9x.moduleData[0].protocol = PULSES_SILV_C;
      break;
    case 6:
-      c9x.moduleData[0].protocol = CTP1009;
+      c9x.moduleData[0].protocol = PULSES_CTP1009;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -653,25 +653,25 @@ t_Gruvin9xModelData_v106::operator ModelData ()
  c9x.timers[1] = timer2;
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = SILV_A;
+      c9x.moduleData[0].protocol = PULSES_SILV_A;
      break;
    case 4:
-      c9x.moduleData[0].protocol = SILV_B;
+      c9x.moduleData[0].protocol = PULSES_SILV_B;
      break;
    case 5:
-      c9x.moduleData[0].protocol = SILV_C;
+      c9x.moduleData[0].protocol = PULSES_SILV_C;
      break;
    case 6:
-      c9x.moduleData[0].protocol = CTP1009;
+      c9x.moduleData[0].protocol = PULSES_CTP1009;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -69,7 +69,7 @@ PACK(typedef struct t_Gruvin9xGeneral_v103 {
  uint8_t   currModel; //0..15
  uint8_t   contrast;
  uint8_t   vBatWarn;
-  int8_t    vBatCalib;
+  int8_t    txVoltageCalibration;
  int8_t    lightSw;
  Gruvin9xTrainerData_v103 trainer;
  uint8_t   view;      //index of subview in main scrren
@@ -106,7 +106,7 @@ PACK(typedef struct t_Gruvin9xGeneral_v104 {
  uint8_t   currModel; //0..15
  uint8_t   contrast;
  uint8_t   vBatWarn;
-  int8_t    vBatCalib;
+  int8_t    txVoltageCalibration;
  int8_t    lightSw;
  Gruvin9xTrainerData_v104 trainer;
  uint8_t   view;      //index of subview in main scrren
@@ -93,24 +93,30 @@ bool Gruvin9xInterface::loadGeneral(GeneralSettings &settings, int version)
  return false;
 }

-bool Gruvin9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long Gruvin9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }


-bool Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
  std::cout << "trying " << getName() << " import... ";

+  std::bitset<NUM_ERRORS> errors;
+
  if (size != this->getEEpromSize()) {
    std::cout << "wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
  }

  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
    std::cout << "wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
  }

  efile->openRd(FILE_GENERAL);
@@ -118,14 +124,16 @@ bool Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int si
  uint8_t version;
  if (efile->readRlc2(&version, 1) != 1) {
    std::cout << "no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
  }

  if (version == 0) {
    efile->openRd(FILE_GENERAL);
    if (efile->readRlc1(&version, 1) != 1) {
      std::cout << "no\n";
-      return false;
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
    }
  }

@@ -145,25 +153,33 @@ bool Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int si
      break;
    default:
      std::cout << "not gruvin9x\n";
-      return false;
+      errors.set(NOT_GRUVIN9X);
+      return errors.to_ulong();
  }

  efile->openRd(FILE_GENERAL);
  if (version == 5) {
-    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings, 1))
-      return false;
+    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings, 1)) {
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
  }
  else if (version < 104) {
-    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings))
-      return false;
+    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings)) {
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
  }
  else if (version <= 106) {
-    if (!loadGeneral<Gruvin9xGeneral_v104>(radioData.generalSettings))
-      return false;
+    if (!loadGeneral<Gruvin9xGeneral_v104>(radioData.generalSettings)) {
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
  }
  else {
    std::cout << "ko\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
  }
  
  for (int i=0; i<getMaxModels(); i++) {
@@ -185,17 +201,21 @@ bool Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int si
    }
    else {
      std::cout << "ko\n";
-      return false;
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
    }
  }

  std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }

-bool Gruvin9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long Gruvin9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }

 int Gruvin9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
@@ -206,25 +226,25 @@ int Gruvin9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t vari
  return 0;
 }

-int Gruvin9xInterface::getSize(ModelData &model)
+int Gruvin9xInterface::getSize(const ModelData & model)
 {
  return 0;
 }

-int Gruvin9xInterface::getSize(GeneralSettings &settings)
+int Gruvin9xInterface::getSize(const GeneralSettings & settings)
 {
  return 0;
 }

-int Gruvin9xInterface::isAvailable(Protocol proto, int port)
+int Gruvin9xInterface::isAvailable(PulsesProtocol proto, int port)
 {
  switch (proto) {
-    case PPM:
-    case SILV_A:
-    case SILV_B:
-    case SILV_C:
-    case CTP1009:
-    case DSM2:
+    case PULSES_PPM:
+    case PULSES_SILV_A:
+    case PULSES_SILV_B:
+    case PULSES_SILV_C:
+    case PULSES_CTP1009:
+    case PULSES_DSM2:
      return 1;
    default:
      return 0;
@@ -1,6 +1,6 @@
 /*
 * 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
@@ -30,24 +30,25 @@ class Gruvin9xInterface : public EEPROMInterface
    virtual ~Gruvin9xInterface();

    virtual const char * getName();
-    
+
    virtual const int  getEEpromSize();

    virtual const int getMaxModels();

-    virtual bool load(RadioData &, const uint8_t *eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);

-    virtual bool loadBackup(RadioData &, uint8_t *eeprom,int esize, int index);
-    
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom,int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);

    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);

-    virtual int getSize(ModelData &);
-    
-    virtual int getSize(GeneralSettings &settings);
+    virtual int getSize(const ModelData &);

-    virtual int isAvailable(Protocol proto, int port=0);
+    virtual int getSize(const GeneralSettings & settings);
+
+    virtual int isAvailable(PulsesProtocol proto, int port=0);

  protected:

@@ -87,14 +87,14 @@ t_Open9xGruvin9xMixData_v207::operator MixData ()
    c9x.mixWarn = mixWarn;

    if (phase<0) {
-      c9x.phases= 1 << (-phase -1);
+      c9x.flightModes= 1 << (-phase -1);
    }
    else if (phase==0) {
-      c9x.phases=0;
+      c9x.flightModes=0;
    }
    else {
-      c9x.phases=63;
-      c9x.phases &= ~(1 << (phase -1));
+      c9x.flightModes=63;
+      c9x.flightModes &= ~(1 << (phase -1));
    }
    c9x.sOffset = sOffset;
  }
@@ -155,14 +155,14 @@ t_Open9xGruvin9xMixData_v209::operator MixData ()
    c9x.mixWarn = mixWarn;

    if (phase<0) {
-      c9x.phases= 1 << (-phase -1);
+      c9x.flightModes= 1 << (-phase -1);
    }
    else if (phase==0) {
-      c9x.phases=0;
+      c9x.flightModes=0;
    }
    else {
-      c9x.phases=63;
-      c9x.phases &= ~(1 << (phase -1));
+      c9x.flightModes=63;
+      c9x.flightModes &= ~(1 << (phase -1));
    }    
    c9x.sOffset = sOffset;
  }
@@ -222,7 +222,7 @@ t_Open9xGruvin9xMixData_v211::operator MixData ()
    c9x.noExpo = noExpo;
    c9x.mltpx = (MltpxValue)mltpx;
    c9x.mixWarn = mixWarn;
-    c9x.phases = phases;
+    c9x.flightModes = phases;
    c9x.sOffset = sOffset;
  }
  return c9x;
@@ -440,16 +440,16 @@ t_Open9xGruvin9xModelData_v207::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -514,19 +514,19 @@ t_Open9xGruvin9xModelData_v208::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -596,19 +596,19 @@ t_Open9xGruvin9xModelData_v209::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -679,19 +679,19 @@ t_Open9xGruvin9xModelData_v210::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -766,19 +766,19 @@ t_Open9xGruvin9xModelData_v211::operator ModelData ()
  }
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -160,12 +160,12 @@ t_Open9xArmExpoData_v208::operator ExpoData ()
  }
  c9x.swtch = open9xArmToSwitch(swtch);
  if (phase<0) {
-    c9x.phases= 1 << (-phase -1);
+    c9x.flightModes= 1 << (-phase -1);
  } else if (phase==0) {
-    c9x.phases=0;
+    c9x.flightModes=0;
  } else {
-    c9x.phases=63;
-    c9x.phases &= ~(1 << (phase -1));
+    c9x.flightModes=63;
+    c9x.flightModes &= ~(1 << (phase -1));
  }  
  c9x.weight = weight;
  return c9x;
@@ -190,14 +190,14 @@ t_Open9xArmExpoData_v210::operator ExpoData ()
  }
  c9x.swtch = open9xArmToSwitch(swtch);
  if (phase<0) {
-    c9x.phases= 1 << (-phase -1);
+    c9x.flightModes= 1 << (-phase -1);
  }
  else if (phase==0) {
-    c9x.phases=0;
+    c9x.flightModes=0;
  }
  else {
-    c9x.phases=63;
-    c9x.phases &= ~(1 << (phase -1));
+    c9x.flightModes=63;
+    c9x.flightModes &= ~(1 << (phase -1));
  }  
  c9x.weight = weight;
  getEEPROMZString(c9x.name, name, sizeof(name));
@@ -213,7 +213,7 @@ t_Open9xArmExpoData_v212::operator ExpoData ()
  // TODO c9x.curveMode=curveMode;
  // c9x.curveParam=curveParam;
  c9x.swtch = open9xArmToSwitch(swtch);
-  c9x.phases= phases;
+  c9x.flightModes= phases;
  c9x.weight = weight;
  getEEPROMZString(c9x.name, name, sizeof(name));
  return c9x;
@@ -292,14 +292,14 @@ t_Open9xArmMixData_v208::operator MixData ()
    c9x.mixWarn = mixWarn;

    if (phase<0) {
-      c9x.phases= 1 << (-phase -1);
+      c9x.flightModes= 1 << (-phase -1);
    }
    else if (phase==0) {
-      c9x.phases=0;
+      c9x.flightModes=0;
    }
    else {
-      c9x.phases=511;
-      c9x.phases &= ~(1 << (phase -1));
+      c9x.flightModes=511;
+      c9x.flightModes &= ~(1 << (phase -1));
    }

    c9x.sOffset = sOffset;
@@ -358,14 +358,14 @@ t_Open9xArmMixData_v209::operator MixData ()
    c9x.mixWarn = mixWarn;

    if (phase<0) {
-      c9x.phases= 1 << (-phase -1);
+      c9x.flightModes= 1 << (-phase -1);
    }
    else if (phase==0) {
-      c9x.phases=0;
+      c9x.flightModes=0;
    }
    else {
-      c9x.phases=511;
-      c9x.phases &= ~(1 << (phase -1));
+      c9x.flightModes=511;
+      c9x.flightModes &= ~(1 << (phase -1));
    }

    c9x.sOffset = sOffset;
@@ -424,14 +424,14 @@ t_Open9xArmMixData_v210::operator MixData ()
    c9x.mixWarn = mixWarn;

    if (phase<0) {
-      c9x.phases= 1 << (-phase -1);
+      c9x.flightModes= 1 << (-phase -1);
    }
    else if (phase==0) {
-      c9x.phases=0;
+      c9x.flightModes=0;
    }
    else {
-      c9x.phases=511;
-      c9x.phases &= ~(1 << (phase -1));
+      c9x.flightModes=511;
+      c9x.flightModes &= ~(1 << (phase -1));
    }

    c9x.sOffset = sOffset;
@@ -493,7 +493,7 @@ t_Open9xArmMixData_v212::operator MixData ()
    c9x.noExpo = noExpo;
    c9x.mltpx = (MltpxValue)mltpx;
    c9x.mixWarn = mixWarn;
-    c9x.phases = phases;
+    c9x.flightModes = phases;
    c9x.sOffset = sOffset;
    getEEPROMZString(c9x.name, name, sizeof(name));
  }
@@ -716,19 +716,19 @@ t_Open9xArmModelData_v208::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -799,19 +799,19 @@ t_Open9xArmModelData_v209::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -883,19 +883,19 @@ t_Open9xArmModelData_v210::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -967,19 +967,19 @@ t_Open9xArmModelData_v211::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -1054,19 +1054,19 @@ t_Open9xArmModelData_v212::operator ModelData ()
  }
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -88,7 +88,7 @@ t_Open9xExpoData_v201::operator ExpoData ()
  ExpoData c9x;
  c9x.mode = mode;
  c9x.chn = chn;
-  if (expo!=0 && curve!=0) {
+  if (expo != 0 && curve != 0) {
    EEPROMWarnings.push_back(::QObject::tr("Simultaneous usage of expo and curves is no longer supported in OpenTX"));
  }
  else {
@@ -101,14 +101,14 @@ t_Open9xExpoData_v201::operator ExpoData ()
  }
  c9x.swtch = open9xStockToSwitch(swtch);
  if (negPhase) {
-    c9x.phases= 1 << (phase -1);
+    c9x.flightModes = 1 << (phase -1);
  }
-  else if (phase==0) {
-    c9x.phases=0;
+  else if (phase == 0) {
+    c9x.flightModes = 0;
  }
  else {
-    c9x.phases=63;
-    c9x.phases &= ~(1 << (phase -1));
+    c9x.flightModes = 63;
+    c9x.flightModes &= ~(1 << (phase -1));
  }  
  c9x.weight = weight;
  return c9x;
@@ -121,7 +121,7 @@ t_Open9xExpoData_v211::operator ExpoData ()
  c9x.chn = chn;
  // TODO c9x.curve
  c9x.swtch = open9xStockToSwitch(swtch);
-  c9x.phases = phases;
+  c9x.flightModes = phases;
  c9x.weight = weight;
  return c9x;
 }
@@ -129,8 +129,8 @@ t_Open9xExpoData_v211::operator ExpoData ()
 t_Open9xLimitData_v201::operator LimitData ()
 {
  LimitData c9x;
-  c9x.min = 10*(min-100);
-  c9x.max = 10*(max+100);
+  c9x.min = 10 * (min - 100);
+  c9x.max = 10 * (max + 100);
  c9x.revert = revert;
  c9x.offset = offset;
  return c9x;
@@ -139,12 +139,12 @@ t_Open9xLimitData_v201::operator LimitData ()
 t_Open9xLimitData_v211::operator LimitData ()
 {
  LimitData c9x;
-  c9x.min = 10*(min-100);
-  c9x.max = 10*(max+100);
+  c9x.min = 10 * (min - 100);
+  c9x.max = 10 * (max + 100);
  c9x.revert = revert;
  c9x.offset = offset;
-  c9x.symetrical=symetrical;
-  c9x.ppmCenter=ppmCenter;
+  c9x.symetrical = symetrical;
+  c9x.ppmCenter = ppmCenter;
  return c9x;
 }

@@ -197,13 +197,13 @@ t_Open9xMixData_v201::operator MixData ()
  c9x.mltpx = (MltpxValue)mltpx;
  c9x.mixWarn = mixWarn;

-  if (phase<0) {
-    c9x.phases= 1 << (-phase -1);
-  } else if (phase==0) {
-    c9x.phases=0;
+  if (phase < 0) {
+    c9x.flightModes = 1 << (-phase -1);
+  } else if (phase == 0) {
+    c9x.flightModes = 0;
  } else {
-    c9x.phases=63;
-    c9x.phases &= ~(1 << (phase -1));
+    c9x.flightModes = 63;
+    c9x.flightModes &= ~(1 << (phase -1));
  }  
  c9x.sOffset = sOffset;
  return c9x;
@@ -258,13 +258,13 @@ t_Open9xMixData_v203::operator MixData ()
  c9x.mltpx = (MltpxValue)mltpx;
  c9x.mixWarn = mixWarn;

-  if (phase<0) {
-    c9x.phases= 1 << (-phase -1);
-  } else if (phase==0) {
-    c9x.phases=0;
+  if (phase < 0) {
+    c9x.flightModes = 1 << (-phase -1);
+  } else if (phase == 0) {
+    c9x.flightModes = 0;
  } else {
-    c9x.phases=63;
-    c9x.phases &= ~(1 << (phase -1));
+    c9x.flightModes = 63;
+    c9x.flightModes &= ~(1 << (phase -1));
  } 
  c9x.sOffset = sOffset;
  return c9x;
@@ -319,15 +319,15 @@ t_Open9xMixData_v205::operator MixData ()
    c9x.mltpx = (MltpxValue)mltpx;
    c9x.mixWarn = mixWarn;

-    if (phase<0) {
-      c9x.phases= 1 << (-phase -1);
+    if (phase < 0) {
+      c9x.flightModes = 1 << (-phase -1);
    }
-    else if (phase==0) {
-      c9x.phases=0;
+    else if (phase == 0) {
+      c9x.flightModes = 0;
    }
    else {
-      c9x.phases=63;
-      c9x.phases &= ~(1 << (phase -1));
+      c9x.flightModes = 63;
+      c9x.flightModes &= ~(1 << (phase -1));
    }
    c9x.sOffset = sOffset;
  }
@@ -339,7 +339,7 @@ t_Open9xMixData_v209::operator MixData ()
  MixData c9x;

  if (srcRaw) {
-    c9x.destCh = destCh+1;
+    c9x.destCh = destCh + 1;
    c9x.swtch = open9xStockToSwitch(swtch);

    if (srcRaw == 0) {
@@ -386,15 +386,15 @@ t_Open9xMixData_v209::operator MixData ()
    c9x.mltpx = (MltpxValue)mltpx;
    c9x.mixWarn = mixWarn;

-    if (phase<0) {
-      c9x.phases= 1 << (-phase -1);
+    if (phase < 0) {
+      c9x.flightModes = 1 << (-phase -1);
    }
-    else if (phase==0) {
-      c9x.phases=0;
+    else if (phase ==0 ) {
+      c9x.flightModes = 0;
    }
    else {
-      c9x.phases=63;
-      c9x.phases &= ~(1 << (phase -1));
+      c9x.flightModes = 63;
+      c9x.flightModes &= ~(1 << (phase -1));
    }
    c9x.sOffset = sOffset;
  }
@@ -406,7 +406,7 @@ t_Open9xMixData_v211::operator MixData ()
  MixData c9x;

  if (srcRaw) {
-    c9x.destCh = destCh+1;
+    c9x.destCh = destCh + 1;
    c9x.swtch = open9xStockToSwitch(swtch);

    if (srcRaw == 0) {
@@ -453,7 +453,7 @@ t_Open9xMixData_v211::operator MixData ()
    c9x.noExpo = noExpo;
    c9x.mltpx = (MltpxValue)mltpx;
    c9x.mixWarn = mixWarn;
-    c9x.phases = phases;
+    c9x.flightModes = phases;
    c9x.sOffset = sOffset;
  }
  return c9x;
@@ -603,8 +603,8 @@ t_Open9xCustomFunctionData_v203::operator CustomFunctionData ()
  CustomFunctionData c9x;
  c9x.swtch = open9xStockToSwitch(swtch);
  if (func < 16) {
-    c9x.enabled=param & 0x01;
-    c9x.param = (param>>1)<<1;
+    c9x.enabled = param & 0x01;
+    c9x.param = (param>>1) << 1;
    c9x.func = (AssignFunc)(func);
  } else {
    c9x.param = param;
@@ -730,7 +730,7 @@ t_Open9xTimerData_v202::operator TimerData ()
 FrSkyRSSIAlarm t_Open9xFrSkyRSSIAlarm::get(int index)
 {
  FrSkyRSSIAlarm c9x;
-  c9x.level = (2+index+level) % 4;
+  c9x.level = (2 + index + level) % 4;
  c9x.value = value + 50;
  return c9x;
 }
@@ -840,7 +840,7 @@ t_Open9xFrSkyData_v204::operator FrSkyData ()
  c9x.channels[0] = channels[0];
  c9x.channels[1] = channels[1];
  c9x.usrProto = usrProto;
-  c9x.blades = blades+2;
+  c9x.blades = blades + 2;
  c9x.screens[0].type = 1;
  for (int i=0; i<4; i++)
    c9x.screens[0].body.bars[i] = bars[i];
@@ -853,7 +853,7 @@ t_Open9xFrSkyData_v205::operator FrSkyData ()
  c9x.channels[0] = channels[0];
  c9x.channels[1] = channels[1];
  c9x.usrProto = usrProto;
-  c9x.blades = blades+2;
+  c9x.blades = blades + 2;
  c9x.screens[0].type = 1;
  for (int i=0; i<4; i++)
    c9x.screens[0].body.bars[i] = bars[i];
@@ -869,7 +869,7 @@ t_Open9xFrSkyData_v208::operator FrSkyData ()
  c9x.channels[1] = channels[1];
  c9x.usrProto = usrProto;
  c9x.voltsSource = voltsSource;
-  c9x.blades = blades+2;
+  c9x.blades = blades + 2;
  c9x.currentSource=currentSource;
  c9x.screens[0].type = 1;
  for (int i=0; i<4; i++)
@@ -886,7 +886,7 @@ t_Open9xFrSkyData_v210::operator FrSkyData ()
  c9x.channels[1] = channels[1];
  c9x.usrProto = usrProto;
  c9x.voltsSource = voltsSource;
-  c9x.blades = blades+2;
+  c9x.blades = blades + 2;
  c9x.currentSource=currentSource;

  int lines_screen_index = 0;
@@ -917,16 +917,16 @@ t_Open9xModelData_v201::operator ModelData ()
  c9x.timers[1] = timer2;
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -991,16 +991,16 @@ t_Open9xModelData_v202::operator ModelData ()
  c9x.timers[1] = timer2;
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -1067,16 +1067,16 @@ t_Open9xModelData_v203::operator ModelData ()
  c9x.timers[1] = timer2;
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -1141,16 +1141,16 @@ t_Open9xModelData_v204::operator ModelData ()
  c9x.timers[1] = timer2;
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -1217,19 +1217,19 @@ t_Open9xModelData_v205::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 2:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 4:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -1295,19 +1295,19 @@ t_Open9xModelData_v208::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -1381,19 +1381,19 @@ t_Open9xModelData_v209::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -1468,19 +1468,19 @@ t_Open9xModelData_v210::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -1556,19 +1556,19 @@ t_Open9xModelData_v211::operator ModelData ()
    c9x.timers[i] = timers[i];
  switch(protocol) {
    case 1:
-      c9x.moduleData[0].protocol = PPM16;
+      c9x.moduleData[0].protocol = PULSES_PPM16;
      break;
    case 2:
-      c9x.moduleData[0].protocol = PPMSIM;
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
      break;
    case 3:
-      c9x.moduleData[0].protocol = PXX_DJT;
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
      break;
    case 4:
-      c9x.moduleData[0].protocol = DSM2;
+      c9x.moduleData[0].protocol = PULSES_DSM2;
      break;
    default:
-      c9x.moduleData[0].protocol = PPM;
+      c9x.moduleData[0].protocol = PULSES_PPM;
      break;
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
@@ -12,7 +12,7 @@
 #define HAS_PERSISTENT_TIMERS(board)          (IS_ARM(board) || IS_2560(board))
 #define HAS_LARGE_LCD(board)                  IS_TARANIS(board)
 #define MAX_VIEWS(board)                      (HAS_LARGE_LCD(board) ? 2 : 256)
-#define MAX_POTS(board)                       (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : 3) : 3)
+#define MAX_POTS(board, version)              (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : (version >= 216 ? 3 : 2)) : 3)
 #define MAX_SLIDERS(board)                    (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : 2) : 0)
 #define MAX_SWITCHES(board, version)          (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 18 : 8) : 7)
 #define MAX_SWITCHES_POSITION(board, version) (IS_TARANIS_X9E(board) ? 18*3 : (IS_TARANIS(board) ? 8*3 : 9))
@@ -80,7 +80,7 @@ class SwitchesConversionTable: public ConversionTable {
      }

      if (IS_TARANIS(board) && version >= 216) {
-        for (int i=1; i<=MAX_POTS(board)*6; i++) {
+        for (int i=1; i<=MAX_POTS(board, version)*6; i++) {
          addConversion(RawSwitch(SWITCH_TYPE_MULTIPOS_POT, -i), -val+offset);
          addConversion(RawSwitch(SWITCH_TYPE_MULTIPOS_POT, i), val++);
        }
@@ -212,8 +212,9 @@ class SourcesConversionTable: public ConversionTable {
      }

      if (IS_TARANIS(board) && version >= 216) {
-        for (int i=0; i<32; i++)
+        for (int i=0; i<32; i++) {
          addConversion(RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i), val++);
+        }
        for (int i=0; i<7; i++) {
          for (int j=0; j<6; j++) {
            addConversion(RawSource(SOURCE_TYPE_LUA_OUTPUT, i*16+j), val++);
@@ -221,16 +222,18 @@ class SourcesConversionTable: public ConversionTable {
        }
      }

-      for (int i=0; i<NUM_STICKS+MAX_POTS(board)+MAX_SLIDERS(board); i++) {
+      for (int i=0; i<NUM_STICKS+MAX_POTS(board, version)+MAX_SLIDERS(board); i++) {
        addConversion(RawSource(SOURCE_TYPE_STICK, i), val++);
      }

-      for (int i=0; i<MAX_ROTARY_ENCODERS(board); i++)
+      for (int i=0; i<MAX_ROTARY_ENCODERS(board); i++) {
        addConversion(RawSource(SOURCE_TYPE_ROTARY_ENCODER, 0), val++);
+      }

      if (!afterrelease21March2013) {
-        for (int i=0; i<NUM_STICKS; i++)
+        for (int i=0; i<NUM_STICKS; i++) {
          addConversion(RawSource(SOURCE_TYPE_TRIM, i), val++);
+        }
      }

      addConversion(RawSource(SOURCE_TYPE_MAX), val++);
@@ -266,15 +269,18 @@ class SourcesConversionTable: public ConversionTable {
      }

      if (!afterrelease21March2013) {
-        for (int i=0; i<3; i++)
+        for (int i=0; i<3; i++) {
          addConversion(RawSource(SOURCE_TYPE_CYC, i), val++);
+        }
      }

-      for (int i=0; i<NUM_PPM_INPUTS(board, version); i++)
+      for (int i=0; i<NUM_PPM_INPUTS(board, version); i++) {
        addConversion(RawSource(SOURCE_TYPE_PPM, i), val++);
+      }

-      for (int i=0; i<MAX_CHANNELS(board, version); i++)
+      for (int i=0; i<MAX_CHANNELS(board, version); i++) {
        addConversion(RawSource(SOURCE_TYPE_CH, i), val++);
+      }

      if (!(flags & FLAG_NOTELEMETRY)) {
        if (IS_ARM(board) && version >= 217) {
@@ -290,33 +296,34 @@ class SourcesConversionTable: public ConversionTable {
            addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
          }
        }
-        else  {
+        else {
          if (afterrelease21March2013) {
            if ((board != BOARD_STOCK && (board!=BOARD_M128 || version<215)) || (variant & GVARS_VARIANT)) {
-              for (int i=0; i<MAX_GVARS(board, version); i++)
+              for (int i=0; i<MAX_GVARS(board, version); i++) {
                addConversion(RawSource(SOURCE_TYPE_GVAR, i), val++);
+              }
            }
          }

-          for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
-            if (version < 216) {
-              if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPEED || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
+          if (IS_ARM(board)) {
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 0), val++); // BATT
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 1), val++); // TIME
+            val += 5;
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 2), val++); // Timer1
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 3), val++); // Timer2
+          }
+          else {
+            for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
+              if (version < 216) {
+                if (i == TELEMETRY_SOURCE_TX_TIME || i == TELEMETRY_SOURCE_SWR || i == TELEMETRY_SOURCE_A3 ||
+                    i == TELEMETRY_SOURCE_A4 || i == TELEMETRY_SOURCE_ASPEED || i == TELEMETRY_SOURCE_DTE ||
+                    i == TELEMETRY_SOURCE_CELL_MIN || i == TELEMETRY_SOURCE_CELLS_MIN || i == TELEMETRY_SOURCE_VFAS_MIN)
+                  continue;
+              }
+              if (i == TELEMETRY_SOURCE_TX_TIME || i == TELEMETRY_SOURCE_SWR || i == TELEMETRY_SOURCE_A3 ||
+                  i == TELEMETRY_SOURCE_A4 || i == TELEMETRY_SOURCE_A3_MIN || i == TELEMETRY_SOURCE_A4_MIN)
                continue;
-            }
-            if (!IS_ARM(board)) {
-              if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_A3_MIN || i==TELEMETRY_SOURCE_A4_MIN)
-                continue;
-            }
-            addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
-            if (version >= 216 && IS_ARM(board)) {
-              if (i==TELEMETRY_SOURCE_RSSI_RX)
-                val += 1;
-              if (i==TELEMETRY_SOURCE_TX_TIME)
-                val += 5;
-              if (i==TELEMETRY_SOURCE_DTE)
-                val += 5;
-              if (i==TELEMETRY_SOURCE_POWER_MAX)
-                val += 5;
+              addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
            }
          }
        }
@@ -380,38 +387,12 @@ void OpenTxEepromCleanup(void)
  SwitchesConversionTable::Cleanup();
 }

-ThrottleSourceConversionTable::ThrottleSourceConversionTable(BoardEnum board, unsigned int version)
-{
-  int val=0;
-
-  addConversion(THROTTLE_SOURCE_THR, val++);
-
-  if (IS_TARANIS(board)) {
-    addConversion(THROTTLE_SOURCE_S1, val++);
-    addConversion(THROTTLE_SOURCE_S2, val++);
-    if (version >= 216)
-      addConversion(THROTTLE_SOURCE_S3, val++);
-    addConversion(THROTTLE_SOURCE_LS, val++);
-    addConversion(THROTTLE_SOURCE_RS, val++);
-  }
-  else {
-    addConversion(THROTTLE_SOURCE_P1, val++);
-    addConversion(THROTTLE_SOURCE_P2, val++);
-    addConversion(THROTTLE_SOURCE_P3, val++);
-  }
-
-  for (int i=0; i<MAX_CHANNELS(board, version); i++) {
-    addConversion(THROTTLE_SOURCE_FIRST_CHANNEL+i, val++);
-  }
-}
-
-
 template <int N>
 class SwitchField: public ConversionField< SignedField<N> > {
  public:
    SwitchField(RawSwitch & sw, BoardEnum board, unsigned int version, unsigned long flags=0):
-      ConversionField< SignedField<N> >(_switch, SwitchesConversionTable::getInstance(board, version, flags), "Switch",
-          "Switch "+ sw.toString()+" cannot be exported on this board!"),
+      ConversionField< SignedField<N> >(_switch, SwitchesConversionTable::getInstance(board, version, flags),  QObject::tr("Switch").toAscii(),
+          QObject::tr("Switch ").toAscii()+ sw.toString()+  QObject::tr(" cannot be exported on this board!").toAscii()),
      sw(sw),
      _switch(0)
    {
@@ -760,6 +741,14 @@ 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)
@@ -775,22 +764,15 @@ class HeliField: public StructField {
        Append(new SignedField<8>(heli.elevatorWeight));
      }
      else {
-        Append(new BoolField<1>(invertELE));
-        Append(new BoolField<1>(invertAIL));
-        Append(new BoolField<1>(invertCOL));
+        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 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 {
@@ -943,7 +925,7 @@ class MixField: public TransformedField {
    {
      if (IS_TARANIS(board) && version >= 217) {
        internalField.Append(new UnsignedField<8>(_destCh));
-        internalField.Append(new UnsignedField<9>(mix.phases));
+        internalField.Append(new UnsignedField<9>(mix.flightModes));
        internalField.Append(new UnsignedField<2>((unsigned int &)mix.mltpx));
        internalField.Append(new UnsignedField<1>((unsigned int &)mix.carryTrim));
        internalField.Append(new UnsignedField<4>(mix.mixWarn));
@@ -961,7 +943,7 @@ class MixField: public TransformedField {
      else if (IS_ARM(board) && version >= 217) {
        internalField.Append(new UnsignedField<5>(_destCh));
        internalField.Append(new UnsignedField<3>(mix.mixWarn));
-        internalField.Append(new UnsignedField<9>(mix.phases));
+        internalField.Append(new UnsignedField<9>(mix.flightModes));
        internalField.Append(new BoolField<1>(_curveMode));
        internalField.Append(new BoolField<1>(mix.noExpo));
        internalField.Append(new SignedField<3>(mix.carryTrim));
@@ -979,7 +961,7 @@ class MixField: public TransformedField {
      }
      else if (IS_TARANIS(board) && version == 216) {
        internalField.Append(new UnsignedField<8>(_destCh));
-        internalField.Append(new UnsignedField<16>(mix.phases));
+        internalField.Append(new UnsignedField<16>(mix.flightModes));
        internalField.Append(new UnsignedField<2>((unsigned int &)mix.mltpx));
        internalField.Append(new UnsignedField<1>((unsigned int &)mix.carryTrim));
        internalField.Append(new SpareBitsField<5>());
@@ -1000,7 +982,7 @@ class MixField: public TransformedField {
      else if (IS_ARM(board) && version == 216) {
        internalField.Append(new UnsignedField<5>(_destCh));
        internalField.Append(new UnsignedField<3>(mix.mixWarn));
-        internalField.Append(new UnsignedField<16>(mix.phases));
+        internalField.Append(new UnsignedField<16>(mix.flightModes));
        internalField.Append(new BoolField<1>(_curveMode));
        internalField.Append(new BoolField<1>(mix.noExpo));
        internalField.Append(new SignedField<3>(mix.carryTrim));
@@ -1019,7 +1001,7 @@ class MixField: public TransformedField {
      }
      else if (IS_ARM(board)) {
        internalField.Append(new UnsignedField<8>(_destCh));
-        internalField.Append(new UnsignedField<16>(mix.phases));
+        internalField.Append(new UnsignedField<16>(mix.flightModes));
        internalField.Append(new BoolField<1>(_curveMode));
        internalField.Append(new BoolField<1>(mix.noExpo));
        internalField.Append(new SignedField<3>(mix.carryTrim));
@@ -1064,7 +1046,7 @@ class MixField: public TransformedField {
        internalField.Append(new SourceField<8>(mix.srcRaw, board, version, FLAG_NOTELEMETRY));
        internalField.Append(new SignedField<8>(_weight));
        internalField.Append(new SwitchField<8>(mix.swtch, board, version));
-        internalField.Append(new UnsignedField<8>(mix.phases));
+        internalField.Append(new UnsignedField<8>(mix.flightModes));
        internalField.Append(new UnsignedField<2>((unsigned int &)mix.mltpx));
        internalField.Append(new SignedField<3>(mix.carryTrim));
        internalField.Append(new UnsignedField<2>(mix.mixWarn));
@@ -1085,7 +1067,7 @@ class MixField: public TransformedField {
        internalField.Append(new SignedField<8>(_weight));
        internalField.Append(new SwitchField<6>(mix.swtch, board, version));
        internalField.Append(new UnsignedField<2>((unsigned int &)mix.mltpx));
-        internalField.Append(new UnsignedField<5>(mix.phases));
+        internalField.Append(new UnsignedField<5>(mix.flightModes));
        internalField.Append(new SignedField<3>(mix.carryTrim));
        internalField.Append(new SourceField<6>(mix.srcRaw, board, version, FLAG_NOTELEMETRY));
        internalField.Append(new UnsignedField<2>(mix.mixWarn));
@@ -1214,7 +1196,7 @@ class InputField: public TransformedField {
        internalField.Append(new UnsignedField<14>(expo.scale, "Scale"));
        internalField.Append(new UnsignedField<8>(expo.chn, "Channel"));
        internalField.Append(new SwitchField<8>(expo.swtch, board, version));
-        internalField.Append(new UnsignedField<16>(expo.phases));
+        internalField.Append(new UnsignedField<16>(expo.flightModes));
        internalField.Append(new SignedField<8>(_weight, "Weight"));
        internalField.Append(new SignedField<6>(expo.carryTrim, "CarryTrim"));
        internalField.Append(new UnsignedField<2>(expo.mode, "Mode"));
@@ -1226,7 +1208,7 @@ class InputField: public TransformedField {
        internalField.Append(new UnsignedField<2>(expo.mode, "Mode"));
        internalField.Append(new UnsignedField<3>(expo.chn, "Channel"));
        internalField.Append(new BoolField<2>(_curveMode));
-        internalField.Append(new UnsignedField<9>(expo.phases, "Phases"));
+        internalField.Append(new UnsignedField<9>(expo.flightModes, "Phases"));
        internalField.Append(new SwitchField<8>(expo.swtch, board, version));
        internalField.Append(new SignedField<8>(_weight, "Weight"));
        internalField.Append(new ZCharField<6>(expo.name));
@@ -1237,7 +1219,7 @@ class InputField: public TransformedField {
        internalField.Append(new UnsignedField<16>(expo.scale, "Scale"));
        internalField.Append(new UnsignedField<8>(expo.chn, "Channel"));
        internalField.Append(new SwitchField<8>(expo.swtch, board, version));
-        internalField.Append(new UnsignedField<16>(expo.phases));
+        internalField.Append(new UnsignedField<16>(expo.flightModes));
        internalField.Append(new SignedField<8>(_weight, "Weight"));
        internalField.Append(new SignedField<6>(expo.carryTrim, "CarryTrim"));
        internalField.Append(new UnsignedField<2>(expo.mode, "Mode"));
@@ -1251,7 +1233,7 @@ class InputField: public TransformedField {
        internalField.Append(new UnsignedField<4>(expo.chn, "Channel"));
        internalField.Append(new BoolField<2>(_curveMode));
        internalField.Append(new SwitchField<8>(expo.swtch, board, version));
-        internalField.Append(new UnsignedField<16>(expo.phases, "Phases"));
+        internalField.Append(new UnsignedField<16>(expo.flightModes, "Phases"));
        internalField.Append(new SignedField<8>(_weight, "Weight"));
        internalField.Append(new ZCharField<6>(expo.name));
        internalField.Append(new SignedField<8>(_curveParam));
@@ -1260,7 +1242,7 @@ class InputField: public TransformedField {
        internalField.Append(new UnsignedField<8>(expo.mode, "Mode"));
        internalField.Append(new UnsignedField<8>(expo.chn, "Channel"));
        internalField.Append(new SwitchField<8>(expo.swtch, board, version));
-        internalField.Append(new UnsignedField<16>(expo.phases, "Phases"));
+        internalField.Append(new UnsignedField<16>(expo.flightModes, "Phases"));
        internalField.Append(new SignedField<8>(_weight, "Weight"));
        internalField.Append(new BoolField<8>(_curveMode));
        if (HAS_LARGE_LCD(board)) {
@@ -1277,7 +1259,7 @@ class InputField: public TransformedField {
        internalField.Append(new UnsignedField<2>(expo.chn));
        internalField.Append(new BoolField<1>(_curveMode));
        internalField.Append(new SpareBitsField<3>());
-        internalField.Append(new UnsignedField<8>(expo.phases));
+        internalField.Append(new UnsignedField<8>(expo.flightModes));
        internalField.Append(new SwitchField<8>(expo.swtch, board, version));
        internalField.Append(new SignedField<8>(_weight));
        internalField.Append(new SignedField<8>(_curveParam));
@@ -1286,7 +1268,7 @@ class InputField: public TransformedField {
        internalField.Append(new UnsignedField<2>(expo.mode));
        internalField.Append(new SwitchField<6>(expo.swtch, board, version));
        internalField.Append(new UnsignedField<2>(expo.chn));
-        internalField.Append(new UnsignedField<5>(expo.phases));
+        internalField.Append(new UnsignedField<5>(expo.flightModes));
        internalField.Append(new BoolField<1>(_curveMode));
        internalField.Append(new SignedField<8>(_weight));
        internalField.Append(new SignedField<8>(_curveParam));
@@ -1360,10 +1342,9 @@ class InputField: public TransformedField {

 class LimitField: public StructField {
  public:
-    template <int shift>
+    template <int shift, int GV1>
    static int exportLimitValue(int value)
    {
-      const int GV1 = 4096;
      if (value > 10000) {
        return -GV1 + value - 10001;
      }
@@ -1373,16 +1354,9 @@ class LimitField: public StructField {
      return value + shift;
    }

-    template <int shift>
+    template <int shift, int GV1>
    static int importLimitValue(int value)
    {
-      /* GVARS mapping on radio:
-        GV1 = -4096
-        GV9 = -4088
-        -GV1 = 4095
-        -GV9 = 4087
-      */
-      const int GV1 = 4096;
      if (value >= GV1) {
        return 10001 + value - GV1;
      }
@@ -1402,10 +1376,10 @@ class LimitField: public StructField {
      StructField("Limit")
    {
      if (IS_TARANIS(board) && version >= 217) {
-        Append(new ConversionField< SignedField<11> >(limit.min, exportLimitValue<1000>, importLimitValue<1000>));
-        Append(new ConversionField< SignedField<11> >(limit.max, exportLimitValue<-1000>, importLimitValue<-1000>));
+        Append(new ConversionField< SignedField<11> >(limit.min, exportLimitValue<1000, 1024>, importLimitValue<1000, 1024>));
+        Append(new ConversionField< SignedField<11> >(limit.max, exportLimitValue<-1000, 1024>, importLimitValue<-1000, 1024>));
        Append(new SignedField<10>(limit.ppmCenter));
-        Append(new ConversionField< SignedField<11> >(limit.offset, exportLimitValue<0>, importLimitValue<0>));
+        Append(new ConversionField< SignedField<11> >(limit.offset, exportLimitValue<0, 1024>, importLimitValue<0, 1024>));
        Append(new BoolField<1>(limit.symetrical));
        Append(new BoolField<1>(limit.revert));
        Append(new SpareBitsField<3>());
@@ -1416,10 +1390,10 @@ class LimitField: public StructField {
      }
      else {
        if (IS_TARANIS(board) && version >= 216) {
-          Append(new ConversionField< SignedField<16> >(limit.min, exportLimitValue<1000>, importLimitValue<1000>));
-          Append(new ConversionField< SignedField<16> >(limit.max, exportLimitValue<-1000>, importLimitValue<-1000>));
+          Append(new ConversionField< SignedField<16> >(limit.min, exportLimitValue<1000, 4096>, importLimitValue<1000, 4096>));
+          Append(new ConversionField< SignedField<16> >(limit.max, exportLimitValue<-1000, 4096>, importLimitValue<-1000, 4096>));
          Append(new SignedField<8>(limit.ppmCenter));
-          Append(new ConversionField< SignedField<14> >(limit.offset, exportLimitValue<0>, importLimitValue<0>));
+          Append(new ConversionField< SignedField<14> >(limit.offset, exportLimitValue<0, 4096>, importLimitValue<0, 4096>));
        }
        else {
          Append(new ConversionField< SignedField<8> >(limit.min, +100, 10));
@@ -1710,12 +1684,6 @@ class LogicalSwitchField: public TransformedField {
        internalField.Append(new SignedField<16>(v3));
        internalField.Append(new ConversionField< UnsignedField<8> >(csw.func, &functionsConversionTable, "Function"));
      }
-      else if (IS_ARM(board) && version >= 216) {
-        internalField.Append(new SignedField<8>(v1));
-        internalField.Append(new SignedField<16>(v2));
-        internalField.Append(new SignedField<16>(v3));
-        internalField.Append(new ConversionField< UnsignedField<8> >(csw.func, &functionsConversionTable, "Function"));
-      }
      else if (IS_ARM(board) && version >= 215) {
        internalField.Append(new SignedField<16>(v1));
        internalField.Append(new SignedField<16>(v2));
@@ -1754,6 +1722,7 @@ class LogicalSwitchField: public TransformedField {
    {
      delete andswitchesConversionTable;
    }
+
    virtual void beforeExport()
    {
      if (csw.func == LS_FN_TIMER) {
@@ -1795,8 +1764,14 @@ class LogicalSwitchField: public TransformedField {
        switchesConversionTable->importValue(v2, csw.val2);
      }
      else if (csw.func >= LS_FN_EQUAL && csw.func <= LS_FN_ELESS) {
-        sourcesConversionTable->importValue((uint8_t)v1, csw.val1);
-        sourcesConversionTable->importValue((uint8_t)v2, csw.val2);
+        if (IS_ARM(board)) {
+          sourcesConversionTable->importValue((uint32_t)v1, csw.val1);
+          sourcesConversionTable->importValue((uint32_t)v2, csw.val2);
+        }
+        else {
+          sourcesConversionTable->importValue((uint8_t)v1, csw.val1);
+          sourcesConversionTable->importValue((uint8_t)v2, csw.val2);
+        }
        if (IS_TARANIS(board) && version < 216) {
          RawSource val1(csw.val1);
          if (val1.type == SOURCE_TYPE_STICK && val1.index < NUM_STICKS) {
@@ -1809,7 +1784,12 @@ class LogicalSwitchField: public TransformedField {
        }
      }
      else if (csw.func != LS_FN_OFF) {
-        sourcesConversionTable->importValue((uint8_t)v1, csw.val1);
+        if (IS_ARM(board) && version >= 217) {
+          sourcesConversionTable->importValue((uint32_t)v1, csw.val1);
+        }
+        else {
+          sourcesConversionTable->importValue((uint8_t)v1, csw.val1);
+        }
        if (IS_TARANIS(board) && version < 216) {
          RawSource val1(csw.val1);
          if (val1.type == SOURCE_TYPE_STICK && val1.index < NUM_STICKS) {
@@ -1938,9 +1918,12 @@ class CustomFunctionsConversionTable: public ConversionTable {
        val++;
        if (IS_ARM(board)) {
          addConversion(FuncVolume, val++);
-          addConversion(FuncReserve, val++);
-          addConversion(FuncReserve, val++);
-          addConversion(FuncReserve, val++);
+          addConversion(FuncSetFailsafeInternalModule, val);
+          addConversion(FuncSetFailsafeExternalModule, val++);
+          addConversion(FuncRangeCheckInternalModule, val);
+          addConversion(FuncRangeCheckExternalModule, val++);
+          addConversion(FuncBindInternalModule, val);
+          addConversion(FuncBindExternalModule, val++);
        }
        addConversion(FuncPlaySound, val++);
        addConversion(FuncPlayPrompt, val++);
@@ -2099,6 +2082,21 @@ class ArmCustomFunctionField: public TransformedField {
            *((uint8_t *)(_param+3)) = fn.func - FuncSetTimer1;
          }
        }
+        else if (fn.func >= FuncSetFailsafeInternalModule && fn.func <= FuncSetFailsafeExternalModule) {
+          if (version >= 216) {
+            *((uint16_t *)_param) = fn.func - FuncSetFailsafeInternalModule;
+          }
+        }
+        else if (fn.func >= FuncRangeCheckInternalModule && fn.func <= FuncRangeCheckExternalModule) {
+          if (version >= 216) {
+            *((uint16_t *)_param) = fn.func - FuncRangeCheckInternalModule;
+          }
+        }
+        else if (fn.func >= FuncBindInternalModule && fn.func <= FuncBindExternalModule) {
+          if (version >= 216) {
+            *((uint16_t *)_param) = fn.func - FuncBindInternalModule;
+          }
+        }
        else if (fn.func == FuncPlayPrompt || fn.func == FuncBackgroundMusic || fn.func == FuncPlayScript) {
          memcpy(_param, fn.paramarm, sizeof(_param));
        }
@@ -2173,7 +2171,7 @@ class ArmCustomFunctionField: public TransformedField {

      if (fn.func >= FuncOverrideCH1 && fn.func <= FuncOverrideCH32) {
        fn.func = AssignFunc(fn.func + index);
-        fn.param = (int8_t)value;
+        fn.param = (int16_t)(uint16_t)value;
      }
      else if (fn.func >= FuncSetTimer1 && fn.func <= FuncSetTimer3) {
        fn.func = AssignFunc(fn.func + index);
@@ -2214,8 +2212,9 @@ class ArmCustomFunctionField: public TransformedField {
        }
      }
      else if (fn.func == FuncPlayValue) {
-        if (version >= 213)
+        if (version >= 213) {
          sourcesConversionTable->importValue(value, (int &)fn.param);
+        }
        else
          SourcesConversionTable::getInstance(board, version, variant, FLAG_NONONE|FLAG_NOSWITCHES)->importValue(value, (int &)fn.param);
      }
@@ -2708,7 +2707,13 @@ class FrskyField: public StructField {
          }
        }

-        Append(new ConversionField< UnsignedField<8> >(frsky.varioSource, &telemetryVarioSourceConversionTable, "Vario Source"));
+        if (version >= 217) {
+          Append(new UnsignedField<7>(frsky.varioSource, "Vario Source"));
+          Append(new BoolField<1>(frsky.varioCenterSilent));
+        }
+        else {
+          Append(new ConversionField< UnsignedField<8> >(frsky.varioSource, &telemetryVarioSourceConversionTable, "Vario Source"));
+        }
        Append(new SignedField<8>(frsky.varioCenterMax));
        Append(new SignedField<8>(frsky.varioCenterMin));
        Append(new SignedField<8>(frsky.varioMin));
@@ -2811,18 +2816,19 @@ class SensorField: public TransformedField {
      if (sensor.type == SensorData::TELEM_TYPE_CUSTOM) {
        _id = sensor.id;
        _instance = sensor.instance;
-        _param = (sensor.ratio) + ((unsigned int)sensor.offset << 16);
+        _ratio = sensor.ratio;
+        _offset = sensor.offset;
      }
      else {
        _id = sensor.persistentValue;
        _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_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_AVERAGE || 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);
-        else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION)
+        else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION || sensor.formula == SensorData::TELEM_FORMULA_TOTALIZE)
          _param = (sensor.amps);
      }
    }
@@ -2832,20 +2838,20 @@ class SensorField: public TransformedField {
      if (sensor.type == SensorData::TELEM_TYPE_CUSTOM) {
        sensor.id = _id;
        sensor.instance = _instance;
-        sensor.ratio = _param & 0xFFFF;
-        sensor.offset = (_param >> 16) & 0xFFFF;
+        sensor.ratio = _ratio;
+        sensor.offset = _offset;
      }
      else {
        sensor.persistentValue = _id;
        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_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_AVERAGE || 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)
          (sensor.gps = _sources[0], sensor.alt = _sources[1]);
-        else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION)
+        else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION || sensor.formula == SensorData::TELEM_FORMULA_TOTALIZE)
          sensor.amps = _sources[0];
      }
      eepromImportDebug() << QString("imported %1").arg(internalField.getName());
@@ -2859,6 +2865,10 @@ class SensorField: public TransformedField {
    union {
      unsigned int _param;
      uint8_t _sources[4];
+      struct {
+        uint16_t _ratio;
+        int16_t _offset;
+      };
    };
 };

@@ -2872,8 +2882,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  board(board),
  version(version),
  variant(variant),
-  protocolsConversionTable(board),
-  throttleSourceConversionTable(board, version)
+  protocolsConversionTable(board)
 {
  sprintf(name, "Model %s", modelData.name);

@@ -2951,7 +2960,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  if (IS_ARM(board) && version >= 217) {
    internalField.Append(new BoolField<1>(modelData.noGlobalFunctions));
    internalField.Append(new UnsignedField<2>(modelData.trimsDisplay));
-    internalField.Append(new SpareBitsField<1>());
+    internalField.Append(new BoolField<1>(modelData.frsky.ignoreSensorIds));
  }
  else if (IS_TARANIS(board) || (IS_ARM(board) && version >= 216)) {
    internalField.Append(new SpareBitsField<4>());
@@ -3008,7 +3017,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
    internalField.Append(new SignedField<8>(modelData.moduleData[0].ppmFrameLength));
  }

-  internalField.Append(new ConversionField< UnsignedField<8> >(modelData.thrTraceSrc, &throttleSourceConversionTable, "Throttle Source"));
+  internalField.Append(new UnsignedField<8>(modelData.thrTraceSrc, "Throttle Source"));

  if (!afterrelease21March2013) {
    internalField.Append(new UnsignedField<8>(modelData.moduleData[0].modelId));
@@ -3150,7 +3159,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  
  if (IS_ARM(board) && version >= 217) {
    for (int i=0; i<8; i++) {
-      if (i < MAX_POTS(board)+MAX_SLIDERS(board))
+      if (i < MAX_POTS(board, version)+MAX_SLIDERS(board))
        internalField.Append(new BoolField<1>(modelData.potsWarningEnabled[i]));
      else
        internalField.Append(new SpareBitsField<1>());
@@ -3158,7 +3167,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  }
  else if (IS_ARM(board) && version >= 216) {
    for (int i=0; i<6; i++) {
-      if (i < MAX_POTS(board)+MAX_SLIDERS(board))
+      if (i < MAX_POTS(board, version)+MAX_SLIDERS(board))
        internalField.Append(new BoolField<1>(modelData.potsWarningEnabled[i]));
      else
        internalField.Append(new SpareBitsField<1>());
@@ -3167,7 +3176,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  }

  if (IS_ARM(board) && version >= 216) {
-    for (int i=0; i < MAX_POTS(board)+MAX_SLIDERS(board); i++) {
+    for (int i=0; i < MAX_POTS(board, version)+MAX_SLIDERS(board); i++) {
      internalField.Append(new SignedField<8>(modelData.potPosition[i]));
    }    
  }
@@ -3186,6 +3195,10 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
      internalField.Append(new SensorField(modelData.sensorData[i], board, version));
    }
  }
+
+  if (IS_TARANIS_X9E(board)) {
+    internalField.Append(new UnsignedField<8>(modelData.toplcdTimer));
+  }
 }

 void OpenTxModelData::beforeExport()
@@ -3193,10 +3206,10 @@ void OpenTxModelData::beforeExport()
  // qDebug() << QString("before export model") << modelData.name;

  for (int module=0; module<3; module++) {
-    if (modelData.moduleData[module].protocol >= PXX_XJT_X16 && modelData.moduleData[module].protocol <= PXX_XJT_LR12)
-      subprotocols[module] = modelData.moduleData[module].protocol - PXX_XJT_X16;
-    else if (modelData.moduleData[module].protocol >= LP45 && modelData.moduleData[module].protocol <= DSMX)
-      subprotocols[module] = modelData.moduleData[module].protocol - LP45;
+    if (modelData.moduleData[module].protocol >= PULSES_PXX_XJT_X16 && modelData.moduleData[module].protocol <= PULSES_PXX_XJT_LR12)
+      subprotocols[module] = modelData.moduleData[module].protocol - PULSES_PXX_XJT_X16;
+    else if (modelData.moduleData[module].protocol >= PULSES_LP45 && modelData.moduleData[module].protocol <= PULSES_DSMX)
+      subprotocols[module] = modelData.moduleData[module].protocol - PULSES_LP45;
    else
      subprotocols[module] = (module==0 ? -1 : 0);
  }
@@ -3210,7 +3223,7 @@ void OpenTxModelData::afterImport()
    for (unsigned int i=0; i<NUM_STICKS; i++) {
      for (int j=0; j<64; j++) {
        ExpoData * expo = &modelData.expoData[j];
-        if (expo->mode == INPUT_MODE_BOTH && expo->chn == i && expo->phases == 0 && expo->swtch.type == SWITCH_TYPE_NONE)
+        if (expo->mode == INPUT_MODE_BOTH && expo->chn == i && expo->flightModes == 0 && expo->swtch.type == SWITCH_TYPE_NONE)
          break;
        if (expo->mode == 0 || expo->chn > i) {
          ExpoData * newExpo = modelData.insertInput(j);
@@ -3225,18 +3238,18 @@ void OpenTxModelData::afterImport()
    }
  }

-  if (IS_TARANIS(board) && modelData.moduleData[0].protocol == 0) {
-    modelData.moduleData[0].protocol = PXX_XJT_X16;
-  }
-
  for (int module=0; module<3; module++) {
-    if (modelData.moduleData[module].protocol == PXX_XJT_X16 || modelData.moduleData[module].protocol == LP45) {
+    if (modelData.moduleData[module].protocol == PULSES_PXX_XJT_X16 || modelData.moduleData[module].protocol == PULSES_LP45) {
      if (subprotocols[module] >= 0)
        modelData.moduleData[module].protocol += subprotocols[module];
      else
-        modelData.moduleData[module].protocol = OFF;
+        modelData.moduleData[module].protocol = PULSES_OFF;
    }
  }
+
+  if (IS_TARANIS(board) && version < 217 && modelData.moduleData[1].protocol != PULSES_OFF) {
+    modelData.moduleData[1].modelId = modelData.moduleData[0].modelId;
+  }
 }

 OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum board, unsigned int version, unsigned int variant):
@@ -3245,7 +3258,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
  generalData(generalData),
  board(board),
  version(version),
-  inputsCount(NUM_STICKS+MAX_POTS(board)+MAX_SLIDERS(board))
+  inputsCount(NUM_STICKS+MAX_POTS(board, version)+MAX_SLIDERS(board))
 {
  eepromImportDebug() << QString("OpenTxGeneralData::OpenTxGeneralData(board: %1, version:%2, variant:%3)").arg(board).arg(version).arg(variant);

@@ -3282,7 +3295,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
  internalField.Append(new UnsignedField<8>(generalData.currModel));
  internalField.Append(new UnsignedField<8>(generalData.contrast));
  internalField.Append(new UnsignedField<8>(generalData.vBatWarn));
-  internalField.Append(new SignedField<8>(generalData.vBatCalib));
+  internalField.Append(new SignedField<8>(generalData.txVoltageCalibration));
  internalField.Append(new SignedField<8>(generalData.backlightMode));

  for (int i=0; i<NUM_STICKS; i++)
@@ -3366,7 +3379,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo

  if (IS_ARM(board)) {
    internalField.Append(new UnsignedField<8>(generalData.backlightBright));
-    internalField.Append(new SignedField<8>(generalData.currentCalib));
+    internalField.Append(new SignedField<8>(generalData.txCurrentCalibration));
    if (version >= 213) {
      internalField.Append(new SignedField<8>(generalData.temperatureWarn)); // TODO
      internalField.Append(new UnsignedField<8>(generalData.mAhWarn));
@@ -3409,7 +3422,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
        internalField.Append(new UnsignedField<8>(generalData.hw_uartMode));
      }
      for (int i=0; i<4; i++) {
-        if (i < MAX_POTS(board))
+        if (i < MAX_POTS(board, version))
          internalField.Append(new UnsignedField<2>(generalData.potConfig[i]));
        else
          internalField.Append(new SpareBitsField<2>());
@@ -3441,7 +3454,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
      for (int i=0; i<NUM_STICKS; ++i) {
        internalField.Append(new ZCharField<3>(generalData.stickName[i]));
      }
-      for (int i=0; i<MAX_POTS(board); ++i) {
+      for (int i=0; i<MAX_POTS(board, version); ++i) {
        internalField.Append(new ZCharField<3>(generalData.potName[i]));
      }
      for (int i=0; i<MAX_SLIDERS(board); ++i) {
@@ -56,40 +56,38 @@ class ProtocolsConversionTable: public ConversionTable
    {
      int val = 0;
      if (IS_ARM(board)) {
-        addConversion(OFF, val++);
+        addConversion(PULSES_OFF, val++);
      }
-      addConversion(PPM, val++);
+      addConversion(PULSES_PPM, val++);
      if (!IS_ARM(board)) {
-        addConversion(PPM16, val++);
-        addConversion(PPMSIM, val++);
+        addConversion(PULSES_PPM16, val++);
+        addConversion(PULSES_PPMSIM, val++);
      }
      if (IS_ARM(board)) {
-        addConversion(PXX_XJT_X16, val);
-        addConversion(PXX_XJT_D8, val);
-        addConversion(PXX_XJT_LR12, val++);
+        addConversion(PULSES_PXX_XJT_X16, val);
+        addConversion(PULSES_PXX_XJT_D8, val);
+        addConversion(PULSES_PXX_XJT_LR12, val++);
      }
      else {
-        addConversion(PXX_DJT, val++);
+        addConversion(PULSES_PXX_DJT, val++);
      }
      if (IS_ARM(board)) {
-        addConversion(LP45, val);
-        addConversion(DSM2, val);
-        addConversion(DSMX, val++);
+        addConversion(PULSES_LP45, val);
+        addConversion(PULSES_DSM2, val);
+        addConversion(PULSES_DSMX, val++);
      }
      else {
-        addConversion(LP45, val++);
-        addConversion(DSM2, val++);
-        addConversion(DSMX, val++);
+        addConversion(PULSES_LP45, val++);
+        addConversion(PULSES_DSM2, val++);
+        addConversion(PULSES_DSMX, val++);
+      }
+      if (IS_TARANIS(board)) {
+        addConversion(PULSES_CROSSFIRE, val++);
+        addConversion(PULSES_MULTIMODULE, val++);
      }
    }
 };

-class ThrottleSourceConversionTable: public ConversionTable {
-
-  public:
-    ThrottleSourceConversionTable(BoardEnum board, unsigned int version);
-};
-
 class ChannelsConversionTable: public ConversionTable
 {
  public:
@@ -121,7 +119,6 @@ class OpenTxModelData: public TransformedField {
    char name[256];
    int subprotocols[C9X_NUM_MODULES+1/*trainer*/];
    ProtocolsConversionTable protocolsConversionTable;
-    ThrottleSourceConversionTable throttleSourceConversionTable;
    ChannelsConversionTable channelsConversionTable;
 };

@@ -23,6 +23,9 @@
 #include "file.h"
 #include "appdata.h"

+#define OPENTX_FIRMWARE_DOWNLOADS        "http://downloads-21.open-tx.org/firmware"
+#define OPENTX_NIGHT_FIRMWARE_DOWNLOADS  "http://downloads-21.open-tx.org/nightly/firmware"
+
 #define FILE_TYP_GENERAL 1
 #define FILE_TYP_MODEL   2

@@ -70,6 +73,8 @@ const char * OpenTxEepromInterface::getName()
      return "OpenTX for Sky9x board / 9X";
    case BOARD_9XRPRO:
      return "OpenTX for 9XR-PRO";
+    case BOARD_AR9X:
+      return "OpenTX for ar9x board / 9X";
    default:
      return "OpenTX for an unknown board";
  }
@@ -88,6 +93,7 @@ const int OpenTxEepromInterface::getEEpromSize()
    case BOARD_SKY9X:
      return EESIZE_SKY9X;
    case BOARD_9XRPRO:
+    case BOARD_AR9X:
      return EESIZE_9XRPRO;
    case BOARD_TARANIS:
    case BOARD_TARANIS_PLUS:
@@ -301,15 +307,19 @@ bool OpenTxEepromInterface::saveModel(unsigned int index, ModelData &model, unsi
  return (sz == eeprom.size());
 }

-bool OpenTxEepromInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long OpenTxEepromInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }

-bool OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
  std::cout << "trying " << getName() << " import...";

+  std::bitset<NUM_ERRORS> errors;
+
  if (size != getEEpromSize()) {
    if (size==4096) {
      int notnull=false;
@@ -320,21 +330,25 @@ bool OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, in
      }
      if (notnull) {
        std::cout << " wrong size (" << size << ")\n";
-        return false;
+        errors.set(WRONG_SIZE);
+        return errors.to_ulong();
      }
      else {
-        QMessageBox::warning(NULL, "companion", QObject::tr("Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"));
+        errors.set(HAS_WARNINGS);
+        errors.set(WARNING_WRONG_FIRMWARE);
        size=2048;
      }
    } else {
      std::cout << " wrong size (" << size << "/" << getEEpromSize() << ")\n";
-      return false;
+      errors.set(WRONG_SIZE);
+      return errors.to_ulong();
    }
  }

  if (!efile->EeFsOpen((uint8_t *)eeprom, size, board)) {
    std::cout << " wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
  }

  efile->openRd(FILE_GENERAL);
@@ -342,30 +356,39 @@ bool OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, in
  uint8_t version;
  if (efile->readRlc2(&version, 1) != 1) {
    std::cout << " no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
  }

  std::cout << " version " << (unsigned int)version;

-  if (!checkVersion(version)) {
+  EepromLoadErrors version_error = checkVersion(version);
+  if (version_error == OLD_VERSION) {
+    errors.set(version_error);
+    errors.set(HAS_WARNINGS);
+  } else if (version_error == NOT_OPENTX) {
    std::cout << " not open9x\n";
-    return false;
+    errors.set(version_error);
+    return errors.to_ulong();
  }

  if (!loadGeneral<OpenTxGeneralData>(radioData.generalSettings, version)) {
    std::cout << " ko\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
  }

  std::cout << " variant " << radioData.generalSettings.variant;
  for (int i=0; i<getMaxModels(); i++) {
    if (!loadModel(version, radioData.models[i], NULL, i, radioData.generalSettings.variant, radioData.generalSettings.stickMode+1)) {
      std::cout << " ko\n";
-      return false;
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
    }
  }
  std::cout << " ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }

 int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
@@ -378,6 +401,7 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t
      case BOARD_TARANIS_PLUS:
      case BOARD_TARANIS_X9E:
      case BOARD_SKY9X:
+      case BOARD_AR9X:
      case BOARD_9XRPRO:
        version = 217;
        break;
@@ -411,7 +435,7 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t
  }

  for (int i=0; i<getMaxModels(); i++) {
-    if (!radioData.models[i].isempty()) {
+    if (!radioData.models[i].isEmpty()) {
      result = saveModel<OpenTxModelData>(i, radioData.models[i], version, variant);
      if (!result) {
        return 0;
@@ -438,19 +462,18 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t
  return size;
 }

-int OpenTxEepromInterface::getSize(ModelData &model)
+int OpenTxEepromInterface::getSize(const ModelData & model)
 {
  if (IS_SKY9X(board))
    return 0;

-  if (model.isempty())
+  if (model.isEmpty())
    return 0;

-  // TODO something better...
-  uint8_t tmp[EESIZE_RLC_MAX];
-  efile->EeFsCreate(tmp, EESIZE_RLC_MAX, board, 255/*version max*/);
+  QByteArray tmp(EESIZE_MAX, 0);
+  efile->EeFsCreate((uint8_t *)tmp.data(), EESIZE_MAX, board, 255/*version max*/);

-  OpenTxModelData open9xModel(model, board, 255/*version max*/, GetCurrentFirmware()->getVariantNumber());
+  OpenTxModelData open9xModel((ModelData &)model, board, 255/*version max*/, GetCurrentFirmware()->getVariantNumber());

  QByteArray eeprom;
  open9xModel.Export(eeprom);
@@ -461,15 +484,15 @@ int OpenTxEepromInterface::getSize(ModelData &model)
  return efile->size(0);
 }

-int OpenTxEepromInterface::getSize(GeneralSettings &settings)
+int OpenTxEepromInterface::getSize(const GeneralSettings & settings)
 {
  if (IS_SKY9X(board))
    return 0;

-  uint8_t tmp[EESIZE_RLC_MAX];
-  efile->EeFsCreate(tmp, EESIZE_RLC_MAX, board, 255);
+  QByteArray tmp(EESIZE_MAX, 0);
+  efile->EeFsCreate((uint8_t *)tmp.data(), EESIZE_MAX, board, 255);

-  OpenTxGeneralData open9xGeneral(settings, board, 255, GetCurrentFirmware()->getVariantNumber());
+  OpenTxGeneralData open9xGeneral((GeneralSettings &)settings, board, 255, GetCurrentFirmware()->getVariantNumber());
  // open9xGeneral.Dump();

  QByteArray eeprom;
@@ -555,8 +578,6 @@ int OpenTxFirmware::getCapability(const Capability capability)
      return (IS_TARANIS(board) ? 10 : 6);
    case GvarsName:
      return (IS_9X(board) ? 0 : 6);
-    case HasChNames:
-      return (IS_TARANIS(board) ? 1 : 0);
    case GvarsInCS:
    case HasFAIMode:
      return 1;
@@ -568,7 +589,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
    case OffsetWeight:
      return (IS_ARM(board) ? 500 : 245);
    case Timers:
-      return (IS_ARM(board) ? 3 : 2);
+      return ((IS_ARM(board) && id.contains("timer3")) ? 3 : 2);
    case TimersName:
      return (IS_TARANIS(board) ? 8 : (IS_ARM(board) ? 3 : 0));
    case PermTimers:
@@ -605,10 +626,8 @@ int OpenTxFirmware::getCapability(const Capability capability)
      else
        return 9;
    case CustomFunctions:
-      if (IS_TARANIS(board))
+      if (IS_ARM(board))
        return 64;
-      else if (IS_ARM(board))
-        return 60;
      else if (IS_2560(board) || board==BOARD_M128)
        return 24;
      else
@@ -649,7 +668,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
    case Haptic:
      return (IS_2560(board) || IS_SKY9X(board) || IS_TARANIS_PLUS(board) || id.contains("haptic"));
    case ModelTrainerEnable:
-      if (IS_ARM(board))
+      if (IS_TARANIS(board))
        return 1;
      else
        return 0;
@@ -707,10 +726,10 @@ int OpenTxFirmware::getCapability(const Capability capability)
    case HasFailsafe:
      return (IS_ARM(board) ? 32 : 0);
    case NumModules:
-      return (IS_ARM(board) && !IS_9XRPRO(board)) ? 2 : 1;
+      return (IS_ARM(board) ? 2 : 1);
    case HasPPMStart:
      return (IS_ARM(board) ? true : false);
-    case HasCurrentCalibration:
+    case HastxCurrentCalibration:
      return (IS_SKY9X(board) ? true : false);
    case HasVolume:
      return (IS_ARM(board) ? true : false);
@@ -732,6 +751,10 @@ int OpenTxFirmware::getCapability(const Capability capability)
      return (IS_TARANIS(board) ? SWITCH_SF1 : SWITCH_THR) ;
    case HasDisplayText:
      return IS_ARM(board) ? 1 : 0;
+    case HasTopLcd:
+      return IS_TARANIS_X9E(board) ? 1 : 0;
+    case GlobalFunctions:
+      return IS_ARM(board) ? 64 : 0;
    case VirtualInputs:
      return IS_TARANIS(board) ? 32 : 0;
    case TrainerInputs:
@@ -774,12 +797,24 @@ int OpenTxFirmware::getCapability(const Capability capability)
    case MixersMonitor:
      return id.contains("mixersmon") ? 1 : 0;
    case HasBatMeterRange:
-      return (IS_TARANIS(board) ? true : false);
+      return (IS_TARANIS(board) ? true : id.contains("battgraph"));
+    case DangerousFunctions:
+      return id.contains("danger") ? 1 : 0;
    default:
      return 0;
  }
 }

+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))
@@ -791,32 +826,36 @@ bool OpenTxFirmware::isTelemetrySourceAvailable(int source)
  return true;
 }

-int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
+int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
 {
  if (IS_TARANIS(board)) {
    switch (port) {
      case 0:
        switch (proto) {
-          case OFF:
-          case PXX_XJT_X16:
-          case PXX_XJT_D8:
-          case PXX_XJT_LR12:
+          case PULSES_OFF:
+          case PULSES_PXX_XJT_X16:
+          case PULSES_PXX_XJT_LR12:
            return 1;
+          case PULSES_PXX_XJT_D8:
+            return id.contains("eu") ? 0 : 1;
+          case PULSES_PPM:
+            return id.contains("internalppm") ? 1 : 0;
          default:
            return 0;
        }
        break;
      case 1:
        switch (proto) {
-          case OFF:
-          case PPM:
-          case PXX_XJT_X16:
-          case PXX_XJT_D8:
-          case PXX_XJT_LR12:
-          //case PXX_DJT:     // Unavailable for now
-          case LP45:
-          case DSM2:
-          case DSMX:
+          case PULSES_OFF:
+          case PULSES_PPM:
+          case PULSES_PXX_XJT_X16:
+          case PULSES_PXX_XJT_D8:
+          case PULSES_PXX_XJT_LR12:
+          //case PULSES_PXX_DJT:     // Unavailable for now
+          case PULSES_LP45:
+          case PULSES_DSM2:
+          case PULSES_DSMX:
+          case PULSES_CROSSFIRE:
            return 1;
          default:
            return 0;
@@ -824,7 +863,7 @@ int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
        break;
      case -1:
        switch (proto) {
-          case PPM:
+          case PULSES_PPM:
            return 1;
          default:
            return 0;
@@ -838,13 +877,13 @@ int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
    switch (port) {
      case 0:
        switch (proto) {
-          case PPM:
-          // case PXX_XJT_X16:
-          // case PXX_XJT_D8:
-          // case PXX_XJT_LR12:
-          case LP45:
-          case DSM2:
-          case DSMX:
+          case PULSES_PPM:
+          case PULSES_PXX_XJT_X16:
+          case PULSES_PXX_XJT_D8:
+          case PULSES_PXX_XJT_LR12:
+          case PULSES_LP45:
+          case PULSES_DSM2:
+          case PULSES_DSMX:
            return 1;
          default:
            return 0;
@@ -852,7 +891,7 @@ int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
        break;
      case 1:
        switch (proto) {
-          case PPM:
+          case PULSES_PPM:
            return 1;
          default:
            return 0;
@@ -864,13 +903,13 @@ int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
  }
  else {
    switch (proto) {
-      case PPM:
-      case DSMX:
-      case LP45:
-      case DSM2:
-      case PXX_DJT:
-      case PPM16:
-      case PPMSIM:
+      case PULSES_PPM:
+      case PULSES_DSMX:
+      case PULSES_LP45:
+      case PULSES_DSM2:
+      // case PULSES_PXX_DJT:     // Unavailable for now
+      case PULSES_PPM16:
+      case PULSES_PPMSIM:
        return 1;
      default:
        return 0;
@@ -883,73 +922,60 @@ size_t getSizeA(T (&)[SIZE]) {
    return SIZE;
 }

-bool OpenTxEepromInterface::checkVersion(unsigned int version)
+EepromLoadErrors OpenTxEepromInterface::checkVersion(unsigned int version)
 {
  switch(version) {
    case 201:
      // first version
-      break;
    case 202:
      // channel order is now always RUD - ELE - THR - AIL
      // changes in timers
      // ppmFrameLength added
      // thrTraceSrc added
-      break;
    case 203:
      // mixers changed (for the trims use for change the offset of a mix)
      // telemetry offset raised to -127 +127
      // function switches now have a param on 4 bits
-      break;
    case 204:
      // telemetry changes (bars)
-      break;
    case 205:
      // mixer changes (differential, negative curves)...
-      break;
    // case 206:
    case 207:
      // V4: Rotary Encoders position in FlightModes
-      break;
    case 208:
      // Trim value in 16bits
      // FrSky A1/A2 offset on 12bits
      // ARM: More Mixers / Expos / CSW / FSW / CHNOUT
-      break;
    case 209:
      // Add TrmR, TrmE, TrmT, TrmA as Mix sources
      // Trims are now OFF / ON / Rud / Ele / Thr / Ail
-      break;
    case 210:
      // Add names in Mixes / Expos
      // Add a new telemetry screen
      // Add support for Play Track <filename>
-      break;
    case 211:
      // Curves big change
-      break;
    case 212:
      // Big changes in mixers / limitse
-      break;
    case 213:
      // GVARS / Variants introduction
-      break;
    case 214:
      // Massive EEPROM change!
-      break;
    case 215:
      // M128 revert because too much RAM used!
-      break;
    case 216:
      // A lot of things (first github release)
+      return OLD_VERSION;
      break;
    case 217:
      // 3 logical switches removed on M128 / gruvin9x boards
      break;
    default:
-      return false;
+      return NOT_OPENTX;
  }

-  return true;
+  return NO_ERROR;
 }

 bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int variant)
@@ -985,13 +1011,16 @@ bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int vari
  return true;
 }

-bool OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
+  std::bitset<NUM_ERRORS> errors;
+
  std::cout << "trying " << getName() << " backup import...";

  if (esize < 8 || memcmp(eeprom, "o9x", 3) != 0) {
    std::cout << " no\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
  }

  BoardEnum backupBoard = (BoardEnum)-1;
@@ -1007,12 +1036,14 @@ bool OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, in
      break;
    default:
      std::cout << " unknown board\n";
-      return false;
+      errors.set(UNKNOWN_BOARD);
+      return errors.to_ulong();
  }

  if (backupBoard != board) {
    std::cout << " not right board\n";
-    return false;
+    errors.set(WRONG_BOARD);
+    return errors.to_ulong();
  }

  uint8_t version = eeprom[4];
@@ -1022,34 +1053,52 @@ bool OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, in

  std::cout << " version " << (unsigned int)version << " ";

-  if (!checkVersion(version)) {
+  EepromLoadErrors version_error = checkVersion(version);
+  if (version_error == OLD_VERSION) {
+    errors.set(version_error);
+    errors.set(HAS_WARNINGS);
+  } else if (version_error == NOT_OPENTX) {
    std::cout << " not open9x\n";
-    return false;
+    errors.set(version_error);
+    return errors.to_ulong();
  }

  if (size > esize-8) {
    std::cout << " wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
  }

  if (bcktype=='M') {
    if (!loadModel(version, radioData.models[index], &eeprom[8], size, variant)) {
      std::cout << " ko\n";
-      return false;
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
    }
  }
  else {
    std::cout << " backup type not supported\n";
-    return false;
+    errors.set(BACKUP_NOT_SUPPORTED);
+    return errors.to_ulong();
  }

  std::cout << " ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
+}
+
+QString OpenTxFirmware::getFirmwareBaseUrl()
+{
+#if defined(ALLOW_NIGHTLY_BUILDS)
+  return (g.useFirmwareNightlyBuilds() ? OPENTX_NIGHT_FIRMWARE_DOWNLOADS : OPENTX_FIRMWARE_DOWNLOADS);
+#else
+  return OPENTX_FIRMWARE_DOWNLOADS;
+#endif
 }

 QString OpenTxFirmware::getFirmwareUrl()
 {
-  QString url = OPENTX_FIRMWARE_DOWNLOADS;
+  QString url = getFirmwareBaseUrl();
  switch (board) {
    case BOARD_STOCK:
    case BOARD_M128:
@@ -1058,6 +1107,7 @@ QString OpenTxFirmware::getFirmwareUrl()
      url.append(QString("/getfw.php?fw=%1.hex").arg(id));
      break;
    case BOARD_SKY9X:
+    case BOARD_AR9X:
    case BOARD_9XRPRO:
    case BOARD_TARANIS:
    case BOARD_TARANIS_PLUS:
@@ -1073,16 +1123,16 @@ QString OpenTxFirmware::getFirmwareUrl()

 QString OpenTxFirmware::getReleaseNotesUrl()
 {
-  QString url = OPENTX_FIRMWARE_DOWNLOADS;
+  QString url = getFirmwareBaseUrl();
  url.append("/releasenotes.txt");
  return url;
 }

 QString OpenTxFirmware::getStampUrl()
 {
-   QString url = OPENTX_FIRMWARE_DOWNLOADS;
-   url.append("/stamp-opentx.txt");
-   return url;
+  QString url = getFirmwareBaseUrl();
+  url.append("/stamp-opentx.txt");
+  return url;
 }

 void addOpenTxCommonOptions(OpenTxFirmware * firmware)
@@ -1100,9 +1150,10 @@ void addOpenTxTaranisOptions(OpenTxFirmware * firmware)
  firmware->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
  firmware->addOption("nogvars", QObject::tr("Disable Global variables"));
  firmware->addOption("lua", QObject::tr("Support for Lua model scripts"));
-  firmware->addOption("nojoystick", QObject::tr("No Joystick emulation inside the FW (only Mass Storage as in the Bootloader)"));
+  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 and LR12 FrSky protocols that are not legal for use anymore on radios sold after Jan 1st, 2015"));
+  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("internalppm", QObject::tr("Support for PPM internal module hack"));
 }

@@ -1127,8 +1178,109 @@ 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("OpenTX for 9X board"), BOARD_STOCK);
+  firmware = new OpenTxFirmware("opentx-9x", QObject::tr("9X with stock 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"));
@@ -1164,7 +1316,7 @@ void registerOpenTxFirmwares()
  firmwares.push_back(firmware);

  /* 9x board with M128 chip */
-  firmware = new OpenTxFirmware("opentx-9x128", QObject::tr("OpenTX for M128 / 9X board"), BOARD_M128);
+  firmware = new OpenTxFirmware("opentx-9x128", QObject::tr("9X with stock board and m128 chip"), 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"));
@@ -1193,69 +1345,52 @@ void registerOpenTxFirmwares()
  addOpenTxCommonOptions(firmware);
  firmwares.push_back(firmware);

-  /* 9XR board */
-  firmware = new OpenTxFirmware("opentx-9xr", QObject::tr("OpenTX for 9XR"), BOARD_STOCK);
-  firmware->addOptions(extr_options);
-  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  /* 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"));
  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("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)"));
+  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 board with M128 chip */
-  firmware = new OpenTxFirmware("opentx-9xr128", QObject::tr("OpenTX for 9XR with M128 chip"), BOARD_M128);
-  firmware->addOptions(extr_options);
-  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  /* 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"));
  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("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("bluetooth", QObject::tr("Bluetooth interface"));
  addOpenTxCommonOptions(firmware);
  firmwares.push_back(firmware);

  /* Gruvin9x board */
-  firmware = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("OpenTX for Gruvin9x board / 9X"), BOARD_GRUVIN9X);
+  firmware = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("9X with Gruvin9x board"), 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"));
@@ -1280,7 +1415,7 @@ void registerOpenTxFirmwares()
  firmwares.push_back(firmware);

  /* MEGA2560 board */
-  firmware = new OpenTxFirmware("opentx-mega2560", QObject::tr("OpenTX for MEGA2560 board"), BOARD_MEGA2560);
+  firmware = new OpenTxFirmware("opentx-mega2560", QObject::tr("DIY MEGA2560 radio"), BOARD_MEGA2560);
  addOpenTxLcdOptions(firmware);
  firmware->addOption("PWR", QObject::tr("Power management by soft-off circuitry"));
  firmware->addOptions(ext_options);
@@ -1291,7 +1426,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"));
@@ -1309,66 +1444,13 @@ void registerOpenTxFirmwares()
  addOpenTxCommonOptions(firmware);
  firmwares.push_back(firmware);

-  /* Sky9x board */
-  firmware = new OpenTxFirmware("opentx-sky9x", QObject::tr("OpenTX for 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("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);
-
-  /* 9XR-Pro */
-  firmware = new OpenTxFirmware("opentx-9xrpro", QObject::tr("OpenTX for 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("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("OpenTX for 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("OpenTX for FrSky Taranis Plus"), BOARD_TARANIS_PLUS);
-  addOpenTxTaranisOptions(firmware);
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
-  /* Taranis X9E board */
-  firmware = new OpenTxFirmware("opentx-taranisx9e", QObject::tr("OpenTX for 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;
 }

+void unregisterOpenTxFirmwares()
+{
+  foreach (Firmware * f, firmwares) {
+    delete f;
+  }
+}
@@ -1,6 +1,6 @@
 /*
 * 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
@@ -19,8 +19,6 @@

 #include "eeprominterface.h"

-#define OPENTX_FIRMWARE_DOWNLOADS    "http://downloads-21.open-tx.org/firmware"
-
 class RleFile;

 class OpenTxEepromInterface : public EEPROMInterface
@@ -35,25 +33,23 @@ class OpenTxEepromInterface : public EEPROMInterface

    virtual const int getMaxModels();

-    virtual bool load(RadioData &, const uint8_t *eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);

-    virtual bool loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
-    
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);

    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);

-    virtual int getSize(ModelData &);
+    virtual int getSize(const ModelData &);
+
+    virtual int getSize(const GeneralSettings &);

-    virtual int getSize(GeneralSettings &);
-    
-    virtual int isAvailable(Protocol proto, int port=0);
-    
  protected:

    const char * getName();

-    bool checkVersion(unsigned int version);
+    EepromLoadErrors checkVersion(unsigned int version);

    bool checkVariant(unsigned int version, unsigned int variant);

@@ -101,6 +97,7 @@ class OpenTxFirmware: public Firmware {

      addTTSLanguage("en");
      addTTSLanguage("cz");
+      addTTSLanguage("de");
      addTTSLanguage("es");
      addTTSLanguage("fr");
      addTTSLanguage("hu");
@@ -113,7 +110,7 @@ class OpenTxFirmware: public Firmware {
    }

    virtual Firmware * getFirmwareVariant(const QString & id);
-    
+
    virtual QString getStampUrl();

    virtual QString getReleaseNotesUrl();
@@ -121,11 +118,20 @@ class OpenTxFirmware: public Firmware {
    virtual QString getFirmwareUrl();

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

    virtual bool isTelemetrySourceAvailable(int source);
-    
+
+    virtual int isAvailable(PulsesProtocol proto, int port=0);
+
+  protected:
+
+    QString getFirmwareBaseUrl();
+
 };

 void registerOpenTxFirmwares();
+void unregisterOpenTxFirmwares();

 #endif
@@ -13,15 +13,25 @@ add_custom_target(about_lbm_taranis
  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
 )

-add_custom_target(trans
-  make tra
+add_custom_target(commondeps
+  make stamp_header tra
  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
 )

-add_custom_target(lua_exports 
-  make PCB=TARANIS lua_exports.inc
-  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
-)
+set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${RADIO_SRC_DIRECTORY}/stamp-opentx.h)
+
+macro(add_lua_export_target target)
+  add_custom_command(
+    OUTPUT ${RADIO_SRC_DIRECTORY}/lua/lua_exports_${target}.inc
+    COMMAND ${CMAKE_C_COMPILER} -E ${ARGN} -DEXPORT ${INTTYPES_INCLUDE_OPTION} myeeprom.h | grep LEXP > lua_exports_${target}.txt
+    COMMAND python ../util/luaexport.py ${C9X_VERSION} lua_exports_${target}.txt lua/lua_exports_${target}.inc lua_fields_${target}.txt
+    WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
+  )
+  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)

 set(OPENTX_SRC_FILES
  opentxsimulator.cpp
@@ -41,6 +51,11 @@ include_directories(
  ${RADIO_SRC_DIRECTORY}/thirdparty/Lua/src
 )

+if(APPLE)
+  # OS X compiler no longer automatically includes /Library/Frameworks in search path
+  set(CMAKE_SHARED_LINKER_FLAGS -F/Library/Frameworks)
+endif(APPLE)
+
 if(DEFINED TRANSLATIONS)
  set(COMMON_DEFINITIONS ${COMMON_DEFINITIONS} TRANSLATIONS_${TRANSLATIONS})
  string(TOLOWER ${TRANSLATIONS} TRANSLATION_SUFFIX)
@@ -73,21 +88,23 @@ add_library(opentx-gruvin9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-mega2560${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-sky9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-9xrpro${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
+add_library(opentx-ar9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-taranis${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-taranisplus${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
 add_library(opentx-taranisx9e${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})

-add_dependencies(opentx-9x${SUFFIX}-simulator about_lbm_9x trans)
-add_dependencies(opentx-9xr${SUFFIX}-simulator about_lbm_9x trans)
-add_dependencies(opentx-9x128${SUFFIX}-simulator about_lbm_9x trans)
-add_dependencies(opentx-9xr128${SUFFIX}-simulator about_lbm_9x trans)
-add_dependencies(opentx-gruvin9x${SUFFIX}-simulator about_lbm_9x trans)
-add_dependencies(opentx-mega2560${SUFFIX}-simulator about_lbm_9x trans)
-add_dependencies(opentx-sky9x${SUFFIX}-simulator about_lbm_9x trans)
-add_dependencies(opentx-9xrpro${SUFFIX}-simulator about_lbm_9x trans)
-add_dependencies(opentx-taranis${SUFFIX}-simulator about_lbm_taranis trans lua_exports)
-add_dependencies(opentx-taranisplus${SUFFIX}-simulator about_lbm_taranis trans lua_exports)
-add_dependencies(opentx-taranisx9e${SUFFIX}-simulator about_lbm_taranis trans lua_exports)
+add_dependencies(opentx-9x${SUFFIX}-simulator about_lbm_9x commondeps)
+add_dependencies(opentx-9xr${SUFFIX}-simulator about_lbm_9x commondeps)
+add_dependencies(opentx-9x128${SUFFIX}-simulator about_lbm_9x commondeps)
+add_dependencies(opentx-9xr128${SUFFIX}-simulator about_lbm_9x commondeps)
+add_dependencies(opentx-gruvin9x${SUFFIX}-simulator about_lbm_9x commondeps)
+add_dependencies(opentx-mega2560${SUFFIX}-simulator about_lbm_9x commondeps)
+add_dependencies(opentx-sky9x${SUFFIX}-simulator about_lbm_9x commondeps)
+add_dependencies(opentx-9xrpro${SUFFIX}-simulator about_lbm_9x commondeps)
+add_dependencies(opentx-ar9x${SUFFIX}-simulator about_lbm_9x commondeps)
+add_dependencies(opentx-taranis${SUFFIX}-simulator about_lbm_taranis commondeps lua_export_taranis)
+add_dependencies(opentx-taranisplus${SUFFIX}-simulator about_lbm_taranis commondeps lua_export_taranis)
+add_dependencies(opentx-taranisx9e${SUFFIX}-simulator about_lbm_taranis commondeps lua_export_taranis_x9e)

 set(OPENTX_LIBRARIES
  opentx-9x${SUFFIX}-simulator
@@ -98,11 +115,16 @@ set(OPENTX_LIBRARIES
  opentx-mega2560${SUFFIX}-simulator
  opentx-sky9x${SUFFIX}-simulator
  opentx-9xrpro${SUFFIX}-simulator
+  opentx-ar9x${SUFFIX}-simulator
  opentx-taranis${SUFFIX}-simulator
  opentx-taranisplus${SUFFIX}-simulator
  opentx-taranisx9e${SUFFIX}-simulator
 )

+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  install(TARGETS ${OPENTX_LIBRARIES} LIBRARY DESTINATION ${SIMULATOR_LIB_PATH})
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+
 # 9X with ATmega64
 target_include_directories(opentx-9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/stock)
 target_compile_definitions(opentx-9x${SUFFIX}-simulator PRIVATE PCBSTD PCB9X CPUM64 EEPROM_RLC ${COMMON_DEFINITIONS})
@@ -143,6 +165,11 @@ target_include_directories(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${RADIO_SRC_
 target_compile_definitions(opentx-9xrpro${SUFFIX}-simulator PRIVATE PCBSKY9X REVX CPUARM VOICE SDCARD ${COMMON_DEFINITIONS})
 target_link_libraries(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})

+# AR9X
+target_include_directories(opentx-ar9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/sky9x)
+target_compile_definitions(opentx-ar9x${SUFFIX}-simulator PRIVATE PCBSKY9X AR9X CPUARM VOICE SDCARD ${COMMON_DEFINITIONS})
+target_link_libraries(opentx-ar9x${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
+
 # Taranis standard
 target_include_directories(opentx-taranis${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis)
 target_compile_definitions(opentx-taranis${SUFFIX}-simulator PRIVATE PCBTARANIS CPUARM CPUSTM32 EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
@@ -158,6 +185,27 @@ target_include_directories(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${RADIO_
 target_compile_definitions(opentx-taranisx9e${SUFFIX}-simulator PRIVATE PCBTARANIS REVPLUS REV9E CPUARM CPUSTM32 STM32F40_41xxx EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
 target_link_libraries(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})

-ADD_CUSTOM_TARGET(opentx-simulators
+add_custom_target(opentx-simulators
  DEPENDS ${OPENTX_LIBRARIES}
 )
+
+if(APPLE)
+  set(SIMULATOR_BUNDLES)
+  foreach(_file ${OPENTX_LIBRARIES})
+    set(SIMULATOR_BUNDLE "${_file}-bundle")
+    add_custom_target(${SIMULATOR_BUNDLE}
+      COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore lib${_file}.dylib
+      COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtNetwork.framework/Versions/4/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/4/QtNetwork lib${_file}.dylib
+      COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtXml.framework/Versions/4/QtXml @executable_path/../Frameworks/QtXml.framework/Versions/4/QtXml lib${_file}.dylib
+      COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui lib${_file}.dylib
+      COMMAND install_name_tool -change @rpath/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL lib${_file}.dylib
+      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+      COMMAND pwd
+      COMMAND cp lib${_file}.dylib companion.app/Contents/Resources/
+      DEPENDS ${_file}
+    )
+    list(APPEND SIMULATOR_BUNDLES ${SIMULATOR_BUNDLE})
+  endforeach()
+  add_custom_target(opentx-simulators-bundle DEPENDS ${SIMULATOR_BUNDLES})
+endif(APPLE)
+
@@ -15,7 +15,6 @@
 */

 #include "opentxsimulator.h"
-#include <QDebug>
 #include <stdio.h>
 #include <exception>
 #include <map>
@@ -41,14 +40,15 @@
 #define GRAPHICS
 #define CURVES
 #if defined(PCBTARANIS)
-#define RTCLOCK
-#define XCURVES
-#define VIRTUALINPUTS
-#define LUA
-#define LUA_MODEL_SCRIPTS
+  #define RTCLOCK
+  #define XCURVES
+  #define VIRTUALINPUTS
+  #define LUA
+  #define LUA_MODEL_SCRIPTS
+  #define LUAINPUTS 
 #else
-#define BUZZER
-#define TEMPLATES
+  #define BUZZER
+  #define TEMPLATES
 #endif
 #define BOLD_FONT
 #define HAPTIC
@@ -61,22 +61,25 @@
 #endif

 #if defined(PCBSKY9X) && !defined(REVX)
-#define ROTARY_ENCODERS 1
+  #define ROTARY_ENCODERS 1
 #elif defined(PCBGRUVIN9X)
-#define ROTARY_ENCODERS 2
+  #define ROTARY_ENCODERS 2
 #endif

 #if defined(CPUARM)
-#define FRSKY_SPORT
+  #define FRSKY_SPORT
 #endif

 #if defined (PCBTARANIS)
-#define MIXERS_MONITOR
+  #define MIXERS_MONITOR
 #endif

 #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)
@@ -90,6 +93,7 @@ namespace NAMESPACE {
 #include "radio/src/telemetry/telemetry.cpp"
 #include "radio/src/telemetry/frsky_sport.cpp"
 #include "radio/src/sbus.cpp"
+#include "radio/src/crc16.cpp"
 #else
 #include "radio/src/main_avr.cpp"
 #include "radio/src/audio_avr.cpp"
@@ -121,6 +125,7 @@ namespace NAMESPACE {
 #include "radio/src/stamp.cpp"
 #include "radio/src/maths.cpp"
 #include "radio/src/vario.cpp"
+#include "radio/src/trainer_input.cpp"

 #if defined(PCBTARANIS)
 #include "radio/src/bmp.cpp"
@@ -231,7 +236,7 @@ namespace NAMESPACE {
 #include "radio/src/targets/taranis/pulses_driver.cpp"
 #include "radio/src/targets/taranis/rtc_driver.cpp"
 #include "radio/src/targets/taranis/trainer_driver.cpp"
-#include "radio/src/targets/taranis/uart3_driver.cpp"
+#include "radio/src/targets/taranis/serial2_driver.cpp"
 #elif defined(PCBSKY9X)
 #include "radio/src/targets/sky9x/board_sky9x.cpp"
 #include "radio/src/targets/sky9x/telemetry_driver.cpp"
@@ -242,7 +247,7 @@ namespace NAMESPACE {
 #include "radio/src/targets/sky9x/sdcard_driver.cpp"
 #include "radio/src/targets/sky9x/coproc_driver.cpp"
 #include "radio/src/targets/sky9x/haptic_driver.cpp"
-#include "radio/src/targets/sky9x/second_serial_driver.cpp"
+#include "radio/src/targets/sky9x/serial2_driver.cpp"
 #include "radio/src/targets/sky9x/pulses_driver.cpp"
 #elif defined(PCBGRUVIN9X)
 #include "radio/src/targets/gruvin9x/board_gruvin9x.cpp"
@@ -258,7 +263,11 @@ namespace NAMESPACE {
 #include "radio/src/targets/simu/simpgmspace.cpp"
 #include "radio/src/translations.cpp"
 #include "radio/src/telemetry/frsky.cpp"
-#include "radio/src/telemetry/frsky_d.cpp"
+#if defined(CPUARM)
+  #include "radio/src/telemetry/frsky_d_arm.cpp"
+#else
+  #include "radio/src/telemetry/frsky_d.cpp"
+#endif
 #include "radio/src/translations/tts_en.cpp"

 #if defined(CPUARM)
@@ -276,7 +285,10 @@ namespace NAMESPACE {
 #endif

 #if defined(LUA)
-#include "radio/src/lua_api.cpp"
+#include "radio/src/lua/interface.cpp"
+#include "radio/src/lua/api_general.cpp"
+#include "radio/src/lua/api_lcd.cpp"
+#include "radio/src/lua/api_model.cpp"
 #include "radio/src/thirdparty/Lua/src/lapi.c"
 #include "radio/src/thirdparty/Lua/src/lcode.c"
 #include "radio/src/thirdparty/Lua/src/lctype.c"
@@ -307,6 +319,7 @@ namespace NAMESPACE {
 #include "radio/src/thirdparty/Lua/src/ltablib.c"
 #include "radio/src/thirdparty/Lua/src/lcorolib.c"
 #include "radio/src/thirdparty/Lua/src/liolib.c"
+#include "radio/src/thirdparty/Lua/src/lstrlib.c"
 #endif

 int16_t g_anas[NUM_STICKS+NUM_POTS];
@@ -316,6 +329,11 @@ 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;
@@ -487,6 +505,44 @@ void OpenTxSimulator::sendTelemetry(::uint8_t * data, unsigned int len)
 #endif
 }

+uint8_t OpenTxSimulator::getSensorInstance(uint16_t id, uint8_t defaultValue)
+{
+#if defined(FRSKY_SPORT)
+  for (int i = 0; i<MAX_SENSORS; i++) {
+    if (isTelemetryFieldAvailable(i)) {
+      TelemetrySensor * sensor = &g_model.telemetrySensors[i];
+      if (sensor->id == id) {
+        return sensor->instance;
+      }
+    }
+  }
+#endif
+  return defaultValue;
+}
+
+uint16_t OpenTxSimulator::getSensorRatio(uint16_t id)
+{
+#if defined(FRSKY_SPORT)
+  for (int i = 0; i<MAX_SENSORS; i++) {
+    if (isTelemetryFieldAvailable(i)) {
+      TelemetrySensor * sensor = &g_model.telemetrySensors[i];
+      if (sensor->id == id) {
+        return sensor->custom.ratio;
+      }
+    }
+  }
+#endif
+  return 0;
+}
+
+void OpenTxSimulator::setLuaStateReloadPermanentScripts()
+{
+#if defined(LUA)
+  luaState = INTERPRETER_RELOAD_PERMANENT_SCRIPTS;
+#endif
+}
+
+
 void OpenTxSimulator::setTrainerInput(unsigned int inputNumber, ::int16_t value)
 {
 #define SETTRAINER_IMPORT
@@ -35,6 +35,10 @@
  #define FLAVOUR "9xrpro"
  #define NAMESPACE Sky9xPro
  #define EEPROM_VARIANT 0
+#elif defined(PCBSKY9X) && defined(AR9X)
+  #define FLAVOUR "ar9x"
+  #define NAMESPACE Ar9x
+  #define EEPROM_VARIANT 0
 #elif defined(PCBSKY9X)
  #define FLAVOUR "sky9x"
  #define NAMESPACE Sky9X
@@ -118,9 +122,16 @@ 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 uint16_t getSensorRatio(uint16_t id);
+
    virtual void setTrainerInput(unsigned int inputNumber, int16_t value);

    virtual void installTraceHook(void (*callback)(const char *));
+
+    virtual void setLuaStateReloadPermanentScripts();
+
 };

 }
@@ -1,4 +0,0 @@
-// Automatically generated file (CMake) - do not edit
-#define DATE_STR  "@DATE@"
-#define TIME_STR  "@TIME@"
-#define VERS_STR  "@C9X_VERSION@"
@@ -1,15 +0,0 @@
-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)
@@ -1,233 +0,0 @@
-/*
- * 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"
-}
@@ -1,58 +0,0 @@
-/*
- * 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
@@ -62,7 +62,7 @@ Th9xGeneral::operator GeneralSettings ()
  result.currModel = currModel;
  result.contrast = contrast;
  result.vBatWarn = vBatWarn;
-  result.vBatCalib = vBatCalib;
+  result.txVoltageCalibration = txVoltageCalibration;
  // result.lightSw = th9xToSwitch(lightSw);
  result.trainer = trainer;
  result.view = view;
@@ -64,7 +64,7 @@ PACK(typedef struct t_Th9xGeneral {
  uint8_t   currModel; //0..15
  uint8_t   contrast;
  uint8_t   vBatWarn;
-  int8_t    vBatCalib;
+  int8_t    txVoltageCalibration;
  int8_t    lightSw;
  Th9xTrainerData trainer;
  uint8_t   adcFilt:2;
@@ -17,7 +17,6 @@
 #include <iostream>
 #include "th9xinterface.h"
 #include "th9xeeprom.h"
-#include "simulator/th9xsimulator.h"
 #include "file.h"
 #include "appdata.h"

@@ -57,23 +56,29 @@ const int Th9xInterface::getMaxModels()
  return 16;
 }

-bool Th9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long Th9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }

-bool Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
  std::cout << "trying th9x import... ";

+  std::bitset<NUM_ERRORS> errors;
+
  if (size != getEEpromSize()) {
    std::cout << "wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
  }

  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
    std::cout << "wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
  }
    
  efile->openRd(FILE_GENERAL);
@@ -81,7 +86,8 @@ bool Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)

  if (efile->readRlc2((uint8_t*)&th9xGeneral, 1) != 1) {
    std::cout << "no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
  }

  std::cout << "version " << (unsigned int)th9xGeneral.myVers << " ";
@@ -91,14 +97,16 @@ bool Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
      break;
    default:
      std::cout << "not th9x\n";
-      return false;
+      errors.set(NOT_TH9X);
+      return errors.to_ulong();
  }

  efile->openRd(FILE_GENERAL);
  int len = efile->readRlc2((uint8_t*)&th9xGeneral, sizeof(Th9xGeneral));
  if (len != sizeof(Th9xGeneral)) {
    std::cout << "not th9x\n";
-    return false;
+    errors.set(NOT_TH9X);
+    return errors.to_ulong();
  }
  radioData.generalSettings = th9xGeneral;
  
@@ -114,12 +122,15 @@ bool Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
  }

  std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }

-bool Th9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long Th9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }

 int Th9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
@@ -130,24 +141,24 @@ int Th9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant,
  return 0;
 }

-int Th9xInterface::getSize(ModelData &model)
+int Th9xInterface::getSize(const ModelData & model)
 {
  return 0;
 }

-int Th9xInterface::getSize(GeneralSettings &settings)
+int Th9xInterface::getSize(const GeneralSettings & settings)
 {
  return 0;
 }

-int Th9xInterface::isAvailable(Protocol proto, int port)
+int Th9xInterface::isAvailable(PulsesProtocol proto, int port)
 {
  switch (proto) {
-    case PPM:
-    case SILV_A:
-    case SILV_B:
-    case SILV_C:
-    case CTP1009:
+    case PULSES_PPM:
+    case PULSES_SILV_A:
+    case PULSES_SILV_B:
+    case PULSES_SILV_C:
+    case PULSES_CTP1009:
      return 1;
    default:
      return 0;
@@ -34,19 +34,19 @@ class Th9xInterface : public EEPROMInterface

    virtual const int getMaxModels();

-    virtual bool load(RadioData &, const uint8_t *eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);

-    virtual bool loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);

-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);

    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);

-    virtual int getSize(ModelData &);
+    virtual int getSize(const ModelData &);

-    virtual int getSize(GeneralSettings &);
+    virtual int getSize(const GeneralSettings &);

-    virtual int isAvailable(Protocol proto, int port=0);
+    virtual int isAvailable(PulsesProtocol proto, int port=0);

  protected:

@@ -2,13 +2,13 @@
 #include "ui_flasheepromdialog.h"
 #include "eeprominterface.h"
 #include "helpers.h"
-#include "splashlibrary.h"
 #include "firmwareinterface.h"
 #include "hexinterface.h"
 #include "appdata.h"
 #include "progressdialog.h"
 #include "radiointerface.h"
 #include "converteeprom.h"
+#include "splashlibrarydialog.h"

 FlashEEpromDialog::FlashEEpromDialog(QWidget *parent, const QString &filename):
 QDialog(parent),
@@ -102,9 +102,9 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
    return -1;
  }

-  QByteArray eeprom(EESIZE_RLC_MAX, 0);
+  QByteArray eeprom(EESIZE_MAX, 0);
  int fileType = getFileType(filename);
-  
+
 #if 0
  if (fileType==FILE_TYPE_XML) {
    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -125,7 +125,8 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
    bool xmlOK = doc.setContent(&file);
    if (xmlOK) {
      RadioData * radioData = new RadioData();
-      if (!loadEEpromXml(*radioData, doc)) {
+      std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEepromXml(*radioData, doc));
+      if (!errors.test(NO_ERROR)) {
        QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings File %1").arg(filename));
      }
      else {
@@ -144,7 +145,7 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
        return -1;
      }
    }
-    eeprom_size = HexInterface(inputStream).load((uint8_t *)eeprom.data(), EESIZE_RLC_MAX);
+    eeprom_size = HexInterface(inputStream).load((uint8_t *)eeprom.data(), EESIZE_MAX);
  }
  else if (fileType==FILE_TYPE_BIN) { //read binary
    eeprom_size = file.size();
@@ -160,7 +161,8 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
  }

  RadioData * radioData = new RadioData();
-  if (eeprom_size == 0 || !loadEEprom(*radioData, (const uint8_t *)eeprom.data(), eeprom_size)) {
+  std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEeprom(*radioData, (const uint8_t *)eeprom.data(), eeprom_size));
+  if (eeprom_size == 0 || !errors.test(NO_ERROR)) {
    QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings file %1").arg(filename));
  }
  else {
@@ -175,8 +177,8 @@ bool FlashEEpromDialog::patchCalibration()
  QString calib = g.profile[g.id()].stickPotCalib();
  QString trainercalib = g.profile[g.id()].trainerCalib();
  int potsnum=GetCurrentFirmware()->getCapability(Pots);
-  int8_t vBatCalib=(int8_t) g.profile[g.id()].vBatCalib();
-  int8_t currentCalib=(int8_t) g.profile[g.id()].currentCalib();
+  int8_t txVoltageCalibration=(int8_t) g.profile[g.id()].txVoltageCalibration();
+  int8_t txCurrentCalibration=(int8_t) g.profile[g.id()].txCurrentCalibration();
  int8_t PPM_Multiplier=(int8_t) g.profile[g.id()].ppmMultiplier();

  if ((calib.length()==(NUM_STICKS+potsnum)*12) && (trainercalib.length()==16)) {
@@ -204,8 +206,8 @@ bool FlashEEpromDialog::patchCalibration()
        radioData->generalSettings.trainer.calib[i] = byte16;
      }
    }
-    radioData->generalSettings.currentCalib = currentCalib;
-    radioData->generalSettings.vBatCalib = vBatCalib;
+    radioData->generalSettings.txCurrentCalibration = txCurrentCalibration;
+    radioData->generalSettings.txVoltageCalibration = txVoltageCalibration;
    radioData->generalSettings.PPM_Multiplier = PPM_Multiplier;
    return true;
  }
@@ -303,7 +305,7 @@ void FlashEEpromDialog::on_burnButton_clicked()
    backupPath = g.profile[g.id()].pBackupDir();
    if (backupPath.isEmpty()) {
      backupPath=g.backupDir();
-    }    
+    }
    backupFilename = backupPath + "/backup-" + QDateTime().currentDateTime().toString("yyyy-MM-dd-HHmmss") + ".bin";
  }
  else if (ui->checkFirmwareCompatibility->isChecked()) {
@@ -110,7 +110,7 @@
      </sizepolicy>
     </property>
     <property name="toolTip">
-      <string>Allows Companion to write to older version of the firmware</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saves a dated copy of your eeprom to the backup folder you specified in the Companion settings before writing the current model to the radio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
     </property>
     <property name="text">
      <string>Backup before Write</string>
@@ -9,8 +9,8 @@
 #include "hexinterface.h"
 #include "progressdialog.h"
 #include "radiointerface.h"
-#include "splashlibrary.h"
 #include "progresswidget.h"
+#include "splashlibrarydialog.h"

 #if defined WIN32 || !defined __GNUC__
  #include <windows.h>
@@ -185,7 +185,7 @@ void FlashFirmwareDialog::on_useExternalSplash_clicked()
 void FlashFirmwareDialog::on_useLibrarySplash_clicked()
 {
  QString fileName;
-  splashLibrary *ld = new splashLibrary(this, &fileName);
+  SplashLibraryDialog *ld = new SplashLibraryDialog(this, &fileName);
  ld->exec();
  if (!fileName.isEmpty()) {
    QImage image(fileName);
@@ -203,6 +203,7 @@ void FlashFirmwareDialog::on_useLibrarySplash_clicked()
 void FlashFirmwareDialog::on_burnButton_clicked()
 {
  g.flashDir(QFileInfo(fwName).dir().absolutePath());
+  g.profile[g.id()].fwName(fwName);
  g.checkHardwareCompatibility(ui->checkHardwareCompatibility->isChecked());
  g.backupOnFlash(ui->backupEEprom->isChecked());

@@ -4,13 +4,15 @@ set(generaledit_NAMES
  generaledit
  generalsetup
  trainer
-  calibration
+  hardware
 )

 set(generaledit_SRCS
+  calibration.cpp
 )

 set(generaledit_HDRS
+  calibration.h
 )

 set(generaledit_UIS
@@ -1,422 +1,90 @@
+#include <QVBoxLayout>
+#include <QHeaderView>
+#include <QSpinBox>
 #include "calibration.h"
-#include "ui_calibration.h"

-void CalibrationPanel::setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
-{
-  bool enabled = false;
-
-  if (IS_TARANIS(firmware->getBoard())) {
-    if (IS_TARANIS_X9E(firmware->getBoard())) {
-      enabled = true;
-      type->addItem(tr("None"), GeneralSettings::SWITCH_NONE);
-    }
-    else if (index < 8) {
-      enabled = true;
-    }
-  }
-
-  if (enabled) {
-    type->addItem(tr("2 Positions Toggle"), GeneralSettings::SWITCH_TOGGLE);
-    type->addItem(tr("2 Positions"), GeneralSettings::SWITCH_2POS);
-    type->addItem(tr("3 Positions"), GeneralSettings::SWITCH_3POS);
-    name->setField(generalSettings.switchName[index], 3, this);
-    type->setField(generalSettings.switchConfig[index], this);
-  }
-  else {
-    label->hide();
-    name->hide();
-    type->hide();
-  }
-}
-
-void CalibrationPanel::setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
-{
-  bool enabled = false;
-
-  if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
-    label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS).toString());
-    enabled = true;
-  }
-  else if (IS_TARANIS_PLUS(firmware->getBoard()) && index < 3) {
-    enabled = true;
-  }
-  else if (IS_TARANIS(firmware->getBoard()) && index < 2) {
-    enabled = true;
-  }
-
-  if (enabled) {
-    type->addItem(tr("None"), GeneralSettings::POT_NONE);
-    type->addItem(tr("Pot with detent"), GeneralSettings::POT_WITH_DETENT);
-    type->addItem(tr("Multipos switch"), GeneralSettings::POT_MULTIPOS_SWITCH);
-    type->addItem(tr("Pot without detent"), GeneralSettings::POT_WITHOUT_DETENT);
-    name->setField(generalSettings.potName[index], 3, this);
-    type->setField(generalSettings.potConfig[index], this);
-  }
-  else {
-    label->hide();
-    name->hide();
-    type->hide();
-  }
-}
-
-void CalibrationPanel::setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
-{
-  bool enabled = false;
-
-  if (IS_TARANIS(firmware->getBoard()) && index < 2) {
-    type->setEnabled(false);
-    enabled = true;
-  }
-  else if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
-    enabled = true;
-  }
-
-  if (IS_TARANIS_X9E(firmware->getBoard())) {
-    label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS+4).toString());
-  }
-
-  if (enabled) {
-    type->addItem(tr("None"), GeneralSettings::SLIDER_NONE);
-    type->addItem(tr("Slider with detent"), GeneralSettings::SLIDER_WITH_DETENT);
-    name->setField(generalSettings.sliderName[index], 3, this);
-    type->setField(generalSettings.sliderConfig[index], this);
-  }
-  else {
-    label->hide();
-    name->hide();
-    type->hide();
-  }
-}

 CalibrationPanel::CalibrationPanel(QWidget * parent, GeneralSettings & generalSettings, Firmware * firmware):
-  GeneralPanel(parent, generalSettings, firmware),
-  ui(new Ui::Calibration)
+  GeneralPanel(parent, generalSettings, firmware)
 {
-  ui->setupUi(this);

-  if (!firmware->getCapability(MultiposPots)) {
-    ui->potsTypeSeparator->hide();
+  tableWidget = new QTableWidget();
+  QVBoxLayout * layout = new QVBoxLayout();
+  layout->addWidget(tableWidget);
+  layout->setContentsMargins(0, 0, 0, 0);
+  this->setLayout(layout);
+
+  tableWidget->verticalHeader()->setResizeMode(QHeaderView::ResizeToContents);
+  tableWidget->setColumnCount(3);
+  tableWidget->setShowGrid(false);
+  tableWidget->setSelectionMode(QAbstractItemView::NoSelection);
+  tableWidget->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
+  tableWidget->setStyleSheet("QTableWidget {background-color: transparent;}");
+  QStringList headerLabels;
+  headerLabels << QObject::tr("Negative span") << QObject::tr("Mid value") << QObject::tr("Positive span"); 
+  tableWidget->setHorizontalHeaderLabels(headerLabels);
+
+  int rows = NUM_STICKS + GetCurrentFirmware()->getCapability(Pots) + GetCurrentFirmware()->getCapability(Sliders);
+  tableWidget->setRowCount(rows);
+
+  for(int i = 0; i < rows; ++i) {
+
+    QTableWidgetItem *newItem = new QTableWidgetItem(AnalogString(i));
+    newItem->setTextAlignment(Qt::AlignLeft);
+    tableWidget->setVerticalHeaderItem(i, newItem);
+
+    for(int j = 0; j < 3; ++j) {
+      QSpinBox * newItem = new QSpinBox();
+      newItem->setMinimum(-9999);
+      newItem->setMaximum(9999);
+      newItem->setSingleStep(1);
+      newItem->setValue(getCalibrationValue(i, j));
+      newItem->setProperty("row", i);
+      newItem->setProperty("column", j);
+      tableWidget->setCellWidget(i, j, newItem);
+      connect(newItem, SIGNAL(valueChanged(int)), this, SLOT(onCellChanged(int)));
+    }
  }
-
-  if (IS_TARANIS(firmware->getBoard())) {
-    ui->rudName->setField(generalSettings.stickName[0], 3, this);
-    ui->eleName->setField(generalSettings.stickName[1], 3, this);
-    ui->thrName->setField(generalSettings.stickName[2], 3, this);
-    ui->ailName->setField(generalSettings.stickName[3], 3, this);
-  }
-  else {
-    ui->rudLabel->hide();
-    ui->rudName->hide();
-    ui->eleLabel->hide();
-    ui->eleName->hide();
-    ui->thrLabel->hide();
-    ui->thrName->hide();
-    ui->ailLabel->hide();
-    ui->ailName->hide();
-  }
-
-  setupPotConfig(0, ui->pot1Label, ui->pot1Name, ui->pot1Type);
-  setupPotConfig(1, ui->pot2Label, ui->pot2Name, ui->pot2Type);
-  setupPotConfig(2, ui->pot3Label, ui->pot3Name, ui->pot3Type);
-  setupPotConfig(3, ui->pot4Label, ui->pot4Name, ui->pot4Type);
-
-  setupSliderConfig(0, ui->lsLabel, ui->lsName, ui->lsType);
-  setupSliderConfig(1, ui->rsLabel, ui->rsName, ui->rsType);
-  setupSliderConfig(2, ui->ls2Label, ui->ls2Name, ui->ls2Type);
-  setupSliderConfig(3, ui->rs2Label, ui->rs2Name, ui->rs2Type);
-
-  setupSwitchConfig(0, ui->saLabel, ui->saName, ui->saType);
-  setupSwitchConfig(1, ui->sbLabel, ui->sbName, ui->sbType);
-  setupSwitchConfig(2, ui->scLabel, ui->scName, ui->scType);
-  setupSwitchConfig(3, ui->sdLabel, ui->sdName, ui->sdType);
-  setupSwitchConfig(4, ui->seLabel, ui->seName, ui->seType);
-  setupSwitchConfig(5, ui->sfLabel, ui->sfName, ui->sfType);
-  setupSwitchConfig(6, ui->sgLabel, ui->sgName, ui->sgType);
-  setupSwitchConfig(7, ui->shLabel, ui->shName, ui->shType);
-  setupSwitchConfig(8, ui->siLabel, ui->siName, ui->siType);
-  setupSwitchConfig(9, ui->sjLabel, ui->sjName, ui->sjType);
-  setupSwitchConfig(10, ui->skLabel, ui->skName, ui->skType);
-  setupSwitchConfig(11, ui->slLabel, ui->slName, ui->slType);
-  setupSwitchConfig(12, ui->smLabel, ui->smName, ui->smType);
-  setupSwitchConfig(13, ui->snLabel, ui->snName, ui->snType);
-  setupSwitchConfig(14, ui->soLabel, ui->soName, ui->soType);
-  setupSwitchConfig(15, ui->spLabel, ui->spName, ui->spType);
-  setupSwitchConfig(16, ui->sqLabel, ui->sqName, ui->sqType);
-  setupSwitchConfig(17, ui->srLabel, ui->srName, ui->srType);
-
-  int potsCount = GetCurrentFirmware()->getCapability(Pots);
-  if (potsCount == 3) {
-    ui->ana8Neg->hide();
-    ui->ana8Mid->hide();
-    ui->ana8Pos->hide();
-  }
-
-  if (IS_TARANIS(firmware->getBoard())) {
-    ui->serialPortMode->setCurrentIndex(generalSettings.hw_uartMode);
-  }
-  else {
-    ui->serialPortMode->hide();
-    ui->serialPortLabel->hide();
-  }
-
-  if (IS_TARANIS_X9E(firmware->getBoard())) {
-    ui->bluetoothEnable->setChecked(generalSettings.bluetoothEnable);
-    ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
-  }
-  else {
-    ui->bluetoothLabel->hide();
-    ui->bluetoothEnable->hide();
-    ui->bluetoothName->hide();
-  }
-
  disableMouseScrolling();
 }

-CalibrationPanel::~CalibrationPanel()
+void CalibrationPanel::onCellChanged(int value)
 {
-  delete ui;
+  QSpinBox * sb = qobject_cast<QSpinBox*>(sender());
+  int row = sb->property("row").toInt();
+  int column = sb->property("column").toInt();
+
+  if (value != getCalibrationValue(row, column)) {
+    setCalibrationValue(row,column, value);
+    qDebug() << "CalibrationPanel::onCellChanged" << row << column << "to" << value;
+    emit modified();
+  }
+}
+    
+int CalibrationPanel::getCalibrationValue(int row, int column)
+{
+  switch(column) {
+    case 0:
+      return generalSettings.calibSpanNeg[row];
+    case 1:
+      return generalSettings.calibMid[row];
+    case 2:
+      return generalSettings.calibSpanPos[row];
+  }
+  return 0;
 }

-/*void CalibrationPanel::update()
+void CalibrationPanel::setCalibrationValue(int row, int column, int value)
 {
-}
-*/
-void CalibrationPanel::on_PPM_MultiplierDSB_editingFinished()
-{
-  generalSettings.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM1_editingFinished()
-{
-  generalSettings.trainer.calib[0] = ui->PPM1->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM2_editingFinished()
-{
-  generalSettings.trainer.calib[1] = ui->PPM2->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM3_editingFinished()
-{
-  generalSettings.trainer.calib[2] = ui->PPM3->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM4_editingFinished()
-{
-  generalSettings.trainer.calib[3] = ui->PPM4->value();
-  emit modified();
-}
-
-
-void CalibrationPanel::on_CurrentCalib_SB_editingFinished()
-{
-  generalSettings.currentCalib = ui->CurrentCalib_SB->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_bluetoothEnable_stateChanged(int)
-{
-  generalSettings.bluetoothEnable = ui->bluetoothEnable->isChecked();
-  emit modified();
-}
-
-void CalibrationPanel::setValues()
-{
-  ui->battCalibDSB->setValue((double)generalSettings.vBatCalib/10);
-  ui->CurrentCalib_SB->setValue((double)generalSettings.currentCalib);
-
-  ui->ana1Neg->setValue(generalSettings.calibSpanNeg[0]);
-  ui->ana2Neg->setValue(generalSettings.calibSpanNeg[1]);
-  ui->ana3Neg->setValue(generalSettings.calibSpanNeg[2]);
-  ui->ana4Neg->setValue(generalSettings.calibSpanNeg[3]);
-  ui->ana5Neg->setValue(generalSettings.calibSpanNeg[4]);
-  ui->ana6Neg->setValue(generalSettings.calibSpanNeg[5]);
-  ui->ana7Neg->setValue(generalSettings.calibSpanNeg[6]);
-  ui->ana8Neg->setValue(generalSettings.calibSpanNeg[7]);
-
-  ui->ana1Mid->setValue(generalSettings.calibMid[0]);
-  ui->ana2Mid->setValue(generalSettings.calibMid[1]);
-  ui->ana3Mid->setValue(generalSettings.calibMid[2]);
-  ui->ana4Mid->setValue(generalSettings.calibMid[3]);
-  ui->ana5Mid->setValue(generalSettings.calibMid[4]);
-  ui->ana6Mid->setValue(generalSettings.calibMid[5]);
-  ui->ana7Mid->setValue(generalSettings.calibMid[6]);
-  ui->ana8Mid->setValue(generalSettings.calibMid[7]);
-
-  ui->ana1Pos->setValue(generalSettings.calibSpanPos[0]);
-  ui->ana2Pos->setValue(generalSettings.calibSpanPos[1]);
-  ui->ana3Pos->setValue(generalSettings.calibSpanPos[2]);
-  ui->ana4Pos->setValue(generalSettings.calibSpanPos[3]);
-  ui->ana5Pos->setValue(generalSettings.calibSpanPos[4]);
-  ui->ana6Pos->setValue(generalSettings.calibSpanPos[5]);
-  ui->ana7Pos->setValue(generalSettings.calibSpanPos[6]);
-  ui->ana8Pos->setValue(generalSettings.calibSpanPos[7]);
-
-  ui->PPM1->setValue(generalSettings.trainer.calib[0]);
-  ui->PPM2->setValue(generalSettings.trainer.calib[1]);
-  ui->PPM3->setValue(generalSettings.trainer.calib[2]);
-  ui->PPM4->setValue(generalSettings.trainer.calib[3]);
-  ui->PPM_MultiplierDSB->setValue((qreal)(generalSettings.PPM_Multiplier+10)/10);
-}
-
-void CalibrationPanel::on_battCalibDSB_editingFinished()
-{
-  generalSettings.vBatCalib = ui->battCalibDSB->value()*10;
-  emit modified();
-}
-
-
-void CalibrationPanel::on_ana1Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[0] = ui->ana1Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana2Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[1] = ui->ana2Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana3Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[2] = ui->ana3Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana4Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[3] = ui->ana4Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana5Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[4] = ui->ana5Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana6Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[5] = ui->ana6Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana7Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[6] = ui->ana7Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana8Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[7] = ui->ana8Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana1Mid_editingFinished()
-{
-  generalSettings.calibMid[0] = ui->ana1Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana2Mid_editingFinished()
-{
-  generalSettings.calibMid[1] = ui->ana2Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana3Mid_editingFinished()
-{
-  generalSettings.calibMid[2] = ui->ana3Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana4Mid_editingFinished()
-{
-  generalSettings.calibMid[3] = ui->ana4Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana5Mid_editingFinished()
-{
-  generalSettings.calibMid[4] = ui->ana5Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana6Mid_editingFinished()
-{
-  generalSettings.calibMid[5] = ui->ana6Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana7Mid_editingFinished()
-{
-  generalSettings.calibMid[6] = ui->ana7Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana8Mid_editingFinished()
-{
-  generalSettings.calibMid[7] = ui->ana8Mid->value();
-  emit modified();
-}
-
-
-void CalibrationPanel::on_ana1Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[0] = ui->ana1Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana2Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[1] = ui->ana2Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana3Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[2] = ui->ana3Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana4Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[3] = ui->ana4Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana5Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[4] = ui->ana5Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana6Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[5] = ui->ana6Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana7Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[6] = ui->ana7Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana8Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[7] = ui->ana8Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_serialPortMode_currentIndexChanged(int index)
-{
-  generalSettings.hw_uartMode = index;
-  emit modified();
+  switch(column) {
+    case 0:
+      generalSettings.calibSpanNeg[row] = value;
+      break;
+    case 1:
+      generalSettings.calibMid[row] = value;
+      break;
+    case 2:
+      generalSettings.calibSpanPos[row] = value;
+      break;
+  }
 }
@@ -1,6 +1,7 @@
 #ifndef CALIBRATION_H
 #define CALIBRATION_H

+#include <QTableWidget>
 #include "generaledit.h"

 namespace Ui {
@@ -17,58 +18,16 @@ class CalibrationPanel : public GeneralPanel

  public:
    CalibrationPanel(QWidget *parent, GeneralSettings & generalSettings, Firmware * firmware);
-    virtual ~CalibrationPanel();
-    // virtual void update();
+    virtual ~CalibrationPanel() {};

  private slots:
-    void on_battCalibDSB_editingFinished();
-    void on_PPM1_editingFinished();
-    void on_PPM2_editingFinished();
-    void on_PPM3_editingFinished();
-    void on_PPM4_editingFinished();
-    void on_PPM_MultiplierDSB_editingFinished();
-
-    void on_CurrentCalib_SB_editingFinished();
-    void on_bluetoothEnable_stateChanged(int);
-
-    void on_ana1Neg_editingFinished();
-    void on_ana2Neg_editingFinished();
-    void on_ana3Neg_editingFinished();
-    void on_ana4Neg_editingFinished();
-    void on_ana5Neg_editingFinished();
-    void on_ana6Neg_editingFinished();
-    void on_ana7Neg_editingFinished();
-    void on_ana8Neg_editingFinished();
-
-    void on_ana1Mid_editingFinished();
-    void on_ana2Mid_editingFinished();
-    void on_ana3Mid_editingFinished();
-    void on_ana4Mid_editingFinished();
-    void on_ana5Mid_editingFinished();
-    void on_ana6Mid_editingFinished();
-    void on_ana7Mid_editingFinished();
-    void on_ana8Mid_editingFinished();
-
-    void on_ana1Pos_editingFinished();
-    void on_ana2Pos_editingFinished();
-    void on_ana3Pos_editingFinished();
-    void on_ana4Pos_editingFinished();
-    void on_ana5Pos_editingFinished();
-    void on_ana6Pos_editingFinished();
-    void on_ana7Pos_editingFinished();
-    void on_ana8Pos_editingFinished();
-
-    void on_serialPortMode_currentIndexChanged(int index);
-
-  protected:
-    void setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
-    void setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
-    void setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
+    void onCellChanged(int value);

  private:
-    Ui::Calibration *ui;
+    QTableWidget * tableWidget;

-    void setValues();
+    int getCalibrationValue(int row, int column);
+    void setCalibrationValue(int row, int column, int value);
 };

 #endif // CALIBRATION_H
@@ -8,6 +8,7 @@
 #include "generalsetup.h"
 #include "trainer.h"
 #include "calibration.h"
+#include "hardware.h"
 #include "../modeledit/customfunctions.h"
 #include "verticalscrollarea.h"

@@ -42,7 +43,8 @@ GeneralEdit::GeneralEdit(QWidget * parent, RadioData & radioData, Firmware * fir
    addTab(new CustomFunctionsPanel(this, NULL, generalSettings, firmware), tr("Global Functions"));
  }
  addTab(new TrainerPanel(this, generalSettings, firmware), tr("Trainer"));
-  addTab(new CalibrationPanel(this, generalSettings, firmware), tr("Hardware / Calibration"));
+  addTab(new HardwarePanel(this, generalSettings, firmware), tr("Hardware"));
+  addTab(new CalibrationPanel(this, generalSettings, firmware), tr("Calibration"));

  ui->tabWidget->setCurrentIndex( g.generalEditTab() );
 }
@@ -82,14 +84,17 @@ 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);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
+  int numSwPots=GetCurrentFirmware()->getCapability(Switches)+GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
  if (calib.isEmpty()) {
    return;
  }
  else {
    QString trainercalib = g.profile[profile_id].trainerCalib();
-    int8_t vBatCalib = (int8_t)g.profile[profile_id].vBatCalib();
-    int8_t currentCalib = (int8_t)g.profile[profile_id].currentCalib();
+    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();
    uint8_t GSStickMode = (uint8_t)g.profile[profile_id].gsStickMode();
    uint8_t vBatWarn = (uint8_t)g.profile[profile_id].vBatWarn();
@@ -106,25 +111,21 @@ 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.currentCalib=currentCalib;
-      generalSettings.vBatCalib=vBatCalib;
+      generalSettings.txCurrentCalibration=txCurrentCalibration;
+      generalSettings.txVoltageCalibration=txVoltageCalibration;
      generalSettings.vBatWarn=vBatWarn;
      if (GetCurrentFirmware()->getCapability(HasBatMeterRange)) {
        generalSettings.vBatMin = (int8_t) g.profile[profile_id].vBatMin();
@@ -134,6 +135,48 @@ 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;
@@ -141,45 +184,32 @@ 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();
@@ -198,13 +228,15 @@ 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);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
  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) ,
@@ -225,8 +257,27 @@ 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 );
-    g.profile[profile_id].vBatCalib( generalSettings.vBatCalib );
-    g.profile[profile_id].currentCalib( generalSettings.currentCalib );
+    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 );
    if (GetCurrentFirmware()->getCapability(HasBatMeterRange)) {
      g.profile[profile_id].vBatMin( generalSettings.vBatMin );
@@ -275,8 +275,8 @@ void GeneralSetupPanel::populateBacklightCB()
 void GeneralSetupPanel::populateVoiceLangCB()
 {
  QComboBox * b = ui->voiceLang_CB;
-  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};
+  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};

  b->clear();
  for (int i=0; strings[i]!=NULL; i++) {
@@ -658,7 +658,7 @@
       <item>
        <widget class="QCheckBox" name="adjustRTC">
         <property name="toolTip">
-          <string>If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.</string>
+          <string>Automatically adjust the radio's clock if a GPS is connected to telemetry.</string>
         </property>
         <property name="layoutDirection">
          <enum>Qt::RightToLeft</enum>
@@ -0,0 +1,241 @@
+#include "hardware.h"
+#include "ui_hardware.h"
+
+void HardwarePanel::setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos = true)
+{
+  bool enabled = false;
+
+  if (IS_TARANIS(firmware->getBoard())) {
+    if (IS_TARANIS_X9E(firmware->getBoard())) {
+      enabled = true;
+      type->addItem(tr("None"), GeneralSettings::SWITCH_NONE);
+    }
+    else if (index < 8) {
+      enabled = true;
+    }
+  }
+
+  if (enabled) {
+    type->addItem(tr("2 Positions Toggle"), GeneralSettings::SWITCH_TOGGLE);
+    type->addItem(tr("2 Positions"), GeneralSettings::SWITCH_2POS);
+    if (threePos) type->addItem(tr("3 Positions"), GeneralSettings::SWITCH_3POS);
+    name->setField(generalSettings.switchName[index], 3, this);
+    type->setField(generalSettings.switchConfig[index], this);
+  }
+  else {
+    label->hide();
+    name->hide();
+    type->hide();
+  }
+}
+
+void HardwarePanel::setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
+{
+  bool enabled = false;
+
+  if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
+    label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS).toString());
+    enabled = true;
+  }
+  else if (IS_TARANIS_PLUS(firmware->getBoard()) && index < 3) {
+    enabled = true;
+  }
+  else if (IS_TARANIS(firmware->getBoard()) && index < 2) {
+    enabled = true;
+  }
+
+  if (enabled) {
+    type->addItem(tr("None"), GeneralSettings::POT_NONE);
+    type->addItem(tr("Pot with detent"), GeneralSettings::POT_WITH_DETENT);
+    type->addItem(tr("Multipos switch"), GeneralSettings::POT_MULTIPOS_SWITCH);
+    type->addItem(tr("Pot without detent"), GeneralSettings::POT_WITHOUT_DETENT);
+    name->setField(generalSettings.potName[index], 3, this);
+    type->setField(generalSettings.potConfig[index], this);
+  }
+  else {
+    label->hide();
+    name->hide();
+    type->hide();
+  }
+}
+
+void HardwarePanel::setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
+{
+  bool enabled = false;
+
+  if (IS_TARANIS(firmware->getBoard()) && index < 2) {
+    type->setEnabled(false);
+    enabled = true;
+  }
+  else if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
+    enabled = true;
+  }
+
+  if (IS_TARANIS_X9E(firmware->getBoard())) {
+    label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS+4).toString());
+  }
+
+  if (enabled) {
+    type->addItem(tr("None"), GeneralSettings::SLIDER_NONE);
+    type->addItem(tr("Slider with detent"), GeneralSettings::SLIDER_WITH_DETENT);
+    name->setField(generalSettings.sliderName[index], 3, this);
+    type->setField(generalSettings.sliderConfig[index], this);
+  }
+  else {
+    label->hide();
+    name->hide();
+    type->hide();
+  }
+}
+
+HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings, Firmware * firmware):
+  GeneralPanel(parent, generalSettings, firmware),
+  ui(new Ui::Hardware)
+{
+  ui->setupUi(this);
+
+  if (IS_TARANIS(firmware->getBoard())) {
+    ui->rudName->setField(generalSettings.stickName[0], 3, this);
+    ui->eleName->setField(generalSettings.stickName[1], 3, this);
+    ui->thrName->setField(generalSettings.stickName[2], 3, this);
+    ui->ailName->setField(generalSettings.stickName[3], 3, this);
+  }
+  else {
+    ui->rudLabel->hide();
+    ui->rudName->hide();
+    ui->eleLabel->hide();
+    ui->eleName->hide();
+    ui->thrLabel->hide();
+    ui->thrName->hide();
+    ui->ailLabel->hide();
+    ui->ailName->hide();
+  }
+
+  setupPotConfig(0, ui->pot1Label, ui->pot1Name, ui->pot1Type);
+  setupPotConfig(1, ui->pot2Label, ui->pot2Name, ui->pot2Type);
+  setupPotConfig(2, ui->pot3Label, ui->pot3Name, ui->pot3Type);
+  setupPotConfig(3, ui->pot4Label, ui->pot4Name, ui->pot4Type);
+
+  setupSliderConfig(0, ui->lsLabel, ui->lsName, ui->lsType);
+  setupSliderConfig(1, ui->rsLabel, ui->rsName, ui->rsType);
+  setupSliderConfig(2, ui->ls2Label, ui->ls2Name, ui->ls2Type);
+  setupSliderConfig(3, ui->rs2Label, ui->rs2Name, ui->rs2Type);
+
+  setupSwitchConfig(0, ui->saLabel, ui->saName, ui->saType);
+  setupSwitchConfig(1, ui->sbLabel, ui->sbName, ui->sbType);
+  setupSwitchConfig(2, ui->scLabel, ui->scName, ui->scType);
+  setupSwitchConfig(3, ui->sdLabel, ui->sdName, ui->sdType);
+  setupSwitchConfig(4, ui->seLabel, ui->seName, ui->seType);
+  setupSwitchConfig(5, ui->sfLabel, ui->sfName, ui->sfType, false);   //switch does not support 3POS
+  setupSwitchConfig(6, ui->sgLabel, ui->sgName, ui->sgType);
+  setupSwitchConfig(7, ui->shLabel, ui->shName, ui->shType, false);   //switch does not support 3POS
+  setupSwitchConfig(8, ui->siLabel, ui->siName, ui->siType);
+  setupSwitchConfig(9, ui->sjLabel, ui->sjName, ui->sjType);
+  setupSwitchConfig(10, ui->skLabel, ui->skName, ui->skType);
+  setupSwitchConfig(11, ui->slLabel, ui->slName, ui->slType);
+  setupSwitchConfig(12, ui->smLabel, ui->smName, ui->smType);
+  setupSwitchConfig(13, ui->snLabel, ui->snName, ui->snType);
+  setupSwitchConfig(14, ui->soLabel, ui->soName, ui->soType);
+  setupSwitchConfig(15, ui->spLabel, ui->spName, ui->spType);
+  setupSwitchConfig(16, ui->sqLabel, ui->sqName, ui->sqType);
+  setupSwitchConfig(17, ui->srLabel, ui->srName, ui->srType);
+
+  if (IS_TARANIS(firmware->getBoard())) {
+    ui->serialPortMode->setCurrentIndex(generalSettings.hw_uartMode);
+  }
+  else {
+    ui->serialPortMode->hide();
+    ui->serialPortLabel->hide();
+  }
+
+  if (!IS_SKY9X(firmware->getBoard())) {
+    ui->txCurrentCalibration->hide();
+    ui->txCurrentCalibrationLabel->hide();
+  }
+
+  if (IS_TARANIS_X9E(firmware->getBoard())) {
+    ui->bluetoothEnable->setChecked(generalSettings.bluetoothEnable);
+    ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
+  }
+  else {
+    ui->bluetoothLabel->hide();
+    ui->bluetoothEnable->hide();
+    ui->bluetoothName->hide();
+  }
+
+  disableMouseScrolling();
+
+  setValues();
+}
+
+HardwarePanel::~HardwarePanel()
+{
+  delete ui;
+}
+
+void HardwarePanel::on_PPM_MultiplierDSB_editingFinished()
+{
+  generalSettings.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
+  emit modified();
+}
+
+void HardwarePanel::on_PPM1_editingFinished()
+{
+  generalSettings.trainer.calib[0] = ui->PPM1->value();
+  emit modified();
+}
+
+void HardwarePanel::on_PPM2_editingFinished()
+{
+  generalSettings.trainer.calib[1] = ui->PPM2->value();
+  emit modified();
+}
+
+void HardwarePanel::on_PPM3_editingFinished()
+{
+  generalSettings.trainer.calib[2] = ui->PPM3->value();
+  emit modified();
+}
+
+void HardwarePanel::on_PPM4_editingFinished()
+{
+  generalSettings.trainer.calib[3] = ui->PPM4->value();
+  emit modified();
+}
+
+
+void HardwarePanel::on_txCurrentHardware_editingFinished()
+{
+  generalSettings.txCurrentCalibration = ui->txCurrentCalibration->value();
+  emit modified();
+}
+
+void HardwarePanel::on_bluetoothEnable_stateChanged(int)
+{
+  generalSettings.bluetoothEnable = ui->bluetoothEnable->isChecked();
+  emit modified();
+}
+
+void HardwarePanel::setValues()
+{
+  ui->txVoltageCalibration->setValue((double)generalSettings.txVoltageCalibration/10);
+  ui->txCurrentCalibration->setValue((double)generalSettings.txCurrentCalibration);
+
+  ui->PPM1->setValue(generalSettings.trainer.calib[0]);
+  ui->PPM2->setValue(generalSettings.trainer.calib[1]);
+  ui->PPM3->setValue(generalSettings.trainer.calib[2]);
+  ui->PPM4->setValue(generalSettings.trainer.calib[3]);
+  ui->PPM_MultiplierDSB->setValue((qreal)(generalSettings.PPM_Multiplier+10)/10);
+}
+
+void HardwarePanel::on_txVoltageHardware_editingFinished()
+{
+  generalSettings.txVoltageCalibration = ui->txVoltageCalibration->value()*10;
+  emit modified();
+}
+
+void HardwarePanel::on_serialPortMode_currentIndexChanged(int index)
+{
+  generalSettings.hw_uartMode = index;
+  emit modified();
+}
@@ -0,0 +1,46 @@
+#ifndef HARDWARE_H
+#define HARDWARE_H
+
+#include "generaledit.h"
+
+namespace Ui {
+  class Hardware;
+}
+
+class QLabel;
+class AutoLineEdit;
+class AutoComboBox;
+
+class HardwarePanel : public GeneralPanel
+{
+    Q_OBJECT
+
+  public:
+    HardwarePanel(QWidget *parent, GeneralSettings & generalSettings, Firmware * firmware);
+    virtual ~HardwarePanel();
+
+  private slots:
+    void on_txVoltageHardware_editingFinished();
+    void on_PPM1_editingFinished();
+    void on_PPM2_editingFinished();
+    void on_PPM3_editingFinished();
+    void on_PPM4_editingFinished();
+    void on_PPM_MultiplierDSB_editingFinished();
+
+    void on_txCurrentHardware_editingFinished();
+    void on_bluetoothEnable_stateChanged(int);
+
+    void on_serialPortMode_currentIndexChanged(int index);
+
+  protected:
+    void setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
+    void setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
+    void setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos);
+
+  private:
+    Ui::Hardware *ui;
+
+    void setValues();
+};
+
+#endif // HARDWARE_H
@@ -12,6 +12,8 @@
 #include "simulatorinterface.h"
 #include "firmwareinterface.h"

+Stopwatch gStopwatch("global");
+
 const QColor colors[C9X_MAX_CURVES] = {
  QColor(0,0,127),
  QColor(0,127,0),
@@ -47,44 +49,6 @@ const QColor colors[C9X_MAX_CURVES] = {
  QColor(255,127,0),
 };

-QString getPhaseName(int val, const char * phasename)
-{
-  if (!val) return "---";
-  if (!phasename) {
-    return QString(val < 0 ? "!" : "") + QObject::tr("FM%1").arg(abs(val) - 1);
-  }
-  else {
-    QString phaseName;
-    phaseName.append(phasename);
-    if (phaseName.isEmpty()) {
-      return QString(val < 0 ? "!" : "") + QObject::tr("FM%1").arg(abs(val) - 1);
-    }
-    else {
-      return QString(val < 0 ? "!" : "") + phaseName;
-    }
-  }
-}
-
-QString getInputStr(ModelData * model, int index)
-{
-  QString result;
-
-  if (GetCurrentFirmware()->getCapability(VirtualInputs)) {
-    if (strlen(model->inputNames[index]) > 0) {
-      result = QObject::tr("[I%1]").arg(index+1);
-      result += QString(model->inputNames[index]);
-    }
-    else {
-      result = QObject::tr("Input%1").arg(index+1, 2, 10, QChar('0'));
-    }
-  }
-  else {
-    result = RawSource(SOURCE_TYPE_STICK, index).toString(model);
-  }
-
-  return result;
-}
-
 void populateGvSourceCB(QComboBox *b, int value)
 {
  QString strings[] = { QObject::tr("---"), QObject::tr("Rud Trim"), QObject::tr("Ele Trim"), QObject::tr("Thr Trim"), QObject::tr("Ail Trim"), QObject::tr("Rot Enc"), QObject::tr("Rud"), QObject::tr("Ele"), QObject::tr("Thr"), QObject::tr("Ail"), QObject::tr("P1"), QObject::tr("P2"), QObject::tr("P3")};
@@ -95,18 +59,35 @@ void populateGvSourceCB(QComboBox *b, int value)
  b->setCurrentIndex(value);
 }

-QString getProtocolStr(const int proto)
+void populateFileComboBox(QComboBox * b, const QSet<QString> & set, const QString & current)
 {
-  static const char *strings[] = { "OFF",
-                                   "PPM",
-                                   "Silverlit A", "Silverlit B", "Silverlit C",
-                                   "CTP1009",
-                                   "LP45", "DSM2", "DSMX",
-                                   "PPM16", "PPMsim",
-                                   "FrSky XJT - D16", "FrSky XJT - D8", "FrSky XJT - LR12", "FrSky DJT",
-  };
+  b->clear();
+  b->addItem("----");

-  return CHECK_IN_ARRAY(strings, proto);
+  bool added = false;
+  // Convert set into list and sort it alphabetically case insensitive
+  QStringList list = QStringList::fromSet(set);
+  qSort(list.begin(), list.end(), caseInsensitiveLessThan);
+  foreach (QString entry, list) {
+    b->addItem(entry);
+    if (entry == current) {
+      b->setCurrentIndex(b->count()-1);
+      added = true;
+    }
+  }
+
+  if (!added && !current.isEmpty()) {
+    b->addItem(current);
+    b->setCurrentIndex(b->count()-1);
+  }
+}
+
+void getFileComboBoxValue(QComboBox * b, char * dest, int length)
+{
+  memset(dest, 0, length+1);
+  if (b->currentText() != "----") {
+    strncpy(dest, b->currentText().toAscii(), length);
+  }
 }

 void populatePhasesCB(QComboBox *b, int value)
@@ -122,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 int deflt, const int mini, const int maxi, const double step, bool allowGvars):
+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):
  QObject(),
  weightGV(weightGV),
  weightSB(weightSB),
@@ -134,7 +115,7 @@ GVarGroup::GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox
  lock(true)
 {
  if (allowGvars && GetCurrentFirmware()->getCapability(Gvars)) {
-    populateGVCB(weightCB, weight);
+    populateGVCB(*weightCB, weight, model);
    connect(weightGV, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
    connect(weightCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
  }
@@ -194,17 +175,18 @@ void GVarGroup::valuesChanged()
    else if (sb)
      weight = sb->value();
    else
-      weight = dsb->value()/step;
+      weight = round(dsb->value()/step);
  }
 }

-CurveGroup::CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags):
+CurveGroup::CurveGroup(QComboBox * curveTypeCB, QCheckBox * curveGVarCB, QComboBox * curveValueCB, QSpinBox * curveValueSB, CurveReference & curve, const ModelData & model, unsigned int flags):
  QObject(),
  curveTypeCB(curveTypeCB),
  curveGVarCB(curveGVarCB),
  curveValueCB(curveValueCB),
  curveValueSB(curveValueSB),
  curve(curve),
+  model(model),
  flags(flags),
  lock(false),
  lastType(-1)
@@ -238,7 +220,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);
+        populateGVCB(*curveValueCB, curve.value, model);
      }
      curveValueCB->show();
      curveValueSB->hide();
@@ -295,6 +277,7 @@ 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
@@ -497,33 +480,39 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
  b->setMaxVisibleItems(10);
 }

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

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

-  int pgvars = GetCurrentFirmware()->getCapability(Gvars);
-  for (int i=-pgvars; i<=-1; i++) {
+  int count = GetCurrentFirmware()->getCapability(Gvars);
+  for (int i=-count; i<=-1; i++) {
    int16_t gval = (int16_t)(-10000+i);
-    b->addItem(QObject::tr("-GV%1").arg(-i), gval);
+    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);
    if (value == gval) {
-      b->setCurrentIndex(b->count()-1);
+      b.setCurrentIndex(b.count()-1);
      selected = true;
    }
  }

-  for (int i=1; i<=pgvars; i++) {
+  for (int i=1; i<=count; i++) {
    int16_t gval = (int16_t)(10000+i);
-    b->addItem(QObject::tr("GV%1").arg(i), gval);
+    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);
    if (value == gval) {
-      b->setCurrentIndex(b->count()-1);
+      b.setCurrentIndex(b.count()-1);
      selected = true;
    }
  }

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

@@ -638,7 +627,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const GeneralSetti
        if (item == source) b->setCurrentIndex(b->count()-1);
      }
      for (int i=0; i<C9X_MAX_SENSORS; ++i) {
-        if (model->sensorData[i].isAvailable()) {
+        if (model && model->sensorData[i].isAvailable()) {    //this conditon must be false if we populate Global Functions where model = 0
          for (int j=0; j<3; ++j) {
            item = RawSource(SOURCE_TYPE_TELEMETRY, 3*i+j);
            b->addItem(item.toString(model), item.toValue());
@@ -650,8 +639,6 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const GeneralSetti
    }
    else {
      for (int i=0; i<(flags & POPULATE_TELEMETRYEXT ? TELEMETRY_SOURCES_STATUS_COUNT : TELEMETRY_SOURCES_COUNT); i++) {
-        if (i==TELEMETRY_SOURCE_RSSI_TX && IS_TARANIS(board))
-          continue;
        if (i==TELEMETRY_SOURCE_TX_TIME && !GetCurrentFirmware()->getCapability(RtcTime))
          continue;
        if (i==TELEMETRY_SOURCE_SWR && !GetCurrentFirmware()->getCapability(SportTelemetry))
@@ -763,134 +750,6 @@ QString getFrSkySrc(int index)
  return RawSource(SOURCE_TYPE_TELEMETRY, index-1).toString();
 }

-QString getTrimInc(ModelData * g_model)
-{
-  switch (g_model->trimInc) {
-    case -2:
-      return QObject::tr("Exponential");
-    case -1:
-      return QObject::tr("Extra Fine");
-    case 0:
-      return QObject::tr("Fine");
-    case 1:
-      return QObject::tr("Medium");
-    case 2:
-      return QObject::tr("Coarse");
-    default:
-      return QObject::tr("Unknown");
-  }
-}
-
-QString getTimerStr(TimerData & timer)
-{
-  QString result = QObject::tr("%1:%2").arg(timer.val/60, 2, 10, QChar('0')).arg(timer.val%60, 2, 10, QChar('0'));
-  result += QString(", ") + timer.mode.toString();
-  if (timer.persistent)
-    result += QObject::tr(", Persistent");
-  if (timer.minuteBeep)
-    result += QObject::tr(", MinuteBeep");
-  if (timer.countdownBeep == 1)
-    result += QObject::tr(", CountDown(Beeps)");
-  else if (timer.countdownBeep == 2)
-    result += QObject::tr(", CountDown(Voice)");
-  return result;
-}
-
-QString getProtocol(ModuleData & module)
-{
-  QString str = getProtocolStr(module.protocol);
-
-  if (module.protocol == PPM)
-    str.append(QObject::tr(": Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4").arg(module.channelsStart+1).arg(module.channelsCount).arg(module.ppmDelay).arg(module.polarityToString()));
-  else
-    str.append(QObject::tr(": Channel start: %1, %2 Channels").arg(module.channelsStart+1).arg(module.channelsCount));
-  return str;
-}
-
-QString getTrainerMode(const int trainermode, ModuleData & module)
-{
-  QString result;
-  switch (trainermode) {
-    case 1:
-      result=QObject::tr("Slave/Jack")+QObject::tr(": Channel start: %1, %2 Channels, %3usec Delay, Pulse polarity %4").arg(module.channelsStart+1).arg(module.channelsCount).arg(module.ppmDelay).arg(module.polarityToString());
-      break;
-    case 2:
-      result=QObject::tr("Master/SBUS Module");
-      break;
-    case 3:
-      result=QObject::tr("Master/CPPM Module");
-      break;
-    case 4:
-      result=QObject::tr("Master/SBUS in battery compartment");
-      break;
-    default:
-      result=QObject::tr("Master/Jack");
-  }
-  return result;
-}
-
-QString getPhasesStr(unsigned int phases, ModelData * model)
-{
-  int numphases = GetCurrentFirmware()->getCapability(FlightModes);
-
-  if (numphases && phases) {
-    QString str;
-    int count = 0;
-    if (phases == (unsigned int)(1<<numphases) - 1) {
-      str = QObject::tr("None");
-    }
-    if (phases) {
-      for (int i=0; i<numphases;i++) {
-        if (!(phases & (1<<i))) {
-          if (count++ > 0) str += QString(", ");
-          str += getPhaseName(i+1, model->flightModeData[i].name);
-        }
-      }
-    }
-    if (count > 1)
-      return QObject::tr("Flight modes(%1)").arg(str);
-    else
-      return QObject::tr("Flight mode(%1)").arg(str);
-  }
-  else {
-    return "";
-  }
-}
-
-QString getCenterBeepStr(ModelData * g_model)
-{
-  QStringList strl;
-  if (g_model->beepANACenter & 0x01)
-    strl << QObject::tr("Rudder");
-  if (g_model->beepANACenter & 0x02)
-    strl << QObject::tr("Elevator");
-  if (g_model->beepANACenter & 0x04)
-    strl << QObject::tr("Throttle");
-  if (g_model->beepANACenter & 0x08)
-    strl << QObject::tr("Aileron");
-  if (IS_TARANIS(GetCurrentFirmware()->getBoard())) {
-    if (g_model->beepANACenter & 0x10)
-      strl << "S1";
-    if (g_model->beepANACenter & 0x20)
-      strl << "S2";
-    if (g_model->beepANACenter & 0x40)
-      strl << "S3";
-    if (g_model->beepANACenter & 0x80)
-      strl << "LS";
-    if (g_model->beepANACenter & 0x100)
-      strl << "RS";
-  }
-  else {
-    if (g_model->beepANACenter & 0x10)
-      strl << "P1";
-    if (g_model->beepANACenter & 0x20)
-      strl << "P2";
-    if (g_model->beepANACenter & 0x40)
-      strl << "P3";
-  }
-  return strl.join(", ");
-}
-
 QString getTheme()
 {
  int theme_set = g.theme();
@@ -988,22 +847,38 @@ QPixmap makePixMap( QImage image, QString firmwareType )
  return(QPixmap::fromImage(image));
 }

-int version2index(QString version)
+int version2index(const QString & version)
 {
-  QStringList parts = version.split('.');
-  int result = 0;
-  if (parts.size() > 2)
-    result = parts[2].toInt();
+  int result = 999;
+  QStringList parts = version.split("N");
  if (parts.size() > 1)
-    result += 100 * parts[1].toInt();
+    result = parts[1].toInt(); // nightly build
+  parts = parts[0].split('.');
+  if (parts.size() > 2)
+    result += 1000 * parts[2].toInt();
+  if (parts.size() > 1)
+    result += 100000 * parts[1].toInt();
  if (parts.size() > 0)
-    result += 10000 * parts[0].toInt();
+    result += 10000000 * parts[0].toInt();
  return result;
 }

 QString index2version(int index)
 {
-  if (index >= 19900) {
+  if (index >= 19900000) {
+    int nightly = index % 1000;
+    index /= 1000;
+    int revision = index % 100;
+    index /= 100;
+    int minor = index % 100;
+    int major = index / 100;
+    QString result = QString("%1.%2.%3").arg(major).arg(minor).arg(revision);
+    if (nightly > 0 && nightly < 999) {
+      result += QString("N%1").arg(nightly);
+    }
+    return result;
+  }
+  else if (index >= 19900) {
    int revision = index % 100;
    index /= 100;
    int minor = index % 100;
@@ -1021,7 +896,7 @@ int qunlink(const QString & fileName)
  return unlink(ba.constData());
 }

-QString generateProcessUniqueTempFileName(const QString &fileName)
+QString generateProcessUniqueTempFileName(const QString & fileName)
 {
  QString sanitizedFileName = fileName;
  sanitizedFileName.remove('/');
@@ -1115,3 +990,107 @@ double toDecimalCoordinate(const QString & value)
  }
  return result;
 }
+
+QStringList extractLatLon(const QString & position)
+{
+  QStringList result;
+  QStringList parts = position.split(' ');
+  if (parts.size() != 2) {
+    result.append(""); 
+    result.append(""); 
+  }
+  else {
+    result.append(parts.at(1).trimmed());
+    result.append(parts.at(0).trimmed());
+  }
+  return result;
+}
+
+TableLayout::TableLayout(QWidget * parent, int rowCount, const QStringList & headerLabels)
+{
+#if defined(TABLE_LAYOUT)
+  tableWidget = new QTableWidget(parent);
+  QVBoxLayout * layout = new QVBoxLayout();
+  layout->addWidget(tableWidget);
+  layout->setContentsMargins(0, 0, 0, 0);
+  parent->setLayout(layout);
+
+  tableWidget->setRowCount(rowCount);
+  tableWidget->setColumnCount(headerLabels.size());
+  tableWidget->setShowGrid(false);
+  tableWidget->verticalHeader()->setVisible(false);
+  tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
+  tableWidget->setSelectionMode(QAbstractItemView::NoSelection);
+  tableWidget->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
+  tableWidget->setStyleSheet("QTableWidget {background-color: transparent;}");
+  tableWidget->setHorizontalHeaderLabels(headerLabels);
+#else
+  gridWidget = new QGridLayout(parent);
+
+  int col = 0;
+  foreach(QString text, headerLabels) {
+    QLabel *label = new QLabel();
+    label->setFrameShape(QFrame::Panel);
+    label->setFrameShadow(QFrame::Raised);
+    label->setMidLineWidth(0);
+    label->setAlignment(Qt::AlignCenter);
+    label->setMargin(5);
+    label->setText(text);
+    // if (!minimize)
+    //   label->setMinimumWidth(100);
+    gridWidget->addWidget(label, 0, col++);
+  }
+#endif
+}
+
+void TableLayout::addWidget(int row, int column, QWidget * widget)
+{
+#if defined(TABLE_LAYOUT)
+  QHBoxLayout * layout = new QHBoxLayout(tableWidget);
+  layout->addWidget(widget);
+  addLayout(row, column, layout);
+#else
+  gridWidget->addWidget(widget, row + 1, column);
+#endif
+}
+
+void TableLayout::addLayout(int row, int column, QLayout * layout)
+{
+#if defined(TABLE_LAYOUT)
+  layout->setContentsMargins(1, 3, 1, 3);
+  QWidget * containerWidget = new QWidget(tableWidget);
+  containerWidget->setLayout(layout);
+  tableWidget->setCellWidget(row, column, containerWidget);
+#else
+  gridWidget->addLayout(layout, row + 1, column);
+#endif
+}
+
+void TableLayout::resizeColumnsToContents() 
+{
+#if defined(TABLE_LAYOUT)
+  tableWidget->resizeColumnsToContents();
+#else
+#endif
+}
+
+void TableLayout::setColumnWidth(int col, int width) 
+{
+#if defined(TABLE_LAYOUT)
+  tableWidget->setColumnWidth(col, width);
+#else
+#endif
+}
+
+void TableLayout::pushRowsUp(int row) 
+{
+#if defined(TABLE_LAYOUT)
+#else
+  // Push the rows up
+  QSpacerItem * spacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
+  gridWidget->addItem(spacer, row, 0);
+#endif
+  // Push rows upward
+  // addDoubleSpring(gridLayout, 5, num_fsw+1);
+
+}
@@ -2,6 +2,9 @@
 #define HELPERS_H

 #include <QtGui>
+#include <QTableWidget>
+#include <QGridLayout>
+#include <QDebug>
 #include "eeprominterface.h"

 extern const QColor colors[C9X_MAX_CURVES];
@@ -26,6 +29,8 @@ extern const QColor colors[C9X_MAX_CURVES];
 #define TRIM_MODE_NONE  0x1F  // 0b11111

 void populateGvSourceCB(QComboBox *b, int value);
+void populateFileComboBox(QComboBox * b, const QSet<QString> & set, const QString & current);
+void getFileComboBoxValue(QComboBox * b, char * dest, int length);
 void populateRotEncCB(QComboBox *b, int value, int renumber);

 QString getTheme();
@@ -40,7 +45,7 @@ class GVarGroup: public QObject {
  Q_OBJECT

  public:
-    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);
+    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);

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

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

  protected slots:
@@ -80,6 +85,7 @@ class CurveGroup : public QObject {
    QComboBox *curveValueCB;
    QSpinBox *curveValueSB;
    CurveReference & curve;
+    const ModelData & model;
    unsigned int flags;
    bool lock;
    int lastType;
@@ -98,8 +104,6 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin

 void populatePhasesCB(QComboBox *b, int value);
 void populateGvarUseCB(QComboBox *b, unsigned int phase);
-QString getProtocolStr(const int proto);
-QString getPhasesStr(unsigned int phases, ModelData * model);

 #define POPULATE_NONE           (1<<0)
 #define POPULATE_SOURCES        (1<<1)
@@ -114,20 +118,11 @@ QString getPhasesStr(unsigned int phases, ModelData * model);
 #define GVARS_VARIANT 0x0001
 #define FRSKY_VARIANT 0x0002

-// void populateGVarCB(QComboBox *b, int value, int min, int max,int pgvars=5); //TODO: Clean Up
-void populateGVCB(QComboBox *b, int value);
+void populateGVCB(QComboBox & b, int value, const ModelData & model);
 void populateSourceCB(QComboBox *b, const RawSource &source, const GeneralSettings generalSettings, const ModelData * model, unsigned int flags);
-QString getPhaseName(int val, const char * phasename=NULL);
-QString getInputStr(ModelData * model, int index);
 QString image2qstring(QImage image);
 int findmult(float value, float base);

-QString getTrimInc(ModelData * g_model);
-QString getTimerStr(TimerData & timer);
-QString getProtocol(ModuleData & module);
-QString getTrainerMode(const int trainermode, ModuleData & module);
-QString getCenterBeepStr(ModelData * g_model);
-
 /* FrSky helpers */
 QString getFrSkyAlarmType(int alarm);
 QString getFrSkyUnits(int units);
@@ -160,7 +155,7 @@ QVector<T> findWidgets(QObject * object, const QString & name)
 // Format a pixmap to fit on the radio using a specific firmware
 QPixmap makePixMap( QImage image, QString firmwareType );

-int version2index(QString version);
+int version2index(const QString & version);
 QString index2version(int index);

 class QTimeS : public QTime
@@ -207,5 +202,62 @@ private:
 };

 double toDecimalCoordinate(const QString & value);
+QStringList extractLatLon(const QString & position);
+
+class TableLayout
+{
+public:
+  TableLayout(QWidget * parent, int rowCount, const QStringList & headerLabels);
+  // ~TableLayout() ;
+
+  void addWidget(int row, int column, QWidget * widget);
+  void addLayout(int row, int column, QLayout * layout);
+
+  void resizeColumnsToContents();
+  void setColumnWidth(int col, int width);
+  void pushRowsUp(int row); 
+
+private:
+#if defined(TABLE_LAYOUT)
+  QTableWidget * tableWidget; 
+#else
+  QGridLayout * gridWidget; 
+#endif
+};
+
+
+class Stopwatch
+{
+public:
+  Stopwatch(const QString & name) :
+    name(name), total(0) {
+    timer.start();
+  };
+  ~Stopwatch() {};
+
+  void restart() {
+    total = 0;
+    timer.restart();
+  };
+
+  void report() {
+    qint64 elapsed = timer.restart();
+    total += elapsed;
+    qDebug() << name << QString("%1 ms [%2 ms]").arg(elapsed).arg(total);
+  };
+
+  void report(const QString & text) {
+    qint64 elapsed = timer.restart();
+    total += elapsed;
+    qDebug() << name << text << QString("%1 ms [%2 ms]").arg(elapsed).arg(total);
+  };
+
+private:
+  QString name;
+  QElapsedTimer timer;
+  qint64 total;
+};
+
+extern Stopwatch gStopwatch;

 #endif // HELPERS_H
@@ -0,0 +1 @@
+*/*.directory
@@ -344,7 +344,7 @@
         <item>
          <layout class="QHBoxLayout" name="horizontalLayout_4">
           <item>
-            <widget class="QToolButton" name="splashLibraryButton">
+            <widget class="QToolButton" name="SplashLibraryDialogButton">
             <property name="text">
              <string>...</string>
             </property>
@@ -455,7 +455,7 @@
  <tabstop>splashincludeCB</tabstop>
  <tabstop>SplashFileName</tabstop>
  <tabstop>SplashSelect</tabstop>
-  <tabstop>splashLibraryButton</tabstop>
+  <tabstop>SplashLibraryDialogButton</tabstop>
  <tabstop>clearImageButton</tabstop>
  <tabstop>InvertPixels</tabstop>
  <tabstop>buttonBox</tabstop>
@@ -8,14 +8,14 @@
 #include <unistd.h>
 #endif

-logsDialog::logsDialog(QWidget *parent) :
-    QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
-    ui(new Ui::logsDialog)
+LogsDialog::LogsDialog(QWidget *parent) :
+  QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+  ui(new Ui::LogsDialog)
 {
  csvlog.clear();

  ui->setupUi(this);
-  this->setWindowIcon(CompanionIcon("logs.png"));
+  setWindowIcon(CompanionIcon("logs.png"));

  plotLock=false;

@@ -36,26 +36,20 @@ logsDialog::logsDialog(QWidget *parent) :
  // create and prepare a plot title layout element
  QCPPlotTitle *title = new QCPPlotTitle(ui->customPlot);
  title->setText(tr("Telemetry logs"));
-  // title->setFont(QFont("sans", 12, QFont::Bold));
+
  // add it to the main plot layout
  ui->customPlot->plotLayout()->insertRow(0);
  ui->customPlot->plotLayout()->addElement(0, 0, title);
-
  ui->customPlot->setNoAntialiasingOnDrag(true);
-
-  ui->customPlot->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom |
-    QCP::iSelectAxes | QCP::iSelectLegend | QCP::iSelectPlottables);
+  ui->customPlot->setInteractions(QCP::iRangeDrag | QCP::iRangeZoom | QCP::iSelectAxes | QCP::iSelectLegend | QCP::iSelectPlottables);

  axisRect = ui->customPlot->axisRect();
  axisRect->axis(QCPAxis::atBottom)->setLabel(tr("Time (hh:mm:ss)"));
  axisRect->axis(QCPAxis::atBottom)->setTickLabelType(QCPAxis::ltDateTime);
  axisRect->axis(QCPAxis::atBottom)->setDateTimeFormat("hh:mm:ss");
  QDateTime now = QDateTime::currentDateTime();
-  axisRect->axis(QCPAxis::atBottom)->setRange(now.addSecs(-60*60*2).toTime_t(),
-    now.toTime_t());
-
+  axisRect->axis(QCPAxis::atBottom)->setRange(now.addSecs(-60*60*2).toTime_t(), now.toTime_t());
  axisRect->axis(QCPAxis::atLeft)->setTickLabels(false);
-
  axisRect->addAxis(QCPAxis::atLeft);
  axisRect->addAxis(QCPAxis::atRight);
  axisRect->axis(QCPAxis::atLeft, 1)->setVisible(false);
@@ -76,8 +70,8 @@ logsDialog::logsDialog(QWidget *parent) :

  ui->customPlot->setAutoAddPlottableToLegend(false);

-  QString Path=g.gePath();
-  if (Path.isEmpty() || !QFile(Path).exists()) {
+  QString path = g.gePath();
+  if (path.isEmpty() || !QFile(path).exists()) {
    ui->mapsButton->hide();
  }

@@ -99,57 +93,52 @@ logsDialog::logsDialog(QWidget *parent) :
  connect(ui->Reset_PB, SIGNAL(clicked()), this, SLOT(plotLogs()));
 }

-logsDialog::~logsDialog()
+LogsDialog::~LogsDialog()
 {
  delete ui;
 }

-void logsDialog::titleDoubleClick(QMouseEvent *evt, QCPPlotTitle *title)
+void LogsDialog::titleDoubleClick(QMouseEvent *evt, QCPPlotTitle *title)
 {
  // Set the plot title by double clicking on it
-
  bool ok;
-  QString newTitle = QInputDialog::getText(this, tr("Plot Title Change"),
-    tr("New plot title:"), QLineEdit::Normal, title->text(), &ok);
-  if (ok)
-  {
+  QString newTitle = QInputDialog::getText(this, tr("Plot Title Change"), tr("New plot title:"), QLineEdit::Normal, title->text(), &ok);
+  if (ok) {
    title->setText(newTitle);
    ui->customPlot->replot();
  }
 }

-void logsDialog::axisLabelDoubleClick(QCPAxis *axis, QCPAxis::SelectablePart part)
+void LogsDialog::axisLabelDoubleClick(QCPAxis *axis, QCPAxis::SelectablePart part)
 {
  // Set an axis label by double clicking on it
-  if (part == QCPAxis::spAxisLabel) // only react when the actual axis label is clicked, not tick label or axis backbone
-  {
+  if (part == QCPAxis::spAxisLabel) {
+    // only react when the actual axis label is clicked, not tick label or axis backbone
    bool ok;
    QString newLabel = QInputDialog::getText(this, tr("Axis Label Change"), tr("New axis label:"), QLineEdit::Normal, axis->label(), &ok);
-    if (ok)
-    {
+    if (ok) {
      axis->setLabel(newLabel);
      ui->customPlot->replot();
    }
  }
 }

-void logsDialog::legendDoubleClick(QCPLegend *legend, QCPAbstractLegendItem *item)
+void LogsDialog::legendDoubleClick(QCPLegend *legend, QCPAbstractLegendItem *item)
 {
  // Rename a graph by double clicking on its legend item
-  if (item) // only react if item was clicked (user could have clicked on border padding of legend where there is no item, then item is 0)
-  {
+  if (item) {
+    // only react if item was clicked (user could have clicked on border padding of legend where there is no item, then item is 0)
    QCPPlottableLegendItem *plItem = qobject_cast<QCPPlottableLegendItem*>(item);
    bool ok;
    QString newName = QInputDialog::getText(this, tr("Graph Name Change"), tr("New graph name:"), QLineEdit::Normal, plItem->plottable()->name(), &ok);
-    if (ok)
-    {
+    if (ok) {
      plItem->plottable()->setName(newName);
      ui->customPlot->replot();
    }
  }
 }

-void logsDialog::selectionChanged()
+void LogsDialog::selectionChanged()
 {
  /*
   normally, axis base line, axis tick labels and axis labels are selectable separately, but we want
@@ -208,20 +197,18 @@ void logsDialog::selectionChanged()
  }

  // synchronize selection of graphs with selection of corresponding legend items:
-  for (int i=0; i<ui->customPlot->graphCount(); ++i)
-  {
+  for (int i=0; i<ui->customPlot->graphCount(); ++i) {
    QCPGraph *graph = ui->customPlot->graph(i);
    QCPPlottableLegendItem *item = ui->customPlot->legend->itemWithPlottable(graph);
    if (item == NULL) item = rightLegend->itemWithPlottable(graph);
-    if (item->selected() || graph->selected())
-    {
+    if (item->selected() || graph->selected()) {
      item->setSelected(true);
      graph->setSelected(true);
    }
  }
 }

-QList<QStringList> logsDialog::filterGePoints(const QList<QStringList> & input)
+QList<QStringList> LogsDialog::filterGePoints(const QList<QStringList> & input)
 {
  QList<QStringList> result;

@@ -230,17 +217,16 @@ QList<QStringList> logsDialog::filterGePoints(const QList<QStringList> & input)
    return result;
  }

-  int latcol=0, longcol=0;
+  int gpscol = 0;
  for (int i=1; i<input.at(0).count(); i++) {
-    //Long,Lat,Course,GPS Speed,GPS Alt
-    if (input.at(0).at(i).contains("Long")) {
-      longcol=i;
-    }
-    if (input.at(0).at(i).contains("Lat")) {
-      latcol=i;
+    if (input.at(0).at(i) == "GPS") {
+      gpscol=i;
    }
  }
-  if (longcol==0 || latcol==0) {
+  if (gpscol == 0) {
+    QMessageBox::critical(this, tr("Error: no GPS data not found"), 
+      tr("The column containing GPS coordinates must be named \"GPS\".\n\n\
+The columns for altitude \"GAlt\" and for speed \"GSpd\" are optional"));
    return result;
  }

@@ -253,14 +239,15 @@ QList<QStringList> logsDialog::filterGePoints(const QList<QStringList> & input)
  for (int i = 1; i < n; i++) {
    if ((ui->logTable->item(i-1, 1)->isSelected() && rangeSelected) || !rangeSelected) {

-      QString latitude = input.at(i).at(latcol).trimmed();
-      QString longitude = input.at(i).at(longcol).trimmed();
+      QStringList latlon = extractLatLon(input.at(i).at(gpscol));
+      QString latitude = latlon[0];
+      QString longitude = latlon[1];
      double flatitude = toDecimalCoordinate(latitude);
      double flongitude = toDecimalCoordinate(longitude);

      // glitch filter
      if ( glitchFilter.isGlitch(flatitude, flongitude) ) {
-        qDebug() << "filterGePoints(): GPS glitch detected at" << i << flatitude << flongitude;  
+        // qDebug() << "filterGePoints(): GPS glitch detected at" << i << flatitude << flongitude;  
        continue;
      }

@@ -275,42 +262,39 @@ QList<QStringList> logsDialog::filterGePoints(const QList<QStringList> & input)
    }
  }

-  qDebug() << "filterGePoints(): filtered from" << input.count() << "to " << result.count() << "points";
+  // qDebug() << "filterGePoints(): filtered from" << input.count() << "to " << result.count() << "points";
  return result;
 }

-void logsDialog::exportToGoogleEarth()
+void LogsDialog::exportToGoogleEarth()
 {
  // filter data points
  QList<QStringList> dataPoints = filterGePoints(csvlog);
  int n = dataPoints.count(); // number of points to export
  if (n==0) return;

-  int latcol=0, longcol=0, altcol=0, speedcol=0;
+  int gpscol=0, altcol=0, speedcol=0;
  QSet<int> nondataCols;
  for (int i=1; i<dataPoints.at(0).count(); i++) {
-    //Long,Lat,Course,GPS Speed,GPS Alt
-    if (dataPoints.at(0).at(i).contains("Long")) {
-      longcol=i;
+    // Long,Lat,Course,GPS Speed,GPS Alt
+    if (dataPoints.at(0).at(i) == "GPS") {
+      gpscol=i;
+    }
+    if (dataPoints.at(0).at(i).contains("GAlt")) {
+      altcol = i;
      nondataCols << i;
    }
-    if (dataPoints.at(0).at(i).contains("Lat")) {
-      latcol=i;
-      nondataCols << i;
-    }
-    if (dataPoints.at(0).at(i).contains("GPS Alt")) {
-      altcol=i;
-      nondataCols << i;
-    }
-    if (dataPoints.at(0).at(i).contains("GPS Speed")) {
-      speedcol=i;
+    if (dataPoints.at(0).at(i).contains("GSpd")) {
+      speedcol = i;
      nondataCols << i;
    }
  }
-  if (longcol==0 || latcol==0 || altcol==0) {
+
+  if (gpscol==0 ) {
    return;
  }

+  // qDebug() << "gpscol" << gpscol << "altcol" << altcol << "speedcol" << speedcol;
  QString geIconFilename = generateProcessUniqueTempFileName("track0.png");
  if (QFile::exists(geIconFilename)) {
    QFile::remove(geIconFilename);
@@ -375,22 +359,26 @@ void logsDialog::exportToGoogleEarth()

  // coordinate data points
  for (int i=1; i<n; i++) {
-    QString latitude=dataPoints.at(i).at(latcol).trimmed();
-    QString longitude=dataPoints.at(i).at(longcol).trimmed();
+    QStringList latlon = extractLatLon(dataPoints.at(i).at(gpscol));
+    QString latitude = latlon[0];
+    QString longitude = latlon[1];
+    int altitude = altcol ? dataPoints.at(i).at(altcol).toFloat() : 0;
    latitude.sprintf("%3.8f", toDecimalCoordinate(latitude));
    longitude.sprintf("%3.8f", toDecimalCoordinate(longitude));
-    outputStream << "\t\t\t\t\t<gx:coord>" << longitude << " " << latitude << " " << dataPoints.at(i).at(altcol).toFloat() << " </gx:coord>\n" ;
+    outputStream << "\t\t\t\t\t<gx:coord>" << longitude << " " << latitude << " " <<  altitude << " </gx:coord>\n" ;
  }

  // additional data for data points
  outputStream << "\t\t\t\t\t<ExtendedData>\n\t\t\t\t\t\t<SchemaData schemaUrl=\"#schema\">\n";

-  // gps speed data points
-  outputStream << "\t\t\t\t\t\t\t<gx:SimpleArrayData name=\"GPSSpeed\">\n";
-  for (int i=1; i<n; i++) {
-    outputStream << "\t\t\t\t\t\t\t\t<gx:value>"<< dataPoints.at(i).at(speedcol) <<"</gx:value>\n";
+  if (speedcol) {
+    // gps speed data points
+    outputStream << "\t\t\t\t\t\t\t<gx:SimpleArrayData name=\"GPSSpeed\">\n";
+    for (int i=1; i<n; i++) {
+      outputStream << "\t\t\t\t\t\t\t\t<gx:value>"<< dataPoints.at(i).at(speedcol) <<"</gx:value>\n";
+    }
+    outputStream << "\t\t\t\t\t\t\t</gx:SimpleArrayData>\n";
  }
-  outputStream << "\t\t\t\t\t\t\t</gx:SimpleArrayData>\n";

  // add values for additional fields
  for (int i=0; i<dataPoints.at(0).count()-2; i++) {
@@ -420,7 +408,7 @@ void logsDialog::exportToGoogleEarth()
  process->start(gePath, parameters);
 }

-void logsDialog::on_mapsButton_clicked()
+void LogsDialog::on_mapsButton_clicked()
 {
  ui->FieldsTW->setDisabled(true);
  ui->logTable->setDisabled(true);
@@ -431,7 +419,7 @@ void logsDialog::on_mapsButton_clicked()
  ui->logTable->setDisabled(false);
 }

-void logsDialog::mousePress()
+void LogsDialog::mousePress()
 {
  // if an axis is selected, only allow the direction of that axis to be dragged
  // if no axis is selected, both directions may be dragged
@@ -444,7 +432,7 @@ void logsDialog::mousePress()
    axisRect->setRangeDrag(Qt::Horizontal | Qt::Vertical);
 }

-void logsDialog::mouseWheel()
+void LogsDialog::mouseWheel()
 {
  // if an axis is selected, only allow the direction of that axis to be zoomed
  // if no axis is selected, both directions may be zoomed
@@ -462,7 +450,7 @@ void logsDialog::mouseWheel()
  }
 }

-void logsDialog::removeAllGraphs()
+void LogsDialog::removeAllGraphs()
 {
  ui->customPlot->clearGraphs();
  ui->customPlot->legend->setVisible(false);
@@ -480,12 +468,11 @@ void logsDialog::removeAllGraphs()
  ui->customPlot->replot();
 }

-void logsDialog::on_fileOpen_BT_clicked()
+void LogsDialog::on_fileOpen_BT_clicked()
 {
-  QString fileName = QFileDialog::getOpenFileName(this,tr("Select your log file"), g.logDir());
+  QString fileName = QFileDialog::getOpenFileName(this, tr("Select your log file"), g.logDir());
  if (!fileName.isEmpty()) {
-
-    g.logDir( fileName );
+    g.logDir(fileName);
    ui->FileName_LE->setText(fileName);
    if (cvsFileParse()) {
      ui->FieldsTW->clear();
@@ -525,15 +512,16 @@ void logsDialog::on_fileOpen_BT_clicked()
  }
 }

-bool logsDialog::cvsFileParse()
+bool LogsDialog::cvsFileParse()
 {
  QFile file(ui->FileName_LE->text());
  int errors=0;
  int lines=-1;

-  if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { //reading HEX TEXT file
+  if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) { // reading HEX TEXT file
    return false;
-  } else {
+  }
+  else {
    csvlog.clear();
    logFilename.clear();
    QTextStream inputStream(&file);
@@ -541,7 +529,8 @@ bool logsDialog::cvsFileParse()

    if (buffer.startsWith("Date,Time")) {
      file.reset();
-    } else {
+    }
+    else {
      return false;
    }

@@ -554,29 +543,30 @@ bool logsDialog::cvsFileParse()
      }
      if (columns.count()==numfields) {
        csvlog.append(columns);
-      } else {
+      }
+      else {
        errors++;
      }
      lines++;
    }

-    logFilename=QFileInfo(file.fileName()).baseName();
+    logFilename = QFileInfo(file.fileName()).baseName();
  }

  file.close();
-  if (errors>1) {
+  if (errors > 1) {
    QMessageBox::warning(this, "Companion", tr("The selected logfile contains %1 invalid lines out of  %2 total lines").arg(errors).arg(lines));
  }

-  int n=csvlog.count();
-  if (n==1) {
+  int n = csvlog.count();
+  if (n == 1) {
    csvlog.clear();
    return false;
  }

  plotLock = true;
  setFlightSessions();
-  plotLock=false;
+  plotLock = false;

  return true;
 }
@@ -586,7 +576,7 @@ struct FlightSession {
  QDateTime end;
 };

-QDateTime logsDialog::getRecordTimeStamp(int index) 
+QDateTime LogsDialog::getRecordTimeStamp(int index) 
 {
  QString tstamp = csvlog.at(index).at(0) + " " + csvlog.at(index).at(1);
  if (csvlog.at(index).at(1).contains(".")) 
@@ -594,7 +584,7 @@ QDateTime logsDialog::getRecordTimeStamp(int index)
  return QDateTime::fromString(tstamp, "yyyy-MM-dd HH:mm:ss");
 }

-QString logsDialog::generateDuration(const QDateTime & start, const QDateTime & end)
+QString LogsDialog::generateDuration(const QDateTime & start, const QDateTime & end)
 {
  int secs = start.secsTo(end);
  QString durationString;
@@ -606,11 +596,11 @@ QString logsDialog::generateDuration(const QDateTime & start, const QDateTime &
  return durationString;
 }

-void logsDialog::setFlightSessions()
+void LogsDialog::setFlightSessions()
 {
  ui->sessions_CB->clear();

-  int n=csvlog.count();
+  int n = csvlog.count();
  // qDebug() << "records" << n;

  // find session breaks
@@ -646,7 +636,7 @@ void logsDialog::setFlightSessions()
  }
 }

-void logsDialog::on_sessions_CB_currentIndexChanged(int index)
+void LogsDialog::on_sessions_CB_currentIndexChanged(int index)
 {
  if (plotLock) return;
  plotLock = true;
@@ -674,7 +664,7 @@ void logsDialog::on_sessions_CB_currentIndexChanged(int index)
  plotLogs();
 }

-void logsDialog::plotLogs()
+void LogsDialog::plotLogs()
 {
  if (plotLock) return;

@@ -920,7 +910,7 @@ void logsDialog::plotLogs()
  ui->customPlot->replot();
 }

-void logsDialog::yAxisChangeRanges(QCPRange range)
+void LogsDialog::yAxisChangeRanges(QCPRange range)
 {
  if (axisRect->axis(QCPAxis::atRight)->visible()) {
    double lowerChange = (range.lower - yAxesRanges[firstLeft].min) *
@@ -1,5 +1,5 @@
-#ifndef LOGSDIALOG_H
-#define LOGSDIALOG_H
+#ifndef _LOGSDIALOG_H_
+#define _LOGSDIALOG_H_

 #include <QtCore>
 #include <QtGui>
@@ -37,16 +37,16 @@ struct plotsCollection {
 };

 namespace Ui {
-    class logsDialog;
+  class LogsDialog;
 }

-class logsDialog : public QDialog
+class LogsDialog : public QDialog
 {
    Q_OBJECT

 public:
-  explicit logsDialog(QWidget *parent = 0);
-  ~logsDialog();
+  explicit LogsDialog(QWidget *parent = 0);
+  ~LogsDialog();

 private slots:
  void titleDoubleClick(QMouseEvent *evt, QCPPlotTitle *title);
@@ -64,7 +64,7 @@ private slots:

 private:
  QList<QStringList> csvlog;
-  Ui::logsDialog *ui;
+  Ui::LogsDialog *ui;
  QCPAxisRect *axisRect;
  QCPLegend *rightLegend;
  bool plotLock;
@@ -85,4 +85,4 @@ private:

 };

-#endif // LOGSDIALOG_H
+#endif // _LOGSDIALOG_H_
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>logsDialog</class>
- <widget class="QDialog" name="logsDialog">
+ <class>LogsDialog</class>
+ <widget class="QDialog" name="LogsDialog">
  <property name="geometry">
   <rect>
    <x>0</x>
@@ -70,15 +70,16 @@
 #include "radiointerface.h"
 #include "progressdialog.h"

-#define OPENTX_COMPANION_DOWNLOADS   "http://downloads-21.open-tx.org/companion"
-#define DONATE_STR      "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QUZ48K4SEXDP2"
+#define OPENTX_COMPANION_DOWNLOADS        "http://downloads-21.open-tx.org/companion"
+#define OPENTX_NIGHT_COMPANION_DOWNLOADS  "http://downloads-21.open-tx.org/nightly/companion"
+#define DONATE_STR                        "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QUZ48K4SEXDP2"

 #ifdef __APPLE__
-  #define C9X_STAMP     OPENTX_COMPANION_DOWNLOADS "/companion-macosx.stamp"
-  #define C9X_INSTALLER "/companion-macosx-%1.dmg"
+  #define COMPANION_STAMP                 "companion-macosx.stamp"
+  #define COMPANION_INSTALLER             "companion-macosx-%1.dmg"
 #else
-  #define C9X_STAMP     OPENTX_COMPANION_DOWNLOADS "/companion-windows.stamp"
-  #define C9X_INSTALLER "/companion-windows-%1.exe"
+  #define COMPANION_STAMP                 "companion-windows.stamp"
+  #define COMPANION_INSTALLER             "companion-windows-%1.exe"
 #endif

 #if defined WIN32 || !defined __GNUC__
@@ -114,16 +115,15 @@ MainWindow::MainWindow():
    this->setIconSize(QSize(32, 32));
    QNetworkProxyFactory::setUseSystemConfiguration(true);
    setAcceptDrops(true);
-    
+
    // give time to the splash to disappear and main window to open before starting updates
    int updateDelay = 1000;
    bool showSplash = g.showSplash();
    if (showSplash) {
-      updateDelay += (SPLASH_TIME*1000); 
+      updateDelay += (SPLASH_TIME*1000);
    }
    QTimer::singleShot(updateDelay, this, SLOT(doAutoUpdates()));
    QTimer::singleShot(updateDelay, this, SLOT(displayWarnings()));
-    updateSdsyncAction();

    QStringList strl = QApplication::arguments();
    QString str;
@@ -158,13 +158,13 @@ MainWindow::MainWindow():
            child->show();
          }
          else {
-            child->show();            
+            child->show();
            child->print(model,printfilename);
            child->close();
          }
        }
      }
-    } 
+    }
    if (printing) {
      QTimer::singleShot(0, this, SLOT(autoClose()));
    }
@@ -185,7 +185,7 @@ void MainWindow::displayWarnings()
    }
  }
  else if (warnId==0) {
-    g.warningId(WARNING_ID);    
+    g.warningId(WARNING_ID);
  }
 }

@@ -216,6 +216,15 @@ void MainWindow::dowloadLastFirmwareUpdate()
  checkForUpdates();
 }

+QString MainWindow::getCompanionUpdateBaseUrl()
+{
+#if defined(ALLOW_NIGHTLY_BUILDS)
+  return g.useCompanionNightlyBuilds() ? OPENTX_NIGHT_COMPANION_DOWNLOADS : OPENTX_COMPANION_DOWNLOADS;
+#else
+  return OPENTX_COMPANION_DOWNLOADS;
+#endif
+}
+
 void MainWindow::checkForUpdates()
 {
  if (checkForUpdatesState & SHOW_DIALOG_WAIT) {
@@ -229,7 +238,7 @@ void MainWindow::checkForUpdates()
    // TODO why create each time a network manager?
    networkManager = new QNetworkAccessManager(this);
    connect(networkManager, SIGNAL(finished(QNetworkReply*)),this, SLOT(checkForCompanionUpdateFinished(QNetworkReply*)));
-    QNetworkRequest request(QUrl(C9X_STAMP));
+    QNetworkRequest request(QUrl(QString("%1/%2").arg(getCompanionUpdateBaseUrl()).arg(COMPANION_STAMP)));
    request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
    networkManager->get(request);
  }
@@ -283,20 +292,17 @@ void MainWindow::checkForCompanionUpdateFinished(QNetworkReply * reply)
      int c9xver = version2index(c9xversion);

      if (c9xver < vnum) {
-#if defined WIN32 || !defined __GNUC__ // || defined __APPLE__  // OSX should only notify of updates since no update packages are available. 
+#if defined WIN32 || !defined __GNUC__ // || defined __APPLE__  // OSX should only notify of updates since no update packages are available.
        int ret = QMessageBox::question(this, "Companion", tr("A new version of Companion is available (version %1)<br>"
                                                            "Would you like to download it?").arg(version) ,
                                        QMessageBox::Yes | QMessageBox::No);

        if (ret == QMessageBox::Yes) {
-#if defined __APPLE__          
-          QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.updatesDir() + QString(C9X_INSTALLER).arg(version));
-#else            
-          QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.updatesDir() + QString(C9X_INSTALLER).arg(version), tr("Executable (*.exe)"));
-#endif
+          QDir dir(g.updatesDir());
+          QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), dir.absoluteFilePath(QString(COMPANION_INSTALLER).arg(version)), tr("Executable (*.exe)"));
          if (!fileName.isEmpty()) {
            g.updatesDir(QFileInfo(fileName).dir().absolutePath());
-            downloadDialog * dd = new downloadDialog(this, QString(OPENTX_COMPANION_DOWNLOADS C9X_INSTALLER).arg(version), fileName);
+            downloadDialog * dd = new downloadDialog(this, QString("%1/%2").arg(getCompanionUpdateBaseUrl()).arg(QString(COMPANION_INSTALLER).arg(version)), fileName);
            installer_fileName = fileName;
            connect(dd, SIGNAL(accepted()), this, SLOT(updateDownloaded()));
            dd->exec();
@@ -304,7 +310,7 @@ void MainWindow::checkForCompanionUpdateFinished(QNetworkReply * reply)
        }
 #else
        QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available, please check the OpenTX website!"));
-#endif            
+#endif
      }
      else {
        if (downloadDialog_forWait && checkForUpdatesState==0) {
@@ -406,6 +412,7 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
        QString currentVersionString = index2version(currentVersion);

        QMessageBox msgBox;
+        msgBox.setWindowTitle("Companion");
        QSpacerItem * horizontalSpacer = new QSpacerItem(500, 0, QSizePolicy::Minimum, QSizePolicy::Expanding);
        QGridLayout * layout = (QGridLayout*)msgBox.layout();
        layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount());
@@ -413,8 +420,7 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
        if (currentVersion == 0) {
          QString rn = GetCurrentFirmware()->getReleaseNotesUrl();
          QAbstractButton *rnButton = NULL;
-          msgBox.setWindowTitle("Companion");
-          msgBox.setInformativeText(tr("Firmware %1 does not seem to have ever been downloaded.\nRelease %2 is available.\nDo you want to download it now?\n\nWe recommend you view the release notes using the button below to learn about any changes that may be important to you.").arg(current_firmware_variant->getId()).arg(versionString));
+          msgBox.setText(tr("Firmware %1 does not seem to have ever been downloaded.\nRelease %2 is available.\nDo you want to download it now?\n\nWe recommend you view the release notes using the button below to learn about any changes that may be important to you.").arg(current_firmware_variant->getId()).arg(versionString));
          QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole);
          msgBox.addButton(trUtf8("No"), QMessageBox::NoRole);
          if (!rn.isEmpty()) {
@@ -442,8 +448,7 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
        else if (version > currentVersion) {
          QString rn = GetCurrentFirmware()->getReleaseNotesUrl();
          QAbstractButton *rnButton = NULL;
-          msgBox.setText("Companion");
-          msgBox.setInformativeText(tr("A new version of %1 firmware is available:\n  - current is %2\n  - newer is %3\n\nDo you want to download it now?\n\nWe recommend you view the release notes using the button below to learn about any changes that may be important to you.").arg(current_firmware_variant->getId()).arg(currentVersionString).arg(versionString));
+          msgBox.setText(tr("A new version of %1 firmware is available:\n  - current is %2\n  - newer is %3\n\nDo you want to download it now?\n\nWe recommend you view the release notes using the button below to learn about any changes that may be important to you.").arg(current_firmware_variant->getId()).arg(currentVersionString).arg(versionString));
          QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole);
          msgBox.addButton(trUtf8("No"), QMessageBox::NoRole);
          if (!rn.isEmpty()) {
@@ -453,8 +458,8 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
          msgBox.resize(0,0);
          msgBox.exec();
          if( msgBox.clickedButton() == rnButton ) {
-            ContributorsDialog *cd = new ContributorsDialog(this); // , 2, rn);
-            cd->exec();
+            ReleaseNotesFirmwareDialog * dialog = new ReleaseNotesFirmwareDialog(this, rn);
+            dialog->exec();
            int ret2 = QMessageBox::question(this, "Companion", tr("Do you want to download release %1 now ?").arg(versionString),
                  QMessageBox::Yes | QMessageBox::No);
            if (ret2 == QMessageBox::Yes) {
@@ -530,37 +535,22 @@ void MainWindow::closeEvent(QCloseEvent *event)
    }
 }

-void MainWindow::setLanguage(QString langString)
-{    
-    g.locale( langString );
-    
-    QMessageBox msgBox;
-    msgBox.setText(tr("The selected language will be used the next time you start Companion."));
-    msgBox.setIcon(QMessageBox::Information);
-    msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
-    msgBox.exec();
+void MainWindow::setLanguage(const QString & langString)
+{
+  g.locale(langString);
+  QMessageBox::information(this, tr("Companion"), tr("The selected language will be used the next time you start Companion."));
 }

 void  MainWindow::setTheme(int index)
-{    
-    g.theme( index );
-    
-    QMessageBox msgBox;
-    msgBox.setText(tr("The new theme will be loaded the next time you start Companion."));
-    msgBox.setIcon(QMessageBox::Information);
-    msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
-    msgBox.exec();
+{
+  g.theme(index);
+  QMessageBox::information(this, tr("Companion"), tr("The new theme will be loaded the next time you start Companion."));
 }

 void  MainWindow::setIconThemeSize(int index)
-{    
-    g.iconSize( index );
-
-    QMessageBox msgBox;
-    msgBox.setText(tr("The icon size will be used the next time you start Companion."));
-    msgBox.setIcon(QMessageBox::Information);
-    msgBox.addButton(tr("OK"), QMessageBox::AcceptRole);
-    msgBox.exec();
+{
+  g.iconSize(index);
+  QMessageBox::information(this, tr("Companion"), tr("The icon size will be used the next time you start Companion."));
 }

 void MainWindow::newFile()
@@ -674,41 +664,47 @@ void MainWindow::contributors()

 void MainWindow::sdsync()
 {
+  QString sdPath = g.profile[g.id()].sdPath();
+  if (sdPath.isEmpty()) {
+    QMessageBox::warning(this, QObject::tr("Synchronization error"), QObject::tr("No SD directory configured!"));
+    return;
+  }
  QString massstoragePath = findMassstoragePath("SOUNDS");
  if (massstoragePath.isEmpty()) {
    QMessageBox::warning(this, QObject::tr("Synchronization error"), QObject::tr("No Radio connected!"));
    return;
  }
-  massstoragePath += "/..";
+  massstoragePath = massstoragePath.left(massstoragePath.length() - 7);
  ProgressDialog progressDialog(this, tr("Synchronize SD"), CompanionIcon("sdsync.png"));
  SyncProcess syncProcess(massstoragePath, g.profile[g.id()].sdPath(), progressDialog.progress());
-  syncProcess.run();
-  progressDialog.exec();
+  if (!syncProcess.run()) {
+    progressDialog.exec();
+  }
 }

 void MainWindow::changelog()
 {
-    ReleaseNotesDialog * dialog = new ReleaseNotesDialog(this);
-    dialog->exec();
+  ReleaseNotesDialog * dialog = new ReleaseNotesDialog(this);
+  dialog->exec();
 }

 void MainWindow::fwchangelog()
 {
-    Firmware *currfirm = GetCurrentFirmware();
-    QString rn=currfirm->getReleaseNotesUrl();
-    if (rn.isEmpty()) {
-      QMessageBox::information(this, tr("Firmware updates"), tr("Current firmware does not provide release notes informations."));
-    }
-    else {
-      ReleaseNotesFirmwareDialog * dialog = new ReleaseNotesFirmwareDialog(this, rn);
-      dialog->exec();
-    }
+  Firmware * firmware = GetCurrentFirmware();
+  QString url = firmware->getReleaseNotesUrl();
+  if (url.isEmpty()) {
+    QMessageBox::information(this, tr("Firmware updates"), tr("Current firmware does not provide release notes informations."));
+  }
+  else {
+    ReleaseNotesFirmwareDialog * dialog = new ReleaseNotesFirmwareDialog(this, url);
+    dialog->exec();
+  }
 }

 void MainWindow::customizeSplash()
-{    
-    customizeSplashDialog *cd = new customizeSplashDialog(this);
-    cd->exec();
+{
+  customizeSplashDialog * dialog = new customizeSplashDialog(this);
+  dialog->exec();
 }

 void MainWindow::cut()
@@ -764,7 +760,7 @@ void MainWindow::readEeprom()

    EEPROMInterface *eepromInterface = GetEepromInterface();

-    if (IS_ARM(eepromInterface->getBoard())) 
+    if (IS_ARM(eepromInterface->getBoard()))
      tempFile = generateProcessUniqueTempFileName("temp.bin");
    else
      tempFile += generateProcessUniqueTempFileName("temp.hex");
@@ -783,25 +779,41 @@ void MainWindow::readEeprom()
 bool MainWindow::readFirmwareFromRadio(const QString &filename)
 {
  ProgressDialog progressDialog(this, tr("Read Firmware from Radio"), CompanionIcon("read_flash.png"));
-  return readFirmware(filename, progressDialog.progress());
+  bool result = readFirmware(filename, progressDialog.progress());
+  if (!result) {
+    progressDialog.exec();
+  }
+  return result;
 }

 bool MainWindow::writeFirmwareToRadio(const QString &filename)
 {
  ProgressDialog progressDialog(this, tr("Write Firmware to Radio"), CompanionIcon("write_flash.png"));
-  return writeFirmware(filename, progressDialog.progress());
+  bool result = writeFirmware(filename, progressDialog.progress());
+  if (!result) {
+    progressDialog.exec();
+  }
+  return result;
 }

 bool MainWindow::readEepromFromRadio(const QString &filename)
 {
  ProgressDialog progressDialog(this, tr("Read Models and Settings from Radio"), CompanionIcon("read_eeprom.png"));
-  return ::readEeprom(filename, progressDialog.progress());
+  bool result = ::readEeprom(filename, progressDialog.progress());
+  if (!result) {
+    progressDialog.exec();
+  }
+  return result;
 }

 bool MainWindow::writeEepromToRadio(const QString &filename)
 {
  ProgressDialog progressDialog(this, tr("Write Models and Settings to Radio"), CompanionIcon("write_eeprom.png"));
-  return ::writeEeprom(filename, progressDialog.progress());
+  bool result = ::writeEeprom(filename, progressDialog.progress());
+  if (!result) {
+    progressDialog.exec();
+  }
+  return result;
 }

 void MainWindow::writeBackup()
@@ -872,7 +884,7 @@ void MainWindow::compare()

 void MainWindow::logFile()
 {
-  logsDialog *fd = new logsDialog(this);
+  LogsDialog *fd = new LogsDialog(this);
  fd->setWindowFlags(Qt::Window);   //to show minimize an maximize buttons
  fd->setAttribute(Qt::WA_DeleteOnClose, true);
  fd->show();
@@ -897,12 +909,6 @@ void MainWindow::about()
    msgBox.exec();
 }

-void MainWindow::updateSdsyncAction()
-{
-  QTimer::singleShot(1000, this, SLOT(updateSdsyncAction()));
-  sdsyncAct->setEnabled(!findMassstoragePath("SOUNDS").isEmpty());
-}
-
 void MainWindow::updateMenus()
 {
    bool hasMdiChild = (activeMdiChild() != 0);
@@ -911,7 +917,7 @@ void MainWindow::updateMenus()
    pasteAct->setEnabled(hasMdiChild ? activeMdiChild()->hasPasteData() : false);
    writeEepromAct->setEnabled(hasMdiChild);
    separatorAct->setVisible(hasMdiChild);
-    
+
    bool hasSelection = (activeMdiChild() && activeMdiChild()->hasSelection());
    cutAct->setEnabled(hasSelection);
    copyAct->setEnabled(hasSelection);
@@ -924,7 +930,7 @@ void MainWindow::updateMenus()
    updateLanguageActions();
    updateIconSizeActions();
    updateIconThemeActions();
-    setWindowTitle(tr("OpenTX Companion 2.1 - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->getName()).arg( g.profile[g.id()].name() ));
+    setWindowTitle(tr("OpenTX Companion %1 - Radio: %2 - Profile: %3").arg(C9X_VERSION).arg(GetCurrentFirmware()->getName()).arg(g.profile[g.id()].name()));
 }

 MdiChild *MainWindow::createMdiChild()
@@ -953,7 +959,7 @@ QAction * MainWindow::addAct(const QString & icon, const QString & sName, const
  QAction * newAction = new QAction( this );
  if (!icon.isEmpty())
    newAction->setIcon(CompanionIcon(icon));
-  if (!sName.isEmpty()) 
+  if (!sName.isEmpty())
    newAction->setText(sName);
  if (!lName.isEmpty())
    newAction->setStatusTip(lName);
@@ -974,7 +980,7 @@ QAction * MainWindow::addAct(QActionGroup *aGroup, const QString & sName, const
 {
  QAction *action = addAct("", sName, lName, QKeySequence::UnknownKey, slot);
  action->setCheckable(true);
-  aGroup->addAction(action);   
+  aGroup->addAction(action);
  return action;
 }

@@ -1008,7 +1014,7 @@ void MainWindow::createActions()
    cutAct =             addAct("cut.png",    tr("Cut Model"),              tr("Cut current model to the clipboard"),    QKeySequence::Cut,    SLOT(cut()));
    copyAct =            addAct("copy.png",   tr("Copy Model"),             tr("Copy current model to the clipboard"),   QKeySequence::Copy,   SLOT(copy()));
    pasteAct =           addAct("paste.png",  tr("Paste Model"),            tr("Paste model from clipboard"),            QKeySequence::Paste,  SLOT(paste()));
- 
+
    QActionGroup *themeAlignGroup = new QActionGroup(this);
    classicThemeAct =    addAct( themeAlignGroup,    tr("Classical"),       tr("The classic companion9x icon theme"),   SLOT(setClassicTheme()));
    yericoThemeAct =     addAct( themeAlignGroup,    tr("Yerico"),          tr("Yellow round honey sweet icon theme"),  SLOT(setYericoTheme()));
@@ -1063,7 +1069,7 @@ void MainWindow::createActions()
    readBackupToFileAct = addAct("read_eeprom_file.png", tr("Backup Radio to File"), tr("Save a complete backup file of all settings and model data in the Radio"), SLOT(readBackup()));
    contributorsAct =    addAct("contributors.png",  tr("Contributors..."), tr("A tribute to those who have contributed to OpenTX and Companion"), SLOT(contributors()));
    sdsyncAct =          addAct("sdsync.png",        tr("Synchronize SD"),          tr("SD card synchronization"),            SLOT(sdsync()));
-    
+
    compareAct->setEnabled(false);
    simulateAct->setEnabled(false);
    printAct->setEnabled(false);
@@ -1109,8 +1115,8 @@ void MainWindow::createMenus()
      languageMenu->addAction(germanLangAct);
      languageMenu->addAction(finnishLangAct);
      languageMenu->addAction(frenchLangAct);
-//      languageMenu->addAction(hebrewLangAct);
      languageMenu->addAction(italianLangAct);
+//      languageMenu->addAction(hebrewLangAct);
      languageMenu->addAction(polishLangAct);
 //      languageMenu->addAction(portugueseLangAct);
      languageMenu->addAction(spanishLangAct);
@@ -1147,7 +1153,7 @@ void MainWindow::createMenus()
    burnMenu->addSeparator();
    burnMenu->addSeparator();
    EEPROMInterface *eepromInterface = GetEepromInterface();
-    if (!IS_ARM(eepromInterface->getBoard())) {    
+    if (!IS_ARM(eepromInterface->getBoard())) {
      burnMenu->addAction(burnFusesAct);
      burnMenu->addAction(burnListAct);
    }
@@ -1164,7 +1170,7 @@ void MainWindow::createMenus()
    helpMenu->addSeparator();
    helpMenu->addAction(contributorsAct);
 }
- 
+
 QMenu *MainWindow::createRecentFileMenu()
 {
    QMenu *recentFileMenu = new QMenu(this);
@@ -1205,7 +1211,7 @@ void MainWindow::createToolBars()
        break;
      default:
        size=QSize(24,24);
-        break;        
+        break;
    }
    fileToolBar = addToolBar(tr("File"));
    fileToolBar->setIconSize(size);
@@ -1251,7 +1257,7 @@ void MainWindow::createToolBars()
    editToolBar->addAction(cutAct);
    editToolBar->addAction(copyAct);
    editToolBar->addAction(pasteAct);
-    
+
    burnToolBar = new QToolBar(tr("Write"));
    addToolBar( Qt::LeftToolBarArea, burnToolBar );
    burnToolBar->setIconSize(size);
@@ -1308,7 +1314,7 @@ void MainWindow::setActiveSubWindow(QWidget *window)
 void MainWindow::updateRecentFileActions()
 {
    int i, numRecentFiles;
- 
+
    //  Hide all document slots
    for ( i=0 ; i < g.historySize(); i++)
      recentFileActs[i]->setVisible(false);
@@ -1316,7 +1322,7 @@ void MainWindow::updateRecentFileActions()
    // Fill slots with content and unhide them
    QStringList files = g.recentFiles();
    numRecentFiles = qMin(files.size(), g.historySize());
- 
+
    for ( i = 0; i < numRecentFiles; i++)  {
      QString text = strippedName(files[i]);
      if (!text.trimmed().isEmpty())
@@ -1343,34 +1349,34 @@ void MainWindow::updateLanguageActions()
 {
  QString langId = g.locale();

-  if (langId=="") 
+  if (langId=="")
    sysLangAct->setChecked(true);
-  else if (langId=="cs_CZ") 
+  else if (langId=="cs_CZ")
    czechLangAct->setChecked(true);
-  else if (langId=="de_DE") 
+  else if (langId=="de_DE")
    germanLangAct->setChecked(true);
-  else if (langId=="en") 
+  else if (langId=="en")
    englishLangAct->setChecked(true);
-  else if (langId=="fi_FI") 
+  else if (langId=="fi_FI")
    finnishLangAct->setChecked(true);
-  else if (langId=="fr_FR") 
+  else if (langId=="fr_FR")
    frenchLangAct->setChecked(true);
-  else if (langId=="it_IT") 
+  else if (langId=="it_IT")
    italianLangAct->setChecked(true);
-  else if (langId=="he_IL") 
-    hebrewLangAct->setChecked(true);
-  else if (langId=="pl_PL") 
+  // else if (langId=="he_IL")
+  //   hebrewLangAct->setChecked(true);
+  else if (langId=="pl_PL")
    polishLangAct->setChecked(true);
-  else if (langId=="pt_PT") 
-    portugueseLangAct->setChecked(true);
-  else if (langId=="ru_RU") 
-    russianLangAct->setChecked(true);
+  // else if (langId=="pt_PT")
+  //   portugueseLangAct->setChecked(true);
  else if (langId=="es_ES")
    spanishLangAct->setChecked(true);
-  else if (langId=="sv_SE") 
+  else if (langId=="sv_SE")
    swedishLangAct->setChecked(true);
-  else if (langId=="nl_NL") 
-    dutchLangAct->setChecked(true);
+  // else if (langId=="ru_RU")
+  //   russianLangAct->setChecked(true);
+  // else if (langId=="nl_NL")
+  //   dutchLangAct->setChecked(true);
 }

 void MainWindow::updateIconThemeActions()
@@ -1387,9 +1393,9 @@ void MainWindow::updateIconThemeActions()

 void MainWindow::updateProfilesActions()
 {
-  for (int i=0; i<MAX_PROFILES; i++) 
+  for (int i=0; i<MAX_PROFILES; i++)
  {
-    if (g.profile[i].existsOnDisk()) 
+    if (g.profile[i].existsOnDisk())
    {
      QString text = tr("%2").arg(g.profile[i].name());
      profileActs[i]->setText(text);
@@ -1397,8 +1403,8 @@ void MainWindow::updateProfilesActions()
      profileActs[i]->setVisible(true);
      if (i == g.id())
        profileActs[i]->setChecked(true);
-    } 
-    else 
+    }
+    else
    {
      profileActs[i]->setVisible(false);
    }
@@ -1412,7 +1418,7 @@ void MainWindow::createProfile()
    ;
  if (i==MAX_PROFILES)  //Failed to find free slot
    return;
- 
+
  // Copy current profile to new and give it a new name
  g.profile[i] = g.profile[g.id()];
  g.profile[i].name(tr("New Radio"));
@@ -76,30 +76,31 @@ class MainWindow : public QMainWindow
    MainWindow();

  protected:
+    QString getCompanionUpdateBaseUrl();
    void dowloadLastFirmwareUpdate();
    void startFirmwareDownload();
    void closeEvent(QCloseEvent *event);
    void dragEnterEvent(QDragEnterEvent *event);
    void dropEvent(QDropEvent *event);
+    void setLanguage(const QString & langString);

  private slots:
    void openDocURL();

-    void setLanguage(QString langString);
-    void setSysLanguage() {setLanguage("");};
-    void setCZLanguage() {setLanguage("cs_CZ");};
-    void setDELanguage() {setLanguage("de_DE");};
-    void setENLanguage() {setLanguage("en");};
-    void setFILanguage() {setLanguage("fi_FI");};
-    void setFRLanguage() {setLanguage("fr_FR");};
-    void setITLanguage() {setLanguage("it_IT");};
-    void setHELanguage() {setLanguage("he_IL");};
-    void setPLLanguage() {setLanguage("pl_PL");};
-    void setESLanguage() {setLanguage("es_ES");};
-    void setPTLanguage() {setLanguage("pt_PT");};
-    void setRULanguage() {setLanguage("ru_RU");};
-    void setSELanguage() {setLanguage("sv_SE");};
-    void setNLLanguage() {setLanguage("nl_NL");};
+    void setSysLanguage() { setLanguage("");      };
+    void setCZLanguage()  { setLanguage("cs_CZ"); };
+    void setDELanguage()  { setLanguage("de_DE"); };
+    void setENLanguage()  { setLanguage("en");    };
+    void setFILanguage()  { setLanguage("fi_FI"); };
+    void setFRLanguage()  { setLanguage("fr_FR"); };
+    void setITLanguage()  { setLanguage("it_IT"); };
+    void setHELanguage()  { setLanguage("he_IL"); };
+    void setPLLanguage()  { setLanguage("pl_PL"); };
+    void setESLanguage()  { setLanguage("es_ES"); };
+    void setPTLanguage()  { setLanguage("pt_PT"); };
+    void setRULanguage()  { setLanguage("ru_RU"); };
+    void setSELanguage()  { setLanguage("sv_SE"); };
+    void setNLLanguage()  { setLanguage("nl_NL"); };

    void setTheme(int index);
    void setClassicTheme()   {setTheme(0);};
@@ -156,7 +157,6 @@ class MainWindow : public QMainWindow
    void loadBackup();
    void appPrefs();
    void fwPrefs();
-    void updateSdsyncAction();
    void updateMenus();
    void createProfile();
    MdiChild *createMdiChild();
@@ -262,20 +262,22 @@ class MainWindow : public QMainWindow
    QAction *normalIconAct;
    QAction *bigIconAct;
    QAction *hugeIconAct;
+
    QAction *sysLangAct;
-    QAction *englishLangAct;
    QAction *czechLangAct;
    QAction *germanLangAct;
-    QAction *frenchLangAct;
+    QAction *englishLangAct;
    QAction *finnishLangAct;
+    QAction *frenchLangAct;
    QAction *italianLangAct;
-    QAction *hebrewLangAct;
+    // QAction *hebrewLangAct;
    QAction *polishLangAct;
+    // QAction *portugueseLangAct;
    QAction *spanishLangAct;
-    QAction *portugueseLangAct;
    QAction *swedishLangAct;
-    QAction *russianLangAct;
-    QAction *dutchLangAct;
+    // QAction *russianLangAct;
+    // QAction *dutchLangAct;
+
    QAction *openDocURLAct;
 };

@@ -81,7 +81,7 @@ MdiChild::MdiChild():
  }
 }

-MdiChild::~MdiChild() 
+MdiChild::~MdiChild()
 {
  delete ui;
 }
@@ -155,7 +155,7 @@ void MdiChild::on_SimulateTxButton_clicked()
 void MdiChild::checkAndInitModel(int row)
 {
  ModelData &model = radioData.models[row - 1];
-  if (model.isempty()) {
+  if (model.isEmpty()) {
    model.setDefaultValues(row - 1, radioData.generalSettings);
    setModified();
  }
@@ -170,26 +170,31 @@ void MdiChild::generalEdit()

 void MdiChild::modelEdit()
 {
-  int row = ui->modelsList->currentRow();
+  int row = getCurrentRow();

  if (row == 0){
    generalEdit();
-  } 
+  }
  else {
    QApplication::setOverrideCursor(Qt::WaitCursor);
    checkAndInitModel( row );
    ModelData &model = radioData.models[row - 1];
+    gStopwatch.restart();
+    gStopwatch.report("ModelEdit creation");
    ModelEdit *t = new ModelEdit(this, radioData, (row - 1), GetCurrentFirmware()/*firmware*/);
+    gStopwatch.report("ModelEdit created");
    t->setWindowTitle(tr("Editing model %1: ").arg(row) + model.name);
    connect(t, SIGNAL(modified()), this, SLOT(setModified()));
+    gStopwatch.report("STARTING MODEL EDIT");
    t->show();
    QApplication::restoreOverrideCursor();
+    gStopwatch.report("ModelEdit shown");
  }
 }

 void MdiChild::wizardEdit()
 {
-  int row = ui->modelsList->currentRow();
+  int row = getCurrentRow();
  if (row > 0) {
    checkAndInitModel(row);
    WizardDialog * wizard = new WizardDialog(radioData.generalSettings, row, this);
@@ -203,13 +208,13 @@ void MdiChild::wizardEdit()

 void MdiChild::openEditWindow()
 {
-  int row = ui->modelsList->currentRow();
+  int row = getCurrentRow();
  if (row == 0){
    generalEdit();
  }
  else{
    ModelData &model = radioData.models[row - 1];
-    if (model.isempty() && g.useWizard()) {
+    if (model.isEmpty() && g.useWizard()) {
      wizardEdit();
    }
    else {
@@ -251,7 +256,7 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
      XmlInterface(inputStream).load(radioData);
    }
    else
-#endif 
+#endif
    if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { //read HEX file
      if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {  //reading HEX TEXT file
          QMessageBox::critical(this, tr("Error"),
@@ -260,18 +265,19 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
                               .arg(file.errorString()));
          return false;
      }
-        
+
      QDomDocument doc(ER9X_EEPROM_FILE_TYPE);
      bool xmlOK = doc.setContent(&file);
      if(xmlOK) {
-        if (loadEEpromXml(radioData, doc)){
+        std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEepromXml(radioData, doc));
+        if (errors.test(NO_ERROR)) {
          ui->modelsList->refreshList();
          if(resetCurrentFile) setCurrentFile(fileName);
          return true;
        }
      }
      file.reset();
-      
+
      QTextStream inputStream(&file);

      if (fileType==FILE_TYPE_EEPE) {  // read EEPE file header
@@ -282,8 +288,8 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
        }
      }

-      uint8_t eeprom[EESIZE_RLC_MAX];
-      int eeprom_size = HexInterface(inputStream).load(eeprom, EESIZE_RLC_MAX);
+      QByteArray eeprom(EESIZE_MAX, 0);
+      int eeprom_size = HexInterface(inputStream).load((uint8_t *)eeprom.data(), EESIZE_MAX);
      if (!eeprom_size) {
        QMessageBox::critical(this, tr("Error"),
            tr("Invalid EEPROM File %1")
@@ -294,12 +300,14 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)

      file.close();

-      if (!loadEEprom(radioData, eeprom, eeprom_size)) {
-        QMessageBox::critical(this, tr("Error"),
-            tr("Invalid EEPROM File %1")
-            .arg(fileName));
+      std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEeprom(radioData, (uint8_t *)eeprom.data(), eeprom_size));
+      if (!errors.test(NO_ERROR)) {
+        ShowEepromErrors(this, tr("Error"), tr("Invalid EEPROM File %1").arg(fileName), errors.to_ulong());
        return false;
      }
+      if (errors.test(HAS_WARNINGS)) {
+        ShowEepromWarnings(this, tr("Warning"), errors.to_ulong());
+      }

      ui->modelsList->refreshList();
      if(resetCurrentFile) setCurrentFile(fileName);
@@ -330,11 +338,18 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
          return false;
      }

-      if (!loadEEprom(radioData, eeprom, eeprom_size) && !::loadBackup(radioData, eeprom, eeprom_size, 0)) {
-        QMessageBox::critical(this, tr("Error"),
-            tr("Invalid binary EEPROM File %1")
-            .arg(fileName));
-        return false;
+      std::bitset<NUM_ERRORS> errorsEeprom((unsigned long long)LoadEeprom(radioData, eeprom, eeprom_size));
+      if (!errorsEeprom.test(NO_ERROR)) {
+        std::bitset<NUM_ERRORS> errorsBackup((unsigned long long)LoadBackup(radioData, eeprom, eeprom_size, 0));
+        if (!errorsBackup.test(NO_ERROR)) {
+          ShowEepromErrors(this, tr("Error"), tr("Invalid binary EEPROM File %1").arg(fileName), (errorsEeprom | errorsBackup).to_ulong());
+          return false;
+        }
+        if (errorsBackup.test(HAS_WARNINGS)) {
+          ShowEepromWarnings(this, tr("Warning"), errorsBackup.to_ulong());
+        }
+      } else if (errorsEeprom.test(HAS_WARNINGS)) {
+        ShowEepromWarnings(this, tr("Warning"), errorsEeprom.to_ulong());
      }

      ui->modelsList->refreshList();
@@ -367,7 +382,7 @@ bool MdiChild::saveAs(bool isNew)
      fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName());
 #else
      fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(BIN_FILES_FILTER));
-#endif      
+#endif
    }
    else {
      QFileInfo fi(curFile);
@@ -375,45 +390,45 @@ bool MdiChild::saveAs(bool isNew)
      fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName());
 #else
      fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(EEPROM_FILES_FILTER));
-#endif      
+#endif
    }
    if (fileName.isEmpty())
      return false;
    g.eepromDir( QFileInfo(fileName).dir().absolutePath() );
    if (isNew)
      return saveFile(fileName);
-    else 
+    else
      return saveFile(fileName,true);
 }

 bool MdiChild::saveFile(const QString &fileName, bool setCurrent)
 {
-    QString myFile;
-    myFile = fileName;
-    if (IS_SKY9X(GetEepromInterface()->getBoard())) {
-      myFile.replace(".eepe", ".bin");
-    }
-    QFile file(myFile);
+  QString myFile;
+  myFile = fileName;
+  if (IS_SKY9X(GetEepromInterface()->getBoard())) {
+    myFile.replace(".eepe", ".bin");
+  }
+  QFile file(myFile);

-    int fileType = getFileType(myFile);
+  int fileType = getFileType(myFile);

-    uint8_t *eeprom = (uint8_t*)malloc(GetEepromInterface()->getEEpromSize());
-    int eeprom_size = 0;
+  uint8_t *eeprom = (uint8_t*)malloc(GetEepromInterface()->getEEpromSize());
+  int eeprom_size = 0;

-    if (fileType != FILE_TYPE_XML) {
-      eeprom_size = GetEepromInterface()->save(eeprom, radioData, GetCurrentFirmware()->getVariantNumber(), 0/*last version*/);
-      if (!eeprom_size) {
-        QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
-        return false;
-      }
-    }
-
-    if (!file.open(fileType == FILE_TYPE_BIN ? QIODevice::WriteOnly : (QIODevice::WriteOnly | QIODevice::Text))) {
+  if (fileType != FILE_TYPE_XML) {
+    eeprom_size = GetEepromInterface()->save(eeprom, radioData, GetCurrentFirmware()->getVariantNumber(), 0/*last version*/);
+    if (!eeprom_size) {
      QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
      return false;
    }
+  }

-    QTextStream outputStream(&file);
+  if (!file.open(fileType == FILE_TYPE_BIN ? QIODevice::WriteOnly : (QIODevice::WriteOnly | QIODevice::Text))) {
+    QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
+    return false;
+  }
+
+  QTextStream outputStream(&file);

 #if 0
    if (fileType==FILE_TYPE_XML) {
@@ -425,34 +440,34 @@ bool MdiChild::saveFile(const QString &fileName, bool setCurrent)
    }
    else
 #endif
-    if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { // write hex
-      if (fileType==FILE_TYPE_EEPE)
-        outputStream << EEPE_EEPROM_FILE_HEADER << "\n";
+  if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { // write hex
+    if (fileType==FILE_TYPE_EEPE)
+      outputStream << EEPE_EEPROM_FILE_HEADER << "\n";

-      if (!HexInterface(outputStream).save(eeprom, eeprom_size)) {
-          QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
-          file.close();
-          return false;
-      }
-    }
-    else if (fileType==FILE_TYPE_BIN) // write binary
-    {
-      long result = file.write((char*)eeprom, eeprom_size);
-      if(result!=eeprom_size) {
-        QMessageBox::warning(this, tr("Error"),tr("Error writing file %1:\n%2.").arg(myFile).arg(file.errorString()));
+    if (!HexInterface(outputStream).save(eeprom, eeprom_size)) {
+        QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(myFile).arg(file.errorString()));
+        file.close();
        return false;
-      }
    }
-    else {
-      QMessageBox::warning(this, tr("Error"),tr("Error writing file %1:\n%2.").arg(myFile).arg("Unknown format"));
+  }
+  else if (fileType==FILE_TYPE_BIN) // write binary
+  {
+    long result = file.write((char*)eeprom, eeprom_size);
+    if(result!=eeprom_size) {
+      QMessageBox::warning(this, tr("Error"),tr("Error writing file %1:\n%2.").arg(myFile).arg(file.errorString()));
      return false;
    }
+  }
+  else {
+    QMessageBox::warning(this, tr("Error"),tr("Error writing file %1:\n%2.").arg(myFile).arg("Unknown format"));
+    return false;
+  }

-    free(eeprom); // TODO free in all cases ...
-    file.close();
-    if(setCurrent) setCurrentFile(myFile);
+  free(eeprom); // TODO free in all cases ...
+  file.close();
+  if(setCurrent) setCurrentFile(myFile);

-    return true;
+  return true;
 }

 QString MdiChild::userFriendlyCurrentFile()
@@ -505,7 +520,7 @@ void MdiChild::setCurrentFile(const QString &fileName)
  files.prepend(fileName);
  while (files.size() > MaxRecentFiles)
      files.removeLast();
- 
+
  g.recentFiles( files );
 }

@@ -529,8 +544,8 @@ void MdiChild::writeEeprom()  // write to Tx

 void MdiChild::simulate()
 {
-  if (ui->modelsList->currentRow() >= 1) {
-    startSimulation(this, radioData, ui->modelsList->currentRow()-1);
+  if (getCurrentRow() > 0) {
+    startSimulation(this, radioData, getCurrentRow()-1);
  }
 }

@@ -539,12 +554,12 @@ void MdiChild::print(int model, QString filename)
  PrintDialog * pd = NULL;

  if (model>=0 && !filename.isEmpty()) {
-    pd = new PrintDialog(this, GetCurrentFirmware()/*firmware*/, &radioData.generalSettings, &radioData.models[model], filename);
+    pd = new PrintDialog(this, GetCurrentFirmware()/*firmware*/, radioData.generalSettings, radioData.models[model], filename);
  }
-  else if (ui->modelsList->currentRow() > 0) {
-    pd = new PrintDialog(this, GetCurrentFirmware()/*firmware*/, &radioData.generalSettings, &radioData.models[ui->modelsList->currentRow()-1]);
+  else if (getCurrentRow() > 0) {
+    pd = new PrintDialog(this, GetCurrentFirmware()/*firmware*/, radioData.generalSettings, radioData.models[getCurrentRow()-1]);
  }
-    
+
  if (pd) {
    pd->setAttribute(Qt::WA_DeleteOnClose, true);
    pd->show();
@@ -561,49 +576,56 @@ void MdiChild::setEEpromAvail(int eavail)
  EEPromAvail=eavail;
 }

+int MdiChild::getCurrentRow() const
+{
+  return ui->modelsList->currentRow();
+}
+
 bool MdiChild::loadBackup()
 {
-    QString fileName = QFileDialog::getOpenFileName(this, tr("Open backup Models and Settings file"), g.eepromDir(),tr(EEPROM_FILES_FILTER));
-    if (fileName.isEmpty())
-      return false;
-    QFile file(fileName);
+  QString fileName = QFileDialog::getOpenFileName(this, tr("Open backup Models and Settings file"), g.eepromDir(),tr(EEPROM_FILES_FILTER));
+  if (fileName.isEmpty())
+    return false;
+  QFile file(fileName);

-    if (!file.exists()) {
-      QMessageBox::critical(this, tr("Error"), tr("Unable to find file %1!").arg(fileName));
+  if (!file.exists()) {
+    QMessageBox::critical(this, tr("Error"), tr("Unable to find file %1!").arg(fileName));
+    return false;
+  }
+  if(getCurrentRow() < 1) return false;
+  int index = getCurrentRow() - 1;
+
+  int eeprom_size = file.size();
+  if (!file.open(QFile::ReadOnly)) {  //reading binary file   - TODO HEX support
+    QMessageBox::critical(this, tr("Error"),
+                          tr("Error opening file %1:\n%2.")
+                          .arg(fileName)
+                          .arg(file.errorString()));
+    return false;
+  }
+  QByteArray eeprom(eeprom_size, 0);
+  long result = file.read((char*)eeprom.data(), eeprom_size);
+  file.close();
+
+  if (result != eeprom_size) {
+    QMessageBox::critical(this, tr("Error"),
+                          tr("Error reading file %1:\n%2.")
+                          .arg(fileName)
+                          .arg(file.errorString()));
+
+    return false;
+  }
+
+    std::bitset<NUM_ERRORS> errorsEeprom((unsigned long long)LoadBackup(radioData, (uint8_t *)eeprom.data(), eeprom_size, index));
+    if (!errorsEeprom.test(NO_ERROR)) {
+      ShowEepromErrors(this, tr("Error"), tr("Invalid binary backup File %1").arg(fileName), (errorsEeprom).to_ulong());
      return false;
    }
-    if(ui->modelsList->currentRow()<1) return false;
-    int index=ui->modelsList->currentRow()-1;
-
-    int eeprom_size = file.size();
-    if (!file.open(QFile::ReadOnly)) {  //reading binary file   - TODO HEX support
-        QMessageBox::critical(this, tr("Error"),
-                              tr("Error opening file %1:\n%2.")
-                              .arg(fileName)
-                              .arg(file.errorString()));
-        return false;
-    }
-    QByteArray eeprom(eeprom_size, 0);
-    long result = file.read((char*)eeprom.data(), eeprom_size);
-    file.close();
-
-    if (result != eeprom_size) {
-        QMessageBox::critical(this, tr("Error"),
-                              tr("Error reading file %1:\n%2.")
-                              .arg(fileName)
-                              .arg(file.errorString()));
-
-        return false;
+    if (errorsEeprom.test(HAS_WARNINGS)) {
+      ShowEepromWarnings(this, tr("Warning"), errorsEeprom.to_ulong());
    }

-    if (!::loadBackup(radioData, (uint8_t *)eeprom.data(), eeprom_size, index)) {
-      QMessageBox::critical(this, tr("Error"),
-          tr("Invalid binary backup File %1")
-          .arg(fileName));
-      return false;
-    }
+  ui->modelsList->refreshList();

-    ui->modelsList->refreshList();
-
-    return true;
+  return true;
 }
@@ -77,6 +77,7 @@ class MdiChild : public QWidget
    void viableModelSelected(bool viable);
    void eepromInterfaceChanged();
    void setEEpromAvail(int eavail);
+    int getCurrentRow() const;

  signals:
    void copyAvailable(bool val);
@@ -7,7 +7,7 @@
 #include <QCheckBox>
 #include <QDoubleSpinBox>

-LimitsGroup::LimitsGroup(Firmware * firmware, QGridLayout *gridLayout, int row, int col, int & value, int min, int max, int deflt):
+LimitsGroup::LimitsGroup(Firmware * firmware, TableLayout * tableLayout, int row, int col, int & value, const ModelData & model, int min, int max, int deflt):
  firmware(firmware),
  spinbox(new QDoubleSpinBox()),
  value(value),
@@ -39,15 +39,18 @@ LimitsGroup::LimitsGroup(Firmware * firmware, QGridLayout *gridLayout, int row,
  }
  
  spinbox->setSingleStep(displayStep*internalStep);
+  spinbox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);

  QHBoxLayout * horizontalLayout = new QHBoxLayout();
  QCheckBox * gv = new QCheckBox(QObject::tr("GV"));
+  gv->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
  horizontalLayout->addWidget(gv);
  QComboBox * cb = new QComboBox();
+  cb->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
  horizontalLayout->addWidget(cb);
  horizontalLayout->addWidget(spinbox);
-  gridLayout->addLayout(horizontalLayout, row, col, 1, 1);
-  gvarGroup = new GVarGroup(gv, spinbox, cb, value, deflt, min, max, displayStep, allowGVars);
+  tableLayout->addLayout(row, col, horizontalLayout);
+  gvarGroup = new GVarGroup(gv, spinbox, cb, value, model, deflt, min, max, displayStep, allowGVars);
 }

 LimitsGroup::~LimitsGroup()
@@ -74,55 +77,55 @@ void LimitsGroup::updateMinMax(int max)
 Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, Firmware * firmware):
  ModelPanel(parent, model, generalSettings, firmware)
 {
-  QGridLayout * gridLayout = new QGridLayout(this);
-  bool minimize = false;
+  Stopwatch s1("Channels");

-  int col = 1;
-  if (firmware->getCapability(ChannelsName)) {
-    minimize=true;
-    addLabel(gridLayout, tr("Name"), col++);
+  int channelNameMaxLen = firmware->getCapability(ChannelsName);
+
+  QStringList headerLabels;
+  headerLabels << "#";
+  if (channelNameMaxLen > 0) {
+    headerLabels << tr("Name");
  }
-  addLabel(gridLayout, tr("Subtrim"), col++, minimize);
-  addLabel(gridLayout, tr("Min"), col++, minimize);
-  addLabel(gridLayout, tr("Max"), col++, minimize);
-  addLabel(gridLayout, tr("Direction"), col++, minimize);
+  headerLabels << tr("Subtrim") << tr("Min") << tr("Max") << tr("Direction");
  if (IS_TARANIS(GetEepromInterface()->getBoard()))
-    addLabel(gridLayout, tr("Curve"), col++, minimize);
+    headerLabels << tr("Curve");
  if (firmware->getCapability(PPMCenter))
-    addLabel(gridLayout, tr("PPM Center"), col++, minimize);
+    headerLabels << tr("PPM Center");
  if (firmware->getCapability(SYMLimits))
-    addLabel(gridLayout, tr("Linear Subtrim"), col++, true);
+    headerLabels << tr("Linear Subtrim");
+  TableLayout * tableLayout = new TableLayout(this, firmware->getCapability(LogicalSwitches), headerLabels);
+
+  s1.report("header");

  for (int i=0; i<firmware->getCapability(Outputs); i++) {
-    col = 0;
+    int col = 0;

    // Channel label
    QLabel *label = new QLabel(this);
-    label->setText(tr("Channel %1").arg(i+1));
+    label->setText(tr("CH%1").arg(i+1));
    label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
-    gridLayout->addWidget(label, i+1, col++, 1, 1);
+    tableLayout->addWidget(i, col++, label);

    // Channel name
-    int nameLen = firmware->getCapability(ChannelsName);
-    if (nameLen > 0) {
+    if (channelNameMaxLen > 0) {
      QLineEdit * name = new QLineEdit(this);
      name->setProperty("index", i);
-      name->setMaxLength(nameLen);
+      name->setMaxLength(channelNameMaxLen);
      QRegExp rx(CHAR_FOR_NAMES_REGEX);
      name->setValidator(new QRegExpValidator(rx, this));
      name->setText(model.limitData[i].name);
      connect(name, SIGNAL(editingFinished()), this, SLOT(nameEdited()));
-      gridLayout->addWidget(name, i+1, col++, 1, 1);
+      tableLayout->addWidget(i, col++, name);
    }

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

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

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

    // Channel inversion
    QComboBox * invCB = new QComboBox(this);
@@ -130,7 +133,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
    invCB->setProperty("index", i);
    invCB->setCurrentIndex((model.limitData[i].revert) ? 1 : 0);
    connect(invCB, SIGNAL(currentIndexChanged(int)), this, SLOT(invEdited()));
-    gridLayout->addWidget(invCB, i+1, col++, 1, 1);
+    tableLayout->addWidget(i, col++, invCB);

    // Curve
    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
@@ -142,7 +145,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
      }
      curveCB->setCurrentIndex(model.limitData[i].curve.value+numcurves);
      connect(curveCB, SIGNAL(currentIndexChanged(int)), this, SLOT(curveEdited()));
-      gridLayout->addWidget(curveCB, i+1, col++, 1, 1);
+      tableLayout->addWidget(i, col++, curveCB);
    }

    // PPM center
@@ -157,7 +160,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
      center->setValue(1500);
      center->setValue(model.limitData[i].ppmCenter + 1500);
      connect(center, SIGNAL(editingFinished()), this, SLOT(ppmcenterEdited()));
-      gridLayout->addWidget(center, i+1, col++, 1, 1);
+      tableLayout->addWidget(i, col++, center);
    }

    // Symetrical limits
@@ -166,14 +169,15 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
      symlimits->setProperty("index", i);
      symlimits->setChecked(model.limitData[i].symetrical);
      connect(symlimits, SIGNAL(toggled(bool)), this, SLOT(symlimitsEdited()));
-      gridLayout->addWidget(symlimits, i+1, col++, 1, 1);
+      tableLayout->addWidget(i, col++, symlimits);
    }
  }
-
-  // Push the rows up
-  addVSpring(gridLayout, 0,firmware->getCapability(Outputs)+1);
+  s1.report("add elements");

  disableMouseScrolling();
+  tableLayout->resizeColumnsToContents();
+  tableLayout->pushRowsUp(firmware->getCapability(Outputs)+1);
+  s1.report("end");
 }

 Channels::~Channels()
@@ -1,6 +1,7 @@
 #ifndef CHANNELS_H
 #define CHANNELS_H

+#include "helpers.h"
 #include "modeledit.h"
 #include <QSpinBox>

@@ -9,7 +10,7 @@ class GVarGroup;
 class LimitsGroup
 {
  public:
-    LimitsGroup(Firmware * firmware, QGridLayout *gridLayout, int row, int col, int & value, int min, int max, int deflt);
+    LimitsGroup(Firmware * firmware, TableLayout *tableLayout, int row, int col, int & value, const ModelData & model, int min, int max, int deflt);
    ~LimitsGroup();

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

-void Curves::on_curveType_currentIndexChanged()
+void Curves::on_curveType_currentIndexChanged(int index)
 {
-  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();
+    void on_curveType_currentIndexChanged(int index);
    void on_curveApply_clicked();

  protected:
@@ -43,8 +43,7 @@ void RepeatComboBox::update()

 CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model, GeneralSettings & generalSettings, Firmware * firmware):
  GenericPanel(parent, model, generalSettings, firmware),
-  functions(model ? model->customFn : generalSettings.customFn),
-  initialized(false)
+  functions(model ? model->customFn : generalSettings.customFn)
 #if defined(PHONON)
  ,
  phononCurrent(-1),
@@ -52,16 +51,9 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
  clickOutput(NULL)
 #endif
 {
-  QGridLayout * gridLayout = new QGridLayout(this);
-
-  addLabel(gridLayout, tr("Switch"), 1);
-  addLabel(gridLayout, tr("Action"), 2);
-  addLabel(gridLayout, tr("Parameters"), 3);
-  addLabel(gridLayout, tr("Enable"), 4, true );
-  addEmptyLabel(gridLayout, 5 );
-
+  Stopwatch s1("CustomFunctionsPanel - populate"); 
  lock = true;
-  int num_fsw = firmware->getCapability(CustomFunctions);
+  int num_fsw = model ? firmware->getCapability(CustomFunctions) : firmware->getCapability(GlobalFunctions);

  if (!firmware->getCapability(VoicesAsNumbers)) {
    tracksSet = getFilesSet(getSoundsPath(generalSettings), QStringList() << "*.wav" << "*.WAV", firmware->getCapability(VoicesMaxLength));
@@ -75,8 +67,10 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
    }
  }

+  s1.report("get tracks");
+
  if (IS_TARANIS(firmware->getBoard())) {
-    scriptsSet = getFilesSet(g.profile[g.id()].sdPath() + "/SCRIPTS", QStringList() << "*.lua", firmware->getCapability(VoicesMaxLength));
+    scriptsSet = getFilesSet(g.profile[g.id()].sdPath() + "/SCRIPTS/FUNCTIONS", QStringList() << "*.lua", firmware->getCapability(VoicesMaxLength));
    for (int i=0; i<num_fsw; i++) {
      if (functions[i].func==FuncPlayScript) {
        QString temp = functions[i].paramarm;
@@ -86,9 +80,14 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
      }
    }
  }
+  s1.report("get scripts");

  CompanionIcon playIcon("play.png");

+  QStringList headerLabels;
+  headerLabels << "#" << tr("Switch") << tr("Action") << tr("Parameters") << tr("Enable");
+  TableLayout * tableLayout = new TableLayout(this, num_fsw, headerLabels);
+
  for (int i=0; i<num_fsw; i++) {
    // The label
    QLabel * label = new QLabel(this);
@@ -101,28 +100,35 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
      label->setText(tr("GF%1").arg(i+1));
    label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
    connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(fsw_customContextMenuRequested(QPoint)));
-    gridLayout->addWidget(label, i+1, 0);
+    tableLayout->addWidget(i, 0, label);
+    // s1.report("label");

    // The switch
    fswtchSwtch[i] = new QComboBox(this);
    fswtchSwtch[i]->setProperty("index", i);
+    populateSwitchCB(fswtchSwtch[i], functions[i].swtch, generalSettings, model ? SpecialFunctionsContext : GlobalFunctionsContext);
    fswtchSwtch[i]->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
    fswtchSwtch[i]->setMaxVisibleItems(10);
    connect(fswtchSwtch[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
-    gridLayout->addWidget(fswtchSwtch[i], i+1, 1);
+    tableLayout->addWidget(i, 1, fswtchSwtch[i]);
+    // s1.report("switch");

    // The function
    fswtchFunc[i] = new QComboBox(this);
    fswtchFunc[i]->setProperty("index", i);
+    populateFuncCB(fswtchFunc[i], functions[i].func);
    connect(fswtchFunc[i], SIGNAL(currentIndexChanged(int)), this, SLOT(functionEdited()));
-    gridLayout->addWidget(fswtchFunc[i], i+1, 2);
+    tableLayout->addWidget(i, 2, fswtchFunc[i]);
+    // s1.report("func");

    // The parameters
-    QHBoxLayout *paramLayout = new QHBoxLayout();
-    gridLayout->addLayout(paramLayout, i+1, 3);
+    QHBoxLayout * paramLayout = new QHBoxLayout();
+    tableLayout->addLayout(i, 3, paramLayout);

    fswtchGVmode[i] = new QComboBox(this);
    fswtchGVmode[i]->setProperty("index", i);
+    populateGVmodeCB(fswtchGVmode[i], functions[i].adjustMode);
+    fswtchGVmode[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
    connect(fswtchGVmode[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
    paramLayout->addWidget(fswtchGVmode[i]);

@@ -149,12 +155,15 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,

    fswtchParamT[i] = new QComboBox(this);
    fswtchParamT[i]->setProperty("index", i);
+    populateFuncParamCB(fswtchParamT[i], functions[i].func, functions[i].param, functions[i].adjustMode);
    paramLayout->addWidget(fswtchParamT[i]);
+    fswtchParamT[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
    connect(fswtchParamT[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));

    fswtchParamArmT[i] = new QComboBox(this);
    fswtchParamArmT[i]->setProperty("index", i);
    fswtchParamArmT[i]->setEditable(true);
+    fswtchParamArmT[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
    paramLayout->addWidget(fswtchParamArmT[i]);

    connect(fswtchParamArmT[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
@@ -171,14 +180,15 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,

 #ifdef PHONON
    playBT[i] = new QPushButton(this);
+    playBT[i]->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
    playBT[i]->setProperty("index", i);
    playBT[i]->setIcon(playIcon);
    paramLayout->addWidget(playBT[i]);
    connect(playBT[i], SIGNAL(pressed()), this, SLOT(playMusic()));
 #endif

-    QHBoxLayout *repeatLayout = new QHBoxLayout();
-    gridLayout->addLayout(repeatLayout, i+1, 4);
+    QHBoxLayout * repeatLayout = new QHBoxLayout();
+    tableLayout->addLayout(i, 4, repeatLayout);
    fswtchRepeat[i] = new RepeatComboBox(this, functions[i].repeatParam);
    repeatLayout->addWidget(fswtchRepeat[i], i+1);
    connect(fswtchRepeat[i], SIGNAL(modified()), this, SLOT(onChildModified()));
@@ -186,17 +196,24 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
    fswtchEnable[i] = new QCheckBox(this);
    fswtchEnable[i]->setProperty("index", i);
    fswtchEnable[i]->setText(tr("ON"));
-    fswtchEnable[i]->setFixedWidth( 80 );
+    fswtchEnable[i]->setFixedWidth(200);
    repeatLayout->addWidget(fswtchEnable[i], i+1);
    connect(fswtchEnable[i], SIGNAL(stateChanged(int)), this, SLOT(customFunctionEdited()));
  }
-
-  // Push rows upward
-  addDoubleSpring(gridLayout, 5, num_fsw+1);
+  s1.report("add items");

  disableMouseScrolling();
+  s1.report("disableMouseScrolling");

  lock = false;
+
+  update();
+  s1.report("update");
+  tableLayout->resizeColumnsToContents();
+  s1.report("resizeColumnsToContents");
+  tableLayout->setColumnWidth(3, 300);
+  tableLayout->pushRowsUp(num_fsw+1);
+  s1.report("end");
 }

 CustomFunctionsPanel::~CustomFunctionsPanel()
@@ -379,17 +396,20 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
      }
    }
    else if (func==FuncReset) {
-      if (modified) cfn.param = (uint8_t)fswtchParamT[i]->currentIndex();
+      if (modified) cfn.param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
      populateFuncParamCB(fswtchParamT[i], func, cfn.param);
      widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE;
    }
-    else if (func>=FuncSetTimer1 && func<=FuncSetTimer2) {
+    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(QTime(0, 59, 59));
+      fswtchParamTime[i]->setMaximumTime(firmware->getMaxTimerStart());
      fswtchParamTime[i]->setTime(QTimeS(cfn.param));
      widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE;
    }
+    else if (func>=FuncSetFailsafeInternalModule && func<=FuncBindExternalModule) {
+      widgetsMask |= CUSTOM_FUNCTION_ENABLE;
+    }
    else if (func==FuncVolume) {
      if (modified) cfn.param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
      populateFuncParamCB(fswtchParamT[i], func, cfn.param);
@@ -442,16 +462,9 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
        else {
          widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
          if (modified) {
-            memset(cfn.paramarm, 0, sizeof(cfn.paramarm));
-            int vml = firmware->getCapability(VoicesMaxLength);
-            if (fswtchParamArmT[i]->currentText() != "----") {
-              widgetsMask |= CUSTOM_FUNCTION_PLAY;
-              for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(), vml); j++) {
-                cfn.paramarm[j] = fswtchParamArmT[i]->currentText().toAscii().at(j);
-              }
-            }
+            getFileComboBoxValue(fswtchParamArmT[i], cfn.paramarm, firmware->getCapability(VoicesMaxLength));
          }
-          populateFuncParamArmTCB(fswtchParamArmT[i], cfn.paramarm, tracksSet);
+          populateFileComboBox(fswtchParamArmT[i], tracksSet, cfn.paramarm);
          if (fswtchParamArmT[i]->currentText() != "----") {
            widgetsMask |= CUSTOM_FUNCTION_PLAY;
          }
@@ -460,16 +473,12 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
      else if (func==FuncBackgroundMusic) {
        widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
        if (modified) {
-          memset(cfn.paramarm, 0, sizeof(cfn.paramarm));
-          int vml=firmware->getCapability(VoicesMaxLength);
-          if (fswtchParamArmT[i]->currentText() != "----") {
-            widgetsMask |= CUSTOM_FUNCTION_PLAY;
-            for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(),vml); j++) {
-              cfn.paramarm[j] = fswtchParamArmT[i]->currentText().toAscii().at(j);
-            }
-          }
+          getFileComboBoxValue(fswtchParamArmT[i], cfn.paramarm, firmware->getCapability(VoicesMaxLength));
+        }
+        populateFileComboBox(fswtchParamArmT[i], tracksSet, cfn.paramarm);
+        if (fswtchParamArmT[i]->currentText() != "----") {
+          widgetsMask |= CUSTOM_FUNCTION_PLAY;
        }
-        populateFuncParamArmTCB(fswtchParamArmT[i], cfn.paramarm, tracksSet);
      }
      else if (func==FuncPlaySound) {
        if (modified) cfn.param = (uint8_t)fswtchParamT[i]->currentIndex();
@@ -485,27 +494,9 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
    else if (func==FuncPlayScript) {
      widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
      if (modified) {
-        memset(cfn.paramarm, 0, sizeof(cfn.paramarm));
-        int vml = 8/*TODO*/;
-        if (fswtchParamArmT[i]->currentText() != "----") {
-          for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(), vml); j++) {
-            cfn.paramarm[j] = fswtchParamArmT[i]->currentText().toAscii().at(j);
-          }
-        }
-      }
-      populateFuncParamArmTCB(fswtchParamArmT[i], cfn.paramarm, scriptsSet);
-    }
-    else if (func==FuncPlayScript) {
-      widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
-      if (modified) {
-        memset(cfn.paramarm, 0, sizeof(cfn.paramarm));
-        int vml = 8/*TODO*/;
-        if (fswtchParamArmT[i]->currentText() != "----") {
-          for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(), vml); j++) {
-            cfn.paramarm[j] = fswtchParamArmT[i]->currentText().toAscii().at(j);
-          }
-        }
+        getFileComboBoxValue(fswtchParamArmT[i], cfn.paramarm, 8);
      }
+      populateFileComboBox(fswtchParamArmT[i], scriptsSet, cfn.paramarm);
    }
    else if (func==FuncBacklight && IS_TARANIS_PLUS(GetEepromInterface()->getBoard())) {
      if (modified) cfn.param = (uint8_t)fswtchBLcolor[i]->value();
@@ -543,16 +534,10 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
 void CustomFunctionsPanel::update()
 {
  lock = true;
-  for (int i=0; i<firmware->getCapability(CustomFunctions); i++) {
-    if (!initialized) {
-      populateSwitchCB(fswtchSwtch[i], functions[i].swtch, generalSettings, model ? SpecialFunctionsContext : GlobalFunctionsContext);
-      populateFuncCB(fswtchFunc[i], functions[i].func);
-      populateGVmodeCB(fswtchGVmode[i], functions[i].adjustMode);
-      populateFuncParamCB(fswtchParamT[i], functions[i].func, functions[i].param, functions[i].adjustMode);
-    }
+  int num_fsw = model ? firmware->getCapability(CustomFunctions) : firmware->getCapability(GlobalFunctions);
+  for (int i=0; i<num_fsw; i++) {
    refreshCustomFunction(i);
  }
-  initialized = true;
  lock = false;
 }

@@ -632,6 +617,8 @@ void CustomFunctionsPanel::populateFuncCB(QComboBox *b, unsigned int value)
        ((i==FuncPlayHaptic) && !firmware->getCapability(Haptic)) ||
        ((i==FuncPlayBoth) && !firmware->getCapability(HasBeeper)) ||
        ((i==FuncLogs) && !firmware->getCapability(HasSDLogs)) ||
+        ((i==FuncSetTimer3) && firmware->getCapability(Timers) < 3) ||
+        ((i>=FuncRangeCheckInternalModule && i<=FuncBindExternalModule) && (!model || !firmware->getCapability(DangerousFunctions))) ||
        ((i>=FuncAdjustGV1 && i<=FuncAdjustGVLast) && !firmware->getCapability(Gvars))
        ) {
      // skipped
@@ -659,77 +646,28 @@ void CustomFunctionsPanel::populateGVmodeCB(QComboBox *b, unsigned int value)
  b->setCurrentIndex(value);
 }

-void CustomFunctionsPanel::populateFuncParamArmTCB(QComboBox *b, char * value, const QSet<QString> &paramsList)
-{
-  b->clear();
-  b->addItem("----");
-
-  bool added = false;
-  QString currentvalue(value);
-  // Convert set into list and sort it alphabetically case insensitive
-  QStringList list = QStringList::fromSet(paramsList);
-  qSort(list.begin(), list.end(), caseInsensitiveLessThan);
-  foreach (QString entry, list) {
-    b->addItem(entry);
-    if (entry==currentvalue) {
-      b->setCurrentIndex(b->count()-1);
-      added = true;
-    }
-  }
-
-  if (!added && strlen(value)) {
-    b->addItem(value);
-    b->setCurrentIndex(b->count()-1);
-  }
-}
-
 void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, uint function, unsigned int value, unsigned int adjustmode)
 {
  QStringList qs;
  b->clear();
  if (function==FuncPlaySound) {
-    qs <<"Beep 1" << "Beep 2" << "Beep 3" << "Warn1" << "Warn2" << "Cheep" << "Ratata" << "Tick" << "Siren" << "Ring" ;
-    qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt"  << "AlmClk"  ;
+    CustomFunctionData::populatePlaySoundParams(qs);
    b->addItems(qs);
    b->setCurrentIndex(value);
  }
  else if (function==FuncPlayHaptic) {
-    qs << "0" << "1" << "2" << "3";
+    CustomFunctionData::populateHapticParams(qs);
    b->addItems(qs);
    b->setCurrentIndex(value);
  }
  else if (function==FuncReset) {
-    qs.append( QObject::tr("Timer1"));
-    qs.append( QObject::tr("Timer2"));
-    if (IS_ARM(firmware->getBoard())) {
-      qs.append( QObject::tr("Timer3"));
-    }
-    qs.append( QObject::tr("Flight"));
-    qs.append( QObject::tr("Telemetry"));
-    int reCount = firmware->getCapability(RotaryEncoders);
-    if (reCount == 1) {
-      qs.append( QObject::tr("Rotary Encoder"));
-    }
-    else if (reCount == 2) {
-      qs.append( QObject::tr("REa"));
-      qs.append( QObject::tr("REb"));
-    }
-    if (IS_ARM(firmware->getBoard())) {
-      for (int i=0; i<C9X_MAX_SENSORS; ++i) {
-        if (model->sensorData[i].isAvailable()) {
-          RawSource item = RawSource(SOURCE_TYPE_TELEMETRY, 3*i);
-          qs.append(item.toString(model));
-        }
-      }
-    }
-    b->addItems(qs);
-    b->setCurrentIndex(value);
+    CustomFunctionData::populateResetParams(model, b, value);
  }
  else if (function==FuncVolume) {
    populateSourceCB(b, RawSource(value), generalSettings, model, POPULATE_NONE|POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_TRIMS|POPULATE_SWITCHES);
  }
  else if (function==FuncPlayValue) {
-    populateSourceCB(b, RawSource(value), generalSettings, model, POPULATE_NONE|POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRY|POPULATE_TELEMETRYEXT);
+    populateSourceCB(b, RawSource(value), generalSettings, model, POPULATE_NONE|POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRY|POPULATE_TELEMETRYEXT|POPULATE_SCRIPT_OUTPUTS);
  }
  else if (function>=FuncAdjustGV1 && function<=FuncAdjustGVLast) {
    switch (adjustmode) {
@@ -65,9 +65,7 @@ class CustomFunctionsPanel : public GenericPanel
    void populateFuncCB(QComboBox *b, unsigned int value);
    void populateGVmodeCB(QComboBox *b, unsigned int value);
    void populateFuncParamCB(QComboBox *b, uint function, unsigned int value, unsigned int adjustmode=0);
-    void populateFuncParamArmTCB(QComboBox *b, char * value, const QSet<QString> & paramsList);

-    bool initialized;
    QSet<QString> tracksSet;
    QSet<QString> scriptsSet;
    int phononCurrent;
--- a/Show More
+++ b/Show More