Update releasenotes.txt

2015-05-03 13:44:10 +02:00 · 2015-05-03 13:43:50 +02:00 · 2015-05-03 13:43:22 +02:00 · 2015-05-03 13:31:09 +02:00 · 2015-05-03 13:18:37 +02:00 · 2015-05-03 10:04:42 +02:00
561 changed files with 86571 additions and 56877 deletions
@@ -467,3 +467,284 @@ Martijn Kruissen
 Jörgen Norman
 Nathan Kinney
 John Godden
+Larry Roper
+Mike Frizell
+Daniel Pospolita
+Peter Herz
+Don Mondrik
+Paul Fram
+Charles Knight
+Matthew Adams
+Kenneth Reed
+Gary Wild
+Christof Ramm
+Bruno Bedard
+Salih Samim Aydin
+Alexander Pils
+Andrew Scerbina
+Donovan Bodishbaugh
+Ray Dunn
+Burt Pickard-Richardson
+Robert Ferguson
+CY Enterprise 
+Michel Stathakis Neto
+Beat Zurflueh
+Heinrich Illig
+Portstate Pty Ltd
+Jens Hoffmann
+Ricardo Santos
+Jean-Francois Le Breton
+Michael Deasy
+Anindya Mukerjee
+Emay Toha
+Kamco Enterprises
+Peter Mueller
+Giovanni Trentini
+Cecil Porter
+Robert Canavan
+Greg Higginbottom
+Tim Walker
+Thos. O'Meara Photography 
+Spis Ltd/TurboNote
+Patricia Cox
+Matthew Lukes
+Sabine Witte
+Phillip Perry
+Beat Zurflueh
+Russell Stutzman
+Dietmar Drees
+Kenneth Ward
+Jens Lochmüller
+Anthony Witham
+Peter Hauke
+Arizona Action Photos
+Francis F Dale
+Willie Swanepoel
+Edward Hauser
+Adilson Oliveira
+Joseph Ordille
+Michael Shellim 
+Teddie Holmes
+Alexandre Rault
+Eric Albin
+Lukas Kliment
+Bernard Philippe
+Bernard Delpy
+Didier Klein
+Arnaldo Guedes
+Cyberauto Systems
+John Alsbrooks
+John Kearney
+Christopher Borden
+Marc Virgilio Ricci
+Frederick Davie
+Jürgen Enders
+Terrence Pitts
+Thomas Sandner
+Marco Coltorti
+Harald Wilczak
+Rodney Lorimor
+Richard Davis
+Stephen Palmer
+Michael Napolitan
+Joshua Bardwell
+Fred Dawson
+Jim Wagner
+Peter Johnson
+Fredrik Lewerth
+Arvin Stenersen
+Daniel Morgan
+Roy Nixon
+Joachim Blunck
+Karl-Heinz Gansel
+Monrovia Mountain Enterprises
+Alessandro Villa
+Jan-Åke Nilsson
+Matthias Rei
+DVR Solutions BV
+Bertrand Condevaux Lanloy
+Henri Mirra
+Aurélien Planiol
+Kevin Caldwell
+Andrew Garello
+Tomasz Maziarz
+Russell Flack
+Fernando Rimoldi
+Greg Reid
+Dietmar Drees
+Holger Landwehr
+Arno Loehdorf
+Boon Sripattha
+Patrik Åkerfeldt
+Alonzo Fretwell
+Renjith Chandrasekharan
+Ruben Gomez Hernandez
+Michael Gardner
+Judith Green
+Timo Ruppell
+John Lipscomb
+Norbert Wenke
+Erik Frieberg
+Raimo Ruotsalainen
+Brian Harris
+Sebastian Blüml 
+Efisio Maxia
+Jeff Theobald
+Anthony Rizzo
+Rodney Huddleston
+Dietmar Drees
+Jürgen Monden
+David Morgan
+Andrew Fernie
+Michel Baily
+Donald Burke
+Ronald Donker
+Fredie Singh
+Patrizio Simoncini (monthly)
+Harald Gabler
+Michael Brown
+Julien Gérard
+Alexandre d'Alton
+Peter Mergaerts
+Jan Houwers
+Gordon Stahl
+Christian Grandjean
+Roger Bergevin
+NorthSide
+Sigmund Martinsen
+Lionel Lafraise
+Gisli Ofeigsson 
+The Gruvin9x Project
+Manuel McLure
+Fernando Rimoldi
+Hiltenkamp Stephan
+Sandeep Kishore Jain
+Sebastien Charpentier
+Greg Parker 
+Norman Maaß
+Adriano Del Ben
+Justin Poole
+Kenneth Harrison
+Eugene LaFaille
+John O'Shaughnessy
+Uwe Jordt
+Stuart Olson
+Frédéric Devillard
+Cheung Leo
+Peter Webster
+Jean-Claude Bachetta
+Delfin Perena
+Sae-wook Yoon
+Focus on Excellence
+Jeffery Golias
+Nick Milton
+Paul Zasso
+Reidar Johannes Lillebotn
+Handley William
+Luke Williams
+Michael Shellim
+Brian Spearing
+Derek Foster
+Pasi Pitkänen
+Lexington S Morley
+Jeff Roberson
+Volkov Victor
+Mike Perkins 
+Bryan Anderson
+Daniel Garber
+Pavel Stein 
+Ravi Gupta
+Patrick Tuxbury
+Mark Deverell
+John Capell 
+Neil McVean
+Matthew Elyash
+Kerry Cochrell
+Willem Aandewiel 
+Reg Bell
+Jean Chenoz
+Philippe Grand
+Tauno Rautakorpi
+Jeff Dillingham
+Brad Kelley
+Shaun Currier
+Danilo Schiara
+John Hennig
+RK Custom Homes
+James Houck
+Piet Teekens
+Tommy Widenflycht
+Johan Petrus Theophilus Maria van Melis
+Ralph Gustafson
+Paul Luby
+Andrew Duncan
+Stephen Crowther
+Edward Glover
+Kelly Byrd
+Brad Curtis
+Wolfgang Kuhl
+LitePilots - litepilots.com
+John Beidl
+Roy Nixon
+Glen Roe
+CY Enterprise
+Evening Shade Pottery
+Gilles Dando
+Patrick Richard
+Justin Altemeier
+Constant Dupuis
+Tony Kenward
+Pierre Rondel
+Ernest Luguera Sanchez
+Adam Brackney
+Joe Baker
+单 雷平
+Ben Fay
+Chris Monk
+Stan von Miller
+Christian Krebs
+Michel Motte
+Graziano Rampinelli
+Joe Baker
+Jean-Philippe Laurent
+Romain Rouzaud
+Michel Garbarino
+Henri Mirra
+Otto Fröhlich
+Thomas Cramer
+Anthony Trombetta
+Fernando Rimoldi
+Dietmar Drees
+Michal Kowalski
+Ivan Correa
+Modellbau
+Massimo Luigi Stara
+Graham Baldwin
+Tomasz Rejman
+Wolfgang Lang
+John Greenwood
+Till von Reumont
+Paul Pereira Brunner 
+Donald L Singer
+Junsun Lee
+Guy Lamaison
+Erwin Dulken
+Mike H Dailey
+Jon Cammarata
+Martin Krueger
+Adolfo Perogio
+Sylvain Techer
+Wes Warner
+Kevin Caldwell
+Ali Ersan Gur
+Hans-Rudolf Riniker
+Sébastien Boutard
+Jean Chessé 
+Mike H Dailey 
+Don Polk
+Roberto Orsello
+Borovikov Dmitriy
+John Lipscomb
+Peter Glassey
+Joseph Kramer
+F.Javier Martinez Velasco
@@ -1,8 +1,7 @@
-##OpenTX Next Branch
+##OpenTX Master 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.    
+You have found your way to the GitHub repository site for the OpenTX Master Branch. This code branch holds the source code for the latest stable release.    

-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 is not done in this branch. It is performed in the branch called next.

 Refer to the opentx.wiki for information about setting up the tool chains for building OpenTX and OpenTX Companion as well as other development related issues.
@@ -1,3 +1,130 @@
+<h2>Version 2.0.16 / 2015-05-03</h2>
+<ul>
+<li><i>nooverridech</i> firmware option was not working</li>
+<li>Fixed setting Expo from gvars for 9XR-Pro (<a href=https://github.com/opentx/opentx/issues/2040>#2040</a>)</li>
+<li>Added Mixers Monitor screen option <i>mixersmon</i> (<a href=https://github.com/opentx/opentx/issues/1945>#1945</a>)</li>
+<li>Added audio playing in simulator (<a href=https://github.com/opentx/opentx/issues/457>#457</a>)</li>
+<li>Fixed sorting of audio tracks (<a href=https://github.com/opentx/opentx/issues/2002>#2002</a>)</li>
+<li>Model wizard fixes (<a href=https://github.com/opentx/opentx/issues/2091>#2091</a>)</li>
+<li>GVAR names removed for 9x, radio doesn't support them (<a href=https://github.com/opentx/opentx/issues/2150>#2150</a>)</li>
+<li>Some LS sources didn't follow the Imperial units setting (<a href=https://github.com/opentx/opentx/issues/2180>#2180</a>)</li>
+<li>Added more fields to the telemetry simulator (<a href=https://github.com/opentx/opentx/issues/2171>#2171</a>)</li>
+<li>Log viewer improvements and massive speed increase (<a href=https://github.com/opentx/opentx/issues/1863>#1863</a>, <a href=https://github.com/opentx/opentx/issues/2163>#2163</a>)</li>
+<li>Added Battery meter range setting (<a href=https://github.com/opentx/opentx/issues/2195>#2195</a>)</li>
+<li>Improvements in Print and Compare dialogs (<a href=https://github.com/opentx/opentx/issues/2219>#2219</a>)</li>
+<li>Reset pots to the middle by right double clicking them in Simulator (<a href=https://github.com/opentx/opentx/issues/1939>#1939</a>)</li>
+<li>Minor fixes: <a href=https://github.com/opentx/opentx/issues/2153>#2153</a>, 
+                 <a href=https://github.com/opentx/opentx/issues/2138>#2138</a>,
+                 <a href=https://github.com/opentx/opentx/issues/2090>#2090</a>,
+                 <a href=https://github.com/opentx/opentx/issues/2122>#2122</a>
+</li>
+</ul>
+
+
+<h2>Version 2.0.15 / 2015-01-13</h2>
+<ul>
+<li>Firmware was not written correctly on radio when compatibility warning check enabled</li>
+<li>Time format for Special Functions Set Timers</li>
+</ul>
+
+<h2>Version 2.0.14 / 2015-01-12</h2>
+<ul>
+<li>OpenTX Companion and Companion9x can now be installed side by side on Linux</li>
+<li>Improved TAB order in dialogs</li>
+<li>Special Function <i>Start Logs</i> renamed to more appropriate <i>SD Logs</i></li>
+<li>Improvements for MAC build</li>
+<li>Fixes to Google Earth logs export</li>
+<li>Firmware compatibility warning check added when flashing new firmware to radio</li>
+<li>Fixed issue with Telemetry Type setting on 9XR-PRO</li>
+<li>Added Telemetry simulator</li>
+<li>Added Trainer simulator</li>
+<li>Added Debug Output window</li>
+<li>Various texts and translations corrections</li>
+<li>Various small bug-fixes</li>
+<li>More reliable method of writing EEPROM.BIN and FIRMWARE.BIN to radio</li>
+<li>Fixed issue with Edge function INSTANT for V1>2s</li>
+<li>Fixed buffer overflow in Joystick code</li>
+</ul>
+
+<h2>Version 2.0.13 / 2014-11-20</h2>
+<ul>
+<li>Too many curves shown on non ARM boards</li>
+<li>Fixed vario limits</li>
+<li>Fixes in compare dialog</li>
+<li>Fixed receiver number range</li>
+<li>Virtual inputs not selectable in SF Volume and heli Collective Source</li>
+<li>Joystick calibration crash after channel assignment</li>
+<li>Gvar import error for limits</li>
+<li>Companion shows too many curve types in input/mixer for 9x</li>
+<li>NOT curves removed from inputs (for non ARM platforms)</li>
+<li>Companion again builds on OS X (Mac)</li>
+<li>Companion simulator Lua crash on OS X 64bit (Mac)</li>
+<li>Companion didn't take care of PlayScript functions</li>
+</ul>
+
+<h2>Version 2.0.12 / 2014-09-15</h2>
+<ul>
+<li>Typos & Translations updated</li>
+</ul>
+
+<h2>Version 2.0.11 / 2014-09-10</h2>
+<ul>
+<li>Limits EEPROM export was broken (all boards except Taranis)</li>
+<li>Fix issue when a GVAR was used as Offset</li>
+</ul>
+
+<h2>Version 2.0.10 / 2014-09-08</h2>
+<ul>
+<li>Taranis is now the default board in General Settings</li>
+<li>GVARS allowed in Limits min/max/offset</li>
+<li>Limits displayed in us when ppmus option selected
+</ul>
+
+<h2>Version 2.0.8 / 2014-07-23</h2>
+<ul>
+<li>Compare dialog bugfixes</li>
+<li>Curve index correctly resetted when type changed</li>
+</ul>
+
+<h2>Version 2.0.7</h2>
+<ul>
+<li>SafetyCH function was missing in simulator</li>
+<li>EEPROM export warning when exporting logical switches > L12 on 9X128</li>
+<li>FAS offset was not exported on 9X/9XR boards</li>
+<li>Trims modes bugfix on non Taranis boards</li>
+<li>It was impossible to open a backuped model from the Tx</li>
+</ul>
+
+<h2>Version 2.0.6</h2>
+<ul>
+<li>Fix Mix curves bug on Sky9x boards</li>
+<li>Channels 17-32 are displayed in the simulator</li>
+<li>Backlight simulation bugfix</li>
+</ul>
+
+<h2>Version 2.0.5</h2>
+<ul>
+<li>Fix crash on startup</li>
+<li>Fix version number in simu</li>
+<li>9XR-Pro now supported on Mac</li>
+<li>Fix loss of settings in telemetry custom screens</li>
+<li>Fix 10000% bug when using GVs in mixer weithg or offset</li>
+<li>Fix Cnsp range in logical switches (up to 30000mAh)</li>
+</ul>
+
+<h2>Version 2.0.4</h2>
+<ul>
+<li>Sound should be ok on all platforms</li>
+<li>Min/Max reviewed in Logical switches (for the whole telemetry)</li>
+<li>Various bug fixes</li>
+</ul>
+
+<h2>Version 2.0.3</h2>
+<ul>
+<li>EEPROM import bug on AdjustGVAR function</li>
+<li>Timers correctly displayed in logical switches tab</li>
+</ul>
+
 <h2>Version 2.0.2</h2>
 <ul>
 <li>Mouse scroll wheel behaves differently</li>
@@ -169,4 +296,4 @@
 <li>Try to reduce modeledit window form MAC</li>
 <li>Wrong init of RF-Module data</li>
 <li>Read flash from TX didn't worked for Taranis</li>
-</ul>
+</ul>
@@ -2,7 +2,7 @@ PROJECT( companion )

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

 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
@@ -33,8 +33,9 @@ IF ( SDL_FOUND )
    INCLUDE_DIRECTORIES( ${SDL_INCLUDE_DIR} )
    MESSAGE("SDL Include Path: " ${SDL_INCLUDE_DIR} )
    ADD_DEFINITIONS( -DJOYSTICKS )
+    ADD_DEFINITIONS( -DSIMU_AUDIO )
 ELSE()
-    MESSAGE( "SDL not found! Joysticks support will be disabled" )
+    MESSAGE( "SDL not found! Joysticks support will be disabled. Simulator audio will not work." )
 ENDIF()

 FIND_PACKAGE(Qt4 4.8.4 REQUIRED)
@@ -88,9 +89,9 @@ add_custom_command(
 )

 add_custom_command(
-  OUTPUT ${RADIO_SRC_DIRECTORY}/stamp-opentx.h
-  COMMAND make stamp_header
-  DEPENDS ${RADIO_SRC_DIRECTORY}/Makefile
+  OUTPUT ${RADIO_SRC_DIRECTORY}/lua_exports.inc
+  COMMAND make PCB=TARANIS lua_exports.cpp
+  DEPENDS ${RADIO_SRC_DIRECTORY}/myeeprom.h
  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
 )

@@ -106,6 +107,7 @@ include_directories(

 add_subdirectory(modeledit)
 add_subdirectory(simulation)
+add_subdirectory(qcustomplot)

 set(common_SRCS
  eeprominterface.cpp
@@ -114,11 +116,12 @@ set(common_SRCS
  firmwares/er9x/er9xeeprom.cpp
  firmwares/er9x/er9xinterface.cpp
  firmwares/gruvin9x/gruvin9xeeprom.cpp
-  firmwares/gruvin9x/gruvin9xinterface.cpp  
+  firmwares/gruvin9x/gruvin9xinterface.cpp
  firmwares/ersky9x/ersky9xeeprom.cpp
  firmwares/ersky9x/ersky9xinterface.cpp
  ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
  ${RADIO_SRC_DIRECTORY}/translations/en.h
+  ${RADIO_SRC_DIRECTORY}/lua_exports.inc
  firmwares/opentx/opentxeeprom.cpp
  firmwares/opentx/open9xStockeeprom.cpp
  firmwares/opentx/open9xGruvin9xeeprom.cpp
@@ -130,15 +133,10 @@ set(common_SRCS
  firmwares/opentx/opentxM128simulator.cpp
  firmwares/opentx/opentxM64simulator.cpp
  file.cpp
-  googleanalytics.cpp
  appdata.cpp
 )

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

 add_library(common ${common_SRCS})

@@ -147,12 +145,11 @@ set(companion_SRCS
  flashinterface.cpp
  # xmlinterface.cpp
  # ${PROJECT_BINARY_DIR}/radio.cxx
-  ${RADIO_SRC_DIRECTORY}/stamp-opentx.h
  helpers.cpp
  mdichild.cpp
  generaledit.cpp
  modelslist.cpp
-  mountlist.cpp 
+  mountlist.cpp
  avroutputdialog.cpp
  apppreferencesdialog.cpp
  fwpreferencesdialog.cpp
@@ -169,7 +166,6 @@ set(companion_SRCS
  mainwindow.cpp
  companion.cpp
  radionotfound.cpp
-  qcustomplot.cpp
  wizarddata.cpp
  wizarddialog.cpp
 )
@@ -194,12 +190,11 @@ set(companion_MOC_HDRS
  mdichild.h
  mainwindow.h
  radionotfound.h
-  qcustomplot.h
  qautocombobox.h
  helpers.h
  wizarddialog.h
 )
-     
+
 set(companion_UIS
  mdichild.ui
  avroutputdialog.ui
@@ -255,8 +250,6 @@ 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)
-
-# Subversion_WC_INFO( ${PROJECT_SOURCE_DIR}/../${FIRMWARE} G9X )
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/firmwares/opentx/stamp-opentx.h.in ${CMAKE_CURRENT_BINARY_DIR}/stamp-opentx.h @ONLY)

 IF( WIN32 )
@@ -283,12 +276,18 @@ 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 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 WIN32 ${companion_SRCS} ${companion_QM})
 ENDIF( )

-TARGET_LINK_LIBRARIES( ${PROJECT_NAME} modeledit simulation common ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} )
+if(SDL_FOUND)
+  target_link_libraries(companion modeledit simulation common qcustomplot ${QT_LIBRARIES} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} )
+else()
+  target_link_libraries(companion modeledit simulation common qcustomplot ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} )
+endif()

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

@@ -325,6 +324,7 @@ set(simu_SRCS
  ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp
  ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
  ${RADIO_SRC_DIRECTORY}/translations/en.h
+  ${RADIO_SRC_DIRECTORY}/lua_exports.inc
  modeledit/node.cpp
  modeledit/edge.cpp # TODO not needed
  simulator.cpp
@@ -342,7 +342,11 @@ if(WIN32)
  set(simu_SRCS ${simu_SRCS} icon.rc)
 endif()

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

 if(SDL_FOUND)
  target_link_libraries(simulator simulation common ${QT_LIBRARIES} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})
@@ -354,6 +358,7 @@ endif()

 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 )
@@ -364,7 +369,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
    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-taranis.rules DESTINATION /etc/udev/rules.d/ )
+    INSTALL( FILES ../targets/linux/45-companion-taranis.rules DESTINATION /etc/udev/rules.d/ )
    # Linux specific code
    SET(OperatingSystem "Linux")
 ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -373,20 +378,20 @@ ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")

 IF( WIN32 )
  IF( MSVC )
-    SET( NSI_IN_FILE companion-vs.nsi.in )  
+    SET( NSI_IN_FILE companion-vs.nsi.in )
  ELSE( )
    SET( NSI_IN_FILE companion-msys.nsi.in )
  ENDIF( )

-  SET( SYSDIR "$ENV{windir}/system32" )  
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion.nsi @ONLY)     
+  SET( SYSDIR "$ENV{windir}/system32" )
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion.nsi @ONLY)

  FIND_PROGRAM(NSIS_EXE makensis.exe PATHS
    "C:/Program Files/NSIS"
-    "C:/Program Files (x86)/NSIS"    
+    "C:/Program Files (x86)/NSIS"
    "C:/Programs/NSIS"
  )
-  
+
  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companionInstall.exe
                     COMMAND "${NSIS_EXE}" ARGS companion.nsi
                     DEPENDS ${PROJECT_NAME} simulator ${PROJECT_BINARY_DIR}/companion.nsi
@@ -405,21 +410,20 @@ IF( APPLE )
  ELSE( )
    SET( WORK_DIR ${PROJECT_BINARY_DIR} )
  ENDIF()
-  
-  ADD_CUSTOM_TARGET( addframeworks ALL 
+
+  ADD_CUSTOM_TARGET( addframeworks ALL
                     COMMAND mkdir -p companion.app/Contents/Frameworks
                     COMMAND mkdir -p companion.app/Contents/Resources
-                     COMMAND mkdir -p companion.app/Contents/translations                     
+                     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 -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/
+                     COMMAND rsync -r /Library/Frameworks/SDL.framework companion.app/Contents/Frameworks/
                     COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
                     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} )

-                        
  ADD_CUSTOM_TARGET( makedmg
                     COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
                     WORKING_DIRECTORY ${WORK_DIR}
@@ -428,12 +432,18 @@ IF( APPLE )
 ENDIF( )

 ADD_CUSTOM_TARGET( stamp
-                   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion.stamp 
+                   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion.stamp
                   DEPENDS ${CMAKE_BINARY_DIR}/version.h )

-ADD_CUSTOM_TARGET( translations
+IF(WIN32)
+  ADD_CUSTOM_TARGET( translations
+                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                   COMMAND lupdate ${CMAKE_SOURCE_DIR} -ts ${companion_TS} )
+ELSE( )
+  ADD_CUSTOM_TARGET( translations
                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
                   COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion_TS} )
+ENDIF( )

 SET(CPACK_PACKAGE_NAME "COMPANION")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
@@ -447,7 +457,7 @@ if(DPKG_PROGRAM)
    OUTPUT_STRIP_TRAILING_WHITESPACE
  )
  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}_${C9X_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-  SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Romolo Manfredini <romolo.manfredini-nosp@m-gmail.com>")
+  SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Bertrand Songis <bsongis-nosp@m-gmail.com>")
  SET(CPACK_DEBIAN_PACKAGE_VERSION ${C9X_VERSION})
  SET(CPACK_DEBIAN_PACKAGE_VERSION_MAJOR ${C9X_VERSION_MAJOR})
  SET(CPACK_DEBIAN_PACKAGE_VERSION_MINOR ${C9X_VERSION_MINOR})
@@ -458,6 +468,6 @@ 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}")
-endif(DPKG_PROGRAM) 
+endif(DPKG_PROGRAM)

 INCLUDE(CPack)
@@ -1,6 +1,6 @@
 /*
 * Author - Kjell Kernen
- * 
+ *
 * 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.
@@ -20,7 +20,7 @@ AppData g;
 // ** CompStoreObj class********************
 void CompStoreObj::clear (const QString tag1, const QString tag2, const QString tag3)
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (tag2.isEmpty())
    {
        settings.remove(tag1);
@@ -43,7 +43,7 @@ void CompStoreObj::clear (const QString tag1, const QString tag2, const QString

 void CompStoreObj::store(const QByteArray newArray, QByteArray &array, const QString tag, const QString group1, const QString group2 )
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (!group1.isEmpty()) settings.beginGroup(group1);
    if (!group2.isEmpty()) settings.beginGroup(group2);

@@ -56,7 +56,7 @@ void CompStoreObj::store(const QByteArray newArray, QByteArray &array, const QSt

 void CompStoreObj::store(const QStringList newSList, QStringList &stringList, const QString tag, const QString group1, const QString group2 )
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (!group1.isEmpty()) settings.beginGroup(group1);
    if (!group2.isEmpty()) settings.beginGroup(group2);

@@ -69,7 +69,7 @@ void CompStoreObj::store(const QStringList newSList, QStringList &stringList, co

 void CompStoreObj::store(const QString newString, QString &string, const QString tag, const QString group1, const QString group2 )
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (!group1.isEmpty()) settings.beginGroup(group1);
    if (!group2.isEmpty()) settings.beginGroup(group2);

@@ -82,7 +82,7 @@ void CompStoreObj::store(const QString newString, QString &string, const QString

 void CompStoreObj::store(const bool newTruth, bool &truth, const QString tag, const QString group1, const QString group2 )
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (!group1.isEmpty()) settings.beginGroup(group1);
    if (!group2.isEmpty()) settings.beginGroup(group2);

@@ -95,7 +95,7 @@ void CompStoreObj::store(const bool newTruth, bool &truth, const QString tag, co

 void CompStoreObj::store(const int newNumber, int &number, const QString tag, const QString group1, const QString group2 )
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (!group1.isEmpty()) settings.beginGroup(group1);
    if (!group2.isEmpty()) settings.beginGroup(group2);

@@ -109,7 +109,7 @@ void CompStoreObj::store(const int newNumber, int &number, const QString tag, co
 // Retrieval functions
 void CompStoreObj::retrieve( QByteArray &array, const QString tag, const QString def, const QString group1, const QString group2 )
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (!group1.isEmpty()) settings.beginGroup(group1);
    if (!group2.isEmpty()) settings.beginGroup(group2);

@@ -121,7 +121,7 @@ void CompStoreObj::retrieve( QByteArray &array, const QString tag, const QString

 void CompStoreObj::retrieve( QStringList &stringList, const QString tag, const QString def, const QString group1, const QString group2 )
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (!group1.isEmpty()) settings.beginGroup(group1);
    if (!group2.isEmpty()) settings.beginGroup(group2);

@@ -133,7 +133,7 @@ void CompStoreObj::retrieve( QStringList &stringList, const QString tag, const Q

 void CompStoreObj::retrieve( QString &string, const QString tag, const QString def, const QString group1, const QString group2 )
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (!group1.isEmpty()) settings.beginGroup(group1);
    if (!group2.isEmpty()) settings.beginGroup(group2);

@@ -145,7 +145,7 @@ void CompStoreObj::retrieve( QString &string, const QString tag, const QString d

 void CompStoreObj::retrieve( bool &truth, const QString tag, const bool def, const QString group1, const QString group2 )
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (!group1.isEmpty()) settings.beginGroup(group1);
    if (!group2.isEmpty()) settings.beginGroup(group2);

@@ -157,7 +157,7 @@ void CompStoreObj::retrieve( bool &truth, const QString tag, const bool def, con

 void CompStoreObj::retrieve( int &number, const QString tag, const int def, const QString group1, const QString group2 )
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    if (!group1.isEmpty()) settings.beginGroup(group1);
    if (!group2.isEmpty()) settings.beginGroup(group2);

@@ -241,7 +241,7 @@ JStickData::JStickData()
 void JStickData::remove()
 {
    // Remove all JStickData values from settings file
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    settings.beginGroup( "JsCalibration" );
    settings.remove( QString( "stick%1_axe").arg(index) );
    settings.remove( QString( "stick%1_min").arg(index) );
@@ -256,7 +256,7 @@ void JStickData::remove()

 bool JStickData::existsOnDisk()
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    settings.beginGroup("JsCalibration");
    int axe = settings.value( QString("stick%1_axe").arg(index), -1 ).toInt();
    settings.endGroup();
@@ -295,8 +295,10 @@ QString Profile::fwName()        const { return _fwName;        }
 QString Profile::fwType()        const { return _fwType;        }
 QString Profile::name()          const { return _name;          }
 QString Profile::sdPath()        const { return _sdPath;        }
+QString Profile::pBackupDir()    const { return _pBackupDir;    }
 QString Profile::splashFile()    const { return _splashFile;    }
 bool    Profile::burnFirmware()  const { return _burnFirmware;  }
+bool    Profile::penableBackup() const { return _penableBackup; }
 bool    Profile::renameFwFiles() const { return _renameFwFiles; }
 int     Profile::channelOrder()  const { return _channelOrder;  }
 int     Profile::defaultMode()   const { return _defaultMode;   }
@@ -313,6 +315,8 @@ int     Profile::currentCalib()  const { return _currentCalib;  }
 int     Profile::gsStickMode()   const { return _gsStickMode;   }
 int     Profile::ppmMultiplier() const { return _ppmMultiplier; }
 int     Profile::vBatCalib()     const { return _vBatCalib;     }
+int     Profile::vBatMin()       const { return _vBatMin;       }
+int     Profile::vBatMax()       const { return _vBatMax;       }
 int     Profile::vBatWarn()      const { return _vBatWarn;      }

 // Set declarations
@@ -320,9 +324,11 @@ void Profile::name          (const QString x) { store(x, _name,          "Name"
 void Profile::fwName        (const QString x) { store(x, _fwName,        "fwName"                ,"Profiles", QString("profile%1").arg(index));}
 void Profile::fwType        (const QString x) { store(x, _fwType,        "fwType"                ,"Profiles", QString("profile%1").arg(index));}
 void Profile::sdPath        (const QString x) { store(x, _sdPath,        "sdPath"                ,"Profiles", QString("profile%1").arg(index));}
+void Profile::pBackupDir    (const QString x) { store(x, _pBackupDir,    "pBackupDir"            ,"Profiles", QString("profile%1").arg(index));}
 void Profile::splashFile    (const QString x) { store(x, _splashFile,    "SplashFileName"        ,"Profiles", QString("profile%1").arg(index));}
 void Profile::burnFirmware  (const bool    x) { store(x, _burnFirmware,  "burnFirmware"          ,"Profiles", QString("profile%1").arg(index));}
 void Profile::renameFwFiles (const bool    x) { store(x, _renameFwFiles, "rename_firmware_files" ,"Profiles", QString("profile%1").arg(index));}
+void Profile::penableBackup (const bool    x) { store(x, _penableBackup, "penableBackup"         ,"Profiles", QString("profile%1").arg(index));}
 void Profile::channelOrder  (const int     x) { store(x, _channelOrder,  "default_channel_order" ,"Profiles", QString("profile%1").arg(index));}
 void Profile::defaultMode   (const int     x) { store(x, _defaultMode,   "default_mode"          ,"Profiles", QString("profile%1").arg(index));}

@@ -338,6 +344,8 @@ void Profile::currentCalib  (const int     x) { store(x, _currentCalib,  "curren
 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::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));}
 void Profile::vBatWarn      (const int     x) { store(x, _vBatWarn,      "vBatWarn"              ,"Profiles", QString("profile%1").arg(index));}

 // Constructor
@@ -346,16 +354,18 @@ Profile::Profile()
    index = -1;
 }

-// The default copy operator can not be used since the index variable would be destroyed 
+// The default copy operator can not be used since the index variable would be destroyed
 Profile& Profile::operator=(const Profile& rhs)
 {
    name         ( rhs.name()          );
    fwName       ( rhs.fwName()        );
    fwType       ( rhs.fwType()        );
    sdPath       ( rhs.sdPath()        );
+    pBackupDir   ( rhs.pBackupDir()    );
    splashFile   ( rhs.splashFile()    );
    burnFirmware ( rhs.burnFirmware()  );
    renameFwFiles( rhs.renameFwFiles() );
+    penableBackup( rhs.penableBackup() );
    channelOrder ( rhs.channelOrder()  );
    defaultMode  ( rhs.defaultMode()   );
    beeper       ( rhs.beeper()        );
@@ -369,6 +379,8 @@ Profile& Profile::operator=(const Profile& rhs)
    gsStickMode  ( rhs.gsStickMode()   );
    ppmMultiplier( rhs.ppmMultiplier() );
    vBatCalib    ( rhs.vBatCalib()     );
+    vBatMin      ( rhs.vBatMin()       );
+    vBatMax      ( rhs.vBatMax()       );
    vBatWarn     ( rhs.vBatWarn()      );

    return *this;
@@ -377,7 +389,7 @@ Profile& Profile::operator=(const Profile& rhs)
 void Profile::remove()
 {
    // Remove all profile values from settings file
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    settings.beginGroup("Profiles");
    settings.remove(QString("profile%1").arg(index));
    settings.endGroup();
@@ -388,7 +400,7 @@ void Profile::remove()

 bool Profile::existsOnDisk()
 {
-    QSettings settings(PRODUCT, COMPANY);
+    QSettings settings(COMPANY, PRODUCT);
    settings.beginGroup("Profiles");
    settings.beginGroup(QString("profile%1").arg(index));
    QStringList keyList = settings.allKeys();
@@ -413,6 +425,8 @@ void Profile::initFwVariables()
    _gsStickMode =   0;
    _ppmMultiplier = 0;
    _vBatCalib =     0;
+    _vBatMin =       0;
+    _vBatMax =       0;
    _vBatWarn =      0;
 }

@@ -424,9 +438,11 @@ void Profile::init(int newIndex)
    _fwType =        "";
    _name =          "";
    _sdPath =        "";
+    _pBackupDir =    "";
    _splashFile =    "";
    _burnFirmware =  false;
    _renameFwFiles = false;
+    _penableBackup = false;
    _channelOrder =  0;
    _defaultMode =   1;

@@ -446,8 +462,10 @@ void Profile::flush()
    getset( _fwType,        "fwType"                ,""     ,"Profiles", QString("profile%1").arg(index));
    getset( _name,          "Name"                  ,""     ,"Profiles", QString("profile%1").arg(index));
    getset( _sdPath,        "sdPath"                ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _pBackupDir,    "pBackupDir"            ,""     ,"Profiles", QString("profile%1").arg(index));
    getset( _splashFile,    "SplashFileName"        ,""     ,"Profiles", QString("profile%1").arg(index));
    getset( _burnFirmware,  "burnFirmware"          ,false  ,"Profiles", QString("profile%1").arg(index));
+    getset( _penableBackup, "penableBackup"         ,false  ,"Profiles", QString("profile%1").arg(index));
    getset( _renameFwFiles, "rename_firmware_files" ,false  ,"Profiles", QString("profile%1").arg(index));
    getset( _channelOrder,  "default_channel_order" ,0      ,"Profiles", QString("profile%1").arg(index));
    getset( _defaultMode,   "default_mode"          ,1      ,"Profiles", QString("profile%1").arg(index));
@@ -464,6 +482,8 @@ void Profile::flush()
    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( _vBatMin,       "VbatMin"               ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _vBatMax,       "VbatMax"               ,0      ,"Profiles", QString("profile%1").arg(index));
    getset( _vBatWarn,      "vBatWarn"              ,0      ,"Profiles", QString("profile%1").arg(index));
 }

@@ -499,6 +519,7 @@ QString AppData::snapshotDir()     { return _snapshotDir;     }
 QString AppData::updatesDir()      { return _updatesDir;      }

 bool AppData::enableBackup()       { return _enableBackup;    }
+bool AppData::checkHardwareCompatibility() { return _checkHardwareCompatibility; }
 bool AppData::backupOnFlash()      { return _backupOnFlash;   }
 bool AppData::jsSupport()          { return _jsSupport;       }
 bool AppData::maximized()          { return _maximized;       }
@@ -550,6 +571,7 @@ void AppData::updatesDir      (const QString     x) { store(x, _updatesDir,

 void AppData::enableBackup    (const bool        x) { store(x, _enableBackup,    "backupEnable"            );}
 void AppData::backupOnFlash   (const bool        x) { store(x, _backupOnFlash,   "backupOnFlash"           );}
+void AppData::checkHardwareCompatibility(const bool x) { store(x, _checkHardwareCompatibility,   "checkHardwareCompatibility");}
 void AppData::maximized       (const bool        x) { store(x, _maximized,       "maximized"               );}
 void AppData::jsSupport       (const bool        x) { store(x, _jsSupport,       "js_support"              );}
 void AppData::showSplash      (const bool        x) { store(x, _showSplash,      "show_splash"             );}
@@ -581,11 +603,29 @@ AppData::AppData()
    for (int i=0; i<MAX_JOYSTICKS; i++)
        joystick[i].init( i );

-    // Import settings from companion9x, but only do it one time.
-    QSettings c9x_settings("companion9x", "companion9x");
-    QSettings settings(PRODUCT, COMPANY);
-    if (profile[0].name().isEmpty() )
+    // Move existing 2.0 settings if present
+    QSettings settings(COMPANY, PRODUCT);
+    if (profile[0].name().isEmpty())
    {
+        QSettings pre2016settings("OpenTX", "OpenTX Companion");
+
+        QStringList keys = pre2016settings.allKeys();
+        for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
+        {
+            settings.setValue(*i, pre2016settings.value(*i));
+        }
+
+        //Reload profiles
+        for (int i=0; i<MAX_PROFILES; i++)
+            profile[i].init( i );
+
+        pre2016settings.clear();
+    }
+
+    // Else import settings from companion9x if present
+    if (profile[0].name().isEmpty())
+    {
+        QSettings c9x_settings("companion9x", "companion9x");
        // Copy all settings from companion9x to companion
        QStringList keys = c9x_settings.allKeys();
        for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
@@ -629,10 +669,13 @@ AppData::AppData()
        settings.remove("patchImage");
        settings.remove("rename_firmware_files");
        settings.remove("sdPath");
-        settings.remove("SplashFileName"); 
+        settings.remove("SplashFileName");
        settings.remove("startup_check_companion9x");
        settings.remove("wizardEnable");

+        // Delete settings that we do not want to carry over from 1.52
+        settings.remove("dfu_location");
+
        // Select the new default profile as current profile
        id( 0 );
    }
@@ -642,7 +685,7 @@ AppData::AppData()

    // Load and store all variables. Use default values if setting values are missing
    QString _tempString;                                         // Do not touch. Do not change the settings version before a new verson update!
-    getset( _tempString,      "settings_version"        ,"20" ); // This is a version marker. Will be used to upgrade the settings later on.
+    getset( _tempString,      "settings_version"        ,"201" ); // This is a version marker. Will be used to upgrade the settings later on.

    getset( _recentFiles,     "recentFileList"          ,"" );
    getset( _mainWinGeo,      "mainWindowGeometry"      ,"" );
@@ -672,6 +715,7 @@ AppData::AppData()
    getset( _updatesDir,      "lastUpdatesDir"          ,"" );

    getset( _enableBackup,    "backupEnable"            ,false );
+    getset( _checkHardwareCompatibility,    "checkHardwareCompatibility", true );
    getset( _backupOnFlash,   "backupOnFlash"           ,true  );
    getset( _jsSupport,       "js_support"              ,false );
    getset( _maximized,       "maximized"               ,false );
@@ -1,6 +1,6 @@
 /*
 * Author - Kjell Kernen
- * 
+ *
 * 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.
@@ -12,7 +12,7 @@
 *
 */

-// All temporary and permanent global variables are defined here to make 
+// All temporary and permanent global variables are defined here to make
 // initialization and storage safe and visible.
 // Do not access variables in QSettings directly, it is not type safe!

@@ -24,8 +24,8 @@
 #include <QString>
 #include <QSettings>

-#define COMPANY "OpenTX Companion"
-#define PRODUCT "OpenTX"
+#define COMPANY "OpenTX"
+#define PRODUCT "Companion 2.0"

 #define MAX_PROFILES 15
 #define MAX_JOYSTICKS 8
@@ -53,7 +53,7 @@ class CompStoreObj
    void getset( QString &string, const QString tag, const QString def, const QString group1="", const QString group2="" );
    void getset( bool &truth, const QString tag, const bool def, const QString group1="", const QString group2="" );
    void getset( int &number, const QString tag, const int def, const QString group1="", const QString group2="" );
-}; 
+};

 class FwRevision: protected CompStoreObj
 {
@@ -107,8 +107,10 @@ class Profile: protected CompStoreObj
    QString _fwType;
    QString _name;
    QString _sdPath;
+    QString _pBackupDir;
    QString _splashFile;
    bool    _burnFirmware;
+    bool    _penableBackup;
    bool    _renameFwFiles;
    int     _channelOrder;
    int     _defaultMode;
@@ -126,6 +128,8 @@ class Profile: protected CompStoreObj
    int     _gsStickMode;
    int     _ppmMultiplier;
    int     _vBatCalib;
+    int     _vBatMin;
+    int     _vBatMax;
    int     _vBatWarn;

  public:
@@ -134,9 +138,11 @@ class Profile: protected CompStoreObj
    QString fwType() const;
    QString name() const;
    QString sdPath() const;
+    QString pBackupDir() const;
    QString splashFile() const;
    bool    burnFirmware() const;
    bool    renameFwFiles() const;
+    bool    penableBackup() const;
    int     channelOrder() const;
    int     defaultMode() const;

@@ -152,6 +158,8 @@ class Profile: protected CompStoreObj
    int     gsStickMode() const;
    int     ppmMultiplier() const;
    int     vBatCalib() const;
+    int     vBatMin() const;
+    int     vBatMax() const;
    int     vBatWarn() const;

    // All the set definitions
@@ -159,9 +167,11 @@ class Profile: protected CompStoreObj
    void fwName        (const QString);
    void fwType        (const QString);
    void sdPath        (const QString);
+    void pBackupDir    (const QString);
    void splashFile    (const QString);
    void burnFirmware  (const bool);
    void renameFwFiles (const bool);
+    void penableBackup (const bool);
    void channelOrder  (const int);
    void defaultMode   (const int);

@@ -177,6 +187,8 @@ class Profile: protected CompStoreObj
    void gsStickMode   (const int);
    void ppmMultiplier (const int);
    void vBatCalib     (const int);
+    void vBatMin       (const int);
+    void vBatMax       (const int);
    void vBatWarn      (const int);

    Profile();
@@ -226,6 +238,7 @@ class AppData: protected CompStoreObj

    bool _enableBackup;
    bool _backupOnFlash;
+    bool _checkHardwareCompatibility;
    bool _maximized;
    bool _jsSupport;
    bool _showSplash;
@@ -259,7 +272,7 @@ class AppData: protected CompStoreObj
    QString avrdudeLocation();
    QString dfuArguments();
    QString dfuLocation();
-    QString lastFw();  
+    QString lastFw();
    QString locale();
    QString mcu();
    QString programmer();
@@ -278,6 +291,7 @@ class AppData: protected CompStoreObj

    bool enableBackup();
    bool backupOnFlash();
+    bool checkHardwareCompatibility();
    bool jsSupport();
    bool maximized();
    bool showSplash();
@@ -329,6 +343,7 @@ class AppData: protected CompStoreObj

    void enableBackup    (const bool);
    void backupOnFlash   (const bool);
+    void checkHardwareCompatibility   (const bool);
    void maximized       (const bool);
    void jsSupport       (const bool);
    void showSplash      (const bool);
@@ -19,10 +19,6 @@ AppPreferencesDialog::AppPreferencesDialog(QWidget *parent) :
  updateLock=false;
  setWindowIcon(CompanionIcon("apppreferences.png"));

-  voice=NULL;
-  connect(ui->langCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(firmwareLangChanged()));
-  connect(ui->voiceCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(firmwareLangChanged()));
-
  initSettings();
  connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
  connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
@@ -70,6 +66,8 @@ void AppPreferencesDialog::writeValues()
  g.profile[g.id()].renameFwFiles(ui->renameFirmware->isChecked());
  g.profile[g.id()].burnFirmware(ui->burnFirmware->isChecked());
  g.profile[g.id()].sdPath(ui->sdPath->text());
+  g.profile[g.id()].pBackupDir(ui->profilebackupPath->text());
+  g.profile[g.id()].penableBackup(ui->pbackupEnable->isChecked());
  g.profile[g.id()].splashFile(ui->SplashFileName->text());

  // The profile name may NEVER be empty
@@ -80,10 +78,11 @@ void AppPreferencesDialog::writeValues()

  // If a new fw type has been choosen, several things need to reset
  current_firmware_variant = getFirmwareVariant();
-  if (g.profile[g.id()].fwType() != current_firmware_variant.id) {
+  QString id = current_firmware_variant->getId();
+  if (g.profile[g.id()].fwType() != id) {
    g.profile[g.id()].fwName("");
    g.profile[g.id()].initFwVariables();
-    g.profile[g.id()].fwType( current_firmware_variant.id );
+    g.profile[g.id()].fwType(id);
  }
 }

@@ -103,8 +102,7 @@ void AppPreferencesDialog::initSettings()
  ui->burnFirmware->setChecked(g.profile[g.id()].burnFirmware());
  ui->snapshotPath->setText(g.snapshotDir());
  ui->snapshotPath->setReadOnly(true);
-  if (ui->snapshotClipboardCKB->isChecked())
-  {
+  if (ui->snapshotClipboardCKB->isChecked()) {
    ui->snapshotPath->setDisabled(true);
    ui->snapshotPathButton->setDisabled(true);
  }
@@ -114,8 +112,9 @@ void AppPreferencesDialog::initSettings()
  ui->historySize->setValue(g.historySize());
  ui->backLightColor->setCurrentIndex(g.backLight());

-  if (IS_TARANIS(GetCurrentFirmware()->getBoard()))
+  if (IS_TARANIS(GetCurrentFirmware()->getBoard())) {
    ui->backLightColor->setEnabled(false);
+  }

  ui->simuSW->setChecked(g.simuSW());
  ui->modelWizard_CB->setChecked(g.useWizard());
@@ -167,6 +166,18 @@ void AppPreferencesDialog::initSettings()
  ui->stickmodeCB->setCurrentIndex(g.profile[g.id()].defaultMode());
  ui->renameFirmware->setChecked(g.profile[g.id()].renameFwFiles());
  ui->sdPath->setText(g.profile[g.id()].sdPath());
+  if (!g.profile[g.id()].pBackupDir().isEmpty()) {
+    if (QDir(g.profile[g.id()].pBackupDir()).exists()) {
+      ui->profilebackupPath->setText(g.profile[g.id()].pBackupDir());
+      ui->pbackupEnable->setEnabled(true);
+      ui->pbackupEnable->setChecked(g.profile[g.id()].penableBackup());
+    } else {
+      ui->pbackupEnable->setDisabled(true);
+    }
+  } else {
+      ui->pbackupEnable->setDisabled(true);
+  }
+
  ui->profileNameLE->setText(g.profile[g.id()].name());
  ui->SplashFileName->setText(g.profile[g.id()].splashFile());

@@ -189,13 +200,12 @@ void AppPreferencesDialog::initSettings()

  foreach(FirmwareInterface * firmware, firmwares) {
    ui->downloadVerCB->addItem(firmware->getName(), firmware->getId());
-    if (current_firmware == firmware) {
+    if (current_firmware->getFirmwareBase() == firmware) {
      ui->downloadVerCB->setCurrentIndex(ui->downloadVerCB->count() - 1);
    }
  }
  
  baseFirmwareChanged();
-  firmwareChanged();
 }

 void AppPreferencesDialog::on_libraryPathButton_clicked()
@@ -228,8 +238,17 @@ void AppPreferencesDialog::on_backupPathButton_clicked()
  if (!fileName.isEmpty()) {
    g.backupDir(fileName);
    ui->backupPath->setText(fileName);
+    ui->backupEnable->setEnabled(true);
+  }
+}
+
+void AppPreferencesDialog::on_ProfilebackupPathButton_clicked()
+{
+  QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your Models and Settings backup folder"), g.backupDir());
+  if (!fileName.isEmpty()) {
+    ui->profilebackupPath->setText(fileName);
+    ui->pbackupEnable->setEnabled(true);
  }
-  ui->backupEnable->setEnabled(true);
 }

 void AppPreferencesDialog::on_ge_pathButton_clicked()
@@ -267,8 +286,9 @@ void AppPreferencesDialog::on_joystickChkB_clicked() {
  }
 }

-void AppPreferencesDialog::on_joystickcalButton_clicked() {
-   joystickDialog * jd=new joystickDialog(this, ui->joystickCB->currentIndex());
+void AppPreferencesDialog::on_joystickcalButton_clicked()
+{
+   JoystickDialog *jd = new JoystickDialog(this, ui->joystickCB->currentIndex());
   jd->exec();
 }
 #endif
@@ -333,7 +353,8 @@ void AppPreferencesDialog::on_SplashSelect_clicked()
  }
 }

-void AppPreferencesDialog::on_clearImageButton_clicked() {
+void AppPreferencesDialog::on_clearImageButton_clicked()
+{
  ui->imageLabel->clear();
  ui->SplashFileName->clear();
 }
@@ -341,65 +362,45 @@ void AppPreferencesDialog::on_clearImageButton_clicked() {

 void AppPreferencesDialog::showVoice(bool show)
 {
-  if (show)
-    showVoice();
-  else
-    hideVoice();
-}
-
-void AppPreferencesDialog::showVoice()
-{
-  ui->voiceLabel->show();
-  ui->voiceCombo->show();
-}
-
-void AppPreferencesDialog::hideVoice()
-{
-  ui->voiceLabel->hide();
-  ui->voiceCombo->hide();
+  ui->voiceLabel->setVisible(show);
+  ui->voiceCombo->setVisible(show);
  QTimer::singleShot(0, this, SLOT(shrink()));
 }

-
 void AppPreferencesDialog::baseFirmwareChanged()
 {
  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-  voice=NULL;
+
  foreach(FirmwareInterface * firmware, firmwares) {
    if (firmware->getId() == selected_firmware) {
-      showVoice(firmware->voice);
      populateFirmwareOptions(firmware);
      break;
    }
  }
-  firmwareChanged();
 }

-FirmwareVariant AppPreferencesDialog::getFirmwareVariant()
+FirmwareInterface * AppPreferencesDialog::getFirmwareVariant()
 {
  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-  bool voice=false;
+
  foreach(FirmwareInterface * firmware, firmwares) {
    QString id = firmware->getId();
    if (id == selected_firmware) {
      foreach(QCheckBox *cb, optionsCheckBoxes) {
        if (cb->isChecked()) {
-          if (cb->text()=="voice" && cb->isChecked())
-            voice=true;
          id += QString("-") + cb->text();
        }
      }
-      if (voice) {
-        if (ui->voiceCombo->count() && (voice || firmware->voice))
-          id += QString("-tts") + ui->voiceCombo->currentText();
-      }
-      else {
-        hideVoice();
-      }
-      if (ui->langCombo->count())
-        id += QString("-") + ui->langCombo->currentText();

-      return GetFirmwareVariant(id);
+      if (voice && voice->isChecked()) {
+        id += QString("-tts") + ui->voiceCombo->currentText();
+      }
+
+      if (ui->langCombo->count()) {
+        id += QString("-") + ui->langCombo->currentText();
+      }
+
+      return GetFirmware(id);
    }
  }

@@ -410,6 +411,9 @@ FirmwareVariant AppPreferencesDialog::getFirmwareVariant()
 void AppPreferencesDialog::firmwareOptionChanged(bool state)
 {
  QCheckBox *cb = qobject_cast<QCheckBox*>(sender());
+  if (cb == voice) {
+    showVoice(voice->isChecked());
+  }
  FirmwareInterface * firmware=NULL;
  if (cb && state) {
    QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
@@ -421,76 +425,40 @@ void AppPreferencesDialog::firmwareOptionChanged(bool state)
              foreach(Option other, opts) {
                if (other.name != opt.name) {
                  foreach(QCheckBox *ocb, optionsCheckBoxes) {
-                    if (ocb->text() == other.name)
+                    if (ocb->text() == other.name) {
                      ocb->setChecked(false);
+                    }
                  }
                }
              }
-              if (voice) {
-                showVoice(voice->isChecked());
-              }
-              
-              return firmwareChanged();
+              return;
            }
          }
        }
      }
    }
  } 
-  else if (cb && !state) {
-    if (cb->text()=="voice") {
-      hideVoice();
-    }
-  }
-  if (voice) {
-    showVoice(voice->isChecked());
-  }
-  else if (firmware) {
-    if (firmware->voice) {
-      showVoice();    
-    }
-  }
-  return firmwareChanged();
-}
-
-void AppPreferencesDialog::firmwareLangChanged()
-{
-  firmwareChanged();
-}
-
-void AppPreferencesDialog::firmwareChanged()
-{
-  if (updateLock)
-    return;
-  
-  FirmwareVariant variant = getFirmwareVariant();
-  QString stamp;
-  stamp.append(variant.firmware->getStampUrl());
-  QString url = variant.getFirmwareUrl();
 }

 void AppPreferencesDialog::populateFirmwareOptions(const FirmwareInterface * firmware)
 {
-  const FirmwareInterface * parent = /*firmware->parent ? firmware->parent : */ firmware;
+  const FirmwareInterface * parent = firmware->getFirmwareBase();

  updateLock = true;

+  QString id = current_firmware_variant->getId();
  ui->langCombo->clear();
  foreach(const char *lang, parent->languages) {
    ui->langCombo->addItem(lang);
-    if (current_firmware_variant.id.endsWith(lang))
+    if (id.endsWith(lang)) {
      ui->langCombo->setCurrentIndex(ui->langCombo->count() - 1);
-  }
-  ui->voiceCombo->clear();
-  foreach(const char *lang, parent->ttslanguages) {
-    ui->voiceCombo->addItem(lang);
-    if (current_firmware_variant.id.contains(QString("-tts%1").arg(lang)))
-      ui->voiceCombo->setCurrentIndex(ui->voiceCombo->count() - 1);
+    }
  }

-  showVoice(ui->langCombo->count()!=0);
+  voice = NULL; // we will search for a voice checkbox

  int index = 0;
+  QWidget * prevFocus = ui->voiceCombo;
  foreach(QList<Option> opts, parent->opts) {
    foreach(Option opt, opts) {
      if (index >= optionsCheckBoxes.size()) {
@@ -498,6 +466,9 @@ void AppPreferencesDialog::populateFirmwareOptions(const FirmwareInterface * fir
        ui->optionsLayout->addWidget(checkbox, optionsCheckBoxes.count()/5, optionsCheckBoxes.count()%5, 1, 1);
        optionsCheckBoxes.push_back(checkbox);
        connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
+        if (prevFocus) {
+          QWidget::setTabOrder(prevFocus, checkbox);
+        }
      }

      QCheckBox *cb = optionsCheckBoxes.at(index++);
@@ -505,21 +476,31 @@ void AppPreferencesDialog::populateFirmwareOptions(const FirmwareInterface * fir
        cb->show();
        cb->setText(opt.name);
        cb->setToolTip(opt.tooltip);
-        cb->setCheckState(current_firmware_variant.id.contains(opt.name) ? Qt::Checked : Qt::Unchecked);
-            
-        if (opt.name==QString("voice")) {
-          voice=cb;
-          showVoice(current_firmware_variant.id.contains(opt.name) ||firmware->voice);
+        cb->setCheckState(id.contains(opt.name) ? Qt::Checked : Qt::Unchecked);
+        if (opt.name == QString("voice")) {
+          voice = cb;
        }
+        prevFocus = cb;
      }
    }
  }
+
  for (; index<optionsCheckBoxes.size(); index++) {
    QCheckBox *cb = optionsCheckBoxes.at(index);
    cb->hide();
    cb->setCheckState(Qt::Unchecked);
  }

+  ui->voiceCombo->clear();
+  foreach(const char *lang, parent->ttslanguages) {
+    ui->voiceCombo->addItem(lang);
+    if (id.contains(QString("-tts%1").arg(lang))) {
+      ui->voiceCombo->setCurrentIndex(ui->voiceCombo->count() - 1);
+    }
+  }
+
+  showVoice(voice && voice->isChecked());
+
  updateLock = false;
  QTimer::singleShot(0, this, SLOT(shrink()));
 }
@@ -28,7 +28,7 @@ class AppPreferencesDialog : public QDialog
    void hideVoice();
    void populateLocale();
    void populateFirmwareOptions(const FirmwareInterface *);
-    FirmwareVariant getFirmwareVariant();
+    FirmwareInterface * getFirmwareVariant();
    QCheckBox * voice;

    Ui::AppPreferencesDialog *ui;
@@ -39,18 +39,17 @@ class AppPreferencesDialog : public QDialog

  protected slots:
    void shrink();  
-    void firmwareLangChanged();
    void baseFirmwareChanged();
    void firmwareOptionChanged(bool state);
-    void firmwareChanged();

    void writeValues();
    void on_libraryPathButton_clicked();
    void on_snapshotPathButton_clicked();
    void on_snapshotClipboardCKB_clicked();
    void on_backupPathButton_clicked();
+    void on_ProfilebackupPathButton_clicked();
    void on_ge_pathButton_clicked();
-
+    
    void on_sdPathButton_clicked();
    void on_removeProfileButton_clicked();
    void on_SplashSelect_clicked();
@@ -3,7 +3,6 @@
 #include <QtGui>
 #include "eeprominterface.h"
 #include "flashinterface.h"
-#include "googleanalytics.h"

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

 # if !__GNUC__
@@ -141,9 +138,9 @@ void avrOutputDialog::doCopy()

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

  source.close();
@@ -354,10 +354,8 @@ void burnConfigDialog::restFuses(bool eeProtect)
          //use hfuse = 0x81 to prevent eeprom being erased with every flashing          
        }
        else {
-          QString tempDir    = QDir::tempPath();
-          QString tempFile;
          QString lfuses;
-          tempFile = tempDir + "/ftemp.bin";
+          QString tempFile = generateProcessUniqueTempFileName("ftemp.bin");
          QStringList argread;
          argread << "-c" << avrProgrammer << "-p" << avrMCU << args  <<"-U" << "lfuse:r:"+tempFile+":r" ;
          avrOutputDialog *ad = new avrOutputDialog(this, avrLoc, argread, "Reset Fuses",AVR_DIALOG_CLOSE_IF_SUCCESSFUL,FALSE);
@@ -376,7 +374,7 @@ void burnConfigDialog::restFuses(bool eeProtect)
              lfuses="lfuse:w:0x3F:m";
            } 
            file.close();
-            unlink(tempFile.toAscii());
+            qunlink(tempFile);
          }
          else {
            lfuses="lfuse:w:0x3F:m";
@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>531</width>
-    <height>335</height>
+    <height>422</height>
   </rect>
  </property>
  <property name="sizePolicy">
@@ -817,6 +817,14 @@ Please only use this if you know what you are doing.  There are no error checks
  <tabstop>avrdude_port</tabstop>
  <tabstop>avrArgs</tabstop>
  <tabstop>pushButton_4</tabstop>
+  <tabstop>samba_location</tabstop>
+  <tabstop>sb_browse</tabstop>
+  <tabstop>arm_mcu</tabstop>
+  <tabstop>samba_port</tabstop>
+  <tabstop>dfu_location</tabstop>
+  <tabstop>dfu_browse</tabstop>
+  <tabstop>dfuArgs</tabstop>
+  <tabstop>advCtrChkB</tabstop>
  <tabstop>buttonBox</tabstop>
 </tabstops>
 <resources>
@@ -42,6 +42,7 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
      ui->EEbackupCB->hide();
    }
+    ui->checkFirmwareCB->setChecked(g.checkHardwareCompatibility());
  }
  else {
    ui->FlashLoadButton->setText(tr("Browse for file"));
@@ -49,6 +50,7 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
    ui->patchcalib_CB->hide();
    ui->patchhw_CB->hide();
    ui->EEpromCB->hide();
+    ui->checkFirmwareCB->hide();
    ui->BurnFlashButton->setDisabled(true);
    ui->FWFileName->clear();
    ui->DateField->clear();
@@ -408,6 +410,7 @@ void burnDialog::on_useLibraryImageCB_clicked()
 void burnDialog::on_BurnFlashButton_clicked()
 {
  if (hexType==FLASH_FILE_TYPE) {
+    g.checkHardwareCompatibility(ui->checkFirmwareCB->isChecked());
    QString fileName=ui->FWFileName->text();
    if (!fileName.isEmpty()) {
      g.flashDir( QFileInfo(fileName).dir().absolutePath() );
@@ -418,12 +421,12 @@ void burnDialog::on_BurnFlashButton_clicked()
          image = pixmap->toImage().scaled(ui->imageLabel->width(), ui->imageLabel->height());
        }
        if (!image.isNull()) {
-          QString tempDir = QDir::tempPath();
          QString tempFile;
          if (getFileType(fileName) == FILE_TYPE_HEX)
-            tempFile = tempDir + "/flash.hex";
+            tempFile = generateProcessUniqueTempFileName("flash.hex");
          else
-            tempFile = tempDir + "/flash.bin";
+            tempFile = generateProcessUniqueTempFileName("flash.bin");
+          qDebug() << "burnDialog::on_BurnFlashButton_clicked(): patching" << fileName << "with custom splash screen and saving to" << tempFile;
          FlashInterface flash(fileName);
          flash.setSplash(image);
          if (flash.saveFlash(tempFile) > 0) {
@@ -555,16 +558,12 @@ void burnDialog::on_BurnFlashButton_clicked()
        QMessageBox::critical(this, tr("Warning"), tr("Wrong radio setting data in profile, Settings not patched"));
      }
    
-      QString fileName;
      if (patch) {
-        QString tempDir    = QDir::tempPath();
-        fileName = tempDir + "/temp.bin";
+        QString fileName = generateProcessUniqueTempFileName("temp.bin");
        QFile file(fileName);

        uint8_t *eeprom = (uint8_t*)malloc(GetEepromInterface()->getEEpromSize());
-        int eeprom_size = 0;
-
-        eeprom_size = GetEepromInterface()->save(eeprom, radioData, GetCurrentFirmwareVariant());
+        int eeprom_size = GetEepromInterface()->save(eeprom, radioData, GetCurrentFirmware()->getVariantNumber());
        if (!eeprom_size) {
          QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(fileName).arg(file.errorString()));
          hexfileName->clear();
@@ -578,10 +577,10 @@ void burnDialog::on_BurnFlashButton_clicked()
        QTextStream outputStream(&file);

        long result = file.write((char*)eeprom, eeprom_size);
-        if (result!=eeprom_size) {
+        if (result != eeprom_size) {
          QMessageBox::warning(this, tr("Error"),tr("Error writing file %1:\n%2.").arg(fileName).arg(file.errorString()));
-          hexfileName->clear();
        }
+
        hexfileName->clear();
        hexfileName->append(fileName);
      }
@@ -30,7 +30,7 @@
    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
  </property>
  <layout class="QGridLayout" name="gridLayout_7">
-   <item row="2" column="0">
+   <item row="3" column="0">
    <layout class="QHBoxLayout" name="horizontalLayout_4">
     <item>
      <spacer name="hs2">
@@ -76,6 +76,19 @@
     </item>
    </layout>
   </item>
+   <item row="2" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   <item row="0" column="0">
    <layout class="QGridLayout" name="gridLayout_4">
     <item row="5" column="0">
@@ -342,26 +355,29 @@
    </layout>
   </item>
   <item row="1" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+    <widget class="QCheckBox" name="checkFirmwareCB">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>0</height>
-      </size>
+     <property name="toolTip">
+      <string>Allows Companion to write to older version of the firmware</string>
     </property>
-    </spacer>
+     <property name="text">
+      <string>Check Firmware compatibility</string>
+     </property>
+    </widget>
   </item>
  </layout>
 </widget>
 <tabstops>
-  <tabstop>BurnFlashButton</tabstop>
  <tabstop>FWFileName</tabstop>
  <tabstop>FlashLoadButton</tabstop>
  <tabstop>versionField</tabstop>
  <tabstop>ModField</tabstop>
+  <tabstop>DateField</tabstop>
  <tabstop>useProfileImageCB</tabstop>
  <tabstop>useFwImageCB</tabstop>
  <tabstop>useLibraryImageCB</tabstop>
@@ -371,6 +387,7 @@
  <tabstop>patchhw_CB</tabstop>
  <tabstop>EEpromCB</tabstop>
  <tabstop>cancelButton</tabstop>
+  <tabstop>BurnFlashButton</tabstop>
 </tabstops>
 <resources>
  <include location="companion.qrc"/>
@@ -12,7 +12,11 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.

 macro(_phonon_find_version)
-   file(READ "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h" _phonon_header LIMIT 5000 OFFSET 1000)
+   set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h")
+   if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+      set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+   endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+   file(READ ${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000)
   string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}")
   set(PHONON_VERSION "${CMAKE_MATCH_1}")
   message(STATUS "Phonon Version: ${PHONON_VERSION}")
@@ -31,7 +35,7 @@ else(PHONON_FOUND)
   # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
   find_library(PHONON_LIBRARY NAMES phonon)

-   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
+   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)

   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
@@ -8,13 +8,14 @@
 # XSD_FOUND, If false, don't try to use xsd

 FIND_PATH( XSD_INCLUDE_DIR xsd/cxx/parser/elements.hxx
-  "/opt/local/xsd-3.3.0-i686-macosx/libxsd"
+  "/opt/local/xsd-3.3.0-i686-macosx/libxsd"
  "C:/Programs/xsd-3.3.0/libxsd"
  "C:/Program Files/CodeSynthesis XSD 3.2/include"
  "C:/mingw/xsd-3.3.0-i686-windows/libxsd"
  $ENV{XSDDIR}/include
  $ENV{CODESYNTH}/include
-  /usr/local/include /usr/include  
+  /usr/local/include /usr/include
+  $ENV{XSDDIR}/libxsd
 )

 IF( WIN32 )
@@ -27,18 +28,19 @@ ENDIF( )
 FIND_PROGRAM( XSDCXX_EXECUTABLE
  NAMES
    ${XSDCXX_FILENAME1} ${XSDCXX_FILENAME2}
-  PATHS
+  PATHS
    "/opt/local/xsd-3.3.0-i686-macosx/bin"
    "C:/Programs/xsd-3.3.0/bin"
-    "C:/mingw/xsd-3.3.0-i686-windows/bin"  
+    "C:/mingw/xsd-3.3.0-i686-windows/bin"
    "C:/Program Files/CodeSynthesis XSD 3.2/bin"
    $ENV{XSDDIR}/bin
    /usr/local/bin
    /usr/bin
+    $ENV{XSDDIR}/xsd
 )

 MESSAGE(STATUS ${XSDCXX_EXECUTABLE})
-      
+
 # if the include and the program are found then we have it
 IF( XSD_INCLUDE_DIR )
  IF( XSDCXX_EXECUTABLE )
@@ -49,4 +51,4 @@ ENDIF( XSD_INCLUDE_DIR )
 MARK_AS_ADVANCED(
  XSD_INCLUDE_DIR
  XSDCXX_EXECUTABLE
-)
+)
@@ -48,6 +48,9 @@
 #include <QSplashScreen>
 #include <QThread>
 #include <iostream>
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  #include <SDL.h>
+#endif
 #include "mainwindow.h"
 #include "eeprominterface.h"
 #include "appdata.h"
@@ -96,19 +99,37 @@ int main(int argc, char *argv[])

  QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));

-  if (g.profile[g.id()].fwType().isEmpty()){
-    g.profile[g.id()].fwType(default_firmware_variant.id);
-    g.profile[g.id()].fwName("");
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  uint32_t sdlFlags = 0;
+  #ifdef JOYSTICKS
+    sdlFlags |= SDL_INIT_JOYSTICK;
+  #endif
+  #ifdef SIMU_AUDIO
+    sdlFlags |= SDL_INIT_AUDIO;
+  #endif
+  if (SDL_Init(sdlFlags) < 0) {
+    fprintf(stderr, "ERROR: couldn't initialize SDL: %s\n", SDL_GetError());
  }
-    
-
-  QPixmap pixmap = QPixmap(g.profile[g.id()].fwType().contains("taranis") ? ":/images/splasht.png" : ":/images/splash.png");
-  QSplashScreen *splash = new QSplashScreen(pixmap);
+#endif

  RegisterEepromInterfaces();
  registerOpenTxFirmwares();

-  current_firmware_variant = GetFirmwareVariant(g.profile[g.id()].fwType());
+  if (g.profile[g.id()].fwType().isEmpty()){
+    g.profile[g.id()].fwType(default_firmware_variant->getId());
+    g.profile[g.id()].fwName("");
+  }
+
+  QString splashScreen;
+  if ( g.profile[g.id()].fwType().contains("taranis"))     splashScreen = ":/images/splasht.png";
+  else if ( g.profile[g.id()].fwType().contains("9xrpro")) splashScreen = ":/images/splashp.png";
+  else if ( g.profile[g.id()].fwType().contains("9xr"))    splashScreen = ":/images/splashr.png";
+  else  splashScreen = ":/images/splash.png";
+
+  QPixmap pixmap = QPixmap(splashScreen);
+  QSplashScreen *splash = new QSplashScreen(pixmap);
+
+  current_firmware_variant = GetFirmware(g.profile[g.id()].fwType());

  MainWindow *mainWin = new MainWindow();
  if (g.showSplash()) {
@@ -128,5 +149,9 @@ int main(int argc, char *argv[])
  UnregisterFirmwares();
  UnregisterEepromInterfaces();

+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  SDL_Quit();
+#endif
+
  return result;
 }
@@ -40,6 +40,8 @@
    <file>images/9xcursphoto.png</file>
    <file>images/screenshot.png</file>
    <file>images/splash.png</file>
+    <file>images/splashp.png</file>
+    <file>images/splashr.png</file>
    <file>images/splasht.png</file>
    <file>images/companion-title.png</file>
    <file>images/maps.png</file>
@@ -24,8 +24,9 @@ public:
  uint8_t models[C9X_MAX_MODELS];
 };

-CompareDialog::CompareDialog(QWidget * parent):
+CompareDialog::CompareDialog(QWidget * parent, FirmwareInterface * firmware):
  QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+  firmware(firmware),
  model1(0),
  model2(0),
  ui(new Ui::CompareDialog)
@@ -75,6 +76,8 @@ void CompareDialog::dragLeaveEvent(QDragLeaveEvent *event)
 void CompareDialog::printDiff()
 {
  te->clear();
+  curvefile1=generateProcessUniqueTempFileName("curve1.png");
+  curvefile2=generateProcessUniqueTempFileName("curve2.png");
  printSetup();
  if (GetCurrentFirmware()->getCapability(FlightModes)) {
    printPhases();
@@ -156,16 +159,12 @@ void CompareDialog::dropEvent(QDropEvent *event)

 void CompareDialog::closeEvent(QCloseEvent *event) 
 {
-  QByteArray ba = curvefile5.toLatin1();
-  char *name = ba.data(); 
-  unlink(name);
-  ba = curvefile9.toLatin1();
-  name = ba.data(); 
-  unlink(name);    
 }

 CompareDialog::~CompareDialog()
 {
+  qunlink(curvefile1);
+  qunlink(curvefile1);
  delete ui;
 }

@@ -254,19 +253,26 @@ void CompareDialog::printSetup()
  str.append(fv(tr("Timer1"), getTimerStr(g_model1->timers[0]), color));  //value, mode, count up/down
  color=getColor1(getTimerStr(g_model1->timers[1]), getTimerStr(g_model2->timers[1]));
  str.append(fv(tr("Timer2"), getTimerStr(g_model1->timers[1]), color));  //value, mode, count up/down
-  color=getColor1(getProtocol(g_model1),getProtocol(g_model2));
-  str.append(fv(tr("Protocol"), getProtocol(g_model1), color)); //proto, numch, delay,
-  color=getColor1(g_model1->moduleData[0].ppmPulsePol,g_model2->moduleData[0].ppmPulsePol);
-  str.append(fv(tr("Pulse Polarity"), g_model1->moduleData[0].ppmPulsePol ? "NEG" : "POS", color));
+  color=getColor1(getProtocol(g_model1->moduleData[0]),getProtocol(g_model2->moduleData[0]));
+  if (firmware->getCapability(NumModules)>1) {
+    str.append("<b>"+(IS_TARANIS(firmware->getBoard()) ? tr("Internal Radio System") : tr("Radio System") )+"</b><br>&nbsp;&nbsp;"); //proto, numch, delay,
+  }
+  str.append(fv(tr("Protocol"), getProtocol(g_model1->moduleData[0]),color)); 
+  if (firmware->getCapability(NumModules)>1) {
+    color=getColor1(getProtocol(g_model1->moduleData[1]),getProtocol(g_model2->moduleData[1]));
+    str.append("<b>"+(IS_TARANIS(firmware->getBoard()) ? tr("External Radio Module") : tr("Extra Radio System"))+"</b><br>&nbsp;&nbsp;"); //proto, numch, delay,
+    str.append(fv(tr("Protocol"), getProtocol(g_model1->moduleData[1]),color));
+  }
+  if (IS_TARANIS(firmware->getBoard())){
+    color=getColor1(getTrainerMode(g_model1->trainerMode, g_model1->moduleData[2]),getTrainerMode(g_model2->trainerMode, g_model2->moduleData[2]));
+    str.append(fv(tr("Trainer port mode"), getTrainerMode(g_model1->trainerMode, g_model1->moduleData[2]),color)); 
+  }
  color=getColor1(g_model1->thrTrim,g_model2->thrTrim);
  str.append(fv(tr("Throttle Trim"), g_model1->thrTrim ? tr("Enabled") : tr("Disabled"), color));
-  color=getColor1(g_model1->thrExpo,g_model2->thrExpo);
-  str.append(fv(tr("Throttle Expo"), g_model1->thrExpo ? tr("Enabled") : tr("Disabled"),color));
-  // TODO    str.append(fv(tr("Trim Switch"), getSWName(g_model->trimSw)));
  color=getColor1(getTrimInc(g_model1),getTrimInc(g_model2));
  str.append(fv(tr("Trim Increment"), getTrimInc(g_model1),color));
-  color=getColor1(getCenterBeep(g_model1),getCenterBeep(g_model2));
-  str.append(fv(tr("Center Beep"), getCenterBeep(g_model1),color)); // specify which channels beep
+  color = getColor1(getCenterBeepStr(g_model1), getCenterBeepStr(g_model2));
+  str.append(fv(tr("Center Beep"), getCenterBeepStr(g_model1), color)); // specify which channels beep
  str.append("</table></td>");
  str.append("<td><table border=0 cellspacing=0 cellpadding=3 width=\"50%\">");
  color=getColor2(g_model1->name,g_model2->name);
@@ -277,19 +283,26 @@ void CompareDialog::printSetup()
  str.append(fv(tr("Timer1"), getTimerStr(g_model2->timers[0]),color));  //value, mode, count up/down
  color=getColor2(getTimerStr(g_model1->timers[1]), getTimerStr(g_model2->timers[1]));
  str.append(fv(tr("Timer2"), getTimerStr(g_model2->timers[1]),color));  //value, mode, count up/down
-  color=getColor2(getProtocol(g_model1),getProtocol(g_model2));
-  str.append(fv(tr("Protocol"), getProtocol(g_model2), color)); //proto, numch, delay,
-  color=getColor2(g_model1->moduleData[0].ppmPulsePol,g_model2->moduleData[0].ppmPulsePol);
-  str.append(fv(tr("Pulse Polarity"), g_model2->moduleData[0].ppmPulsePol ? "NEG" : "POS", color));
+  color=getColor2(getProtocol(g_model1->moduleData[0]),getProtocol(g_model2->moduleData[0]));
+  if (firmware->getCapability(NumModules)>1) {
+    str.append("<b>"+(IS_TARANIS(firmware->getBoard()) ? tr("Internal Radio System") : tr("Radio System") )+"</b><br>&nbsp;&nbsp;"); //proto, numch, delay,
+  }
+  str.append(fv(tr("Protocol"), getProtocol(g_model2->moduleData[0]),color)); 
+  if (firmware->getCapability(NumModules)>1) {
+    color=getColor2(getProtocol(g_model1->moduleData[1]),getProtocol(g_model2->moduleData[1]));
+    str.append("<b>"+(IS_TARANIS(firmware->getBoard()) ? tr("External Radio Module") : tr("Extra Radio System"))+"</b><br>&nbsp;&nbsp;"); //proto, numch, delay,
+    str.append(fv(tr("Protocol"), getProtocol(g_model2->moduleData[1]),color));
+  }
+  if (IS_TARANIS(firmware->getBoard())){
+    color=getColor2(getTrainerMode(g_model1->trainerMode, g_model1->moduleData[2]),getTrainerMode(g_model2->trainerMode, g_model2->moduleData[2]));
+    str.append(fv(tr("Trainer port mode"), getTrainerMode(g_model2->trainerMode, g_model2->moduleData[2]),color)); 
+  }
  color=getColor2(g_model1->thrTrim,g_model2->thrTrim);
  str.append(fv(tr("Throttle Trim"), g_model2->thrTrim ? tr("Enabled") : tr("Disabled"), color));
-  color=getColor2(g_model1->thrExpo,g_model2->thrExpo);
-  str.append(fv(tr("Throttle Expo"), g_model2->thrExpo ? tr("Enabled") : tr("Disabled"),color));
-  // TODO    str.append(fv(tr("Trim Switch"), getSWName(g_model->trimSw)));
  color=getColor2(getTrimInc(g_model1),getTrimInc(g_model2));
  str.append(fv(tr("Trim Increment"), getTrimInc(g_model2),color));
-  color=getColor2(getCenterBeep(g_model1),getCenterBeep(g_model2));
-  str.append(fv(tr("Center Beep"), getCenterBeep(g_model2),color)); // specify which channels beep
+  color = getColor2(getCenterBeepStr(g_model1),getCenterBeepStr(g_model2));
+  str.append(fv(tr("Center Beep"), getCenterBeepStr(g_model2), color)); // specify which channels beep
  str.append("</td></tr></table></td></tr></table>");
  te->append(str);
 }
@@ -310,8 +323,8 @@ void CompareDialog::printPhases()
  }
  str.append("</tr>");
  for (i=0; i<GetCurrentFirmware()->getCapability(FlightModes); i++) {
-    PhaseData *pd1=&g_model1->phaseData[i];
-    PhaseData *pd2=&g_model2->phaseData[i];
+    FlightModeData *pd1=&g_model1->flightModeData[i];
+    FlightModeData *pd2=&g_model2->flightModeData[i];
    str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
    color=getColor1(pd1->name,pd2->name);
    str.append(QString("<font size=+1 face='Courier New' color=%2>%1</font></td>").arg(pd1->name).arg(color));
@@ -333,32 +346,19 @@ void CompareDialog::printPhases()
    str.append("</tr>");
  }
  str.append("</table>");
-  int gvars=0;
-  int gvarnum=0;
-  if (GetCurrentFirmware()->getCapability(HasVariants)) {
-    if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
-      gvars=1;
-    }
-  }
-  else {
-    gvars=1;
-  }
-  if (gvars==1) {
-    gvarnum=GetCurrentFirmware()->getCapability(Gvars);
-  }
-  if ((gvars==1 && GetCurrentFirmware()->getCapability(GvarsFlightModes)) || GetCurrentFirmware()->getCapability(RotaryEncoders)) {
+  int gvars = GetCurrentFirmware()->getCapability(Gvars);
+  if ((gvars && GetCurrentFirmware()->getCapability(GvarsFlightModes)) || GetCurrentFirmware()->getCapability(RotaryEncoders)) {
    str.append("<br><table border=1 cellspacing=0 cellpadding=1 width=\"100%\">");
    str.append("<tr><td style=\"border-style:none;\">&nbsp;</td>");
    if (GetCurrentFirmware()->getCapability(GvarsFlightModes)) {
-      
-      str.append(QString("<td colspan=%1 align=center><b>").arg(gvarnum)+tr("Gvars")+"</td>");
+      str.append(QString("<td colspan=%1 align=center><b>").arg(gvars)+tr("Gvars")+"</td>");
    }
    if (GetCurrentFirmware()->getCapability(RotaryEncoders)) {
      str.append(QString("<td colspan=%1 align=center><b>").arg(GetCurrentFirmware()->getCapability(RotaryEncoders))+tr("Rot. Enc.")+"</td>");
    }
    str.append("</tr><tr><td align=center><b>"+tr("Flight mode name")+"</b></td>");
    if (GetCurrentFirmware()->getCapability(GvarsFlightModes)) {
-      for (i=0; i<gvarnum; i++) {
+      for (i=0; i<gvars; i++) {
        str.append(QString("<td width=\"40\" align=\"center\"><b>GV%1</b><br>%2</td>").arg(i+1).arg(g_model1->gvars_names[i]));
      }
    }
@@ -367,13 +367,13 @@ void CompareDialog::printPhases()
    }
    str.append("</tr>");
    for (i=0; i<GetCurrentFirmware()->getCapability(FlightModes); i++) {
-      PhaseData *pd1=&g_model1->phaseData[i];
-      PhaseData *pd2=&g_model2->phaseData[i];
+      FlightModeData *pd1=&g_model1->flightModeData[i];
+      FlightModeData *pd2=&g_model2->flightModeData[i];
      str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
      color=getColor1(pd1->name,pd2->name);
      str.append(QString("<font size=+1 face='Courier New' color=%2>%1</font></td>").arg(pd1->name).arg(color));
      if (GetCurrentFirmware()->getCapability(GvarsFlightModes)) {
-        for (k=0; k<gvarnum; k++) {
+        for (k=0; k<gvars; k++) {
          color=getColor1(pd1->gvars[k],pd2->gvars[k]);
          if (pd1->gvars[k]<=1024) {
            str.append(QString("<td align=\"right\" width=\"40\"><font size=+1 face='Courier New' color=%2>%1").arg(pd1->gvars[k]).arg(color)+"</font></td>");
@@ -412,8 +412,8 @@ void CompareDialog::printPhases()
  }
  str.append("</tr>");
  for (i=0; i<GetCurrentFirmware()->getCapability(FlightModes); i++) {
-    PhaseData *pd1=&g_model1->phaseData[i];
-    PhaseData *pd2=&g_model2->phaseData[i];
+    FlightModeData *pd1=&g_model1->flightModeData[i];
+    FlightModeData *pd2=&g_model2->flightModeData[i];
    str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
    color=getColor2(pd1->name,pd2->name);
    str.append(QString("<font size=+1 face='Courier New' color=%2>%1</font></td>").arg(pd2->name).arg(color));
@@ -436,18 +436,18 @@ void CompareDialog::printPhases()
  }
  str.append("</table>");
  
-  if ((gvars==1 && GetCurrentFirmware()->getCapability(GvarsFlightModes)) || GetCurrentFirmware()->getCapability(RotaryEncoders)) {
+  if ((gvars && GetCurrentFirmware()->getCapability(GvarsFlightModes)) || GetCurrentFirmware()->getCapability(RotaryEncoders)) {
    str.append("<br><table border=1 cellspacing=0 cellpadding=1 width=\"100%\">");
    str.append("<tr><td style=\"border-style:none;\">&nbsp;</td>");
    if (GetCurrentFirmware()->getCapability(GvarsFlightModes)) {
-      str.append(QString("<td colspan=%1 align=center><b>").arg(gvarnum)+tr("Gvars")+"</td>");
+      str.append(QString("<td colspan=%1 align=center><b>").arg(gvars)+tr("Gvars")+"</td>");
    }
    if (GetCurrentFirmware()->getCapability(RotaryEncoders)) {
      str.append(QString("<td colspan=%1 align=center><b>").arg(GetCurrentFirmware()->getCapability(RotaryEncoders))+tr("Rot. Enc.")+"</td>");
    }
    str.append("</tr><tr><td align=center ><b>"+tr("Flight mode name")+"</b></td>");
    if (GetCurrentFirmware()->getCapability(GvarsFlightModes)) {
-      for (i=0; i<gvarnum; i++) {
+      for (i=0; i<gvars; i++) {
        str.append(QString("<td width=\"40\" align=\"center\"><b>GV%1</b><br>%2</td>").arg(i+1).arg(g_model2->gvars_names[i]));
      }
    }
@@ -456,13 +456,13 @@ void CompareDialog::printPhases()
    }
    str.append("</tr>");
    for (i=0; i<GetCurrentFirmware()->getCapability(FlightModes); i++) {
-      PhaseData *pd1=&g_model1->phaseData[i];
-      PhaseData *pd2=&g_model2->phaseData[i];
+      FlightModeData *pd1=&g_model1->flightModeData[i];
+      FlightModeData *pd2=&g_model2->flightModeData[i];
      str.append("<tr><td><b>"+tr("FM")+QString("%1</b> ").arg(i));
      color=getColor1(pd1->name,pd2->name);
      str.append(QString("<font size=+1 face='Courier New' color=%2>%1</font></td>").arg(pd2->name).arg(color));
      if (GetCurrentFirmware()->getCapability(GvarsFlightModes)) {
-        for (k=0; k<gvarnum; k++) {
+        for (k=0; k<gvars; k++) {
          color=getColor1(pd1->gvars[k],pd2->gvars[k]);
          if (pd2->gvars[k]<=1024) {
            str.append(QString("<td align=\"right\" width=\"40\"><font size=+1 face='Courier New' color=%2>%1").arg(pd2->gvars[k]).arg(color)+"</font></td>");
@@ -519,11 +519,11 @@ void CompareDialog::printLimits()
      str.append(doTC(tr("CH")+QString(" %1").arg(i+1,2,10,QChar('0')),"",true));
    }
    color=getColor1(g_model1->limitData[i].offset,g_model2->limitData[i].offset);
-    str.append(doTR(QString::number((qreal)g_model1->limitData[i].offset/10, 'f', 1),color));
+    str.append(doTR(g_model1->limitData[i].offsetToString(), color));
    color=getColor1(g_model1->limitData[i].min,g_model2->limitData[i].min);
-    str.append(doTR(QString::number(g_model1->limitData[i].min),color));
+    str.append(doTR(g_model1->limitData[i].minToString(), color));
    color=getColor1(g_model1->limitData[i].max,g_model2->limitData[i].max);
-    str.append(doTR(QString::number(g_model1->limitData[i].max),color));
+    str.append(doTR(g_model1->limitData[i].maxToString(), color));
    color=getColor1(g_model1->limitData[i].revert,g_model2->limitData[i].revert);
    str.append(doTR(QString(g_model1->limitData[i].revert ? tr("INV") : tr("NOR")),color));
    str.append("</tr>");
@@ -546,11 +546,11 @@ void CompareDialog::printLimits()
      str.append(doTC(tr("CH")+QString(" %1").arg(i+1,2,10,QChar('0')),"",true));
    }
    color=getColor2(g_model1->limitData[i].offset,g_model2->limitData[i].offset);
-    str.append(doTR(QString::number((qreal)g_model2->limitData[i].offset/10, 'f', 1),color));
+    str.append(doTR(g_model2->limitData[i].offsetToString(), color));
    color=getColor2(g_model1->limitData[i].min,g_model2->limitData[i].min);
-    str.append(doTR(QString::number(g_model2->limitData[i].min),color));
+    str.append(doTR(g_model2->limitData[i].minToString(), color));
    color=getColor2(g_model1->limitData[i].max,g_model2->limitData[i].max);
-    str.append(doTR(QString::number(g_model2->limitData[i].max),color));
+    str.append(doTR(g_model2->limitData[i].maxToString(), color));
    color=getColor2(g_model1->limitData[i].revert,g_model2->limitData[i].revert);
    str.append(doTR(QString(g_model2->limitData[i].revert ? tr("INV") : tr("NOR")),color));
    str.append("</tr>");
@@ -562,28 +562,23 @@ void CompareDialog::printLimits()
 void CompareDialog::printGvars()
 {
  QString color;
-  int gvars=0;
-  int gvarnum=0;
-  if ((GetCurrentFirmwareVariant() & GVARS_VARIANT ) || (!GetCurrentFirmware()->getCapability(HasVariants) && GetCurrentFirmware()->getCapability(Gvars))) {
-    gvars=1;
-    gvarnum=GetCurrentFirmware()->getCapability(Gvars);
-  }
+  int gvars = GetCurrentFirmware()->getCapability(Gvars);

-  if (!GetCurrentFirmware()->getCapability(GvarsFlightModes) && (gvars==1 && GetCurrentFirmware()->getCapability(Gvars))) {
+  if (!GetCurrentFirmware()->getCapability(GvarsFlightModes) && gvars) {
    QString str = "<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">";
    str.append("<tr><td colspan=2><h2>"+tr("Global Variables")+"</h2></td></tr>");
    str.append("<tr><td width=50%>");
    str.append("<table border=1 cellspacing=0 cellpadding=3 width=100>");
-    PhaseData *pd1=&g_model1->phaseData[0];
-    PhaseData *pd2=&g_model2->phaseData[0];
-    int width=100/gvarnum;
+    FlightModeData *pd1=&g_model1->flightModeData[0];
+    FlightModeData *pd2=&g_model2->flightModeData[0];
+    int width = 100 / gvars;
    str.append("<tr>");
-    for(int i=0; i<gvarnum; i++) {        
+    for (int i=0; i<gvars; i++) {
      str.append(QString("<td width=\"%1%\" align=\"center\"><b>").arg(width)+tr("GV")+QString("%1</b></td>").arg(i+1));
    }
    str.append("</tr>");
    str.append("<tr>");
-    for(int i=0; i<gvarnum; i++) {
+    for (int i=0; i<gvars; i++) {
      color=getColor1(pd1->gvars[i],pd2->gvars[i]);
      str.append(QString("<td width=\"%1%\" align=\"center\"><font color=%2>").arg(width).arg(color)+QString("%1</font></td>").arg(pd1->gvars[i]));
    }
@@ -591,12 +586,12 @@ void CompareDialog::printGvars()
    str.append("</table></td><td width=50%>");
    str.append("<table border=1 cellspacing=0 cellpadding=3 width=100>");
    str.append("<tr>");
-    for(int i=0; i<gvarnum; i++) {        
+    for (int i=0; i<gvars; i++) {
      str.append(QString("<td width=\"%1%\" align=\"center\"><b>").arg(width)+tr("GV")+QString("%1</b></td>").arg(i+1));
    }
    str.append("</tr>");
    str.append("<tr>");
-    for(int i=0; i<gvarnum; i++) {
+    for (int i=0; i<gvars; i++) {
      color=getColor2(pd1->gvars[i],pd2->gvars[i]);
      str.append(QString("<td width=\"%1%\" align=\"center\"><font color=%2>").arg(width).arg(color)+QString("%1</font></td>").arg(pd2->gvars[i]));
    }
@@ -673,7 +668,7 @@ void CompareDialog::printExpos()
                first=1;
                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightModes);j++) {
                  if (!(ed->phases & mask)) {
-                    PhaseData *pd = &g_model1->phaseData[j];
+                    FlightModeData *pd = &g_model1->flightModeData[j];
                    if (!first) {
                      str += QString(", ")+ QString("%1").arg(getPhaseName(j+1, pd->name));
                    } else {
@@ -751,7 +746,7 @@ void CompareDialog::printExpos()
                first=1;
                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightModes);j++) {
                  if (!(ed->phases & mask)) {
-                    PhaseData *pd = &g_model2->phaseData[j];
+                    FlightModeData *pd = &g_model2->flightModeData[j];
                    if (!first) {
                      str += QString(", ")+ QString("%1").arg(getPhaseName(j+1, pd->name));
                    } else {
@@ -821,11 +816,11 @@ void CompareDialog::printMixers()
              break;
          };
          str += QString(" %1").arg(getGVarString(md->weight)).rightJustified(6, ' ');
-          str += md->srcRaw.toString();
+          str += md->srcRaw.toString(*g_model1);
          if (md->swtch.type) str += " " + tr("Switch") + QString("(%1)").arg(md->swtch.toString());
          if (md->carryTrim) str += " " + tr("noTrim");
          if (md->sOffset)  str += " "+ tr("Offset") + QString(" (%1%)").arg(getGVarString(md->sOffset));
-          str += md->curve.toString().replace("<", "&lt;").replace(">", "&gt;");
+          if (md->curve.value) str += " " + Qt::escape(md->curve.toString());
          if (md->delayDown || md->delayUp) str += tr(" Delay(u%1:d%2)").arg(md->delayUp/scale).arg(md->delayDown/scale);
          if (md->speedDown || md->speedUp) str += tr(" Slow(u%1:d%2)").arg(md->speedUp/scale).arg(md->speedDown/scale);
          if (md->mixWarn)  str += " "+tr("Warn")+QString("(%1)").arg(md->mixWarn);
@@ -849,7 +844,7 @@ void CompareDialog::printMixers()
                first=1;
                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightModes);j++) {
                  if (!(md->phases & mask)) {
-                    PhaseData *pd = &g_model1->phaseData[j];
+                    FlightModeData *pd = &g_model1->flightModeData[j];
                    if (!first) {
                      str += QString(", ")+ QString("%1").arg(getPhaseName(j+1, pd->name));
                    } else {
@@ -899,12 +894,11 @@ void CompareDialog::printMixers()
              break;
          };
          str += QString(" %1").arg(getGVarString(md->weight)).rightJustified(6, ' ');
-          str += md->srcRaw.toString();
+          str += md->srcRaw.toString(*g_model2);
          if (md->swtch.type) str += " " + tr("Switch") + QString("(%1)").arg(md->swtch.toString());
          if (md->carryTrim) str += " " + tr("noTrim");
          if (md->sOffset)  str += " "+ tr("Offset") + QString(" (%1%)").arg(getGVarString(md->sOffset));
-          // TODO if (md->differential)  str += " "+ tr("Diff") + QString(" (%1%)").arg(getGVarString(md->differential));
-          // TODO if (md->curve) str += " " + tr("Curve") + QString("(%1)").arg(getCurveStr(md->curve).replace("<", "&lt;").replace(">", "&gt;"));
+          if (md->curve.value) str += " " + Qt::escape(md->curve.toString());
          if (md->delayDown || md->delayUp) str += tr(" Delay(u%1:d%2)").arg(md->delayUp/scale).arg(md->delayDown/scale);
          if (md->speedDown || md->speedUp) str += tr(" Slow(u%1:d%2)").arg(md->speedUp/scale).arg(md->speedDown/scale);
          if (md->mixWarn)  str += " "+tr("Warn")+QString("(%1)").arg(md->mixWarn);
@@ -928,7 +922,7 @@ void CompareDialog::printMixers()
                first=1;
                for (int j=0; j<GetCurrentFirmware()->getCapability(FlightModes);j++) {
                  if (!(md->phases & mask)) {
-                    PhaseData *pd = &g_model2->phaseData[j];
+                    FlightModeData *pd = &g_model2->flightModeData[j];
                    if (!first) {
                      str += QString(", ")+ QString("%1").arg(getPhaseName(j+1, pd->name));
                    } else {
@@ -957,82 +951,176 @@ void CompareDialog::printMixers()

 void CompareDialog::printCurves()
 {
-#if 0
-  int i,r,g,b,c;
+  int i,r,g,b,c,count1,count2,usedcurves=0;
+  QString cm1y,cm1x, cm2y,cm2x;
  char buffer [16];
-  QString color;
-  QColor * qplot_color[8];
-  qplot_color[0]=new QColor(0,0,127);
-  qplot_color[1]=new QColor(0,127,0);
-  qplot_color[2]=new QColor(127,0,0);
-  qplot_color[3]=new QColor(127,127,0);
-  qplot_color[4]=new QColor(0,0,255);
-  qplot_color[5]=new QColor(0,255,0);
-  qplot_color[6]=new QColor(255,0,0);
-  qplot_color[7]=new QColor(255,255,0);
+  QPen pen(Qt::black, 2, Qt::SolidLine);
+  int numcurves=firmware->getCapability(NumCurves);
+  if (numcurves==0) {
+    numcurves=16;
+  }
+
  QString str = "<table border=1 cellspacing=0 cellpadding=3 style=\"page-break-after:always;\" width=\"100%\"><tr><td><h2>";
  str.append(tr("Curves"));
  str.append("</h2></td></tr><tr><td>");
-  str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=11><b>"+tr("5 Point Curves")+"</b></td></tr><tr>");
-  for(i=0; i<5; i++) 
-    str.append(doTC(tr("pt %1").arg(i+1), "", true));
-  str.append("<td></td>");
-  for(i=0; i<5; i++) 
-    str.append(doTC(tr("pt %1").arg(i+1), "", true));
-  str.append("</tr>");
+  str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\">");
+  QImage qi1(ISIZE+1,ISIZE+1,QImage::Format_RGB32);
+  QPainter painter1(&qi1);
+  QImage qi2(ISIZE+1,ISIZE+1,QImage::Format_RGB32);
+  QPainter painter2(&qi2);
+  painter1.setBrush(QBrush("#FFFFFF"));
+  painter2.setBrush(QBrush("#FFFFFF"));
+  painter1.setPen(QColor(0,0,0));
+  painter2.setPen(QColor(0,0,0));
+  painter1.drawRect(0,0,ISIZE,ISIZE);
+  painter2.drawRect(0,0,ISIZE,ISIZE);
+  
+  for(i=0; i<numcurves; i++) {
+    count1=0;
+    for(int j=0; j<g_model1->curves[i].count; j++) {
+      if (g_model1->curves[i].points[j].y!=0)
+        count1++;
+    }
+    count2=0;
+    for(int j=0; j<g_model2->curves[i].count; j++) {
+      if (g_model2->curves[i].points[j].y!=0)
+        count2++;
+    }
+    if ((count1>0) || (g_model1->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)|| (g_model1->curves[i].count !=5) ||
+        (count2>0) || (g_model2->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)|| (g_model2->curves[i].count !=5)) {
+      pen.setColor(colors[usedcurves]);
+      painter1.setPen(pen);
+      painter2.setPen(pen);

-  for(i=0; i<MAX_CURVE5; i++) {
-    qplot_color[i]->getRgb(&r,&g,&b);
-    c=r;
-    c*=256;
-    c+=g;
-    c*=256;
-    c+=b;
-    sprintf(buffer,"%06x",c);
-    str.append("<tr>");
-    for(int j=0; j<5; j++) { 
-      color=getColor1(g_model2->curves5[i][j],g_model2->curves5[i][j]);
-      str.append(doTR(QString::number(g_model1->curves5[i][j]),color));
-    }
-    str.append(QString("<td width=\"10%\" align=\"center\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td>").arg(i+1));
-    for(int j=0; j<5; j++) { 
-      color=getColor1(g_model2->curves5[i][j],g_model2->curves5[i][j]);
-      str.append(doTR(QString::number(g_model2->curves5[i][j]),color));
-    }
-    str.append("</tr>");
-  }
-  str.append("</table></td></tr><tr><td>");
+      colors[usedcurves].getRgb(&r,&g,&b);
+      c=r;
+      c*=256;
+      c+=g;
+      c*=256;
+      c+=b;
+      sprintf(buffer,"%06x",c);
+      // curves are different in number of points or curve type so makes little sense to compare they are just different
+      if ((g_model1->curves[i].count!=g_model2->curves[i].count) || (g_model1->curves[i].type!=g_model2->curves[i].type)) {        
+        cm1y="[";
+        cm1x="[";
+        for(int j=0; j<g_model1->curves[i].count; j++) {
+          cm1y.append(QString("%1").arg(g_model1->curves[i].points[j].y));
+          cm1x.append(QString("%1").arg(g_model1->curves[i].points[j].x));
+          if (j<(g_model1->curves[i].count-1)) {
+            cm1y.append(",");
+            cm1x.append(",");
+          }
+          if (g_model1->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)
+            painter1.drawLine(ISIZE/2+(ISIZE*g_model1->curves[i].points[j-1].x)/200,ISIZE/2-(ISIZE*g_model1->curves[i].points[j-1].y)/200,ISIZE/2+(ISIZE*g_model1->curves[i].points[j].x)/200,ISIZE/2-(ISIZE*g_model1->curves[i].points[j].y)/200);
+          else
+            painter1.drawLine(ISIZE*(j-1)/(g_model1->curves[i].count-1),ISIZE/2-(ISIZE*g_model1->curves[i].points[j-1].y)/200,ISIZE*(j)/(g_model1->curves[i].count-1),ISIZE/2-(ISIZE*g_model1->curves[i].points[j].y)/200);
+          
+        }
+        cm1y.append("]");
+        cm1x.append("]");
+        cm2y="[";
+        cm2x="[";
+        for(int j=0; j<g_model2->curves[i].count; j++) {
+          cm2y.append(QString("%1").arg(g_model2->curves[i].points[j].y));
+          cm2x.append(QString("%1").arg(g_model2->curves[i].points[j].x));
+          if (j<(g_model2->curves[i].count-1)) {
+            cm2y.append(",");
+            cm2x.append(",");
+          }
+          if (g_model2->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)
+            painter2.drawLine(ISIZE/2+(ISIZE*g_model2->curves[i].points[j-1].x)/200,ISIZE/2-(ISIZE*g_model2->curves[i].points[j-1].y)/200,ISIZE/2+(ISIZE*g_model2->curves[i].points[j].x)/200,ISIZE/2-(ISIZE*g_model2->curves[i].points[j].y)/200);
+          else
+            painter2.drawLine(ISIZE*(j-1)/(g_model2->curves[i].count-1),ISIZE/2-(ISIZE*g_model2->curves[i].points[j-1].y)/200,ISIZE*(j)/(g_model2->curves[i].count-1),ISIZE/2-(ISIZE*g_model2->curves[i].points[j].y)/200);
+          
+        }
+        cm2y.append("]");
+        cm2x.append("]");
+        str.append("<tr><td nowrap width=\"45%\"><font color=green>");
+        str.append(cm1y);
+        if ((g_model1->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)) {
+          str.append(QString("<br>")+cm1x+QString("</font></td>"));
+        }      
+        str.append(QString("<td width=\"10%\" align=\"center\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td>").arg(i+1));
+        str.append("<td nowrap width=\"45%\"><font color=red>");
+        str.append(cm2y);
+        if ((g_model2->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)) {
+          str.append(QString("<br>")+cm2x+QString("</font></td></tr>"));
+        }      
+      } else {
+      // curves have the same number of points and the same type, we can compare them point by point
+        cm1y="[";
+        cm1x="[";
+        cm2y="[";
+        cm2x="[";
+        for(int j=0; j<g_model1->curves[i].count; j++) {
+          if (g_model1->curves[i].points[j].y!=g_model2->curves[i].points[j].y) {
+            cm1y.append(QString("<font color=green>%1</font>").arg(g_model1->curves[i].points[j].y));
+            cm2y.append(QString("<font color=red>%1</font>").arg(g_model2->curves[i].points[j].y));
+          } else {
+            cm1y.append(QString("<font color=grey>%1</font>").arg(g_model1->curves[i].points[j].y));
+            cm2y.append(QString("<font color=grey>%1</font>").arg(g_model2->curves[i].points[j].y));            
+          }
+          if (g_model1->curves[i].points[j].x!=g_model2->curves[i].points[j].x) {
+            cm1x.append(QString("<font color=green>%1</font>").arg(g_model1->curves[i].points[j].x));
+            cm2x.append(QString("<font color=red>%1</font>").arg(g_model2->curves[i].points[j].x));
+          } else {
+            cm1x.append(QString("<font color=grey>%1</font>").arg(g_model1->curves[i].points[j].x));
+            cm2x.append(QString("<font color=grey>%1</font>").arg(g_model2->curves[i].points[j].x));            
+          }
+          if (j<(g_model1->curves[i].count-1)) {
+            cm1y.append(",");
+            cm1x.append(",");
+            cm2y.append(",");
+            cm2x.append(",");
+          }
+          if (g_model1->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)
+            painter1.drawLine(ISIZE/2+(ISIZE*g_model1->curves[i].points[j-1].x)/200,ISIZE/2-(ISIZE*g_model1->curves[i].points[j-1].y)/200,ISIZE/2+(ISIZE*g_model1->curves[i].points[j].x)/200,ISIZE/2-(ISIZE*g_model1->curves[i].points[j].y)/200);
+          else
+            painter1.drawLine(ISIZE*(j-1)/(g_model1->curves[i].count-1),ISIZE/2-(ISIZE*g_model1->curves[i].points[j-1].y)/200,ISIZE*(j)/(g_model1->curves[i].count-1),ISIZE/2-(ISIZE*g_model1->curves[i].points[j].y)/200);
+          if (g_model2->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)
+            painter2.drawLine(ISIZE/2+(ISIZE*g_model2->curves[i].points[j-1].x)/200,ISIZE/2-(ISIZE*g_model2->curves[i].points[j-1].y)/200,ISIZE/2+(ISIZE*g_model2->curves[i].points[j].x)/200,ISIZE/2-(ISIZE*g_model2->curves[i].points[j].y)/200);
+          else
+            painter2.drawLine(ISIZE*(j-1)/(g_model2->curves[i].count-1),ISIZE/2-(ISIZE*g_model2->curves[i].points[j-1].y)/200,ISIZE*(j)/(g_model2->curves[i].count-1),ISIZE/2-(ISIZE*g_model2->curves[i].points[j].y)/200);          
+        }
+        painter1.setPen(QColor(0,0,0));
+        painter2.setPen(QColor(0,0,0));
+        painter1.drawLine(0,ISIZE/2,ISIZE,ISIZE/2);
+        painter2.drawLine(0,ISIZE/2,ISIZE,ISIZE/2);
+        painter1.drawLine(ISIZE/2,0,ISIZE/2,ISIZE);
+        painter2.drawLine(ISIZE/2,0,ISIZE/2,ISIZE);
+        for(i=0; i<21; i++) {
+          painter1.drawLine(ISIZE/2-5,(ISIZE*i)/(20),ISIZE/2+5,(ISIZE*i)/(20));
+          painter2.drawLine(ISIZE/2-5,(ISIZE*i)/(20),ISIZE/2+5,(ISIZE*i)/(20));
+          painter1.drawLine((ISIZE*i)/(20),ISIZE/2-5,(ISIZE*i)/(20),ISIZE/2+5);
+          painter2.drawLine((ISIZE*i)/(20),ISIZE/2-5,(ISIZE*i)/(20),ISIZE/2+5);
+        }

-  str.append("<table border=1 cellspacing=0 cellpadding=3 width=\"100%\"><tr><td colspan=19><b>"+tr("9 Point Curves")+"</b></td></tr><tr>");
-  for(i=0; i<9; i++) 
-    str.append(doTC(tr("pt %1").arg(i+1), "", true));
-  str.append("<td></td>");
-  for(i=0; i<9; i++) 
-    str.append(doTC(tr("pt %1").arg(i+1), "", true));
-  str.append("</tr>");
-  for(i=0; i<MAX_CURVE9; i++) {
-    qplot_color[i]->getRgb(&r,&g,&b);
-    c=r;
-    c*=256;
-    c+=g;
-    c*=256;
-    c+=b;
-    sprintf(buffer,"%06x",c);
-    str.append("<tr>");
-    for(int j=0; j<9; j++) { 
-      color=getColor1(g_model2->curves9[i][j],g_model2->curves9[i][j]);
-      str.append(doTR(QString::number(g_model1->curves5[i][j]),color));
+        cm1y.append("]");
+        cm1x.append("]");
+        cm2y.append("]");
+        cm2x.append("]");
+        str.append("<tr><td nowrap width=\"45%\">");
+        str.append(cm1y);
+        if ((g_model1->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)) {
+          str.append(QString("<br>")+cm1x+QString("</td>"));
+        }      
+        str.append(QString("<td width=\"10%\" align=\"center\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td>").arg(i+1));
+        str.append("<td nowrap width=\"45%\">");
+        str.append(cm2y);
+        if ((g_model2->curves[i].type == CurveData::CURVE_TYPE_CUSTOM)) {
+          str.append(QString("<br>")+cm2x+QString("</td></tr>"));
+        }      
+      }
+      usedcurves++;
    }
-    str.append(QString("<td width=\"10%\" align=\"center\"><font color=#%1><b>").arg(buffer)+tr("Curve")+QString(" %1</b></font></td>").arg(i+1+MAX_CURVE5));
-    for(int j=0; j<9; j++) { 
-      color=getColor1(g_model2->curves9[i][j],g_model2->curves9[i][j]);
-      str.append(doTR(QString::number(g_model2->curves9[i][j]),color));
-    }
-    str.append("</tr>");
  }
-  str.append("</table></td></tr></table>");
-  te->append(str);
-#endif
+  if (usedcurves>0) {
+    str.append(QString("<tr><td width=45 align=center><img src=\"%1\" border=0></td><td>&nbsp;</td><td width=45 align=center><img src=\"%2\" border=0></td>").arg(curvefile1).arg(curvefile2));
+    str.append("</table></td></tr></table>");
+    qi1.save(curvefile1, "png",100); 
+    qi2.save(curvefile2, "png",100); 
+    te->append(str);
+  }
 }

 void CompareDialog::printSwitches()
@@ -1043,17 +1131,14 @@ void CompareDialog::printSwitches()
    str.append("<tr><td><h2>"+tr("Logical Switches")+"</h2></td></tr>");
    str.append("<tr><td><table border=1 cellspacing=0 cellpadding=1 width=\"100%\">");
    for (int i=0; i<GetCurrentFirmware()->getCapability(LogicalSwitches); i++) {
-      QString sw1 = g_model1->customSw[i].toString(*g_model1);
-      QString sw2 = g_model2->customSw[i].toString(*g_model2);
+      GeneralSettings settings;
+      QString sw1 = g_model1->customSw[i].toString(*g_model1, settings);
+      QString sw2 = g_model2->customSw[i].toString(*g_model2, settings);
      if (!(sw1.isEmpty() && sw2.isEmpty())) {
        str.append("<tr>");
        color=getColor1(sw1,sw2);
        str.append(QString("<td  width=\"45%\"><font color=%1>").arg(color)+sw1+"</font></td>");
-        if (i<9) {
-          str.append("<td align=\"center\" width=\"10%\"><b>"+tr("LS")+QString("%1</b></td>").arg(i+1));
-        } else {
-          str.append("<td align=\"center\" width=\"10%\"><b>"+tr("LS")+('A'+(i-9))+"</b></td>");
-        }
+        str.append("<td align=\"center\" width=\"10%\"><b>"+tr("L%1").arg(i+1)+QString("</b></td>"));
        color=getColor2(sw1,sw2);
        str.append(QString("<td  width=\"45%\"><font color=%1>").arg(color)+sw2+"</font></td>");
        str.append("</tr>");
@@ -1088,7 +1173,7 @@ void CompareDialog::printFSwitches()
  for(int i=0; i<GetCurrentFirmware()->getCapability(CustomFunctions); i++)
  {
    if (g_model1->funcSw[i].swtch.type || g_model2->funcSw[i].swtch.type) {
-      if ((g_model1->funcSw[i].swtch != g_model2->funcSw[i].swtch) || (g_model1->funcSw[i].func!=g_model2->funcSw[i].func) || (g_model1->funcSw[i].adjustMode!=g_model2->funcSw[i].adjustMode) || (g_model1->funcSw[i].param!=g_model2->funcSw[i].param)) {
+      if ((g_model1->funcSw[i].swtch != g_model2->funcSw[i].swtch) || (g_model1->funcSw[i].func!=g_model2->funcSw[i].func) || (g_model1->funcSw[i].adjustMode!=g_model2->funcSw[i].adjustMode) || (g_model1->funcSw[i].param!=g_model2->funcSw[i].param) || (g_model1->funcSw[i].enabled != g_model2->funcSw[i].enabled) || (g_model1->funcSw[i].repeatParam != g_model2->funcSw[i].repeatParam)) {
        color1="green";
        color2="red";
      } else {
@@ -15,10 +15,12 @@ class CompareDialog : public QDialog
    Q_OBJECT

  public:
-    CompareDialog(QWidget *parent);
+    CompareDialog(QWidget *parent, FirmwareInterface * firmware);
    ~CompareDialog();
+    FirmwareInterface * firmware;

  protected:
+    GeneralSettings * settings;
    ModelData * g_model1;
    ModelData * g_model2;
    ModelData * modeltemp;
@@ -63,8 +65,8 @@ class CompareDialog : public QDialog
    bool ChannelHasMix(MixData * mixArray, uint8_t destCh);
    
    QTextEdit * te;
-    QString curvefile5;
-    QString curvefile9;
+    QString curvefile1;
+    QString curvefile2;
    QDir *qd;
    
 private slots:
@@ -85,6 +85,7 @@ contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnu
        QFile file(":/releasenotes.txt");
        if(file.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
          ui->textEditor->setHtml(file.readAll());
+          ui->textEditor->setOpenExternalLinks(true);
        }
        ui->textEditor->scroll(0,0);
        setWindowTitle(tr("Companion Release Notes"));
@@ -124,6 +125,7 @@ contributorsDialog::~contributorsDialog()
 void contributorsDialog::replyFinished(QNetworkReply * reply)
 {
    ui->textEditor->setHtml(reply->readAll());
+    ui->textEditor->setOpenExternalLinks(true);
 }

 void contributorsDialog::forceClose()
@@ -15,7 +15,7 @@
  </property>
  <layout class="QGridLayout" name="gridLayout">
   <item row="0" column="0">
-    <widget class="QTextEdit" name="textEditor">
+    <widget class="QTextBrowser" name="textEditor">
     <property name="readOnly">
      <bool>true</bool>
     </property>
@@ -505,7 +505,7 @@ class ConversionTable {
    {
      after = 0;

-      for (std::list<ConversionTuple>::iterator it=internalTable.begin(); it!=internalTable.end(); it++) {
+      for (std::list<ConversionTuple>::iterator it=exportTable.begin(); it!=exportTable.end(); it++) {
        ConversionTuple tuple = *it;
        if (before == tuple.a) {
          after = tuple.b;
@@ -520,7 +520,7 @@ class ConversionTable {
    {
      after = 0;

-      for (std::list<ConversionTuple>::iterator it=internalTable.begin(); it!=internalTable.end(); it++) {
+      for (std::list<ConversionTuple>::iterator it=importTable.begin(); it!=importTable.end(); it++) {
        ConversionTuple tuple = *it;
        if (before == tuple.b) {
          after = tuple.a;
@@ -547,10 +547,23 @@ class ConversionTable {

    void addConversion(const int a, const int b)
    {
-      internalTable.push_back(ConversionTuple(a, b));
+      ConversionTuple conversion(a, b);
+      importTable.push_back(conversion);
+      exportTable.push_back(conversion);
    }

-    std::list<ConversionTuple> internalTable;
+    void addImportConversion(const int a, const int b)
+    {
+      importTable.push_back(ConversionTuple(a, b));
+    }
+
+    void addExportConversion(const int a, const int b)
+    {
+      exportTable.push_back(ConversionTuple(a, b));
+    }
+
+    std::list<ConversionTuple> importTable;
+    std::list<ConversionTuple> exportTable;
 };

 template<class T>
@@ -648,7 +661,7 @@ class ConversionField: public TransformedField {
        if (table->exportValue(_field, _field))
          return;
        if (!error.isEmpty())
-          EEPROMWarnings += error + "\n";
+          EEPROMWarnings.push_back(error);
      }

      if (shift) {
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <list>
+#include <float.h>
 #include "eeprominterface.h"
 #include "firmwares/er9x/er9xinterface.h"
 #include "firmwares/th9x/th9xinterface.h"
@@ -11,7 +12,7 @@
 #include "helpers.h"
 #include "wizarddata.h"

-QString EEPROMWarnings;
+std::list<QString> EEPROMWarnings;

 const char * switches9X[] = { "3POS", "THR", "RUD", "ELE", "AIL", "GEA", "TRN" };
 const char * switchesX9D[] = { "SA", "SB", "SC", "SD", "SE", "SF", "SG", "SH" };
@@ -91,11 +92,13 @@ QString getGVarString(int16_t val, bool sign)
  }
 }

-RawSourceRange RawSource::getRange(bool singleprec)
+RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSettings & settings, unsigned int flags) const
 {
  RawSourceRange result;

-  int board = GetEepromInterface()->getBoard();
+  FirmwareInterface * firmware = GetCurrentFirmware();
+  int board = firmware->getBoard();
+  bool singleprec = (flags & RANGE_SINGLE_PRECISION);

  if (!singleprec && !IS_ARM(board)) {
    singleprec = true;
@@ -103,11 +106,16 @@ RawSourceRange RawSource::getRange(bool singleprec)

  switch (type) {
    case SOURCE_TYPE_TELEMETRY:
+      if (singleprec) {
+        result.offset = -DBL_MAX;
+      }
+
      switch (index) {
        case TELEMETRY_SOURCE_TX_BATT:
          result.step = 0.1;
          result.decimals = 1;
          result.max = 25.5;
+          result.unit = QObject::tr("V");
          break;
        case TELEMETRY_SOURCE_TX_TIME:
          result.step = 1;
@@ -116,34 +124,42 @@ RawSourceRange RawSource::getRange(bool singleprec)
        case TELEMETRY_SOURCE_TIMER1:
        case TELEMETRY_SOURCE_TIMER2:
          result.step = singleprec ? 5 : 1;
-          result.max = singleprec ? 255*5 : 7200;
+          result.max = singleprec ? 255*5 : 60*60;
+          result.unit = QObject::tr("s");
          break;
        case TELEMETRY_SOURCE_RSSI_TX:
        case TELEMETRY_SOURCE_RSSI_RX:
          result.max = 100;
          if (singleprec) result.offset = 128;
          break;
+        case TELEMETRY_SOURCE_A1_MIN:
+        case TELEMETRY_SOURCE_A2_MIN:
+        case TELEMETRY_SOURCE_A3_MIN:
+        case TELEMETRY_SOURCE_A4_MIN:
+          result = model.frsky.channels[index-TELEMETRY_SOURCE_A1_MIN].getRange();
+          break;
        case TELEMETRY_SOURCE_A1:
        case TELEMETRY_SOURCE_A2:
        case TELEMETRY_SOURCE_A3:
        case TELEMETRY_SOURCE_A4:
-          if (model) {
-            const FrSkyChannelData & channel = model->frsky.channels[index-TELEMETRY_SOURCE_A1];
-            float ratio = channel.getRatio();
-            if (channel.type==0 || channel.type==1 || channel.type==2)
-              result.decimals = 2;
-            else
-              result.decimals = 0;
-            result.step = ratio / 255;
-            result.min = channel.offset * result.step;
-            result.max = ratio + result.min;
-          }
+          result = model.frsky.channels[index-TELEMETRY_SOURCE_A1].getRange();
          break;
        case TELEMETRY_SOURCE_ALT:
+        case TELEMETRY_SOURCE_ALT_MIN:
+        case TELEMETRY_SOURCE_ALT_MAX:
        case TELEMETRY_SOURCE_GPS_ALT:
          result.step = singleprec ? 8 : 1;
          result.min = -500;
          result.max = singleprec ? 1540 : 3000;
+          if (firmware->getCapability(Imperial) || settings.imperial) {
+            result.step = (result.step * 105) / 32;
+            result.min = (result.min * 105) / 32;
+            result.max = (result.max * 105) / 32;
+            result.unit = QObject::tr("ft");
+          }
+          else {
+            result.unit = QObject::tr("m");
+          }
          break;
        case TELEMETRY_SOURCE_T1:
        case TELEMETRY_SOURCE_T1_MAX:
@@ -151,89 +167,155 @@ RawSourceRange RawSource::getRange(bool singleprec)
        case TELEMETRY_SOURCE_T2_MAX:
          result.min = -30;
          result.max = 225;
+          result.unit = QObject::trUtf8("°C");
          break;
        case TELEMETRY_SOURCE_HDG:
          result.step = singleprec ? 2 : 1;
          result.max = 360;
          if (singleprec) result.offset = 256;
+          result.unit = QObject::trUtf8("°");
          break;
        case TELEMETRY_SOURCE_RPM:
        case TELEMETRY_SOURCE_RPM_MAX:
          result.step = singleprec ? 50 : 1;
-          result.max = singleprec ? 12750 : 20000;
+          result.max = singleprec ? 12750 : 30000;
          break;
        case TELEMETRY_SOURCE_FUEL:
          result.max = 100;
+          result.unit = QObject::tr("%");
+          break;
+        case TELEMETRY_SOURCE_ASPEED:
+        case TELEMETRY_SOURCE_ASPEED_MAX:
+          result.decimals = 1;
+          result.step = singleprec ? 2.0 : 0.1;
+          result.max = singleprec ? (2*255) : 2000;
+          if (firmware->getCapability(Imperial) || settings.imperial) {
+            result.step *= 1.150779;
+            result.max *= 1.150779;
+            result.unit = QObject::tr("mph");
+          }
+          else {
+            result.step *= 1.852;
+            result.max *= 1.852;
+            result.unit = QObject::tr("km/h");
+          }
          break;
        case TELEMETRY_SOURCE_SPEED:
        case TELEMETRY_SOURCE_SPEED_MAX:
-          result.step = singleprec ? 4 : 1;
-          result.max = singleprec ? (4*236) : 2000;
-          if (model && !model->frsky.imperial) {
+          result.step = singleprec ? 2 : 1;
+          result.max = singleprec ? (2*255) : 2000;
+          if (firmware->getCapability(Imperial) || settings.imperial) {
+            result.step *= 1.150779;
+            result.max *= 1.150779;
+            result.unit = QObject::tr("mph");
+          }
+          else {
            result.step *= 1.852;
            result.max *= 1.852;
+            result.unit = QObject::tr("km/h");
          }
          break;
        case TELEMETRY_SOURCE_VERTICAL_SPEED:
          result.step = 0.1;
-          result.min = -12.5;
-          result.max = 13.0;
+          result.min = singleprec ? -12.5 : -300.0;
+          result.max = singleprec ? 13.0 : 300.0;
          result.decimals = 1;
+          result.unit = QObject::tr("m/s");
+          break;
+        case TELEMETRY_SOURCE_DTE:
+          result.max = 30000;
          break;
        case TELEMETRY_SOURCE_DIST:
        case TELEMETRY_SOURCE_DIST_MAX:
          result.step = singleprec ? 8 : 1;
          result.max = singleprec ? 2040 : 10000;
+          if (firmware->getCapability(Imperial) || settings.imperial) {
+            result.step = (result.step * 105) / 32;
+            result.min = (result.min * 105) / 32;
+            result.max = (result.max * 105) / 32;
+            result.unit = QObject::tr("ft");
+          }
+          else {
+            result.unit = QObject::tr("m");
+          }
          break;
        case TELEMETRY_SOURCE_CELL:
        case TELEMETRY_SOURCE_CELL_MIN:
          result.step = singleprec ? 0.02 : 0.01;
          result.max = 5.1;
          result.decimals = 2;
+          result.unit = QObject::tr("V");
          break;
        case TELEMETRY_SOURCE_CELLS_SUM:
        case TELEMETRY_SOURCE_CELLS_MIN:
        case TELEMETRY_SOURCE_VFAS:
        case TELEMETRY_SOURCE_VFAS_MIN:
          result.step = 0.1;
-          result.max = 25.5;
+          result.max = singleprec ? 25.5 : 100.0;
          result.decimals = 1;
+          result.unit = QObject::tr("V");
          break;
        case TELEMETRY_SOURCE_CURRENT:
        case TELEMETRY_SOURCE_CURRENT_MAX:
          result.step = singleprec ? 0.5 : 0.1;
          result.max = singleprec ? 127.5 : 200.0;
          result.decimals = 1;
+          result.unit = QObject::tr("A");
          break;
        case TELEMETRY_SOURCE_CONSUMPTION:
          result.step = singleprec ? 100 : 1;
-          result.max = singleprec ? 25500 : 10000;
+          result.max = singleprec ? 25500 : 30000;
+          result.unit = QObject::tr("mAh");
          break;
        case TELEMETRY_SOURCE_POWER:
        case TELEMETRY_SOURCE_POWER_MAX:
          result.step = singleprec ? 5 : 1;
          result.max = singleprec ? 1275 : 2000;
+          result.unit = QObject::tr("W");
          break;
        case TELEMETRY_SOURCE_ACCX:
        case TELEMETRY_SOURCE_ACCY:
        case TELEMETRY_SOURCE_ACCZ:
          result.step = 0.01;
          result.decimals = 2;
-          result.max = 2.55;
+          result.max = singleprec ? 2.55 : 10.00;
+          result.min = singleprec ? 0 : -10.00;
+          result.unit = QObject::tr("g");
          break;
        default:
          result.max = 125;
          break;
      }
-      if (singleprec && !result.offset) {
+
+      if (singleprec && result.offset==-DBL_MAX) {
        result.offset = result.max - (127*result.step);
      }
+
+      if (flags & (RANGE_DELTA_FUNCTION|RANGE_DELTA_ABS_FUNCTION)) {
+        if (singleprec) {
+          result.offset = 0;
+          result.min = result.step * -127;
+          result.max = result.step * 127;
+        }
+        else {
+          result.min = -result.max;
+        }
+      }
      break;

-    default:
-      result.max = (model && model->extendedLimits ? 125 : 100);
-      result.min = - result.max;
+    case SOURCE_TYPE_GVAR:
+      result.max = 1024;
+      result.min = -result.max;
      break;
+
+    default:
+      result.max = model.getChannelsMax(true);
+      result.min = -result.max;
+      break;
+  }
+
+  if (flags & RANGE_DELTA_ABS_FUNCTION) {
+    result.min = 0;
  }

  return result;
@@ -257,7 +339,7 @@ QString RotaryEncoderString(int index)
  return CHECK_IN_ARRAY(rotary, index);
 }

-QString RawSource::toString()
+QString RawSource::toString(const ModelData & model)
 {
  static const QString trims[] = {
    QObject::tr("TrmR"), QObject::tr("TrmE"), QObject::tr("TrmT"), QObject::tr("TrmA")
@@ -292,11 +374,13 @@ QString RawSource::toString()
    case SOURCE_TYPE_VIRTUAL_INPUT:
    {
      QString result = QObject::tr("[I%1]").arg(index+1);
-      if (model && strlen(model->inputNames[index]) > 0) {
-        result += QString(model->inputNames[index]);
+      if (strlen(model.inputNames[index]) > 0) {
+        result += QString(model.inputNames[index]);
      }
      return result;
    }
+    case SOURCE_TYPE_LUA_OUTPUT:
+      return QObject::tr("LUA%1%2").arg(index/16+1).arg(QChar('a'+index%16));
    case SOURCE_TYPE_STICK:
      return AnalogString(index);
    case SOURCE_TYPE_TRIM:
@@ -384,7 +468,7 @@ QString RawSwitch::toString()
  };

  static const QString timerModes[] = {
-    QObject::tr("OFF"), QObject::tr("ABS"),
+    QObject::tr("OFF"), QObject::tr("ON"),
    QObject::tr("THs"), QObject::tr("TH%"), QObject::tr("THt")
  };

@@ -459,6 +543,16 @@ CSFunctionFamily LogicalSwitchData::getFunctionFamily()
    return LS_FAMILY_VCOMP;
 }

+unsigned int LogicalSwitchData::getRangeFlags()
+{
+  if (func == LS_FN_DPOS)
+    return RANGE_DELTA_FUNCTION;
+  else if (func == LS_FN_DAPOS)
+    return RANGE_DELTA_ABS_FUNCTION;
+  else
+    return 0;
+}
+
 QString LogicalSwitchData::funcToString()
 {
  switch (func) {
@@ -509,7 +603,7 @@ QString LogicalSwitchData::funcToString()
  }
 }

-QString LogicalSwitchData::toString(const ModelData & model)
+QString LogicalSwitchData::toString(const ModelData & model, const GeneralSettings & settings)
 {
  QString result = "";

@@ -530,11 +624,11 @@ QString LogicalSwitchData::toString(const ModelData & model)
      result += QObject::tr("Timer(%1, %2)").arg(ValToTim(val1)).arg(ValToTim(val2));
      break;
    case LS_FAMILY_VOFS: {
-      RawSource source = RawSource(val1, &model);
-      RawSourceRange range = source.getRange();
+      RawSource source = RawSource(val1);
+      RawSourceRange range = source.getRange(model, settings);
      QString res;
      if (val1)
-        res += source.toString();
+        res += source.toString(model);
      else
        res += "0";
      res.remove(" ");
@@ -545,7 +639,7 @@ QString LogicalSwitchData::toString(const ModelData & model)
      else if (func == LS_FN_DPOS) result = "d(" + res + ")";
      result += res;

-      if (func == LS_FN_APOS || func == LS_FN_VPOS || func == LS_FN_DAPOS || func == LS_FN_DPOS)
+      if (func == LS_FN_APOS || func == LS_FN_VPOS || func == LS_FN_DPOS || func == LS_FN_DAPOS)
        result += " &gt; ";
      else if (func == LS_FN_ANEG || func == LS_FN_VNEG)
        result += " &lt; ";
@@ -577,7 +671,7 @@ QString LogicalSwitchData::toString(const ModelData & model)

    case LS_FAMILY_VCOMP:
      if (val1)
-        result += RawSource(val1).toString();
+        result += RawSource(val1).toString(model);
      else
        result += "0";
      switch (func) {
@@ -605,7 +699,7 @@ QString LogicalSwitchData::toString(const ModelData & model)
          break;
      }
      if (val2)
-        result += RawSource(val2).toString();
+        result += RawSource(val2).toString(model);
      else
        result += "0";
      break;
@@ -626,97 +720,19 @@ QString LogicalSwitchData::toString(const ModelData & model)
  return result;
 }

-#if 0
-QStringList FuncSwData::toStringList()
+void FuncSwData::clear()
 {
-  QStringList result;
-  QStringList qs;
-
-  result << swtch.toString();
-  result << funcToString();
-
-  if (func < FuncInstantTrim) {
-    result << QString("%1").arg(param);
+  memset(this, 0, sizeof(FuncSwData));
+  if (!GetCurrentFirmware()->getCapability(SafetyChannelCustomFunction)) {
+    func = FuncTrainer;
  }
-  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"  ;
-    if (param>=0 && param<(int)qs.count())
-      result << qs.at(param);
-    else
-      result << QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
-  }
-  else if (func==FuncPlayHaptic) {
-    qs << "0" << "1" << "2" << "3";
-    if (param>=0 && param<(int)qs.count())
-      result << qs.at(param);
-    else
-      result << 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("All"));
-    qs.append( QObject::tr("Telemetry"));
-    if (param>=0 && param<(int)qs.count())
-      result << qs.at(param);
-    else
-      result << QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
-  }
-  else if ((func==FuncVolume)|| (func==FuncPlayValue)) {
-    RawSource item(param);
-    result << item.toString();
-  }
-  else if ((func==FuncPlayPrompt) || (func==FuncPlayBoth)) {
-    if ( GetCurrentFirmware()->getCapability(VoicesAsNumbers)) {
-      result << QString("%1").arg(param);
-    } else {
-      result << paramarm;
-    }
-  }
-  else if ((func>FuncBackgroundMusicPause) && (func<FuncCount)) {
-    switch (adjustMode) {
-      case 0:
-        result << QObject::tr("Value ")+QString("%1").arg(param);
-        break;
-      case 1:
-        result << RawSource(param).toString();
-        break;
-      case 2:
-        result << RawSource(param).toString();
-        break;
-      case 3:
-        if (param==0) {
-          result << QObject::tr("Decr:")+QString(" -1");
-        }
-        else {
-          result << QObject::tr("Incr:")+QString(" +1");
-        }
-        break;
-      default:
-        break;
-    }
-  }
-
-  if (func==FuncPlaySound || func==FuncPlayHaptic || func==FuncPlayValue || func==FuncPlayPrompt || func==FuncPlayBoth || func==FuncBackgroundMusic) {
-              str.append(doTC(QString("%1").arg(g_model->funcSw[i].repeatParam),"green"));
-            } else {
-              str.append(doTC( "&nbsp;","green"));
-            }
-            if ((index<=FuncInstantTrim) || (index>FuncBackgroundMusicPause)) {
-              str.append(doTC((g_model->funcSw[i].enabled ? "ON" : "OFF"),"green"));
-            } else {
-              str.append(doTC( "---","green"));
-            }
-
-  return result;
 }
-#endif

 QString FuncSwData::funcToString()
 {
-  if (func >= FuncSafetyCh1 && func <= FuncSafetyCh32)
-    return QObject::tr("Safety %1").arg(RawSource(SOURCE_TYPE_CH, func).toString());
+  ModelData model;
+  if (func >= FuncOverrideCH1 && func <= FuncOverrideCH32)
+    return QObject::tr("Override %1").arg(RawSource(SOURCE_TYPE_CH, func).toString(model));
  else if (func == FuncTrainer)
    return QObject::tr("Trainer");
  else if (func == FuncTrainerRUD)
@@ -745,8 +761,10 @@ QString FuncSwData::funcToString()
    return QObject::tr("Play Both");
  else if (func == FuncPlayValue)
    return QObject::tr("Play Value");
+  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)
@@ -795,7 +813,8 @@ QString FuncSwData::paramToString()
  }
  else if ((func==FuncVolume)|| (func==FuncPlayValue)) {
    RawSource item(param);
-    return item.toString();
+    ModelData model;
+    return item.toString(model);
  }
  else if ((func==FuncPlayPrompt) || (func==FuncPlayBoth)) {
    if ( GetCurrentFirmware()->getCapability(VoicesAsNumbers)) {
@@ -805,15 +824,16 @@ QString FuncSwData::paramToString()
    }
  }
  else if ((func>FuncBackgroundMusicPause) && (func<FuncCount)) {
+    ModelData model;
    switch (adjustMode) {
      case 0:
        return QObject::tr("Value ")+QString("%1").arg(param);
        break;
      case 1:
-        return RawSource(param).toString();
+        return RawSource(param).toString(model);
        break;
      case 2:
-        return RawSource(param).toString();
+        return RawSource(param).toString(model);
        break;
      case 3:
        if (param==0) {
@@ -841,6 +861,28 @@ QString FuncSwData::repeatToString()
  }
 }

+QString LimitData::minToString()
+{
+  return QString::number((qreal)min/10);
+}
+
+QString LimitData::maxToString()
+{
+  return QString::number((qreal)max/10);
+}
+
+QString LimitData::offsetToString()
+{
+  return QString::number((qreal)offset/10, 'f', 1);
+}
+
+void LimitData::clear()
+{
+  memset(this, 0, sizeof(LimitData));
+  min = -1000;
+  max = +1000;
+}
+
 GeneralSettings::GeneralSettings()
 {
  memset(this, 0, sizeof(GeneralSettings));
@@ -993,6 +1035,29 @@ int GeneralSettings::getDefaultChannel(unsigned int stick) const
  return -1;
 }

+float FrSkyChannelData::getRatio() const
+{
+  if (type==0 || type==1 || type==2)
+    return float(ratio << multiplier) / 10.0;
+  else
+    return ratio << multiplier;
+}
+
+RawSourceRange FrSkyChannelData::getRange() const
+{
+  RawSourceRange result;
+  float ratio = getRatio();
+  if (type==0 || type==1 || type==2)
+    result.decimals = 2;
+  else
+    result.decimals = 0;
+  result.step = ratio / 255;
+  result.min = offset * result.step;
+  result.max = ratio + result.min;
+  result.unit = QObject::tr("V");
+  return result;
+}
+
 void FrSkyData::clear()
 {
  memset(this, 0, sizeof(FrSkyData));
@@ -1015,13 +1080,6 @@ ModelData::ModelData(const ModelData & src)
 ModelData & ModelData::operator = (const ModelData & src)
 {
  memcpy(this, &src, sizeof(ModelData));
-
-  for (int i=0; i<C9X_MAX_MIXERS; i++)
-    mixData[i].srcRaw.model = this;
-  for (int i=0; i<C9X_MAX_EXPOS; i++)
-    expoData[i].srcRaw.model = this;
-  swashRingData.collectiveSource.model = this;
-
  return *this;
 }

@@ -1045,14 +1103,34 @@ bool ModelData::isInputValid(const unsigned int idx) const

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

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

 void ModelData::clearMixes()
@@ -1080,7 +1158,7 @@ void ModelData::clear()
    moduleData[1].protocol=OFF;      
  }
  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    phaseData[i].clear();
+    flightModeData[i].clear();
  }
  clearInputs();
  clearMixes();
@@ -1090,6 +1168,8 @@ void ModelData::clear()
    expoData[i].clear();
  for (int i=0; i<C9X_NUM_CSW; i++)
    customSw[i].clear();
+  for (int i=0; i<C9X_MAX_CUSTOM_FUNCTIONS; i++)
+    funcSw[i].clear();
  for (int i=0; i<C9X_MAX_CURVES; i++)
    curves[i].clear(5);
  for (int i=0; i<2; i++)
@@ -1112,7 +1192,7 @@ void ModelData::setDefaultInputs(const GeneralSettings & settings)
      expo->mode = INPUT_MODE_BOTH;
      expo->srcRaw = settings.getDefaultSource(i);
      expo->weight = 100;
-      strncpy(inputNames[i], expo->srcRaw.toString().toLatin1().constData(), sizeof(inputNames[i])-1);
+      strncpy(inputNames[i], expo->srcRaw.toString(*this).toLatin1().constData(), sizeof(inputNames[i])-1);
    }
  }
 }
@@ -1128,7 +1208,7 @@ void ModelData::setDefaultMixes(const GeneralSettings & settings)
    mix->destCh = i+1;
    mix->weight = 100;
    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
-      mix->srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i, this);
+      mix->srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i);
    }
    else {
      mix->srcRaw = RawSource(SOURCE_TYPE_STICK, i);
@@ -1149,7 +1229,7 @@ int ModelData::getTrimValue(int phaseIdx, int trimIdx)
 {
  int result = 0;
  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    PhaseData & phase = phaseData[phaseIdx];
+    FlightModeData & phase = flightModeData[phaseIdx];
    if (phase.trimMode[trimIdx] < 0) {
      return result;
    }
@@ -1171,17 +1251,17 @@ int ModelData::getTrimValue(int phaseIdx, int trimIdx)

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

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

 ModelData ModelData::removeGlobalVars()
@@ -1239,9 +1319,9 @@ ModelData ModelData::removeGlobalVars()
  return result;
 }

-int ModelData::getChannelsMax()
+int ModelData::getChannelsMax(bool forceExtendedLimits) const
 {
-  if (extendedLimits)
+  if (forceExtendedLimits || extendedLimits)
    return IS_TARANIS(GetCurrentFirmware()->getBoard()) ? 150 : 125;
  else
    return 100;
@@ -1274,8 +1354,8 @@ void UnregisterEepromInterfaces()
 }

 QList<FirmwareInterface *> firmwares;
-FirmwareVariant default_firmware_variant;
-FirmwareVariant current_firmware_variant;
+FirmwareInterface * default_firmware_variant;
+FirmwareInterface * current_firmware_variant;

 void UnregisterFirmwares() 
 {
@@ -1339,15 +1419,11 @@ QString getBoardName(BoardEnum board)
  }
 }

-FirmwareVariant GetFirmwareVariant(QString id)
+FirmwareInterface * GetFirmware(QString id)
 {
-  FirmwareVariant result;
-
  foreach(FirmwareInterface * firmware, firmwares) {
-    if (id.contains(firmware->getId()+"-") || (!id.contains("-") && id.contains(firmware->getId()))) {
-      result.id = id;
-      result.firmware = firmware;
-      result.variant = firmware->getVariant(id);
+    FirmwareInterface * result = firmware->getFirmwareVariant(id);
+    if (result) {
      return result;
    }
  }
@@ -1361,20 +1437,21 @@ void FirmwareInterface::addOption(const char *option, QString tooltip, uint32_t
  addOptions(options);
 }

-unsigned int FirmwareInterface::getVariant(const QString & variantId)
+unsigned int FirmwareInterface::getVariantNumber()
 {
-  unsigned int variant = variantBase;
-  QStringList options = variantId.mid(id.length()+1).split("-", QString::SkipEmptyParts);
+  unsigned int result = 0;
+  const FirmwareInterface * base = getFirmwareBase();
+  QStringList options = id.mid(base->getId().length()+1).split("-", QString::SkipEmptyParts);
  foreach(QString option, options) {
-    foreach(QList<Option> group, opts) {
+    foreach(QList<Option> group, base->opts) {
      foreach(Option opt, group) {
        if (opt.name == option) {
-          variant += opt.variant;
+          result += opt.variant;
        }
      }
    }
  }
-  return variant;
+  return result;
 }

 void FirmwareInterface::addLanguage(const char *lang)
@@ -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
@@ -252,7 +252,7 @@ enum TelemetrySource {
  TELEMETRY_SOURCE_ACCZ,
  TELEMETRY_SOURCE_HDG,
  TELEMETRY_SOURCE_VERTICAL_SPEED,
-  TELEMETRY_SOURCE_ASPD,
+  TELEMETRY_SOURCE_ASPEED,
  TELEMETRY_SOURCE_DTE,
  TELEMETRY_SOURCE_A1_MIN,
  TELEMETRY_SOURCE_A2_MIN,
@@ -286,7 +286,7 @@ enum TelemetrySource {
 enum RawSourceType {
  SOURCE_TYPE_NONE,
  SOURCE_TYPE_VIRTUAL_INPUT,
-  SOURCE_TYPE_LUA_INPUT,
+  SOURCE_TYPE_LUA_OUTPUT,
  SOURCE_TYPE_STICK, // and POTS
  SOURCE_TYPE_ROTARY_ENCODER,
  SOURCE_TYPE_TRIM,
@@ -327,29 +327,31 @@ class RawSourceRange
    double max;
    double step;
    double offset;
-
+    QString unit;
 };

+#define RANGE_SINGLE_PRECISION    1
+#define RANGE_DELTA_FUNCTION      2
+#define RANGE_DELTA_ABS_FUNCTION  4
+
+class GeneralSettings;
 class RawSource {
  public:
    RawSource():
      type(SOURCE_TYPE_NONE),
-      index(0),
-      model(NULL)
+      index(0)
    {
    }

-    RawSource(int value, const ModelData * model=NULL):
+    RawSource(int value):
      type(RawSourceType(abs(value)/65536)),
-      index(value >= 0 ? abs(value)%65536 : -(abs(value)%65536)),
-      model(model)
+      index(value >= 0 ? abs(value)%65536 : -(abs(value)%65536))
    {
    }

-    RawSource(RawSourceType type, int index=0, const ModelData * model=NULL):
+    RawSource(RawSourceType type, int index=0):
      type(type),
-      index(index),
-      model(model)
+      index(index)
    {
    }

@@ -358,10 +360,10 @@ class RawSource {
      return index >= 0 ? (type * 65536 + index) : -(type * 65536 - index);
    }

-    QString toString();
-    
-    RawSourceRange getRange(bool singleprec=false);
-    
+    QString toString(const ModelData & model);
+
+    RawSourceRange getRange(const ModelData & model, const GeneralSettings & settings, unsigned int flags=0) const;
+
    bool operator == ( const RawSource & other) {
      return (this->type == other.type) && (this->index == other.index);
    }
@@ -370,9 +372,13 @@ class RawSource {
      return (this->type != other.type) || (this->index != other.index);
    }

+    bool isTimeBased() const
+    {
+      return (type==SOURCE_TYPE_TELEMETRY && (index==TELEMETRY_SOURCE_TX_TIME || index==TELEMETRY_SOURCE_TIMER1 || index==TELEMETRY_SOURCE_TIMER2));
+    }
+
    RawSourceType type;
    int index;
-    const ModelData * model;
 };

 enum RawSwitchType {
@@ -520,6 +526,8 @@ class GeneralSettings {
    int    temperatureCalib;
    int    temperatureWarn;
    unsigned int mAhWarn;
+    unsigned int mAhUsed;
+    unsigned int globalTimer;
    unsigned int btBaudrate;
    unsigned int sticksGain;
    unsigned int rotarySteps;
@@ -625,7 +633,10 @@ class LimitData {
    bool  symetrical;
    char  name[6+1];
    CurveReference curve;
-    void clear() { memset(this, 0, sizeof(LimitData)); min = -1000; max = +1000; }
+    QString minToString();
+    QString maxToString();
+    QString offsetToString();
+    void clear();
 };

 enum MltpxValue {
@@ -710,13 +721,14 @@ class LogicalSwitchData { // Logical Switches data
    int andsw;
    void clear() { memset(this, 0, sizeof(LogicalSwitchData)); }
    CSFunctionFamily getFunctionFamily();
+    unsigned int getRangeFlags();
    QString funcToString();
-    QString toString(const ModelData & model);
+    QString toString(const ModelData & model, const GeneralSettings & settings);
 };

 enum AssignFunc {
-  FuncSafetyCh1 = 0,
-  FuncSafetyCh32 = FuncSafetyCh1+C9X_NUM_CHNOUT-1,
+  FuncOverrideCH1 = 0,
+  FuncOverrideCH32 = FuncOverrideCH1+C9X_NUM_CHNOUT-1,
  FuncTrainer,
  FuncTrainerRUD,
  FuncTrainerELE,
@@ -732,6 +744,7 @@ enum AssignFunc {
  FuncPlayPrompt,
  FuncPlayBoth,
  FuncPlayValue,
+  FuncPlayScript,
  FuncLogs,
  FuncVolume,
  FuncBacklight,
@@ -745,7 +758,7 @@ enum AssignFunc {

 class FuncSwData { // Function Switches data
  public:
-    FuncSwData(AssignFunc func=FuncSafetyCh1) { clear(); this->func = func; }
+    FuncSwData(AssignFunc func=FuncOverrideCH1) { clear(); this->func = func; }
    RawSwitch    swtch;
    AssignFunc   func;
    int param;
@@ -753,16 +766,16 @@ class FuncSwData { // Function Switches data
    unsigned int enabled; // TODO perhaps not any more the right name
    unsigned int adjustMode;
    int repeatParam;
-    void clear() { memset(this, 0, sizeof(FuncSwData)); }
+    void clear();
    QString funcToString();
    QString paramToString();
    QString repeatToString();
    QStringList toStringList();
 };

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

 class SwashRingData { // Swash Ring data
@@ -814,14 +827,8 @@ class FrSkyChannelData {
    unsigned int multiplier;
    FrSkyAlarmData alarms[2];

-    float getRatio() const
-    {
-      if (type==0 || type==1 || type==2)
-        return float(ratio << multiplier) / 10.0;
-      else
-        return ratio << multiplier;
-    }
-
+    float getRatio() const;
+    RawSourceRange getRange() const;
    void clear() { memset(this, 0, sizeof(FrSkyChannelData)); }
 };

@@ -882,7 +889,6 @@ class FrSkyData {
    FrSkyData() { clear(); }
    FrSkyChannelData channels[4];
    unsigned int usrProto;
-    unsigned int imperial;
    int blades;
    unsigned int voltsSource;
    bool altitudeDisplayed;
@@ -916,9 +922,8 @@ class TimerData {
    RawSwitch    mode;
    bool         minuteBeep;
    unsigned int countdownBeep;
-    bool         dir;    // 0=>Count Down, 1=>Count Up
    unsigned int val;
-    bool         persistent;
+    unsigned int persistent;
    int          pvalue;
    void clear() { memset(this, 0, sizeof(TimerData)); mode = RawSwitch(SWITCH_TYPE_TIMER_MODE, 0); }
 };
@@ -954,6 +959,7 @@ class ModuleData {
    bool         ppmPulsePol;           // false = positive
    int          ppmFrameLength;
    void clear() { memset(this, 0, sizeof(ModuleData)); }
+    QString polarityToString() { return ppmPulsePol ? QObject::tr("Positive") : QObject::tr("Negative"); }
 };

 #define C9X_MAX_SCRIPTS       7
@@ -982,7 +988,6 @@ class ModelData {
    char      name[12+1];
    TimerData timers[2];
    bool      thrTrim;            // Enable Throttle Trim
-    bool      thrExpo;            // Enable Throttle Expo
    int       trimInc;            // Trim Increments
    bool      disableThrottleWarning;

@@ -991,7 +996,7 @@ class ModelData {
    bool      extendedLimits; // TODO xml
    bool      extendedTrims;
    bool      throttleReversed;
-    PhaseData phaseData[C9X_MAX_FLIGHT_MODES];
+    FlightModeData flightModeData[C9X_MAX_FLIGHT_MODES];
    MixData   mixData[C9X_MAX_MIXERS];
    LimitData limitData[C9X_NUM_CHNOUT];

@@ -1041,113 +1046,123 @@ class ModelData {
    void clearMixes();
    void clearInputs();

-    int getChannelsMax();
+    int getChannelsMax(bool forceExtendedLimits=false) const;

  protected:
    void removeGlobalVar(int & var);
 };

 class RadioData {
-  public:   
+  public:
    GeneralSettings generalSettings;
-    ModelData models[C9X_MAX_MODELS];    
+    ModelData models[C9X_MAX_MODELS];
 };

 // TODO rename FlightPhase to FlightMode
 enum Capability {
- FlightModes,
- FlightModesName,
- FlightModesHaveFades,
- Mixes,
- Timers,
- TimeDivisions,
- CustomFunctions,
- VoicesAsNumbers,
- VoicesMaxLength,
- ModelVoice,
- MultiLangVoice,
- ModelImage,
- Pots,
- Switches,
- SwitchesPositions,
- LogicalSwitches,
- CustomAndSwitches,
- HasNegAndSwitches,
- LogicalSwitchesExt,
- RotaryEncoders,
- Outputs,
- ChannelsName,
- ExtraInputs,
- ExtendedTrims,
- NumCurves,
- NumCurvePoints,
- OffsetWeight,
- Simulation,
- SoundMod,
- SoundPitch,
- MaxVolume,
- EepromBackup,
- Haptic,
- HasBeeper,
- ModelTrainerEnable,
- Timer2ThrTrig,
- HasExpoNames,
- HasNoExpo,
- HasMixerNames,
- HasChNames,
- HasCvNames,
- HasPxxCountry,
- HasPPMStart,
- HasGeneralUnits,
- HasFAIMode,
- OptrexDisplay,
- PPMExtCtrl,
- PPMFrameLength,
- DSM2Indexes,
- Telemetry,
- TelemetryUnits,
- TelemetryBars,
- Gvars,
- GvarsInCS,
- GvarsAreNamed,
- GvarsFlightModes,
- GvarsName,
- NoTelemetryProtocol,
- TelemetryCustomScreens,
- TelemetryCustomScreensFieldsPerLine,
- TelemetryTimeshift,
- TelemetryMaxMultiplier,
- HasAltitudeSel,
- HasVario,
- HasVarioSink,
- HasVariants,
- HasFailsafe,
- HasSoundMixer,
- NumModules,
- PPMCenter,
- SYMLimits,
- HasCurrentCalibration,
- HasVolume,
- HasBrightness,
- PerModelTimers,
- SlowScale,
- SlowRange,
- PermTimers,
- HasSDLogs,
- CSFunc,
- LCDWidth,
- GetThrSwitch,
- HasDisplayText,
- VirtualInputs,
- TrainerInputs,
- LuaInputs,
- LimitsPer1000,
- EnhancedCurves,
- HasFasOffset,
- HasMahPersistent,
- MultiposPots,
- MultiposPotsPositions,
- SimulatorVariant,
+  FlightModes,
+  FlightModesName,
+  FlightModesHaveFades,
+  Imperial,
+  Mixes,
+  Timers,
+  TimeDivisions,
+  CustomFunctions,
+  SafetyChannelCustomFunction,
+  VoicesAsNumbers,
+  VoicesMaxLength,
+  ModelVoice,
+  MultiLangVoice,
+  ModelImage,
+  Pots,
+  Switches,
+  SwitchesPositions,
+  LogicalSwitches,
+  CustomAndSwitches,
+  HasNegAndSwitches,
+  LogicalSwitchesExt,
+  RotaryEncoders,
+  Outputs,
+  ChannelsName,
+  ExtraInputs,
+  ExtendedTrims,
+  NumCurves,
+  NumCurvePoints,
+  OffsetWeight,
+  Simulation,
+  SoundMod,
+  SoundPitch,
+  MaxVolume,
+  EepromBackup,
+  Haptic,
+  HasBeeper,
+  ModelTrainerEnable,
+  Timer2ThrTrig,
+  HasExpoNames,
+  HasNoExpo,
+  HasMixerNames,
+  HasChNames,
+  HasCvNames,
+  HasPxxCountry,
+  HasPPMStart,
+  HasGeneralUnits,
+  HasFAIMode,
+  OptrexDisplay,
+  PPMExtCtrl,
+  PPMFrameLength,
+  DSM2Indexes,
+  Telemetry,
+  TelemetryUnits,
+  TelemetryBars,
+  Heli,
+  Gvars,
+  GvarsInCS,
+  GvarsAreNamed,
+  GvarsFlightModes,
+  GvarsName,
+  NoTelemetryProtocol,
+  TelemetryCustomScreens,
+  TelemetryCustomScreensFieldsPerLine,
+  TelemetryTimeshift,
+  TelemetryMaxMultiplier,
+  HasAltitudeSel,
+  HasVario,
+  HasVarioSink,
+  HasFailsafe,
+  HasSoundMixer,
+  NumModules,
+  PPMCenter,
+  PPMUnitMicroseconds,
+  SYMLimits,
+  HasCurrentCalibration,
+  HasVolume,
+  HasBrightness,
+  PerModelTimers,
+  SlowScale,
+  SlowRange,
+  PermTimers,
+  HasSDLogs,
+  CSFunc,
+  LCDWidth,
+  GetThrSwitch,
+  HasDisplayText,
+  VirtualInputs,
+  TrainerInputs,
+  LuaScripts,
+  LuaInputsPerScript,
+  LuaOutputsPerScript,
+  LimitsPer1000,
+  EnhancedCurves,
+  HasFasOffset,
+  HasMahPersistent,
+  MultiposPots,
+  MultiposPotsPositions,
+  SimulatorVariant,
+  MavlinkTelemetry,
+  HasInputDiff,
+  HasMixerExpo,
+  MixersMonitor,
+  HasBatMeterRange
 };

 class SimulatorInterface;
@@ -1167,15 +1182,15 @@ class EEPROMInterface
    virtual bool load(RadioData &radioData, const uint8_t *eeprom, int size) = 0;

    virtual bool loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index) = 0;
-    
+
    virtual bool 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(GeneralSettings &) = 0;
-    
+
    virtual int isAvailable(Protocol proto, int port=0) = 0;

    virtual const int getEEpromSize() = 0;
@@ -1192,7 +1207,7 @@ class EEPROMInterface

 };

-extern QString EEPROMWarnings;
+extern std::list<QString> EEPROMWarnings;

 /* EEPROM string conversion functions */
 void setEEPROMString(char *dst, const char *src, int size);
@@ -1231,12 +1246,12 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
  for (int p=0; p<C9X_MAX_FLIGHT_MODES; p++) {
    for (int i=0; i<NUM_STICKS/2; i++) {
      int converted_stick = applyStickMode(i+1, mode) - 1;
-      int tmp = model.phaseData[p].trim[i];
-      model.phaseData[p].trim[i] = model.phaseData[p].trim[converted_stick];
-      model.phaseData[p].trim[converted_stick] = tmp;
-      tmp = model.phaseData[p].trimRef[i];
-      model.phaseData[p].trimRef[i] = model.phaseData[p].trimRef[converted_stick];
-      model.phaseData[p].trimRef[converted_stick] = tmp;
+      int tmp = model.flightModeData[p].trim[i];
+      model.flightModeData[p].trim[i] = model.flightModeData[p].trim[converted_stick];
+      model.flightModeData[p].trim[converted_stick] = tmp;
+      tmp = model.flightModeData[p].trimRef[i];
+      model.flightModeData[p].trimRef[i] = model.flightModeData[p].trimRef[converted_stick];
+      model.flightModeData[p].trimRef[converted_stick] = tmp;
    }
  }

@@ -1303,27 +1318,45 @@ struct Option {
 class FirmwareInterface {

  public:
+    FirmwareInterface(const QString & id, const QString & name, const BoardEnum board, EEPROMInterface * eepromInterface):
+      id(id),
+      name(name),
+      board(board),
+      eepromInterface(eepromInterface),
+      variantBase(0),
+      base(NULL)
+    {
+    }
+
+    FirmwareInterface(FirmwareInterface * base, const QString & id, const QString & name, const BoardEnum board, EEPROMInterface * eepromInterface):
+      id(id),
+      name(name),
+      board(board),
+      eepromInterface(eepromInterface),
+      variantBase(0),
+      base(base)
+    {
+    }
+
    virtual ~FirmwareInterface()
    {
      delete eepromInterface;
    }

-    FirmwareInterface(const QString & id, const QString & name, const BoardEnum board, EEPROMInterface * eepromInterface, bool voice = false):
-      id(id),
-      name(name),
-      board(board),
-      eepromInterface(eepromInterface),
-      voice(voice),
-      variantBase(0)
+    inline const FirmwareInterface * getFirmwareBase() const
    {
+      return base ? base : this;
    }

+    // TODO needed?
    inline void setVariantBase(unsigned int variant)
    {
      variantBase = variant;
    }

-    unsigned int getVariant(const QString & id);
+    virtual FirmwareInterface * getFirmwareVariant(const QString & id) { return NULL; }
+
+    unsigned int getVariantNumber();

    virtual void addLanguage(const char *lang);

@@ -1342,19 +1375,19 @@ class FirmwareInterface {

    virtual QString getReleaseNotesUrl() = 0;

-    virtual QString getFirmwareUrl(QString & id) = 0;
+    virtual QString getFirmwareUrl() = 0;

-    inline BoardEnum getBoard()
+    inline BoardEnum getBoard() const
    {
      return board;
    }

-    inline QString getName()
+    inline QString getName() const
    {
      return name;
    }

-    inline QString getId()
+    inline QString getId() const
    {
      return id;
    }
@@ -1366,6 +1399,8 @@ class FirmwareInterface {

    virtual int getCapability(const Capability) = 0;

+    virtual bool isTelemetrySourceAvailable(int source) = 0;
+
    virtual SimulatorInterface * getSimulator()
    {
      return NULL;
@@ -1381,61 +1416,23 @@ class FirmwareInterface {
    QString name;
    BoardEnum board;
    EEPROMInterface * eepromInterface;
-
-  public:
-    bool voice;
-
-  protected:
    unsigned int variantBase;
+    FirmwareInterface * base;

  private:
    FirmwareInterface();

 };

-class FirmwareVariant
-{
-  public:
-    FirmwareVariant():
-      firmware(NULL),
-      variant(0)
-    {
-    }
-
-    FirmwareVariant(QString & id, FirmwareInterface * firmware, unsigned int variant):
-      id(id),
-      firmware(firmware),
-      variant(variant)
-    {
-    }
-
-    QString getFirmwareUrl()
-    {
-      if (firmware)
-        return firmware->getFirmwareUrl(id);
-      else
-        return "";
-    }
-
-    QString id;
-    FirmwareInterface * firmware;
-    unsigned int variant;
-};
-
 extern QList<FirmwareInterface *> firmwares;
-extern FirmwareVariant default_firmware_variant;
-extern FirmwareVariant current_firmware_variant;
+extern FirmwareInterface * default_firmware_variant;
+extern FirmwareInterface * current_firmware_variant;

-FirmwareVariant GetFirmwareVariant(QString id);
-
-inline FirmwareInterface * GetFirmware(QString id)
-{
-  return GetFirmwareVariant(id).firmware;
-}
+FirmwareInterface * GetFirmware(QString id);

 inline FirmwareInterface * GetCurrentFirmware()
 {
-  return current_firmware_variant.firmware;
+  return current_firmware_variant;
 }

 inline EEPROMInterface * GetEepromInterface()
@@ -1443,11 +1440,6 @@ inline EEPROMInterface * GetEepromInterface()
  return GetCurrentFirmware()->getEepromInterface();
 }

-inline unsigned int GetCurrentFirmwareVariant()
-{
-  return current_firmware_variant.variant;
-}
-
 void UnregisterEepromInterfaces();

 inline int divRoundClosest(const int n, const int d)
@@ -344,6 +344,57 @@ unsigned int RleFile::readRlc12(uint8_t *buf, unsigned int i_len, bool rlc2)
  }
 }

+unsigned int importRlc(QByteArray & dst, QByteArray & src, unsigned int rlcVersion)
+{
+  uint8_t *buf = (uint8_t *)src.data();
+  unsigned int len = src.size();
+  uint8_t zeroes = 0;
+  uint8_t bRlc = 0;
+
+  dst.resize(0);
+
+  for( ; 1; ) {
+    for (int i=0; i<zeroes; i++)
+      dst.append((char)0);
+    zeroes = 0;
+
+    if (len == 0)
+      return dst.size();
+
+    for (int i=0; i<bRlc; i++) {
+      dst.append(*buf++);
+      if (--len == 0)
+        return dst.size();
+    }
+
+    bRlc = *buf++;
+    --len;
+
+    if (!(bRlc & 0x7f)) {
+      qDebug() << "RLC decoding error!";
+      return 0;
+    }
+
+    if (rlcVersion == 2) {
+      if (bRlc&0x80){ // if contains high byte
+        zeroes  = (bRlc>>4) & 0x07;
+        bRlc    = bRlc & 0x0f;
+      }
+      else if (bRlc&0x40){
+        zeroes = bRlc & 0x3f;
+        bRlc   = 0;
+      }
+    }
+    else {
+      if (bRlc&0x80){ // if contains high byte
+        zeroes = bRlc & 0x7f;
+        bRlc   = 0;
+      }
+    }
+  }
+  return dst.size();
+}
+
 unsigned int RleFile::write1(uint8_t b)
 {
  return write(&b, 1);
@@ -146,4 +146,6 @@ public:
  unsigned int get_current_block_number(unsigned int block_no, uint16_t *p_size);
 };

+unsigned int importRlc(QByteArray & dst, QByteArray & src, unsigned int rlcVersion=2);
+
 #endif
@@ -138,8 +138,8 @@ t_Er9xLimitData::t_Er9xLimitData()
 t_Er9xLimitData::operator LimitData ()
 {
  LimitData c9x;
-  c9x.min = min-100;
-  c9x.max = max+100;
+  c9x.min = 10*(min-100);
+  c9x.max = 10*(max+100);
  c9x.revert = revert;
  c9x.offset = offset;
  return c9x;
@@ -358,7 +358,6 @@ t_Er9xModelData::operator ModelData ()
  c9x.used = true;
  getEEPROMString(c9x.name, name, sizeof(name));
  c9x.timers[0].mode = getEr9xTimerMode(tmrMode);
-  c9x.timers[0].dir = tmrDir;
  c9x.timers[0].val = tmrVal;
  switch(protocol) {
    case 1:
@@ -377,7 +376,6 @@ t_Er9xModelData::operator ModelData ()
  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
  c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
  c9x.thrTrim = thrTrim;
-  c9x.thrExpo = thrExpo;
  c9x.trimInc = trimInc-2;
  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
  c9x.funcSw[0].func = FuncInstantTrim;
@@ -443,7 +441,7 @@ t_Er9xModelData::operator ModelData ()
  }

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

  for (int i=0; i<ER9X_MAX_CURVE5; i++) {
    c9x.curves[i].count = 5;
@@ -468,7 +466,6 @@ t_Er9xModelData::operator ModelData ()

  c9x.frsky = frsky;
  c9x.frsky.usrProto=FrSkyUsrProto;
-  c9x.frsky.imperial=FrSkyImperial;
  c9x.frsky.FrSkyGpsAlt=FrSkyGpsAlt;
  return c9x;
 }
@@ -195,13 +195,13 @@ PACK(typedef struct t_gvar {
 //	int8_t gvswitch ;
 }) Er9xGvarData ;

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

 PACK(typedef struct t_Er9xModelData {
  char      name[10];             // 10 must be first for eeLoadModelName
@@ -251,7 +251,7 @@ PACK(typedef struct t_Er9xModelData {
  uint8_t unused1[8] ;
  uint8_t CustomDisplayIndex[6] ;
  Er9xGvarData gvars[ER9X_MAX_GVARS] ;
-  Er9xPhaseData phaseData[ER9X_MAX_MODES] ;
+  Er9xFlightModeData flightModeData[ER9X_MAX_MODES] ;
  
  operator ModelData();
  t_Er9xModelData() { memset(this, 0, sizeof(t_Er9xModelData)); }
@@ -54,6 +54,10 @@ class Er9xSimulator : public SimulatorInterface {

    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;
@@ -147,8 +147,8 @@ t_Ersky9xLimitData::t_Ersky9xLimitData()
 t_Ersky9xLimitData::operator LimitData ()
 {
  LimitData c9x;
-  c9x.min = min-100;
-  c9x.max = max+100;
+  c9x.min = 10*(min-100);
+  c9x.max = 10*(max+100);
  c9x.revert = revert;
  c9x.offset = offset;
  return c9x;
@@ -489,7 +489,6 @@ t_Ersky9xModelData_v10::operator ModelData ()
  getEEPROMString(c9x.name, name, sizeof(name));
  for (int i=0; i<2; i++) {
    c9x.timers[i].mode = getErSky9xTimerMode(timer[i].tmrModeA);
-    c9x.timers[i].dir = timer[i].tmrDir;
    c9x.timers[i].val = timer[i].tmrVal;
  }
  switch(protocol) {
@@ -509,7 +508,6 @@ t_Ersky9xModelData_v10::operator ModelData ()
  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
  c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
  c9x.thrTrim = thrTrim;
-  c9x.thrExpo = thrExpo;
  c9x.trimInc = trimInc-2;
  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
  c9x.funcSw[0].func = FuncInstantTrim;
@@ -571,7 +569,7 @@ t_Ersky9xModelData_v10::operator ModelData ()
  }

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

  for (int i=0; i<ERSKY9X_MAX_CURVE5; i++) {
    c9x.curves[i].count = 5;
@@ -596,7 +594,6 @@ t_Ersky9xModelData_v10::operator ModelData ()

  c9x.frsky = frsky;
  c9x.frsky.usrProto=FrSkyUsrProto;
-  c9x.frsky.imperial=FrSkyImperial;
  c9x.frsky.FrSkyGpsAlt=FrSkyGpsAlt;
  return c9x;
 }
@@ -608,7 +605,6 @@ t_Ersky9xModelData_v11::operator ModelData ()
  getEEPROMString(c9x.name, name, sizeof(name));
  for (int i=0; i<2; i++) {
    c9x.timers[i].mode = getErSky9xTimerMode(timer[i].tmrModeA);
-    c9x.timers[i].dir = timer[i].tmrDir;
    c9x.timers[i].val = timer[i].tmrVal;
  }
  switch(protocol) {
@@ -628,7 +624,6 @@ t_Ersky9xModelData_v11::operator ModelData ()
  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
  c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
  c9x.thrTrim = thrTrim;
-  c9x.thrExpo = thrExpo;
  c9x.trimInc = trimInc-2;
  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
  c9x.funcSw[0].func = FuncInstantTrim;
@@ -690,7 +685,7 @@ t_Ersky9xModelData_v11::operator ModelData ()
  }

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

  for (int i=0; i<ERSKY9X_MAX_CURVE5; i++) {
    c9x.curves[i].count = 5;
@@ -715,7 +710,6 @@ t_Ersky9xModelData_v11::operator ModelData ()

  c9x.frsky = frsky;
  c9x.frsky.usrProto=FrSkyUsrProto;
-  c9x.frsky.imperial=FrSkyImperial;
  c9x.frsky.FrSkyGpsAlt=FrSkyGpsAlt;
  // for (int i=0; i<8; i++) {
  //   c9x.frskyalarms[i].frskyAlarmLimit=frskyAlarms.alarmData[i].frskyAlarmLimit;
@@ -726,7 +720,7 @@ t_Ersky9xModelData_v11::operator ModelData ()
  //   c9x.customdisplay[i]=customDisplayIndex[i];
  // }
  for (int i=0; i<5;i++) {
-    c9x.phaseData[0].gvars[i]=gvars[i].gvar;
+    c9x.flightModeData[0].gvars[i]=gvars[i].gvar;
    // c9x.gvsource[i]=gvars[i].gvsource;
  }
  return c9x;
@@ -237,14 +237,14 @@ PACK(typedef struct t_Ersky9xgvar {
 //	int8_t gvswitch ;
 }) Ersky9xGvarData ;

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

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

  operator ModelData();
@@ -54,6 +54,10 @@ class Ersky9xSimulator : public SimulatorInterface {

    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;
@@ -201,8 +201,8 @@ t_Gruvin9xLimitData::t_Gruvin9xLimitData()
 t_Gruvin9xLimitData::operator LimitData ()
 {
  LimitData c9x;
-  c9x.min = min-100;
-  c9x.max = max+100;
+  c9x.min = 10*(min-100);
+  c9x.max = 10*(max+100);
  c9x.revert = revert;
  c9x.offset = offset;
  return c9x;
@@ -347,9 +347,9 @@ t_Gruvin9xSwashRingData::operator SwashRingData ()
  return c9x;
 }

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

-t_Gruvin9xPhaseData_v106::operator PhaseData ()
+t_Gruvin9xFlightModeData_v106::operator FlightModeData ()
 {
-  PhaseData c9x;
+  FlightModeData c9x;
  for (int i=0; i<NUM_STICKS; i++)
    c9x.trim[i] = (((int16_t)trim[i]) << 2) + ((trim_ext >> (2*i)) & 0x03);
  c9x.swtch = gruvin9xToSwitch(swtch);
@@ -378,7 +378,6 @@ t_Gruvin9xTimerData::operator TimerData ()
  TimerData c9x;
  c9x.mode = getEr9xTimerMode(mode);
  c9x.val = val;
-  c9x.dir = dir;
  return c9x;
 }

@@ -447,14 +446,13 @@ t_Gruvin9xModelData_v102::operator ModelData ()
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
  c9x.thrTrim = thrTrim;
-  c9x.thrExpo = thrExpo;
  c9x.trimInc = trimInc-2;
  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
  c9x.beepANACenter = beepANACenter;
  c9x.moduleData[0].ppmPulsePol = pulsePol;
  c9x.extendedLimits = extendedLimits;
  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++)
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
  for (int i=0; i<G9X_MAX_MIXERS; i++)
    c9x.mixData[i] = mixData[i];
  for (int i=0; i<G9X_NUM_CHNOUT; i++)
@@ -518,14 +516,13 @@ t_Gruvin9xModelData_v103::operator ModelData ()
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
  c9x.thrTrim = thrTrim;
-  c9x.thrExpo = thrExpo;
  c9x.trimInc = trimInc-2;
  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
  c9x.beepANACenter = beepANACenter;
  c9x.moduleData[0].ppmPulsePol = pulsePol;
  c9x.extendedLimits = extendedLimits;
  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++)
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
  for (int i=0; i<G9X_MAX_MIXERS; i++)
    c9x.mixData[i] = mixData[i];
  for (int i=0; i<G9X_NUM_CHNOUT; i++)
@@ -589,7 +586,6 @@ t_Gruvin9xModelData_v105::operator ModelData ()
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
  c9x.thrTrim = thrTrim;
-  c9x.thrExpo = thrExpo;
  c9x.trimInc = trimInc-2;
  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
  c9x.beepANACenter = beepANACenter;
@@ -597,20 +593,20 @@ t_Gruvin9xModelData_v105::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (phaseData[i].trim[j] > 125) {
-        c9x.phaseData[i].trimRef[j] = 0;
-        c9x.phaseData[i].trim[j] = 0;
+      if (flightModeData[i].trim[j] > 125) {
+        c9x.flightModeData[i].trimRef[j] = 0;
+        c9x.flightModeData[i].trim[j] = 0;
      }
-      else if (phaseData[i].trim[j] < -125) {
-        c9x.phaseData[i].trimRef[j] = 129 + phaseData[i].trim[j];
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      else if (flightModeData[i].trim[j] < -125) {
+        c9x.flightModeData[i].trimRef[j] = 129 + flightModeData[i].trim[j];
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
      else {
-        c9x.phaseData[i].trim[j] += subtrim[j];
+        c9x.flightModeData[i].trim[j] += subtrim[j];
      }
    }
  }
@@ -680,7 +676,6 @@ t_Gruvin9xModelData_v106::operator ModelData ()
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
  c9x.thrTrim = thrTrim;
-  c9x.thrExpo = thrExpo;
  c9x.trimInc = trimInc-2;
  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
  c9x.beepANACenter = beepANACenter;
@@ -688,13 +683,13 @@ t_Gruvin9xModelData_v106::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -244,19 +244,19 @@ PACK(typedef struct t_Gruvin9xSwashRingData { // Swash Ring data
  t_Gruvin9xSwashRingData();
 }) Gruvin9xSwashRingData;

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

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


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

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

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

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

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

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

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

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

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

 #include "open9xStockeeprom.h"

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

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

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

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

  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -138,7 +138,6 @@ t_Open9xArmTimerData_v202::operator TimerData ()
 */
  c9x.val = val;
  c9x.persistent = false;
-  c9x.dir = (val == 0);
  return c9x;
 }

@@ -149,7 +148,7 @@ t_Open9xArmExpoData_v208::operator ExpoData ()
  c9x.chn = chn;

  if (expo!=0 && curve!=0) {
-    EEPROMWarnings += ::QObject::tr("Simultaneous usage of expo and curves is no longer supported") + "\n";
+    EEPROMWarnings.push_back(::QObject::tr("Simultaneous usage of expo and curves is no longer supported"));
  }
  else {
    if (curve == 0) {
@@ -179,7 +178,7 @@ t_Open9xArmExpoData_v210::operator ExpoData ()
  c9x.chn = chn;

  if (expo!=0 && curve!=0) {
-    EEPROMWarnings += ::QObject::tr("Simultaneous usage of expo and curves is no longer supported") + "\n";
+    EEPROMWarnings.push_back(::QObject::tr("Simultaneous usage of expo and curves is no longer supported"));
  }
  else {
    if (curve == 0) {
@@ -220,9 +219,9 @@ t_Open9xArmExpoData_v212::operator ExpoData ()
  return c9x;
 }

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

-t_Open9xArmPhaseData_v212::operator PhaseData ()
+t_Open9xArmFlightModeData_v212::operator FlightModeData ()
 {
-  PhaseData c9x;
+  FlightModeData c9x;
  for (int i=0; i<NUM_STICKS; i++)
    c9x.trim[i] = trim[i];
  c9x.swtch = open9xArmToSwitch(swtch);
@@ -577,7 +576,7 @@ t_Open9xArmFuncSwData_v208::operator FuncSwData ()
  FuncSwData c9x;
  c9x.swtch = open9xArmToSwitch(swtch);
  c9x.func = (AssignFunc)(func);
-  if (c9x.func <= FuncSafetyCh32) {
+  if (c9x.func <= FuncOverrideCH32) {
    c9x.enabled=param & 0x01;
    c9x.param = (param>>1)<<1;
  }
@@ -768,13 +767,13 @@ t_Open9xArmModelData_v208::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_ARM_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -857,13 +856,13 @@ t_Open9xArmModelData_v209::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_ARM_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -947,13 +946,13 @@ t_Open9xArmModelData_v210::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_ARM_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1031,13 +1030,13 @@ t_Open9xArmModelData_v211::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_ARM_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1118,13 +1117,13 @@ t_Open9xArmModelData_v212::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_ARM_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -169,26 +169,26 @@ PACK(typedef struct t_Open9xArmMixData_v212 {
  t_Open9xArmMixData_v212() { memset(this, 0, sizeof(t_Open9xArmMixData_v212)); }
 }) Open9xArmMixData_v212;

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

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

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

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

  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -89,7 +89,7 @@ t_Open9xExpoData_v201::operator ExpoData ()
  c9x.mode = mode;
  c9x.chn = chn;
  if (expo!=0 && curve!=0) {
-    EEPROMWarnings += ::QObject::tr("Simultaneous usage of expo and curves is no longer supported in OpenTX") + "\n";
+    EEPROMWarnings.push_back(::QObject::tr("Simultaneous usage of expo and curves is no longer supported in OpenTX"));
  }
  else {
    if (curve == 0) {
@@ -129,8 +129,8 @@ t_Open9xExpoData_v211::operator ExpoData ()
 t_Open9xLimitData_v201::operator LimitData ()
 {
  LimitData c9x;
-  c9x.min = min-100;
-  c9x.max = max+100;
+  c9x.min = 10*(min-100);
+  c9x.max = 10*(max+100);
  c9x.revert = revert;
  c9x.offset = offset;
  return c9x;
@@ -139,8 +139,8 @@ t_Open9xLimitData_v201::operator LimitData ()
 t_Open9xLimitData_v211::operator LimitData ()
 {
  LimitData c9x;
-  c9x.min = min-100;
-  c9x.max = max+100;
+  c9x.min = 10*(min-100);
+  c9x.max = 10*(max+100);
  c9x.revert = revert;
  c9x.offset = offset;
  c9x.symetrical=symetrical;
@@ -573,8 +573,8 @@ t_Open9xFuncSwData_v201::operator FuncSwData ()
 }

 enum Functions {
-  FUNC_SAFETY_CH1,
-  FUNC_SAFETY_CH16=FUNC_SAFETY_CH1+15,
+  FUNC_OVERRIDE_CH1,
+  FUNC_OVERRIDE_CH16=FUNC_OVERRIDE_CH1+15,
  FUNC_TRAINER,
  FUNC_TRAINER_RUD,
  FUNC_TRAINER_ELE,
@@ -686,9 +686,9 @@ t_Open9xSwashRingData_v209::operator SwashRingData ()
  return c9x;
 }

-t_Open9xPhaseData_v201::operator PhaseData ()
+t_Open9xFlightModeData_v201::operator FlightModeData ()
 {
-  PhaseData c9x;
+  FlightModeData c9x;
  for (int i=0; i<NUM_STICKS; i++)
    c9x.trim[i] = (((int16_t)trim[i]) << 2) + ((trim_ext >> (2*i)) & 0x03);
  c9x.swtch = open9xStockToSwitch(swtch);
@@ -704,7 +704,6 @@ t_Open9xTimerData_v201::operator TimerData ()
  // c9x.mode = TMRMODE_OFF;
  c9x.val = val;
  c9x.persistent = persistent;
-  c9x.dir = dir;
  return c9x;
 }

@@ -725,7 +724,6 @@ t_Open9xTimerData_v202::operator TimerData ()
 */
  c9x.val = val;
  c9x.persistent = false;
-  c9x.dir = (val == 0);
  return c9x;
 }

@@ -842,7 +840,6 @@ t_Open9xFrSkyData_v204::operator FrSkyData ()
  c9x.channels[0] = channels[0];
  c9x.channels[1] = channels[1];
  c9x.usrProto = usrProto;
-  c9x.imperial = imperial;
  c9x.blades = blades+2;
  c9x.screens[0].type = 1;
  for (int i=0; i<4; i++)
@@ -856,7 +853,6 @@ t_Open9xFrSkyData_v205::operator FrSkyData ()
  c9x.channels[0] = channels[0];
  c9x.channels[1] = channels[1];
  c9x.usrProto = usrProto;
-  c9x.imperial = imperial;
  c9x.blades = blades+2;
  c9x.screens[0].type = 1;
  for (int i=0; i<4; i++)
@@ -941,7 +937,6 @@ t_Open9xModelData_v201::operator ModelData ()
  }
  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
  c9x.thrTrim = thrTrim;
-  c9x.thrExpo = thrExpo;
  c9x.trimInc = trimInc - 2;
  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
  c9x.beepANACenter = beepANACenter;
@@ -949,13 +944,13 @@ t_Open9xModelData_v201::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1023,13 +1018,13 @@ t_Open9xModelData_v202::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1099,13 +1094,13 @@ t_Open9xModelData_v203::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1173,13 +1168,13 @@ t_Open9xModelData_v204::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1252,13 +1247,13 @@ t_Open9xModelData_v205::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1338,13 +1333,13 @@ t_Open9xModelData_v208::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1431,13 +1426,13 @@ t_Open9xModelData_v209::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1525,13 +1520,13 @@ t_Open9xModelData_v210::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -1613,13 +1608,13 @@ t_Open9xModelData_v211::operator ModelData ()
  c9x.extendedLimits = extendedLimits;
  c9x.extendedTrims = extendedTrims;
  for (int i=0; i<O9X_MAX_FLIGHT_MODES; i++) {
-    c9x.phaseData[i] = phaseData[i];
+    c9x.flightModeData[i] = flightModeData[i];
    for (int j=0; j<NUM_STICKS; j++) {
-      if (c9x.phaseData[i].trim[j] > 500) {
-        c9x.phaseData[i].trimRef[j] = c9x.phaseData[i].trim[j] - 501;
-        if (c9x.phaseData[i].trimRef[j] >= i)
-          c9x.phaseData[i].trimRef[j] += 1;
-        c9x.phaseData[i].trim[j] = 0;
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
      }
    }
  }
@@ -445,7 +445,7 @@ PACK(typedef struct t_Open9xSwashRingData_v209 { // Swash Ring data
  t_Open9xSwashRingData_v209() { memset(this, 0, sizeof(t_Open9xSwashRingData_v209)); }
 }) Open9xSwashRingData_v209;

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

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

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

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

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

  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
  uint8_t   thrTraceSrc;
@@ -48,6 +48,8 @@
 #define GPS
 #define FAI_CHOICE
 #define FRSKY_STICKS
+#define OVERRIDE_CHANNEL_FUNCTION
+#define FLAVOUR "gruvin9x"

 #define EEPROM_VARIANT 3

@@ -66,6 +68,7 @@ namespace Open9xGruvin9x {
 #include "radio/src/switches.cpp"
 #include "radio/src/curves.cpp"
 #include "radio/src/mixer.cpp"
+#include "radio/src/timers.cpp"
 #include "radio/src/pulses/pulses_avr.cpp"
 #include "radio/src/stamp.cpp"
 #include "radio/src/maths.cpp"
@@ -76,9 +79,10 @@ namespace Open9xGruvin9x {
 #include "radio/src/gui/view_main.cpp"
 #include "radio/src/gui/view_statistics.cpp"
 #include "radio/src/gui/view_telemetry.cpp"
-#include "radio/src/lcd.cpp"
+#include "radio/src/lcd_common.cpp"
+#include "radio/src/lcd_default.cpp"
 #include "radio/src/keys.cpp"
-#include "radio/src/simpgmspace.cpp"
+#include "radio/src/targets/simu/simpgmspace.cpp"
 #include "radio/src/templates.cpp"
 #include "radio/src/translations.cpp"
 #include "radio/src/fonts.cpp"
@@ -177,13 +181,13 @@ void Open9xGruvin9xSimulator::setValues(TxInputs &inputs)
 void Open9xGruvin9xSimulator::setTrim(unsigned int idx, int value)
 {
  idx = Open9xGruvin9x::modn12x3[4*getStickMode() + idx];
-  uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
+  uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
  setTrimValue(phase, idx, value);
 }

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

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

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

@@ -56,6 +56,11 @@ class Open9xGruvin9xSimulator : public SimulatorInterface {

    virtual const char * getError();

+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
+
+    virtual void installTraceHook(void (*callback)(const char *)) {};
 };

 #endif
@@ -46,6 +46,10 @@
 #define GPS
 #define FAI_CHOICE
 #define FRSKY_STICKS
+#define DSM2
+#define DSM2_PPM
+#define OVERRIDE_CHANNEL_FUNCTION
+#define FLAVOUR "9x128"

 #define EEPROM_VARIANT SIMU_M128_VARIANTS
 #define GAUGES
@@ -65,6 +69,7 @@ namespace OpenTxM128 {
 #include "radio/src/switches.cpp"
 #include "radio/src/curves.cpp"
 #include "radio/src/mixer.cpp"
+#include "radio/src/timers.cpp"
 #include "radio/src/pulses/pulses_avr.cpp"
 #include "radio/src/stamp.cpp"
 #include "radio/src/maths.cpp"
@@ -75,9 +80,10 @@ namespace OpenTxM128 {
 #include "radio/src/gui/view_main.cpp"
 #include "radio/src/gui/view_statistics.cpp"
 #include "radio/src/gui/view_telemetry.cpp"
-#include "radio/src/lcd.cpp"
+#include "radio/src/lcd_common.cpp"
+#include "radio/src/lcd_default.cpp"
 #include "radio/src/keys.cpp"
-#include "radio/src/simpgmspace.cpp"
+#include "radio/src/targets/simu/simpgmspace.cpp"
 #include "radio/src/templates.cpp"
 #include "radio/src/translations.cpp"
 #include "radio/src/fonts.cpp"
@@ -169,13 +175,13 @@ void OpenTxM128Simulator::setValues(TxInputs &inputs)
 void OpenTxM128Simulator::setTrim(unsigned int idx, int value)
 {
  idx = OpenTxM128::modn12x3[4*getStickMode() + idx];
-  uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
+  uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
  setTrimValue(phase, idx, value);
 }

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

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

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

@@ -56,6 +56,11 @@ class OpenTxM128Simulator : public SimulatorInterface {

    virtual const char * getError();

+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
+
+    virtual void installTraceHook(void (*callback)(const char *)) {};
 };

 #endif
@@ -50,10 +50,11 @@
 #define GPS
 #define FAI_CHOICE
 #define FRSKY_STICKS
-
+#define OVERRIDE_CHANNEL_FUNCTION
+#define FAS_OFFSET
 #define EEPROM_VARIANT SIMU_STOCK_VARIANTS
 #define GAUGES
-
+#define FLAVOUR "9x"
 #define NUM_POTS  3

 #undef min
@@ -71,6 +72,7 @@ namespace OpenTxM64 {
 #include "radio/src/switches.cpp"
 #include "radio/src/curves.cpp"
 #include "radio/src/mixer.cpp"
+#include "radio/src/timers.cpp"
 #include "radio/src/pulses/pulses_avr.cpp"
 #include "radio/src/stamp.cpp"
 #include "radio/src/maths.cpp"
@@ -81,9 +83,10 @@ namespace OpenTxM64 {
 #include "radio/src/gui/view_main.cpp"
 #include "radio/src/gui/view_statistics.cpp"
 #include "radio/src/gui/view_telemetry.cpp"
-#include "radio/src/lcd.cpp"
+#include "radio/src/lcd_common.cpp"
+#include "radio/src/lcd_default.cpp"
 #include "radio/src/keys.cpp"
-#include "radio/src/simpgmspace.cpp"
+#include "radio/src/targets/simu/simpgmspace.cpp"
 #include "radio/src/telemetry/frsky.cpp"
 #include "radio/src/telemetry/frsky_d.cpp"
 #include "radio/src/templates.cpp"
@@ -179,13 +182,13 @@ void OpenTxM64Simulator::setValues(TxInputs &inputs)
 void OpenTxM64Simulator::setTrim(unsigned int idx, int value)
 {
  idx = OpenTxM64::modn12x3[4*getStickMode() + idx];
-  uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
+  uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
  setTrimValue(phase, idx, value);
 }

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

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

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

@@ -55,6 +55,11 @@ class OpenTxM64Simulator : public SimulatorInterface {

    virtual const char * getError();

+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
+
+    virtual void installTraceHook(void (*callback)(const char *)) {};
 };

 #endif
@@ -54,9 +54,10 @@
 #define GPS
 #define FAI_CHOICE
 #define FRSKY_STICKS
-
+#define OVERRIDE_CHANNEL_FUNCTION
 #define NUM_POTS  3
 #define EEPROM_VARIANT 3
+#define FLAVOUR "sky9x"

 #undef min
 #undef max
@@ -75,9 +76,11 @@ namespace Open9xSky9x {
 #include "radio/src/eeprom_raw.cpp"
 #include "radio/src/eeprom_conversions.cpp"
 #include "radio/src/opentx.cpp"
+// #include "radio/src/debug.cpp"     // only included once in Taranis simulator because functions are exported as C and don't support namespaces
 #include "radio/src/strhelpers.cpp"
 #include "radio/src/switches.cpp"
 #include "radio/src/mixer.cpp"
+#include "radio/src/timers.cpp"
 #include "radio/src/curves.cpp"
 #include "radio/src/targets/sky9x/pulses_driver.cpp"
 #include "radio/src/pulses/pulses_arm.cpp"
@@ -92,11 +95,13 @@ namespace Open9xSky9x {
 #include "radio/src/gui/view_telemetry.cpp"
 #include "radio/src/gui/view_about.cpp"
 #include "radio/src/gui/view_text.cpp"
-#include "radio/src/lcd.cpp"
+#include "radio/src/lcd_common.cpp"
+#include "radio/src/lcd_default.cpp"
 #include "radio/src/logs.cpp"
 #include "radio/src/targets/sky9x/keys_driver.cpp"
 #include "radio/src/keys.cpp"
-#include "radio/src/simpgmspace.cpp"
+#include "radio/src/sdcard.cpp"
+#include "radio/src/targets/simu/simpgmspace.cpp"
 #include "radio/src/templates.cpp"
 #include "radio/src/translations.cpp"
 #include "radio/src/fonts.cpp"
@@ -109,6 +114,7 @@ namespace Open9xSky9x {
 #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/haptic.cpp"
 #include "radio/src/translations/tts_cz.cpp"
 #include "radio/src/translations/tts_de.cpp"
@@ -120,6 +126,7 @@ namespace Open9xSky9x {
 #include "radio/src/translations/tts_pt.cpp"
 #include "radio/src/translations/tts_sk.cpp"
 #include "radio/src/translations/tts_pl.cpp"
+#include "radio/src/translations/tts_hu.cpp"

 int16_t g_anas[NUM_STICKS+BOARD_9X_NUM_POTS];

@@ -148,11 +155,9 @@ using namespace Open9xSky9x;
 Open9xSky9xSimulator::Open9xSky9xSimulator()
 {
    QString path=g.profile[g.id()].sdPath()+"/";
-    int i=0;
-    for (i=0; i< std::min(path.length(),1022); i++) {
-      simuSdDirectory[i]=path.at(i).toAscii();
-    }
-    simuSdDirectory[i]=0;  
+    strncpy (simuSdDirectory, path.toAscii().constData(), sizeof(simuSdDirectory)-1);
+    simuSdDirectory[sizeof(simuSdDirectory)-1] = '\0';
+
 }

 bool Open9xSky9xSimulator::timer10ms()
@@ -161,7 +166,7 @@ bool Open9xSky9xSimulator::timer10ms()
 #include "simulatorimport.h"
 }

-uint8_t * Open9xSky9xSimulator::getLcd()
+::uint8_t * Open9xSky9xSimulator::getLcd()
 {
 #define GETLCD_IMPORT
 #include "simulatorimport.h"
@@ -178,6 +183,7 @@ void Open9xSky9xSimulator::start(QByteArray & eeprom, bool tests)
  g_rotenc[0] = 0;
  memcpy(Open9xSky9x::eeprom, eeprom.data(), std::min<int>(sizeof(Open9xSky9x::eeprom), eeprom.size()));
  StartEepromThread(NULL);
+  StartAudioThread();
  StartMainThread(tests);
 }

@@ -185,12 +191,14 @@ void Open9xSky9xSimulator::start(const char * filename, bool tests)
 {
  g_rotenc[0] = 0;
  StartEepromThread(filename);
+  StartAudioThread();
  StartMainThread(tests);
 }

 void Open9xSky9xSimulator::stop()
 {
  StopMainThread();
+  StopAudioThread();
  StopEepromThread();
 }

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

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

  for (int i=0; i<2; i++) {
-    uint8_t idx = Open9xSky9x::modn12x3[4*getStickMode() + i];
-    int16_t tmp = trims.values[i];
+    ::uint8_t idx = Open9xSky9x::modn12x3[4*getStickMode() + i];
+    ::int16_t tmp = trims.values[i];
    trims.values[i] = trims.values[idx];
    trims.values[idx] = tmp;
  }
 }

-void Open9xSky9xSimulator::wheelEvent(uint8_t steps)
+void Open9xSky9xSimulator::wheelEvent(::uint8_t steps)
 {
  g_rotenc[0] += steps*4;
 }

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

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

@@ -254,3 +262,13 @@ const char * Open9xSky9xSimulator::getError()
 #define GETERROR_IMPORT
 #include "simulatorimport.h"
 }
+
+void Open9xSky9xSimulator::setTrainerInput(unsigned int inputNumber, ::int16_t value)
+{
+#define SETTRAINER_IMPORT
+#include "simulatorimport.h"
+}
+
+void Open9xSky9xSimulator::installTraceHook(void (*callback)(const char *)) {
+  ::traceCallback = callback;
+}
@@ -56,6 +56,11 @@ class Open9xSky9xSimulator : public SimulatorInterface {

    virtual const char * getError();

+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value);
+
+    virtual void installTraceHook(void (*callback)(const char *));
 };

 #endif
@@ -54,8 +54,9 @@
 #define EEPROM_VARIANT 3
 #define HAPTIC
 #define REVPLUS
-
+#define OVERRIDE_CHANNEL_FUNCTION
 #define NUM_POTS  5
+#define FLAVOUR "taranis-plus"

 #undef min
 #undef max
@@ -78,10 +79,12 @@ inline int geteepromsize() {
 #include "radio/src/eeprom_conversions.cpp"
 #include "radio/src/eeprom_rlc.cpp"
 #include "radio/src/opentx.cpp"
+#include "radio/src/debug.cpp"
 #include "radio/src/strhelpers.cpp"
 #include "radio/src/switches.cpp"
 #include "radio/src/curves.cpp"
 #include "radio/src/mixer.cpp"
+#include "radio/src/timers.cpp"
 #include "radio/src/targets/taranis/pulses_driver.cpp"
 #include "radio/src/targets/taranis/rtc_driver.cpp"
 #include "radio/src/targets/taranis/trainer_driver.cpp"
@@ -99,7 +102,8 @@ inline int geteepromsize() {
 #include "radio/src/gui/view_telemetry.cpp"
 #include "radio/src/gui/view_text.cpp"
 #include "radio/src/gui/view_about.cpp"
-#include "radio/src/lcd.cpp"
+#include "radio/src/lcd_common.cpp"
+#include "radio/src/lcd_taranis.cpp"
 #include "radio/src/logs.cpp"
 #include "radio/src/rtc.cpp"
 #include "radio/src/targets/taranis/keys_driver.cpp"
@@ -107,10 +111,10 @@ inline int geteepromsize() {
 #include "radio/src/bmp.cpp"
 #include "radio/src/haptic.cpp"
 #include "radio/src/targets/taranis/haptic_driver.cpp"
-// TODO Because FatFS in not C++ there cannot be namespaces there and the functions are defined several times!
-#undef SDCARD
-#include "radio/src/simpgmspace.cpp"
-#define SDCARD
+#include "radio/src/sdcard.cpp"
+// Because FatFS in not C++ there cannot be namespaces there and the functions are defined several times!
+#define SKIP_FATFS_DECLARATION
+#include "radio/src/targets/simu/simpgmspace.cpp"
 #include "radio/src/translations.cpp"
 #include "radio/src/fonts.cpp"
 #include "radio/src/telemetry/frsky.cpp"
@@ -129,7 +133,7 @@ inline int geteepromsize() {
 #include "radio/src/translations/tts_pt.cpp"
 #include "radio/src/translations/tts_sk.cpp"
 #include "radio/src/translations/tts_pl.cpp"
-
+#include "radio/src/translations/tts_hu.cpp"
 #include "radio/src/lua.cpp"
 #include "radio/src/lua/src/lapi.c"
 #include "radio/src/lua/src/lcode.c"
@@ -147,6 +151,7 @@ inline int geteepromsize() {
 #include "radio/src/lua/src/lstate.c"
 #include "radio/src/lua/src/lstring.c"
 #include "radio/src/lua/src/ltable.c"
+#include "radio/src/lua/src/lrotable.c"
 #include "radio/src/lua/src/ltm.c"
 #include "radio/src/lua/src/lundump.c"
 #include "radio/src/lua/src/lvm.c"
@@ -154,6 +159,7 @@ inline int geteepromsize() {
 #include "radio/src/lua/src/lbaselib.c"
 #include "radio/src/lua/src/linit.c"
 #include "radio/src/lua/src/lmathlib.c"
+#include "radio/src/lua/src/lbitlib.c"
 #include "radio/src/lua/src/loadlib.c"
 #include "radio/src/lua/src/lauxlib.c"
 #include "radio/src/lua/src/ltablib.c"
@@ -191,11 +197,8 @@ OpentxTaranisSimulator::OpentxTaranisSimulator()
 {
  taranisSimulatorBoard = GetEepromInterface()->getBoard();
  QString path=g.profile[g.id()].sdPath()+"/";
-  int i=0;
-  for (i=0; i< std::min(path.length(),1022); i++) {
-    simuSdDirectory[i]=path.at(i).toAscii();
-  }
-  simuSdDirectory[i]=0;  
+  strncpy (simuSdDirectory, path.toAscii().constData(), sizeof(simuSdDirectory)-1);
+  simuSdDirectory[sizeof(simuSdDirectory)-1] = '\0';  
 }

 bool OpentxTaranisSimulator::timer10ms()
@@ -204,7 +207,7 @@ bool OpentxTaranisSimulator::timer10ms()
 #include "simulatorimport.h"
 }

-uint8_t * OpentxTaranisSimulator::getLcd()
+::uint8_t * OpentxTaranisSimulator::getLcd()
 {
 #define GETLCD_IMPORT
 #include "simulatorimport.h"
@@ -220,18 +223,21 @@ void OpentxTaranisSimulator::start(QByteArray & eeprom, bool tests)
 {
  memcpy(Open9xX9D::eeprom, eeprom.data(), std::min<int>(sizeof(Open9xX9D::eeprom), eeprom.size()));
  StartEepromThread(NULL);
+  StartAudioThread();
  StartMainThread(tests);
 }

 void OpentxTaranisSimulator::start(const char * filename, bool tests)
 {
  StartEepromThread(filename);
+  StartAudioThread();
  StartMainThread(tests);
 }

 void OpentxTaranisSimulator::stop()
 {
  StopMainThread();
+  StopAudioThread();
  StopEepromThread();
 }

@@ -251,40 +257,40 @@ void OpentxTaranisSimulator::setValues(TxInputs &inputs)
 void OpentxTaranisSimulator::setTrim(unsigned int idx, int value)
 {
  idx = Open9xX9D::modn12x3[4*getStickMode() + idx];
-  uint8_t phase = getTrimFlightPhase(getFlightPhase(), idx);
+  ::uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
  setTrimValue(phase, idx, value);
 }

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

  for (int i=0; i<2; i++) {
-    uint8_t idx = Open9xX9D::modn12x3[4*getStickMode() + i];
-    int16_t tmp = trims.values[i];
+    ::uint8_t idx = Open9xX9D::modn12x3[4*getStickMode() + i];
+    ::int16_t tmp = trims.values[i];
    trims.values[i] = trims.values[idx];
    trims.values[idx] = tmp;
  }
 }

-void OpentxTaranisSimulator::wheelEvent(uint8_t steps)
+void OpentxTaranisSimulator::wheelEvent(::uint8_t steps)
 {
  // g_rotenc[0] += steps*4;
 }

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

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

@@ -293,3 +299,18 @@ const char * OpentxTaranisSimulator::getError()
 #define GETERROR_IMPORT
 #include "simulatorimport.h"
 }
+
+void OpentxTaranisSimulator::sendTelemetry(::uint8_t * data, unsigned int len) 
+{
+  frskySportProcessPacket(data);
+}
+
+void OpentxTaranisSimulator::setTrainerInput(unsigned int inputNumber, ::int16_t value)
+{
+#define SETTRAINER_IMPORT
+#include "simulatorimport.h"
+}
+
+void OpentxTaranisSimulator::installTraceHook(void (*callback)(const char *)) {
+  ::traceCallback = callback;
+}
@@ -56,6 +56,11 @@ class OpentxTaranisSimulator : public SimulatorInterface {

    virtual const char * getError();

+    virtual void sendTelemetry(uint8_t * data, unsigned int len);
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value);
+
+    virtual void installTraceHook(void (*callback)(const char *));
 };

 #endif
@@ -19,7 +19,7 @@
 #define MAX_MIXERS(board, version)           (IS_ARM(board) ? 64 : 32)
 #define MAX_CHANNELS(board, version)         (IS_ARM(board) ? 32 : 16)
 #define MAX_EXPOS(board, version)            (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 216) ? 64 : 32) : (IS_DBLRAM(board, version) ? 16 : 14))
-#define MAX_CUSTOM_SWITCHES(board, version)  (IS_ARM(board) ? 32 : (IS_DBLEEPROM(board, version) ? 15 : 12))
+#define MAX_CUSTOM_SWITCHES(board, version)  (IS_ARM(board) ? 32 : ((IS_DBLEEPROM(board, version) && version<217) ? 15 : 12))
 #define MAX_CUSTOM_FUNCTIONS(board, version) (IS_ARM(board) ? (version >= 216 ? 64 : 32) : (IS_DBLEEPROM(board, version) ? 24 : 16))
 #define MAX_CURVES(board, version)           (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 216) ? 32 : 16) : O9X_MAX_CURVES)
 #define MAX_GVARS(board, version)            ((IS_ARM(board) && version >= 216) ? 9 : 5)
@@ -40,11 +40,11 @@ inline int switchIndex(int i, BoardEnum board, unsigned int version)
 class SwitchesConversionTable: public ConversionTable {

  public:
-    SwitchesConversionTable(BoardEnum board, unsigned int version, unsigned long flags=0)
+    SwitchesConversionTable(BoardEnum board, unsigned int version, bool timer=false)
    {
      int val=0;
      int offset=0;
-      if (flags & POPULATE_TIMER_MODES) {
+      if (timer) {
        offset = 4;
        for (int i=0; i<5; i++) {
          addConversion(RawSwitch(SWITCH_TYPE_TIMER_MODE, i), val++);
@@ -56,8 +56,15 @@ class SwitchesConversionTable: public ConversionTable {

      for (int i=1; i<=MAX_SWITCHES_POSITION(board); i++) {
        int s = switchIndex(i, board, version);
-        addConversion(RawSwitch(SWITCH_TYPE_SWITCH, -s), -val+offset);
-        addConversion(RawSwitch(SWITCH_TYPE_SWITCH, s), val++);
+        addConversion(RawSwitch(SWITCH_TYPE_SWITCH, s), val);
+        if (IS_TARANIS(board) && s>=21/*SHup/SHdown*/) {
+          addImportConversion(RawSwitch(SWITCH_TYPE_SWITCH, 21+22-s), -val+offset);
+          addExportConversion(RawSwitch(SWITCH_TYPE_SWITCH, -s), -val+offset);
+        }
+        else {
+          addConversion(RawSwitch(SWITCH_TYPE_SWITCH, -s), -val+offset);
+        }
+        val++;
      }

      if (IS_TARANIS(board) && version >= 216) {
@@ -86,17 +93,15 @@ class SwitchesConversionTable: public ConversionTable {
        addConversion(RawSwitch(SWITCH_TYPE_VIRTUAL, i), val++);
      }

-      if (!(flags & POPULATE_TIMER_MODES)) {
-        addConversion(RawSwitch(SWITCH_TYPE_OFF), -val+offset);
-        addConversion(RawSwitch(SWITCH_TYPE_ON), val++);
-        if (version >= 216) {
-          addConversion(RawSwitch(SWITCH_TYPE_ONE, -1), -val+offset);
-          addConversion(RawSwitch(SWITCH_TYPE_ONE, 1), val++);
-          if (IS_ARM(board)) {
-            for (int i=1; i<=MAX_FLIGHT_MODES(board, version); i++) {
-              addConversion(RawSwitch(SWITCH_TYPE_FLIGHT_MODE, -i), -val+offset);
-              addConversion(RawSwitch(SWITCH_TYPE_FLIGHT_MODE, i), val++);
-            }
+      addConversion(RawSwitch(SWITCH_TYPE_OFF), -val+offset);
+      addConversion(RawSwitch(SWITCH_TYPE_ON), val++);
+      if (version >= 216) {
+        addConversion(RawSwitch(SWITCH_TYPE_ONE, -1), -val+offset);
+        addConversion(RawSwitch(SWITCH_TYPE_ONE, 1), val++);
+        if (IS_ARM(board)) {
+          for (int i=1; i<=MAX_FLIGHT_MODES(board, version); i++) {
+            addConversion(RawSwitch(SWITCH_TYPE_FLIGHT_MODE, -i), -val+offset);
+            addConversion(RawSwitch(SWITCH_TYPE_FLIGHT_MODE, i), val++);
          }
        }
      }
@@ -124,6 +129,16 @@ class SwitchesConversionTable: public ConversionTable {
      ConversionTable::addConversion(sw.toValue(), b);
    }

+    void addImportConversion(const RawSwitch & sw, const int b)
+    {
+      ConversionTable::addImportConversion(sw.toValue(), b);
+    }
+
+    void addExportConversion(const RawSwitch & sw, const int b)
+    {
+      ConversionTable::addExportConversion(sw.toValue(), b);
+    }
+
    class Cache {
      public:
        Cache(BoardEnum board, unsigned int version, unsigned long flags, SwitchesConversionTable * table):
@@ -189,7 +204,7 @@ class SourcesConversionTable: public ConversionTable {
          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_INPUT, i*16+j), val++);
+            addConversion(RawSource(SOURCE_TYPE_LUA_OUTPUT, i*16+j), val++);
          }
        }
      }
@@ -235,8 +250,9 @@ class SourcesConversionTable: public ConversionTable {
              addConversion(RawSource(SOURCE_TYPE_SWITCH, i), val++);
          }
        }
-        for (int i=0; i<MAX_CUSTOM_SWITCHES(board, version); i++)
+        for (int i=0; i<MAX_CUSTOM_SWITCHES(board, version); i++) {
          addConversion(RawSource(SOURCE_TYPE_CUSTOM_SWITCH, i), val++);
+        }
      }

      if (!afterrelease21March2013) {
@@ -260,7 +276,7 @@ class SourcesConversionTable: public ConversionTable {

        for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
          if (version < 216) {
-            if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPD || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
+            if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPEED || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
              continue;
          }
          if (!IS_ARM(board)) {
@@ -369,7 +385,8 @@ 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"),
+      ConversionField< SignedField<N> >(_switch, SwitchesConversionTable::getInstance(board, version, flags), "Switch",
+          "Switch "+ sw.toString()+" cannot be exported on this board!"),
      sw(sw),
      _switch(0)
    {
@@ -443,7 +460,7 @@ class TelemetrySourcesConversionTable: public ConversionTable {
      addConversion(1+TELEMETRY_SOURCE_HDG, val++);
      addConversion(1+TELEMETRY_SOURCE_VERTICAL_SPEED, val++);
      if (version >= 216) {
-        addConversion(1+TELEMETRY_SOURCE_ASPD, val++);
+        addConversion(1+TELEMETRY_SOURCE_ASPEED, val++);
        addConversion(1+TELEMETRY_SOURCE_DTE, val++);
      }
      if (IS_ARM(board) && version >= 216) {
@@ -503,7 +520,8 @@ template <int N>
 class SourceField: public ConversionField< UnsignedField<N> > {
  public:
    SourceField(RawSource & source, BoardEnum board, unsigned int version, unsigned int variant, unsigned long flags=0):
-      ConversionField< UnsignedField<N> >(_source, SourcesConversionTable::getInstance(board, version, variant, flags), "Source"),
+      ConversionField< UnsignedField<N> >(_source, SourcesConversionTable::getInstance(board, version, variant, flags), 
+            "Source", "Source "+ source.toString(ModelData())+" cannot be exported on this board!"),
      source(source),
      _source(0)
    {
@@ -701,7 +719,7 @@ class HeliField: public StructField {

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

  protected:
    StructField internalField;
-    PhaseData & phase;
+    FlightModeData & phase;
    int index;
    BoardEnum board;
    unsigned int version;
@@ -867,8 +885,8 @@ class MixField: public TransformedField {
        internalField.Append(new SpareBitsField<8>());
      }
      else if (IS_ARM(board) && version >= 216) {
-        internalField.Append(new UnsignedField<4>(_destCh));
-        internalField.Append(new UnsignedField<4>(mix.mixWarn));
+        internalField.Append(new UnsignedField<5>(_destCh));
+        internalField.Append(new UnsignedField<3>(mix.mixWarn));
        internalField.Append(new UnsignedField<16>(mix.phases));
        internalField.Append(new BoolField<1>(_curveMode));
        internalField.Append(new BoolField<1>(mix.noExpo));
@@ -973,7 +991,12 @@ class MixField: public TransformedField {
        _destCh = mix.destCh - 1;
        if (mix.curve.type == CurveReference::CURVE_REF_CUSTOM) {
          _curveMode = true;
-          _curveParam = 6 + mix.curve.value;
+          if (mix.curve.value > 0) {
+            _curveParam = 6 + mix.curve.value;
+          }
+          else {
+            _curveParam = mix.curve.value;
+          }
        }
        else if (mix.curve.type == CurveReference::CURVE_REF_FUNC) {
          _curveMode = true;
@@ -1009,18 +1032,20 @@ class MixField: public TransformedField {
      if (IS_TARANIS(board) && version < 216) {
        if (mix.srcRaw.type == SOURCE_TYPE_STICK && mix.srcRaw.index < NUM_STICKS) {
          if (!mix.noExpo) {
-            mix.srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, mix.srcRaw.index, model);
+            mix.srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, mix.srcRaw.index);
          }
        }
      }

      if (mix.srcRaw.type != SOURCE_TYPE_NONE) {
        mix.destCh = _destCh + 1;
-        if (!IS_ARM(board) || version < 216) {
+        if (!IS_TARANIS(board) || version < 216) {
          if (!_curveMode)
            mix.curve = CurveReference(CurveReference::CURVE_REF_DIFF, smallGvarToC9x(_curveParam));
          else if (_curveParam > 6)
            mix.curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, _curveParam-6);
+          else if (_curveParam < 0)
+            mix.curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, _curveParam);
          else
            mix.curve = CurveReference(CurveReference::CURVE_REF_FUNC, _curveParam);
        }
@@ -1080,7 +1105,7 @@ class InputField: public TransformedField {
        internalField.Append(new SignedField<6>(expo.carryTrim, "CarryTrim"));
        internalField.Append(new UnsignedField<2>(expo.mode, "Mode"));
        internalField.Append(new ZCharField<8>(expo.name));
-        internalField.Append(new SignedField<8>(expo.offset, "Offset"));
+        internalField.Append(new SignedField<8>(_offset, "Offset"));
        internalField.Append(new CurveReferenceField(expo.curve, board, version));
        internalField.Append(new SpareBitsField<8>());
      }
@@ -1133,7 +1158,11 @@ class InputField: public TransformedField {

    virtual void beforeExport()
    {
-      _weight    = smallGvarToEEPROM(expo.weight);
+      _weight = smallGvarToEEPROM(expo.weight);
+
+      if (IS_TARANIS(board) && version >= 216) {
+        _offset = smallGvarToEEPROM(expo.offset);
+      }

      if (!IS_TARANIS(board) || version < 216) {
        if (expo.curve.type==CurveReference::CURVE_REF_FUNC && expo.curve.value) {
@@ -1166,6 +1195,10 @@ class InputField: public TransformedField {

      expo.weight = smallGvarToC9x(_weight);

+      if (IS_TARANIS(board) && version >= 216) {
+        expo.offset = smallGvarToC9x(_offset);
+      }
+
      if (!IS_TARANIS(board) || version < 216) {
        if (!_curveMode)
          expo.curve = CurveReference(CurveReference::CURVE_REF_EXPO, smallGvarToC9x(_curveParam));
@@ -1183,24 +1216,65 @@ class InputField: public TransformedField {
    unsigned int version;
    bool _curveMode;
    int  _weight;
+    int  _offset;
    int  _curveParam;
 };

 class LimitField: public StructField {
  public:
+    template <int shift>
+    static int exportLimitValue(int value)
+    {
+      const int GV1 = 4096;
+      if (value > 10000) {
+        return -GV1 + value - 10001;
+      }
+      if (value < -10000) {
+        return GV1 + value + 10000;
+      }
+      return value + shift;
+    }
+
+    template <int shift>
+    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;
+      }
+      if (value >= GV1-9) {
+        return -10000 + value - GV1;
+      }
+      if (value < -GV1) {
+        return -10000 + value + GV1 + 1;
+      }
+      if (value < -GV1+9) {
+        return 10000 + value + GV1 + 1;
+      }
+      return value - shift;
+    }
+
    LimitField(LimitData & limit, BoardEnum board, unsigned int version):
      StructField("Limit")
    {
      if (IS_TARANIS(board) && version >= 216) {
-        Append(new ConversionField< SignedField<16> >(limit.min, +1000));
-        Append(new ConversionField< SignedField<16> >(limit.max, -1000));
+        Append(new ConversionField< SignedField<16> >(limit.min, exportLimitValue<1000>, importLimitValue<1000>));
+        Append(new ConversionField< SignedField<16> >(limit.max, exportLimitValue<-1000>, importLimitValue<-1000>));
+        Append(new SignedField<8>(limit.ppmCenter));
+        Append(new ConversionField< SignedField<14> >(limit.offset, exportLimitValue<0>, importLimitValue<0>));
      }
      else {
        Append(new ConversionField< SignedField<8> >(limit.min, +100, 10));
        Append(new ConversionField< SignedField<8> >(limit.max, -100, 10));
+        Append(new SignedField<8>(limit.ppmCenter));
+        Append(new SignedField<14>(limit.offset));
      }
-      Append(new SignedField<8>(limit.ppmCenter));
-      Append(new SignedField<14>(limit.offset));
      Append(new BoolField<1>(limit.symetrical));
      Append(new BoolField<1>(limit.revert));
      if (HAS_LARGE_LCD(board)) {
@@ -1255,14 +1329,14 @@ class CurvesField: public TransformedField {
        if (IS_TARANIS(board) && version >= 216) {
          offset += (curve->type == CurveData::CURVE_TYPE_CUSTOM ? curve->count * 2 - 2 : curve->count);
          if (offset > maxPoints) {
-            EEPROMWarnings += ::QObject::tr("OpenTX only accepts %1 points in all curves").arg(maxPoints) + "\n";
+            EEPROMWarnings.push_back(::QObject::tr("OpenTX only accepts %1 points in all curves").arg(maxPoints));
            break;
          }
        }
        else {
          offset += (curve->type == CurveData::CURVE_TYPE_CUSTOM ? curve->count * 2 - 2 : curve->count) - 5;
          if (offset > maxPoints - 5 * maxCurves) {
-            EEPROMWarnings += ::QObject::tr("OpenTx only accepts %1 points in all curves").arg(maxPoints) + "\n";
+            EEPROMWarnings.push_back(::QObject::tr("OpenTx only accepts %1 points in all curves").arg(maxPoints));
            break;
          }
          _curves[i] = offset;
@@ -1544,11 +1618,27 @@ class LogicalSwitchField: public TransformedField {
      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_TARANIS(board) && version < 216) {
+          RawSource val1(csw.val1);
+          if (val1.type == SOURCE_TYPE_STICK && val1.index < NUM_STICKS) {
+            csw.val1 = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, val1.index).toValue();
+          }
+          RawSource val2(csw.val2);
+          if (val2.type == SOURCE_TYPE_STICK && val2.index < NUM_STICKS) {
+            csw.val2 = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, val2.index).toValue();
+          }
+        }
      }
      else if (csw.func != LS_FN_OFF) {
        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) {
+            csw.val1 = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, val1.index).toValue();
+          }
+        }
        csw.val2 = v2;
-        RawSource val1(csw.val1, model);
+        RawSource val1(csw.val1);
        if (IS_ARM(board) && version < 216 && val1.type == SOURCE_TYPE_TELEMETRY) {
          switch (val1.index) {
            case TELEMETRY_SOURCE_TIMER1:
@@ -1677,7 +1767,10 @@ class CustomFunctionsConversionTable: public ConversionTable {
        addConversion(FuncPlayValue, val++);
        if (IS_ARM(board)) {
          addConversion(FuncReserve, val++);
-          addConversion(FuncReserve, val++);
+          if (IS_TARANIS(board))
+            addConversion(FuncPlayScript, val++);
+          else
+            addConversion(FuncReserve, val++);
          addConversion(FuncReserve, val++);
          addConversion(FuncBackgroundMusic, val++);
          addConversion(FuncBackgroundMusicPause, val++);
@@ -1799,10 +1892,10 @@ class ArmCustomFunctionField: public TransformedField {
      else
        _active = (fn.enabled ? 1 : 0);

-      if (fn.func >= FuncSafetyCh1 && fn.func <= FuncSafetyCh32) {
+      if (fn.func >= FuncOverrideCH1 && fn.func <= FuncOverrideCH32) {
        if (version >= 216) {
          *((uint16_t *)_param) = fn.param;
-          *((uint8_t *)(_param+3)) = fn.func - FuncSafetyCh1;
+          *((uint8_t *)(_param+3)) = fn.func - FuncOverrideCH1;
        }
        else {
          *((uint32_t *)_param) = fn.param;
@@ -1818,7 +1911,7 @@ class ArmCustomFunctionField: public TransformedField {
          *((uint8_t *)(_param+3)) = fn.func - FuncSetTimer1;
        }
      }
-      else if (fn.func == FuncPlayPrompt || fn.func == FuncBackgroundMusic) {
+      else if (fn.func == FuncPlayPrompt || fn.func == FuncBackgroundMusic || fn.func == FuncPlayScript) {
        memcpy(_param, fn.paramarm, sizeof(_param));
      }
      else if (fn.func >= FuncAdjustGV1 && fn.func <= FuncAdjustGVLast) {
@@ -1881,7 +1974,7 @@ class ArmCustomFunctionField: public TransformedField {
        value = *((uint32_t *)_param);
      }

-      if (fn.func >= FuncSafetyCh1 && fn.func <= FuncSafetyCh32) {
+      if (fn.func >= FuncOverrideCH1 && fn.func <= FuncOverrideCH32) {
        fn.func = AssignFunc(fn.func + index);
        fn.param = (int8_t)value;
      }
@@ -1893,7 +1986,7 @@ class ArmCustomFunctionField: public TransformedField {
        fn.func = AssignFunc(fn.func + index);
        fn.param = value;
      }
-      else if (fn.func == FuncPlayPrompt || fn.func == FuncBackgroundMusic) {
+      else if (fn.func == FuncPlayPrompt || fn.func == FuncBackgroundMusic || fn.func == FuncPlayScript) {
        memcpy(fn.paramarm, _param, sizeof(fn.paramarm));
      }
      else if (fn.func == FuncVolume) {
@@ -1908,7 +2001,7 @@ class ArmCustomFunctionField: public TransformedField {
          else if (fn.adjustMode == 2)
            fn.param = RawSource(SOURCE_TYPE_GVAR, value).toValue();
          else
-            fn.param = value;
+            fn.param = (int16_t)value;
        }
        else if (version >= 214) {
          fn.adjustMode = _mode;
@@ -1917,7 +2010,7 @@ class ArmCustomFunctionField: public TransformedField {
          else if (fn.adjustMode == 2)
            fn.param = RawSource(SOURCE_TYPE_GVAR, value).toValue();
          else
-            fn.param = value;
+            fn.param = (int8_t)value;
        }
        else {
          sourcesConversionTable->importValue(value, (int &)fn.param);
@@ -1986,9 +2079,9 @@ class AvrCustomFunctionField: public TransformedField {
      _param = fn.param;
      _active = (fn.enabled ? 1 : 0);

-      if (fn.func >= FuncSafetyCh1 && fn.func <= FuncSafetyCh32) {
+      if (fn.func >= FuncOverrideCH1 && fn.func <= FuncOverrideCH32) {
        if (version >= 216)
-          _union_param = fn.func - FuncSafetyCh1;
+          _union_param = fn.func - FuncOverrideCH1;
        else if (version >= 213)
          _active += ((fn.func % 4) << 1);
      }
@@ -2046,7 +2139,7 @@ class AvrCustomFunctionField: public TransformedField {
        fn.enabled = (_active & 0x01);
      }

-      if (fn.func >= FuncSafetyCh1 && fn.func <= FuncSafetyCh32) {
+      if (fn.func >= FuncOverrideCH1 && fn.func <= FuncOverrideCH32) {
        if (version >= 216)
          fn.func = AssignFunc(fn.func + _union_param);
        else if (version >= 213)
@@ -2061,6 +2154,10 @@ class AvrCustomFunctionField: public TransformedField {
        if (version >= 216) {
          fn.func = AssignFunc(fn.func + (_union_param >> 2));
          fn.adjustMode = (_union_param & 0x03);
+          if (fn.adjustMode == 1)
+            sourcesConversionTable->importValue(_param, (int &)fn.param);
+          else if (fn.adjustMode == 2)
+            fn.param = RawSource(SOURCE_TYPE_GVAR, _param).toValue();
        }
        else if (version >= 213) {
          fn.adjustMode = ((_active >> 1) & 0x03);
@@ -2331,10 +2428,9 @@ class FrskyField: public StructField {
        Append(new UnsignedField<3>(frsky.varioSource));
        Append(new SignedField<5>(frsky.varioCenterMin));
        Append(new ConversionField< UnsignedField<3> >(frsky.currentSource, &telemetryCurrentSourceConversionTable, "Current Source"));
-        Append(new SignedField<8>(frsky.varioCenterMax));
+        Append(new SignedField<5>(frsky.varioCenterMax));
        if (version >= 216) {
-          // TODO int8_t   fasOffset;
-          Append(new SpareBitsField<8>());
+          Append(new SignedField<8>(frsky.fasOffset));
        }
      }
    }
@@ -2390,13 +2486,13 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  }

  for (int i=0; i<O9X_MAX_TIMERS; i++) {
-    internalField.Append(new SwitchField<8>(modelData.timers[i].mode, board, version, POPULATE_TIMER_MODES));
+    internalField.Append(new SwitchField<8>(modelData.timers[i].mode, board, version, true));
    if ((IS_ARM(board) || IS_2560(board)) && version >= 216) {
      internalField.Append(new UnsignedField<16>(modelData.timers[i].val));
      internalField.Append(new UnsignedField<2>(modelData.timers[i].countdownBeep));
      internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep));
-      internalField.Append(new BoolField<1>(modelData.timers[i].persistent));
-      internalField.Append(new SpareBitsField<4>());
+      internalField.Append(new UnsignedField<2>(modelData.timers[i].persistent));
+      internalField.Append(new SpareBitsField<3>());
      internalField.Append(new SignedField<16>(modelData.timers[i].pvalue));
    }
    else if (afterrelease21March2013) {
@@ -2404,7 +2500,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
      internalField.Append(new BoolField<1>((bool &)modelData.timers[i].countdownBeep));
      internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep));
      if (HAS_PERSISTENT_TIMERS(board)) {
-        internalField.Append(new BoolField<1>(modelData.timers[i].persistent));
+        internalField.Append(new UnsignedField<1>(modelData.timers[i].persistent));
        internalField.Append(new SpareBitsField<1>());
        internalField.Append(new SignedField<16>(modelData.timers[i].pvalue));
      }
@@ -2415,7 +2511,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
    else {
      internalField.Append(new UnsignedField<16>(modelData.timers[i].val));
      if (HAS_PERSISTENT_TIMERS(board)) {
-        internalField.Append(new BoolField<1>(modelData.timers[i].persistent));
+        internalField.Append(new UnsignedField<1>(modelData.timers[i].persistent));
        internalField.Append(new SpareBitsField<15>());
      }
    }
@@ -2424,7 +2520,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  if (IS_ARM(board))
    internalField.Append(new UnsignedField<3>(modelData.telemetryProtocol));
  else
-    internalField.Append(new ConversionField< SignedField<3> >(modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this protocol")));
+    internalField.Append(new ConversionField< UnsignedField<3> >((unsigned int &)modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this telemetry protocol")));

  internalField.Append(new BoolField<1>(modelData.thrTrim));

@@ -2475,7 +2571,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  }
  internalField.Append(new HeliField(modelData.swashRingData, board, version, variant));
  for (int i=0; i<MAX_FLIGHT_MODES(board, version); i++)
-    internalField.Append(new FlightModeField(modelData.phaseData[i], i, board, version));
+    internalField.Append(new FlightModeField(modelData.flightModeData[i], i, board, version));

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

@@ -2528,12 +2624,12 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne

  if (IS_TARANIS(board)) {
    modulesCount = 3;
-    internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[1].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this protocol")));
+    internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[1].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this radio protocol")));
    internalField.Append(new UnsignedField<8>(modelData.trainerMode));
  }
  else if (IS_ARM(board) && version >= 216) {
    modulesCount = 3;
-    internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this protocol")));
+    internalField.Append(new ConversionField< SignedField<8> >(modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this radio protocol")));
  }

  if (IS_ARM(board) && version >= 215) {
@@ -2559,7 +2655,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  if (IS_TARANIS(board) && version >= 216) {
    for (int i=0; i<7; i++) {
      ScriptData & script = modelData.scriptData[i];
-      internalField.Append(new ZCharField<10>(script.filename));
+      internalField.Append(new CharField<10>(script.filename));
      internalField.Append(new ZCharField<10>(script.name));
      for (int j=0; j<10; j++) {
        internalField.Append(new SignedField<8>(script.inputs[j]));
@@ -2753,8 +2849,8 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, BoardEnum bo
    if (version >= 213) {
      internalField.Append(new SignedField<8>(generalData.temperatureWarn)); // TODO
      internalField.Append(new UnsignedField<8>(generalData.mAhWarn));
-      internalField.Append(new SpareBitsField<16>()); // mAhUsed
-      internalField.Append(new SpareBitsField<32>()); // globalTimer
+      internalField.Append(new UnsignedField<16>(generalData.mAhUsed));
+      internalField.Append(new UnsignedField<32>(generalData.globalTimer));
      internalField.Append(new SignedField<8>(generalData.temperatureCalib)); // TODO
      internalField.Append(new UnsignedField<8>(generalData.btBaudrate)); // TODO
      internalField.Append(new BoolField<8>(generalData.optrexDisplay)); //TODO
@@ -2800,10 +2896,12 @@ void OpenTxGeneralData::beforeExport()
      sum += generalData.calibSpanPos[i];
      if (++count == 12) break;
    }
-    for (int i=0; i<4; i++) {
-      potsType[i] = generalData.potsType[i];
-      if (i<2 && potsType[i] == 1)
-        potsType[i] = 0;
+    if (IS_TARANIS(board)) {
+      for (int i=0; i<4; i++) {
+        potsType[i] = generalData.potsType[i];
+        if (i<2 && potsType[i] == 1)
+          potsType[i] = 0;
+      }
    }
  }
  else {
@@ -2817,9 +2915,11 @@ void OpenTxGeneralData::beforeExport()

 void OpenTxGeneralData::afterImport()
 {
-  for (int i=0; i<4; i++) {
-    generalData.potsType[i] = potsType[i];
-    if (i<2 && potsType[i] == 0)
-      generalData.potsType[i] = 1;
+  if (IS_TARANIS(board)) {
+    for (int i=0; i<4; i++) {
+      generalData.potsType[i] = potsType[i];
+      if (i<2 && potsType[i] == 0)
+        generalData.potsType[i] = 1;
+    }
  }
 }
@@ -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
@@ -113,7 +113,7 @@ template <class T>
 bool OpenTxEepromInterface::loadModel(ModelData &model, uint8_t *data, int index, unsigned int stickMode)
 {
  T _model;
-  
+
  if (!data) {
    // load from EEPROM
    efile->openRd(FILE_MODEL(index));
@@ -163,8 +163,20 @@ bool OpenTxEepromInterface::loadModelVariant(unsigned int index, ModelData &mode
  }
  else {
    // load from SD Backup, size is stored in index
-    QByteArray eepromData((char *)data, index);
-    open9xModel.Import(eepromData);
+    QByteArray backupData((char *)data, index);
+    QByteArray modelData;
+    if (IS_SKY9X(board))
+      modelData = backupData;
+    else
+      importRlc(modelData, backupData);
+    if (modelData.size()) {
+      open9xModel.Import(modelData);
+      // open9xModel.Dump();
+      model.used = true;
+    }
+    else {
+      model.clear();
+    }
  }

  return true;
@@ -297,7 +309,7 @@ bool OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, in
 {
  std::cout << "trying " << getName() << " import...";

-  if (size != getEEpromSize()) {    
+  if (size != getEEpromSize()) {
    if (size==4096) {
      int notnull=false;
      for (int i=2048; i<4096; i++) {
@@ -325,7 +337,7 @@ bool OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, in
  }

  efile->openRd(FILE_GENERAL);
-  
+
  uint8_t version;
  if (efile->readRlc2(&version, 1) != 1) {
    std::cout << " no\n";
@@ -343,7 +355,7 @@ bool OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, in
    std::cout << " ko\n";
    return false;
  }
-  
+
  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)) {
@@ -369,10 +381,10 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t
        break;
      case BOARD_GRUVIN9X:
      case BOARD_MEGA2560:
-        version = 216;
+        version = 217;
        break;
      case BOARD_M128:
-        version = 216;
+        version = 217;
        break;
      case BOARD_STOCK:
        version = 216;
@@ -387,7 +399,7 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t
  if (board == BOARD_M128) {
    variant |= M128_VARIANT;
  }
-  
+
  int result = saveGeneral<OpenTxGeneralData>(radioData.generalSettings, board, version, variant);
  if (!result) {
    return 0;
@@ -402,10 +414,21 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t
    }
  }

-  if (!EEPROMWarnings.isEmpty())
+  if (!EEPROMWarnings.empty()) {
+    QString msg;
+    int noErrorsToDisplay = std::min((int)EEPROMWarnings.size(),10);
+    for (int n = 0; n < noErrorsToDisplay; n++) {
+      msg += "-" + EEPROMWarnings.front() + "\n";
+      EEPROMWarnings.pop_front();
+    }
+    if (!EEPROMWarnings.empty()) {
+      msg = QObject::tr("(displaying only first 10 warnings)") + "\n" + msg;
+    }
+    EEPROMWarnings.clear();
    QMessageBox::warning(NULL,
        QObject::tr("Warning"),
-        QObject::tr("EEPROM saved with these warnings:") + "\n- " + EEPROMWarnings.remove(EEPROMWarnings.length()-1, 1).replace("\n", "\n- "));
+        QObject::tr("EEPROM saved with these warnings:") + "\n" + msg);
+  }

  return size;
 }
@@ -422,7 +445,7 @@ int OpenTxEepromInterface::getSize(ModelData &model)
  uint8_t tmp[EESIZE_RLC_MAX];
  efile->EeFsCreate(tmp, EESIZE_RLC_MAX, board);

-  OpenTxModelData open9xModel(model, board, 255, GetCurrentFirmwareVariant());
+  OpenTxModelData open9xModel(model, board, 255, GetCurrentFirmware()->getVariantNumber());

  QByteArray eeprom;
  open9xModel.Export(eeprom);
@@ -441,7 +464,7 @@ int OpenTxEepromInterface::getSize(GeneralSettings &settings)
  uint8_t tmp[EESIZE_RLC_MAX];
  efile->EeFsCreate(tmp, EESIZE_RLC_MAX, board);

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

  QByteArray eeprom;
@@ -453,9 +476,26 @@ int OpenTxEepromInterface::getSize(GeneralSettings &settings)
  return efile->size(0);
 }

+FirmwareInterface * OpenTxFirmware::getFirmwareVariant(const QString & id)
+{
+  if (id.contains(getId()+"-") || (!id.contains("-") && id.contains(getId()))) {
+    FirmwareInterface * result = new OpenTxFirmware(id, this);
+    // TODO result.variant = firmware->getVariant(id);
+    return result;
+  }
+  else {
+    return NULL;
+  }
+}
+
 int OpenTxFirmware::getCapability(const Capability capability)
 {
  switch (capability) {
+    case Imperial:
+      if (IS_ARM(board))
+        return 0;
+      else
+        return id.contains("imperial") ? 1 : 0;
    case ModelImage:
      if (IS_TARANIS(board))
        return 1;
@@ -491,12 +531,22 @@ int OpenTxFirmware::getCapability(const Capability capability)
        return 5;
    case FlightModesHaveFades:
      return 1;
+    case Heli:
+      if (IS_TARANIS(board))
+        return id.contains("noheli") ? 0 : 1;
+      else
+        return id.contains("heli") ? 1 : 0;
    case Gvars:
-      return IS_ARM(board) ? 9 : 5;
+      if (IS_TARANIS(board))
+        return id.contains("nogvars") ? 0 : 9;
+      else if (id.contains("gvars"))
+        return IS_ARM(board) ? 9 : 5;
+      else
+        return 0;
    case FlightModesName:
      return (IS_TARANIS(board) ? 10 : 6);
    case GvarsName:
-      return 6;
+      return (IS_9X(board) ? 0 : 6);
    case HasChNames:
      return (IS_TARANIS(board) ? 1 : 0);
    case GvarsInCS:
@@ -529,11 +579,11 @@ int OpenTxFirmware::getCapability(const Capability capability)
        return 24;
      else
        return 16;
+    case SafetyChannelCustomFunction:
+      return id.contains("nooverridech") ? 0 : 1;
    case LogicalSwitches:
      if (IS_ARM(board))
        return 32;
-      else if (board==BOARD_GRUVIN9X||board==BOARD_M128)
-        return 15;
      else
        return 12;
    case CustomAndSwitches:
@@ -563,7 +613,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
    case SoundPitch:
      return 1;
    case Haptic:
-      return 1;
+      return (board == BOARD_GRUVIN9X || IS_SKY9X(board) || board == BOARD_TARANIS_PLUS || id.contains("haptic"));
    case ModelTrainerEnable:
      if (IS_ARM(board))
        return 1;
@@ -594,7 +644,10 @@ int OpenTxFirmware::getCapability(const Capability capability)
    case HasCvNames:
      return (IS_TARANIS(board) ? 1 : 0);
    case Telemetry:
-      return TM_HASTELEMETRY|TM_HASOFFSET|TM_HASWSHH;
+      if (board == BOARD_GRUVIN9X || IS_ARM(board) || id.contains("frsky") || id.contains("telemetrez"))
+        return TM_HASTELEMETRY|TM_HASOFFSET|TM_HASWSHH;
+      else
+        return 0;
    case TelemetryBars:
      return 1;
    case TelemetryCustomScreens:
@@ -610,7 +663,9 @@ int OpenTxFirmware::getCapability(const Capability capability)
    case TelemetryMaxMultiplier:
      return (IS_ARM(board) ? 32 : 8);
    case PPMCenter:
-      return 1;
+      return (IS_TARANIS(board) || id.contains("ppmca")) ? 1 : 0;
+    case PPMUnitMicroseconds:
+      return id.contains("ppmus") ? 1 : 0;
    case SYMLimits:
      return 1;
    case OptrexDisplay:
@@ -619,11 +674,6 @@ int OpenTxFirmware::getCapability(const Capability capability)
      return 1;
    case HasVarioSink:
      return ((board == BOARD_GRUVIN9X || IS_ARM(board)) ? true : false);
-    case HasVariants:
-      if (IS_TARANIS(board))
-        return 0;
-      else
-        return 1;
    case HasFailsafe:
      return (IS_ARM(board) ? 32 : 0);
    case NumModules:
@@ -656,7 +706,12 @@ int OpenTxFirmware::getCapability(const Capability capability)
      return IS_TARANIS(board) ? 32 : 0;
    case TrainerInputs:
      return IS_ARM(board) ? 16 : 8;
-    case LuaInputs:
+    case LuaScripts:
+      return IS_TARANIS(board) ? 7 : 0;
+    case LuaInputsPerScript:
+      return IS_TARANIS(board) ? 10 : 0;
+    case LuaOutputsPerScript:
+      return IS_TARANIS(board) ? 6 : 0;
    case LimitsPer1000:
    case EnhancedCurves:
      return IS_TARANIS(board);
@@ -675,11 +730,31 @@ int OpenTxFirmware::getCapability(const Capability capability)
        return SIMU_M128_VARIANTS;
      else
        return 0;
+    case MavlinkTelemetry:
+      return id.contains("mavlink") ? 1 : 0;
+    case HasInputDiff:
+    case HasMixerExpo:
+      return (IS_TARANIS(board) ? true : false);
+    case MixersMonitor:
+      return id.contains("mixersmon") ? 1 : 0;
+    case HasBatMeterRange:
+      return (IS_TARANIS(board) ? true : false);
    default:
      return 0;
  }
 }

+bool OpenTxFirmware::isTelemetrySourceAvailable(int source)
+{
+  if (IS_TARANIS(board) && (source == TELEMETRY_SOURCE_RSSI_TX))
+    return false;
+
+  if (source == TELEMETRY_SOURCE_DTE)
+    return false;
+
+  return true;
+}
+
 int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
 {
  if (IS_TARANIS(board)) {
@@ -749,7 +824,7 @@ int OpenTxEepromInterface::isAvailable(Protocol proto, int port)
        break;
      default:
        return 0;
-    }   
+    }
  }
  else {
    switch (proto) {
@@ -831,6 +906,9 @@ bool OpenTxEepromInterface::checkVersion(unsigned int version)
    case 216:
      // A lot of things (first github release)
      break;
+    case 217:
+      // 3 logical switches removed on M128 / gruvin9x boards
+      break;
    default:
      return false;
  }
@@ -864,11 +942,32 @@ bool OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, in
 {
  std::cout << "trying " << getName() << " backup import...";

-  if (esize < 8 || memcmp(eeprom, "o9x", 3) != 0 || eeprom[3] != 0x30+board) {
+  if (esize < 8 || memcmp(eeprom, "o9x", 3) != 0) {
    std::cout << " no\n";
    return false;
  }

+  BoardEnum backupBoard = (BoardEnum)-1;
+  switch (eeprom[3]) {
+    case 0x33:
+      backupBoard = BOARD_TARANIS;
+      break;
+    case 0x32:
+      backupBoard = BOARD_SKY9X;
+      break;
+    case 0x31:
+      backupBoard = BOARD_GRUVIN9X;
+      break;
+    default:
+      std::cout << " unknown board\n";
+      return false;
+  }
+
+  if (backupBoard != board) {
+    std::cout << " not right board\n";
+    return false;
+  }
+
  uint8_t version = eeprom[4];
  uint8_t bcktype = eeprom[5];
  uint16_t size = ((uint16_t)eeprom[7] << 8) + eeprom[6];
@@ -901,7 +1000,7 @@ bool OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, in
  return true;
 }

-QString OpenTxFirmware::getFirmwareUrl(QString & id)
+QString OpenTxFirmware::getFirmwareUrl()
 {
  QString url = OPENTX_FIRMWARE_DOWNLOADS;
  switch (board) {
@@ -957,6 +1056,15 @@ SimulatorInterface * OpenTxFirmware::getSimulator()
  }
 }

+void addOpenTxCommonOptions(OpenTxFirmware * firmware)
+{
+  firmware->addOption("ppmus", QObject::tr("Channel values displayed in us"));
+  firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  firmware->addOption("nooverridech", QObject::tr("No OverrideCH functions available"));
+  Option fai_options[] = { { "faichoice", QObject::tr("Possibility to enable FAI MODE (no telemetry) at field") }, { "faimode", QObject::tr("FAI MODE (no telemetry) always enabled") }, { NULL } };
+  firmware->addOptions(fai_options);
+}
+
 void registerOpenTxFirmwares()
 {
  OpenTxFirmware * openTx;
@@ -964,10 +1072,9 @@ void registerOpenTxFirmwares()
  Option ext_options[] = { { "frsky", QObject::tr("Support for frsky telemetry mod"), FRSKY_VARIANT }, { "telemetrez", QObject::tr("Support for telemetry easy board"), FRSKY_VARIANT }, { "jeti", QObject::tr("Support for jeti telemetry mod"), 0 }, { "ardupilot", QObject::tr("Support for receiving ardupilot data"), 0 }, { "nmea", QObject::tr("Support for receiving NMEA data"), 0 }, { "mavlink", QObject::tr("Support for MAVLINK devices"), MAVLINK_VARIANT }, { NULL } };
  Option nav_options[] = { { "rotenc", QObject::tr("Rotary Encoder use in menus navigation") }, { "potscroll", QObject::tr("Pots use in menus navigation") }, { NULL } };
  Option extr_options[] = { { "frsky", QObject::tr("Support for frsky telemetry mod"), FRSKY_VARIANT }, { "jeti", QObject::tr("Support for jeti telemetry mod"), 0 }, { "ardupilot", QObject::tr("Support for receiving ardupilot data"), 0 }, { "nmea", QObject::tr("Support for receiving NMEA data"), 0 }, { "mavlink", QObject::tr("Support for MAVLINK devices"), MAVLINK_VARIANT }, { NULL } };
-  Option fai_options[] = { { "faichoice", QObject::tr("Possibility to enable FAI MODE at field") }, { "faimode", QObject::tr("FAI MODE always enabled") }, { NULL } };

  /* 9x board */
-  openTx = new OpenTxFirmware("opentx-9x", QObject::tr("OpenTX for 9X board"), BOARD_STOCK, false);
+  openTx = new OpenTxFirmware("opentx-9x", QObject::tr("OpenTX for 9X board"), BOARD_STOCK);
  openTx->addOptions(ext_options);
  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
@@ -980,7 +1087,6 @@ void registerOpenTxFirmwares()
  // NOT TESTED openTx->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
  openTx->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
  openTx->addOptions(nav_options);
@@ -991,7 +1097,6 @@ void registerOpenTxFirmwares()
  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
  openTx->addOption("battgraph", QObject::tr("Battery graph"));
  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
  openTx->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
  openTx->addOption("pgbar", QObject::tr("EEprom write progress bar"));
  openTx->addOption("imperial", QObject::tr("Imperial units"));
@@ -1001,11 +1106,11 @@ void registerOpenTxFirmwares()
  openTx->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
  openTx->addOption("fasoffset", QObject::tr("Allow compensating for offset errors in FrSky FAS current sensors"));
  openTx->addOption("stickrev", QObject::tr("Add support for reversing stick inputs (e.g. needed for FrSky gimbals)"));
-  openTx->addOptions(fai_options);
+  addOpenTxCommonOptions(openTx);
  firmwares.push_back(openTx);

  /* 9x board with M128 chip */
-  openTx = new OpenTxFirmware("opentx-9x128", QObject::tr("OpenTX for M128 / 9X board"), BOARD_M128, false);
+  openTx = new OpenTxFirmware("opentx-9x128", QObject::tr("OpenTX for M128 / 9X board"), BOARD_M128);
  openTx->addOptions(ext_options);
  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
@@ -1018,7 +1123,6 @@ void registerOpenTxFirmwares()
  // NOT TESTED openTx->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
  openTx->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
  openTx->addOptions(nav_options);
@@ -1029,15 +1133,14 @@ void registerOpenTxFirmwares()
  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
  openTx->addOption("battgraph", QObject::tr("Battery graph"));
  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
  openTx->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
  openTx->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
  openTx->addOption("imperial", QObject::tr("Imperial units"));
-  openTx->addOptions(fai_options);
+  addOpenTxCommonOptions(openTx);
  firmwares.push_back(openTx);

  /* 9XR board */
-  openTx = new OpenTxFirmware("opentx-9xr", QObject::tr("OpenTX for 9XR"), BOARD_STOCK, false);
+  openTx = new OpenTxFirmware("opentx-9xr", QObject::tr("OpenTX for 9XR"), BOARD_STOCK);
  openTx->addOptions(extr_options);
  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
@@ -1050,7 +1153,6 @@ void registerOpenTxFirmwares()
  // NOT TESTED openTx->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
  openTx->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
  openTx->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
@@ -1059,7 +1161,6 @@ void registerOpenTxFirmwares()
  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
  openTx->addOption("battgraph", QObject::tr("Battery graph"));
  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
  openTx->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
  openTx->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
  openTx->addOption("imperial", QObject::tr("Imperial units"));
@@ -1068,11 +1169,11 @@ void registerOpenTxFirmwares()
  openTx->addOption("nogps", QObject::tr("No GPS support"));
  openTx->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
  openTx->addOption("stickrev", QObject::tr("Add support for reversing stick inputs (e.g. needed for FrSky gimbals)"));
-  openTx->addOptions(fai_options);
+  addOpenTxCommonOptions(openTx);
  firmwares.push_back(openTx);

  /* 9XR board with M128 chip */
-  openTx = new OpenTxFirmware("opentx-9xr128", QObject::tr("OpenTX for 9XR with M128 chip"), BOARD_M128, false);
+  openTx = new OpenTxFirmware("opentx-9xr128", QObject::tr("OpenTX for 9XR with M128 chip"), BOARD_M128);
  openTx->addOptions(extr_options);
  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
@@ -1085,7 +1186,6 @@ void registerOpenTxFirmwares()
  // NOT TESTED openTx->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
  openTx->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
  openTx->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
@@ -1094,16 +1194,14 @@ void registerOpenTxFirmwares()
  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
  openTx->addOption("battgraph", QObject::tr("Battery graph"));
  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
  openTx->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
  openTx->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
  openTx->addOption("imperial", QObject::tr("Imperial units"));
-  openTx->addOptions(fai_options);
+  addOpenTxCommonOptions(openTx);
  firmwares.push_back(openTx);

  /* Gruvin9x board */
-  openTx = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("OpenTX for Gruvin9x board / 9X"), BOARD_GRUVIN9X, false);
-  openTx->setVariantBase(FRSKY_VARIANT);
+  openTx = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("OpenTX for Gruvin9x board / 9X"), BOARD_GRUVIN9X);
  openTx->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
  openTx->addOption("nofp", QObject::tr("No flight modes"));
@@ -1114,7 +1212,6 @@ void registerOpenTxFirmwares()
  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 } };
  openTx->addOptions(dsm2_options);
  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
  openTx->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
@@ -1124,22 +1221,18 @@ void registerOpenTxFirmwares()
  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
  openTx->addOption("battgraph", QObject::tr("Battery graph"));
  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
  openTx->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
  openTx->addOption("imperial", QObject::tr("Imperial units"));
-  openTx->addOptions(fai_options);
+  addOpenTxCommonOptions(openTx);
  firmwares.push_back(openTx);

-#ifndef __APPLE__
-  /* SKY9X board */
-  openTx = new OpenTxFirmware("opentx-sky9x", QObject::tr("OpenTX for Sky9x board / 9X"), BOARD_SKY9X, true);
-  openTx->setVariantBase(FRSKY_VARIANT);
+  /* Sky9x board */
+  openTx = new OpenTxFirmware("opentx-sky9x", QObject::tr("OpenTX for Sky9x board / 9X"), BOARD_SKY9X);
  openTx->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
  openTx->addOption("nofp", QObject::tr("No flight modes"));
  openTx->addOption("nocurves", QObject::tr("Disable curves menus"));
  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
  openTx->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
@@ -1149,59 +1242,51 @@ void registerOpenTxFirmwares()
  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
  openTx->addOption("battgraph", QObject::tr("Battery graph"));
  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  openTx->addOption("tsticks", QObject::tr("Use FrSky Taranis sticks in a 9X/9XR"));
  openTx->addOption("bluetooth", QObject::tr("Bluetooth interface"));
-  openTx->addOptions(fai_options);
+  addOpenTxCommonOptions(openTx);
  firmwares.push_back(openTx);
-  
+
  /* 9XR-Pro */
-  openTx = new OpenTxFirmware("opentx-9xrpro", QObject::tr("OpenTX for 9XR-PRO"), BOARD_9XRPRO, true);
-  openTx->setVariantBase(FRSKY_VARIANT);
+  openTx = new OpenTxFirmware("opentx-9xrpro", QObject::tr("OpenTX for 9XR-PRO"), BOARD_9XRPRO);
  openTx->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
  openTx->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
  openTx->addOption("nofp", QObject::tr("No flight modes"));
  openTx->addOption("nocurves", QObject::tr("Disable curves menus"));
  openTx->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
  openTx->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
  openTx->addOption("symlimits", QObject::tr("Symetrical Limits"));
  openTx->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
  openTx->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
  openTx->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  openTx->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
  openTx->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
  openTx->addOption("battgraph", QObject::tr("Battery graph"));
  openTx->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  openTx->addOption("tsticks", QObject::tr("Use FrSky Taranis sticks in a 9X/9XR"));
  openTx->addOption("bluetooth", QObject::tr("Bluetooth interface"));
-  openTx->addOptions(fai_options);
+  addOpenTxCommonOptions(openTx);
  firmwares.push_back(openTx);
-#endif
-  
+
  /* Taranis board */
-  openTx = new OpenTxFirmware("opentx-taranis", QObject::tr("OpenTX for FrSky Taranis"), BOARD_TARANIS, true);
+  openTx = new OpenTxFirmware("opentx-taranis", QObject::tr("OpenTX for FrSky Taranis"), BOARD_TARANIS);
  openTx->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
  openTx->addOption("nogvars", QObject::tr("Disable Global variables"));
  openTx->addOption("haptic", QObject::tr("Haptic module installed"));
  openTx->addOption("lua", QObject::tr("Support for Lua model scripts"));
-  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
-  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  openTx->addOptions(fai_options);
+  openTx->addOption("nojoystick", QObject::tr("No Joystick emulation inside the FW (only Mass Storage as in the Bootloader)"));
+  openTx->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
+  addOpenTxCommonOptions(openTx);
  firmwares.push_back(openTx);
-  
+
  /* Taranis Plus board */
-  openTx = new OpenTxFirmware("opentx-taranisplus", QObject::tr("OpenTX for FrSky Taranis Plus"), BOARD_TARANIS_PLUS, true);
+  openTx = new OpenTxFirmware("opentx-taranisplus", QObject::tr("OpenTX for FrSky Taranis Plus"), BOARD_TARANIS_PLUS);
  openTx->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
  openTx->addOption("nogvars", QObject::tr("Disable Global variables"));
  openTx->addOption("lua", QObject::tr("Support for Lua model scripts"));
-  openTx->addOption("ppmus", QObject::tr("Channel values displayed in us"));
-  openTx->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
-  openTx->addOptions(fai_options);
+  openTx->addOption("nojoystick", QObject::tr("No Joystick emulation inside the FW (only Mass Storage as in the Bootloader)"));
+  openTx->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
+  addOpenTxCommonOptions(openTx);
  firmwares.push_back(openTx);

-  default_firmware_variant = GetFirmwareVariant("opentx-9x-heli-templates-en");
+  default_firmware_variant = GetFirmware("opentx-taranis-en");
  current_firmware_variant = default_firmware_variant;
 }

@@ -18,7 +18,6 @@

 #include "eeprominterface.h"

-#define OPENTX_COMPANION_DOWNLOADS   "http://downloads-20.open-tx.org/companion"
 #define OPENTX_FIRMWARE_DOWNLOADS    "http://downloads-20.open-tx.org/firmware"

 class RleFile;
@@ -80,8 +79,13 @@ class OpenTxEepromInterface : public EEPROMInterface

 class OpenTxFirmware: public FirmwareInterface {
  public:
-    OpenTxFirmware(const QString & id, const QString & name, const BoardEnum board, bool voice = false):
-      FirmwareInterface(id, name, board, new OpenTxEepromInterface(board), voice)
+    OpenTxFirmware(const QString & id, OpenTxFirmware * parent):
+      FirmwareInterface(parent, id, parent->getName(), parent->getBoard(), parent->eepromInterface)
+    {
+    }
+
+    OpenTxFirmware(const QString & id, const QString & name, const BoardEnum board):
+      FirmwareInterface(id, name, board, new OpenTxEepromInterface(board))
    {
      addLanguage("en");
      addLanguage("fr");
@@ -103,19 +107,23 @@ class OpenTxFirmware: public FirmwareInterface {
      addTTSLanguage("pl");
      addTTSLanguage("pt");
      addTTSLanguage("es");
+      addTTSLanguage("hu");
    }
+
+    virtual FirmwareInterface * getFirmwareVariant(const QString & id);
    
    virtual QString getStampUrl();

    virtual QString getReleaseNotesUrl();

-    virtual QString getFirmwareUrl(QString & id);
+    virtual QString getFirmwareUrl();

    virtual int getCapability(const Capability);

+    virtual bool isTelemetrySourceAvailable(int source);
+
    virtual SimulatorInterface * getSimulator();
    
-    
 };

 void registerOpenTxFirmwares();
@@ -2,4 +2,3 @@
 #define DATE_STR  "@DATE@"
 #define TIME_STR  "@TIME@"
 #define VERS_STR  "@C9X_VERSION@"
-#define MOD_STR   "FH"
@@ -124,8 +124,8 @@ t_Th9xLimitData::t_Th9xLimitData()
 t_Th9xLimitData::operator LimitData ()
 {
  LimitData c9x;
-  c9x.min = min-100;
-  c9x.max = max+100;
+  c9x.min = 10*(min-100);
+  c9x.max = 10*(max+100);
  c9x.revert = revert;
  c9x.offset = offset;
  return c9x;
@@ -197,7 +197,7 @@ int8_t t_Th9xLogicalSwitchData::fromSource(RawSource source)
  if (source.type == SOURCE_TYPE_STICK)
    v1 = 1+source.index;
  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER) {
-    EEPROMWarnings += ::QObject::tr("th9x on this board doesn't have Rotary Encoders") + "\n";
+    EEPROMWarnings.push_back(::QObject::tr("th9x on this board doesn't have Rotary Encoders"));
    v1 = 5+source.index;
  }
  else if (source.type == SOURCE_TYPE_MAX)
@@ -272,7 +272,6 @@ t_Th9xModelData::operator ModelData ()
  /*c9x.protocol = (Protocol)protocol;
  c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
  c9x.thrTrim = thrTrim;
-  c9x.thrExpo = thrExpo;
  c9x.trimInc = trimInc;
  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
  c9x.funcSw[0].func = FuncTrims2Offsets;
@@ -295,7 +294,7 @@ t_Th9xModelData::operator ModelData ()
  for (int i=0; i<TH9X_MAX_MIXERS; i++)
    c9x.mixData[i] = mixData[i];
  for (int i=0; i<NUM_STICKS; i++)
-    c9x.phaseData[0].trim[i] = trimData[i].itrim;
+    c9x.flightModeData[0].trim[i] = trimData[i].itrim;
  for (int i=0; i<TH9X_MAX_CURVES3; i++) {
    c9x.curves[i].count = 3;
    for (int j=0; j<3; j++) {
@@ -67,6 +67,11 @@ FlashInterface::FlashInterface(QString fileName):

  if (flash_size > 0) {
    version = seekLabel(VERS_MARK);
+    if (version.startsWith("opentx-")) {
+      int index = version.lastIndexOf('-');
+      flavour = version.mid(0, index);
+      version = version.mid(index+1);
+    }
    date = seekLabel(DATE_MARK);
    time = seekLabel(TIME_MARK);
    eepromId = seekLabel(EEPR_MARK);
@@ -94,7 +99,7 @@ QString FlashInterface::seekString(const QString & string)
  if (start > 0) {
    start += string.length();
    int end = -1;
-    for (int i=start; i<start+20; i++) {
+    for (int i=start; i<start+50; i++) {
      char c = flash.at(i);
      if (c == '\0' || c == '\036') {
        end = i;
@@ -219,21 +224,13 @@ bool FlashInterface::setSplash(const QImage & newsplash)
  QColor color;
  QByteArray splash;
  if (splash_format == QImage::Format_Indexed8) {
-    unsigned int idx = 0;
-    for (unsigned int y=0; y<splash_height; y+=8) {
-      for (unsigned int x=0; x<splash_width; x++) {
-        unsigned int values[] = { 255, 255, 255, 255 };
-        for (unsigned int z=0; z<8; z++) {
-          if (y+z < splash_height) {
-            QRgb gray = qGray(newsplash.pixel(x, y+z));
-            for (unsigned int i=0; i<4; i++) {
-              if (gray & (1<<(4+i)))
-                values[i] -= 1 << z;
-            }
-          }
-        }
-        for (int i=0; i<4; i++)
-          b[idx++] = values[i];
+    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++) {
+        QRgb gray = qGray(newsplash.pixel(x, y));
+        uint8_t z = ((255-gray)*15)/255;
+        if (y & 1) z <<= 4;
+        b[idx] |= z;
      }
    }
  }
@@ -243,7 +240,7 @@ bool FlashInterface::setSplash(const QImage & newsplash)
    for (uint y=0; y<splash_height; y++) {
      for (uint x=0; x<splash_width; x++) {
        color = QColor(blackNwhite.pixel(x,y));
-        b[splash_width*(y/8) + x] |=((color==black ? 1: 0)<<(y % 8));
+        b[splash_width*(y/8) + x] |= ((color==black ? 1: 0)<<(y % 8));
      }
    }
  }
@@ -278,10 +275,10 @@ QImage FlashInterface::getSplash()
    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/8)*splash_width*4;
-        unsigned int mask = (1 << (y%8));
-        for (unsigned int x=0; x<splash_width; x++, idx+=4) {
-          unsigned int z = ((flash.at(splash_offset+idx) & mask) ? 0x1 : 0) + ((flash.at(splash_offset+idx+1) & mask) ? 0x2 : 0) + ((flash.at(splash_offset+idx+2) & mask) ? 0x4 : 0) + ((flash.at(splash_offset+idx+3) & mask) ? 0x8 : 0);
+        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);
+          unsigned int z = (y & 1) ? (byte >> 4) : (byte & 0x0F);
          z = 255-(z*255)/15;
          QRgb rgb = qRgb(z, z, z);
          image.setPixel(x, y, rgb);
@@ -293,9 +290,11 @@ QImage FlashInterface::getSplash()
  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++)
+      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);
+        }
+      }
    }
    return image;
  }
@@ -311,6 +310,29 @@ bool FlashInterface::isValid()
  return isValidFlag;
 }

+QString FlashInterface::getFlavour()
+{
+  if (flavour == "opentx-x9dp")
+    return "opentx-taranis-plus";
+  else if (flavour == "opentx-x9d")
+    return "opentx-taranis";
+  else
+    return flavour;
+}
+
+bool FlashInterface::isHardwareCompatible(FlashInterface &previousFirmware)
+{
+  QString newFlavour = getFlavour();
+  if (newFlavour.isEmpty())
+    return true;
+
+  QString previousFlavour = previousFirmware.getFlavour();
+  if (previousFlavour.isEmpty())
+    return true;
+
+  return (newFlavour == previousFlavour);
+}
+
 uint FlashInterface::saveFlash(QString fileName)
 {
  uint8_t binflash[MAX_FSIZE];
@@ -47,6 +47,7 @@ class FlashInterface
    inline QString getDate() { return date; }
    inline QString getTime() { return time; }
    int getSize() { return flash_size; }
+    QString getFlavour();
    inline QString getVersion() { return version; }
    unsigned int getVersionId() { return versionId; }
    inline int getEEpromVersion() { return eepromVersion; }
@@ -60,6 +61,7 @@ class FlashInterface
    QImage::Format getSplashFormat();
    uint saveFlash(QString fileName);
    bool isValid();
+    bool isHardwareCompatible(FlashInterface &previousFirmware);

  private:
    QByteArray flash;
@@ -72,6 +74,7 @@ class FlashInterface
    QString filename;
    QString date;
    QString time;
+    QString flavour;
    QString version;
    int versionId;
    QString eepromId;
@@ -14,6 +14,12 @@ FirmwarePreferencesDialog::FirmwarePreferencesDialog(QWidget *parent) :
  ui->setupUi(this);
  setWindowIcon(CompanionIcon("fwpreferences.png"));
  initSettings();
+
+  foreach(const char *lang, GetCurrentFirmware()->getFirmwareBase()->ttslanguages) {
+    ui->voiceCombo->addItem(lang);
+    if (current_firmware_variant->getId().contains(QString("-tts%1").arg(lang)))
+      ui->voiceCombo->setCurrentIndex(ui->voiceCombo->count() - 1);
+  }
 }

 FirmwarePreferencesDialog::~FirmwarePreferencesDialog()
@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>416</width>
-    <height>153</height>
+    <height>154</height>
   </rect>
  </property>
  <property name="sizePolicy">
@@ -81,56 +81,6 @@
      <string>Set voice language.
 May be different from firmware language</string>
     </property>
-     <item>
-      <property name="text">
-       <string>en</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>cz</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>de</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>es</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>fi</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>fr</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>it</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>pl</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>pt</string>
-      </property>
-     </item>
-     <item>
-      <property name="text">
-       <string>se</string>
-      </property>
-     </item>
    </widget>
   </item>
   <item row="7" column="5">
@@ -227,6 +177,10 @@ May be different from firmware language</string>
  </layout>
 </widget>
 <tabstops>
+  <tabstop>checkFWUpdates</tabstop>
+  <tabstop>fw_dnld</tabstop>
+  <tabstop>voiceCombo</tabstop>
+  <tabstop>voice_dnld</tabstop>
  <tabstop>buttonBox</tabstop>
 </tabstops>
 <resources>
@@ -32,7 +32,7 @@ class GeneralEdit : public QDialog

  protected:
    virtual bool eventFilter(QObject *obj, QEvent *event);
-    
+
  signals:
    void modelValuesChanged();

@@ -108,11 +108,11 @@ class GeneralEdit : public QDialog
    void on_bgVolume_SL_valueChanged();
    void on_varioVolume_SL_valueChanged();
    void on_wavVolume_SL_valueChanged();
-    
+
    void on_varioP0_SB_editingFinished();
    void on_varioPMax_SB_editingFinished();
    void on_varioR0_SB_editingFinished();
-    
+
    void on_pot1Type_currentIndexChanged(int index);
    void on_pot2Type_currentIndexChanged(int index);
    void on_pot3Type_currentIndexChanged(int index);
@@ -128,6 +128,8 @@ class GeneralEdit : public QDialog
    void on_mavbaud_CB_currentIndexChanged(int index);
    void on_voiceLang_CB_currentIndexChanged(int index);
    void on_battCalibDSB_editingFinished();
+    void on_vBatMinDSB_editingFinished();
+    void on_vBatMaxDSB_editingFinished();
    void on_battwarningDSB_editingFinished();
    void on_contrastSB_editingFinished();
    void on_calretrieve_PB_clicked();
@@ -137,6 +139,7 @@ class GeneralEdit : public QDialog
    void shrink();
    void stickReverseEdited();
    void on_switchesDelay_valueChanged();
+    void on_blAlarm_ChkB_stateChanged();
 };

 #endif // GENERALEDIT_H
@@ -1,73 +0,0 @@
-#include "googleanalytics.h"
-#include <QtGui>
-
-#define TRACKING_ID  "UA-40098569-1"
-
-GoogleAnalytics ga;
-
-GoogleAnalytics::GoogleAnalytics():
-  userId(qrand()),
-  networkManager(new QNetworkAccessManager(this))
-{
-}
-
-GoogleAnalytics::~GoogleAnalytics()
-{
-  delete networkManager;
-}
-
-void GoogleAnalytics::sendPageView(QString title)
-{
-  // create request and set URL of receiver
-  QNetworkRequest request;
-  QUrl host("http://www.google-analytics.com/collect");
-  request.setUrl(host);
-  request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-
-  // setup parameters of request
-  QString requestParams;
-  requestParams += "v=1"; // version of protocol
-  requestParams += "&t=pageview"; // type of request
-  requestParams += "&tid=" TRACKING_ID; // Google Analytics account
-  requestParams += "&cid=" + QString::number(userId); // unique user identifier
-  requestParams += "&dp=companion-" + title.toLower().replace(" ", "-"); // name of page
-  requestParams += "&dt=" + title; // title of page
-  requestParams += "&ul=" + QLocale::system().name(); // language
-
-  // send request via post method
-  networkManager->post(request, requestParams.toStdString().c_str());
-}
-
-void GoogleAnalytics::sendEvent(QString category, QString action, QString label)
-{
-  // create request and set URL of receiver
-  QNetworkRequest request;
-  QUrl host("http://www.google-analytics.com/collect");
-  request.setUrl(host);
-  request.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
-
-  // setup parameters of request
-  QString requestParams;
-  requestParams += "v=1"; // version of protocol
-  requestParams += "&t=event"; // type of request
-  requestParams += "&ec=" + category;
-  requestParams += "&ea=" + action;
-  requestParams += "&el=" + label;
-  requestParams += "&tid=" TRACKING_ID; // Google Analytics account
-  requestParams += "&cid=" + QString::number(userId); // unique user identifier
-  requestParams += "&dt=Companion"; // name of page (or app name)
-  requestParams += "&ul=" + QLocale::system().name(); // language
-
-  // send request via post method
-  networkManager->post(request, requestParams.toStdString().c_str());
-}
-
-void GoogleAnalytics::slot_receive(QNetworkReply * reply)
-{
-  // output information about reply
-  qDebug() << "RequestUrl:" << reply->request().url();
-  qDebug() << "Status:" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-  qDebug() << "Error:"<< reply->error();
-  QByteArray bytes = reply->readAll();
-  qDebug() << "Contents" << QString::fromUtf8(bytes.data(), bytes.size());
-}
@@ -1,21 +0,0 @@
-#include <QtNetwork>
-
-class GoogleAnalytics: public QObject
-{
-  Q_OBJECT
-
-  public:
-    GoogleAnalytics();
-    ~GoogleAnalytics();
-    void sendPageView(QString page);
-    void sendEvent(QString category, QString action, QString label="");
-
-  protected slots:
-    void slot_receive(QNetworkReply * reply);
-
-  protected:
-    int userId;
-    QNetworkAccessManager * networkManager;
-};
-
-extern GoogleAnalytics ga;
@@ -1,4 +1,11 @@
 #include <QtGui>
+#if defined WIN32
+  #include <io.h>
+  #include <stdio.h>
+#endif
+#if !defined WIN32 && defined __GNUC__
+  #include <unistd.h>
+#endif 
 #include "appdata.h"
 #include "helpers.h"
 #include "simulatordialog.h"
@@ -72,7 +79,7 @@ QString getInputStr(ModelData & model, int index)
    }
  }
  else {
-    result = RawSource(SOURCE_TYPE_STICK, index).toString();
+    result = RawSource(SOURCE_TYPE_STICK, index).toString(model);
  }

  return result;
@@ -140,58 +147,55 @@ void populatePhasesCB(QComboBox *b, int value)
  b->setCurrentIndex(value + GetCurrentFirmware()->getCapability(FlightModes));
 }

-bool gvarsEnabled()
-{
-  int gvars=0;
-  if (GetCurrentFirmware()->getCapability(HasVariants)) {
-    if ((GetCurrentFirmwareVariant() & GVARS_VARIANT)) {
-      gvars=1;
-    }
-  }
-  else {
-    gvars=1;
-  }
-  return gvars;
-}
-
-GVarGroup::GVarGroup(QCheckBox *weightGV, QSpinBox *weightSB, QComboBox *weightCB, int & weight, const int deflt, const int mini, const int maxi, const unsigned int flags):
+GVarGroup::GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox *weightCB, int & weight, const int deflt, const int mini, const int maxi, const double step, bool allowGvars):
  QObject(),
  weightGV(weightGV),
  weightSB(weightSB),
+  sb(dynamic_cast<QSpinBox *>(weightSB)),
+  dsb(dynamic_cast<QDoubleSpinBox *>(weightSB)),
  weightCB(weightCB),
  weight(weight),
-  flags(flags),
-  lock(false)
+  step(step),
+  lock(true)
 {
-  lock = true;
-
-  if (gvarsEnabled()) {
+  if (allowGvars && GetCurrentFirmware()->getCapability(Gvars)) {
    populateGVCB(weightCB, weight);
    connect(weightGV, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
    connect(weightCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
  }
  else {
    weightGV->hide();
-    if (weight > maxi || weight < -mini) {
+    if (weight > maxi || weight < mini) {
      weight = deflt;
    }
  }

-  weightSB->setMinimum(mini);
-  weightSB->setMaximum(maxi);
+  int val;

  if (weight>maxi || weight<mini) {
+    val = deflt;
    weightGV->setChecked(true);
    weightSB->hide();
    weightCB->show();
  }
  else {
+    val = weight;
    weightGV->setChecked(false);
-    weightSB->setValue(weight);
    weightSB->show();
    weightCB->hide();
  }

+  if (sb) {
+    sb->setMinimum(mini);
+    sb->setMaximum(maxi);
+    sb->setValue(val);
+  }
+  else {
+    dsb->setMinimum(mini*step);
+    dsb->setMaximum(maxi*step);
+    dsb->setValue(val*step);
+  }
+
  connect(weightSB, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));

  lock = false;
@@ -200,16 +204,23 @@ GVarGroup::GVarGroup(QCheckBox *weightGV, QSpinBox *weightSB, QComboBox *weightC
 void GVarGroup::gvarCBChanged(int state)
 {
  weightCB->setVisible(state);
-  weightSB->setVisible(!state);
+  if (weightSB)
+    weightSB->setVisible(!state);
+  else
+    weightSB->setVisible(!state);
  valuesChanged();
 }

 void GVarGroup::valuesChanged()
 {
-  if (weightGV->isChecked())
-    weight = weightCB->itemData(weightCB->currentIndex()).toInt();
-  else
-    weight = weightSB->value();
+  if (!lock) {
+    if (weightGV->isChecked())
+      weight = weightCB->itemData(weightCB->currentIndex()).toInt();
+    else if (sb)
+      weight = sb->value();
+    else
+      weight = dsb->value()/step;
+  }
 }

 CurveGroup::CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags):
@@ -223,14 +234,14 @@ CurveGroup::CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox
  lock(false),
  lastType(-1)
 {
-  curveTypeCB->addItem(tr("Diff"));
-  curveTypeCB->addItem(tr("Expo"));
-  curveTypeCB->addItem(tr("Func"));
-  curveTypeCB->addItem(tr("Curve"));
+  if (!(flags & HIDE_DIFF)) curveTypeCB->addItem(tr("Diff"), 0);
+  if (!(flags & HIDE_EXPO)) curveTypeCB->addItem(tr("Expo"), 1);
+  curveTypeCB->addItem(tr("Func"), 2);
+  curveTypeCB->addItem(tr("Curve"), 3);

  curveValueCB->setMaxVisibleItems(10);

-  connect(curveTypeCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
+  connect(curveTypeCB, SIGNAL(currentIndexChanged(int)), this, SLOT(typeChanged(int)));
  connect(curveGVarCB, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
  connect(curveValueCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
  connect(curveValueSB, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
@@ -242,10 +253,12 @@ void CurveGroup::update()
 {
  lock = true;

-  curveTypeCB->setCurrentIndex(curve.type);
+  int found = curveTypeCB->findData(curve.type);
+  if (found < 0) found = 0;
+  curveTypeCB->setCurrentIndex(found);

  if (curve.type == CurveReference::CURVE_REF_DIFF || curve.type == CurveReference::CURVE_REF_EXPO) {
-    curveGVarCB->show();
+    curveGVarCB->setVisible(GetCurrentFirmware()->getCapability(Gvars));
    if (curve.value > 100 || curve.value < -100) {
      curveGVarCB->setChecked(true);
      if (lastType != CurveReference::CURVE_REF_DIFF && lastType != CurveReference::CURVE_REF_EXPO) {
@@ -285,11 +298,13 @@ void CurveGroup::update()
        if (lastType != curve.type) {
          lastType = curve.type;
          curveValueCB->clear();
-          for (int i=-numcurves; i<=numcurves; i++) {
-            curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, i).toString());
+          for (int i= ((flags & HIDE_NEGATIVE_CURVES) ? 0 : -numcurves); i<=numcurves; i++) {
+            curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, i).toString(), i);
+            if (i == curve.value) {
+              curveValueCB->setCurrentIndex(curveValueCB->count() - 1);
+            }
          }
        }
-        curveValueCB->setCurrentIndex(curve.value+numcurves);
        break;
      }
      default:
@@ -304,7 +319,7 @@ void CurveGroup::gvarCBChanged(int state)
 {
  if (!lock) {
    if (state) {
-      curve.value = 10000; // TODO constant in EEpromInterface ...
+      curve.value = 10000+1; // TODO constant in EEpromInterface ...
    }
    else {
      curve.value = 0; // TODO could be better
@@ -314,10 +329,33 @@ void CurveGroup::gvarCBChanged(int state)
  }
 }

+void CurveGroup::typeChanged(int value)
+{
+  if (!lock) {
+    int type = curveTypeCB->itemData(curveTypeCB->currentIndex()).toInt();
+    switch (type) {
+      case 0:
+        curve = CurveReference(CurveReference::CURVE_REF_DIFF, 0);
+        break;
+      case 1:
+        curve = CurveReference(CurveReference::CURVE_REF_EXPO, 0);
+        break;
+      case 2:
+        curve = CurveReference(CurveReference::CURVE_REF_FUNC, 0);
+        break;
+      case 3:
+        curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, 0);
+        break;
+    }
+
+    update();
+  }
+}
+
 void CurveGroup::valuesChanged()
 {
  if (!lock) {
-    switch (curveTypeCB->currentIndex()) {
+    switch (curveTypeCB->itemData(curveTypeCB->currentIndex()).toInt()) {
      case 0:
      case 1:
      {
@@ -326,14 +364,14 @@ void CurveGroup::valuesChanged()
          value = curveValueCB->itemData(curveValueCB->currentIndex()).toInt();
        else
          value = curveValueSB->value();
-        curve = CurveReference(curveTypeCB->currentIndex() == 0 ? CurveReference::CURVE_REF_DIFF : CurveReference::CURVE_REF_EXPO, value);
+        curve = CurveReference(curveTypeCB->itemData(curveTypeCB->currentIndex()).toInt() == 0 ? CurveReference::CURVE_REF_DIFF : CurveReference::CURVE_REF_EXPO, value);
        break;
      }
      case 2:
        curve = CurveReference(CurveReference::CURVE_REF_FUNC, curveValueCB->currentIndex());
        break;
      case 3:
-        curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, curveValueCB->currentIndex() - GetCurrentFirmware()->getCapability(NumCurves));
+        curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, curveValueCB->itemData(curveValueCB->currentIndex()).toInt());
        break;
    }

@@ -363,43 +401,13 @@ void populateBacklightCB(QComboBox *b, const uint8_t value)
  }
 }

-void populateAndSwitchCB(QComboBox *b, const RawSwitch & value)
-{
-  GeneralSettings fakeSettings;
-
-  if (IS_ARM(GetEepromInterface()->getBoard())) {
-    populateSwitchCB(b, value, fakeSettings);
-  }
-  else {
-    RawSwitch item;
-
-    b->clear();
-
-    item = RawSwitch(SWITCH_TYPE_NONE);
-    b->addItem(item.toString(), item.toValue());
-    if (item == value) b->setCurrentIndex(b->count()-1);
-
-    for (int i=1; i<=GetCurrentFirmware()->getCapability(SwitchesPositions); i++) {
-      item = RawSwitch(SWITCH_TYPE_SWITCH, i);
-      b->addItem(item.toString(), item.toValue());
-      if (item == value) b->setCurrentIndex(b->count()-1);
-    }
-
-    for (int i=1; i<=6; i++) {
-      item = RawSwitch(SWITCH_TYPE_VIRTUAL, i);
-      b->addItem(item.toString(), item.toValue());
-      if (item == value) b->setCurrentIndex(b->count()-1);
-    }
-  }
-}
-
-void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettings & generalSettings, unsigned long attr)
+void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettings & generalSettings, SwitchContext context)
 {
  RawSwitch item;

  b->clear();

-  if (attr & POPULATE_ONOFF) {
+  if (context != MixesContext) {
    // !FMx
    if (IS_ARM(GetCurrentFirmware()->getBoard())) {
      for (int i=-GetCurrentFirmware()->getCapability(FlightModes); i<0; i++) {
@@ -408,14 +416,6 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
        if (item == value) b->setCurrentIndex(b->count()-1);
      }
    }
-    // !One
-    item = RawSwitch(SWITCH_TYPE_ONE, 1);
-    b->addItem(item.toString(), item.toValue());
-    if (item == value) b->setCurrentIndex(b->count()-1);
-    // OFF
-    item = RawSwitch(SWITCH_TYPE_OFF);
-    b->addItem(item.toString(), item.toValue());
-    if (item == value) b->setCurrentIndex(b->count()-1);
  }

  for (int i=-GetCurrentFirmware()->getCapability(LogicalSwitches); i<0; i++) {
@@ -448,11 +448,15 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin

  for (int i=-GetCurrentFirmware()->getCapability(SwitchesPositions); i<0; i++) {
    item = RawSwitch(SWITCH_TYPE_SWITCH, i);
+    if (IS_TARANIS(GetCurrentFirmware()->getBoard())) {
+      //hide up and down for !SH and !SF, because they are redundant (!SFup == SFdown)
+      if (item.toString().contains("H") || item.toString().contains("F")) continue;
+    }
    b->addItem(item.toString(), item.toValue());
    if (item == value) b->setCurrentIndex(b->count()-1);
  }

-  if (attr & POPULATE_TIMER_MODES) {
+  if (context == TimersContext) {
    for (int i=0; i<5; i++) {
      item = RawSwitch(SWITCH_TYPE_TIMER_MODE, i);
      b->addItem(item.toString(), item.toValue());
@@ -499,7 +503,7 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
    if (item == value) b->setCurrentIndex(b->count()-1);
  }

-  if (attr & POPULATE_ONOFF) {
+  if (context == CustomFunctionsContext) {
    // ON
    item = RawSwitch(SWITCH_TYPE_ON);
    b->addItem(item.toString(), item.toValue());
@@ -508,7 +512,10 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
    item = RawSwitch(SWITCH_TYPE_ONE, 1);
    b->addItem(item.toString(), item.toValue());
    if (item == value) b->setCurrentIndex(b->count()-1);
-    // FMx
+  }
+
+  // FMx
+  if (context != MixesContext) {
    if (IS_ARM(GetCurrentFirmware()->getBoard())) {
      for (int i=1; i<=GetCurrentFirmware()->getCapability(FlightModes); i++) {
        item = RawSwitch(SWITCH_TYPE_FLIGHT_MODE, i);
@@ -523,8 +530,7 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin

 void populateGVCB(QComboBox *b, int value)
 {
-  int selected=0;
-  int nullitem;
+  bool selected = false;

  b->clear();

@@ -534,29 +540,22 @@ void populateGVCB(QComboBox *b, int value)
    b->addItem(QObject::tr("-GV%1").arg(-i), gval);
    if (value == gval) {
      b->setCurrentIndex(b->count()-1);
-      selected=1;
+      selected = true;
    }
  }

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

-  if (selected==0)
-    b->setCurrentIndex(nullitem);
+  if (!selected) {
+    b->setCurrentIndex(pgvars);
+  }
 }

 void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData & model, unsigned int flags)
@@ -567,16 +566,27 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &

  if (flags & POPULATE_SOURCES) {
    item = RawSource(SOURCE_TYPE_NONE);
-    b->addItem(item.toString(), item.toValue());
+    b->addItem(item.toString(model), item.toValue());
    if (item == source) b->setCurrentIndex(b->count()-1);
  }

+  if (flags & POPULATE_SCRIPT_OUTPUTS) {
+    for (int i=0; i<GetCurrentFirmware()->getCapability(LuaScripts); i++) {
+      for (int j=0; j<GetCurrentFirmware()->getCapability(LuaOutputsPerScript); j++) {
+        item = RawSource(SOURCE_TYPE_LUA_OUTPUT, i*16+j);
+        b->addItem(item.toString(model), item.toValue());
+        if (item == source) b->setCurrentIndex(b->count()-1);
+      }
+    }
+  }
+
+
  if (flags & POPULATE_VIRTUAL_INPUTS) {
    int virtualInputs = GetCurrentFirmware()->getCapability(VirtualInputs);
    for (int i=0; i<virtualInputs; i++) {
      if (model.isInputValid(i)) {
-        item = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i, &model);
-        b->addItem(item.toString(), item.toValue());
+        item = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i);
+        b->addItem(item.toString(model), item.toValue());
        if (item == source) b->setCurrentIndex(b->count()-1);
      }
    }
@@ -585,12 +595,12 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
  if (flags & POPULATE_SOURCES) {
    for (int i=0; i<4+GetCurrentFirmware()->getCapability(Pots); i++) {
      item = RawSource(SOURCE_TYPE_STICK, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }
    for (int i=0; i<GetCurrentFirmware()->getCapability(RotaryEncoders); i++) {
      item = RawSource(SOURCE_TYPE_ROTARY_ENCODER, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }
  }
@@ -598,27 +608,27 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
  if (flags & POPULATE_TRIMS) {
    for (int i=0; i<4; i++) {
      item = RawSource(SOURCE_TYPE_TRIM, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }
  }

  if (flags & POPULATE_SOURCES) {
    item = RawSource(SOURCE_TYPE_MAX);
-    b->addItem(item.toString(), item.toValue());
+    b->addItem(item.toString(model), item.toValue());
    if (item == source) b->setCurrentIndex(b->count()-1);
  }
  
  if (flags & POPULATE_SWITCHES) {
    for (int i=0; i<GetCurrentFirmware()->getCapability(Switches); i++) {
      item = RawSource(SOURCE_TYPE_SWITCH, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }

    for (int i=0; i<GetCurrentFirmware()->getCapability(LogicalSwitches); i++) {
      item = RawSource(SOURCE_TYPE_CUSTOM_SWITCH, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }
  }
@@ -626,19 +636,19 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
  if (flags & POPULATE_SOURCES) {
    for (int i=0; i<NUM_CYC; i++) {
      item = RawSource(SOURCE_TYPE_CYC, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }

    for (int i=0; i<GetCurrentFirmware()->getCapability(TrainerInputs); i++) {
      item = RawSource(SOURCE_TYPE_PPM, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }

    for (int i=0; i<GetCurrentFirmware()->getCapability(Outputs); i++) {
      item = RawSource(SOURCE_TYPE_CH, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }
  }
@@ -648,7 +658,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
      if (i==TELEMETRY_SOURCE_RSSI_TX && IS_TARANIS(GetCurrentFirmware()->getBoard()))
        continue;
      item = RawSource(SOURCE_TYPE_TELEMETRY, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }
  }
@@ -657,7 +667,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
      if (i==TELEMETRY_SOURCE_RSSI_TX && IS_TARANIS(GetCurrentFirmware()->getBoard()))
        continue;
      item = RawSource(SOURCE_TYPE_TELEMETRY, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }
  }
@@ -665,7 +675,7 @@ void populateSourceCB(QComboBox *b, const RawSource & source, const ModelData &
  if (flags & POPULATE_GVARS) {
    for (int i=0; i<GetCurrentFirmware()->getCapability(Gvars); i++) {
      item = RawSource(SOURCE_TYPE_GVAR, i);
-      b->addItem(item.toString(), item.toValue());
+      b->addItem(item.toString(model), item.toValue());
      if (item == source) b->setCurrentIndex(b->count()-1);
    }
  }
@@ -791,36 +801,77 @@ QString getFrSkyMeasure(int units)

 QString getFrSkySrc(int index)
 {
-  return RawSource(SOURCE_TYPE_TELEMETRY, index-1).toString();
+  ModelData model;
+  return RawSource(SOURCE_TYPE_TELEMETRY, index-1).toString(model);
 }

 QString getTrimInc(ModelData * g_model)
 {
-    switch (g_model->trimInc) {
-      case (1): return QObject::tr("Extra Fine");
-      case (2): return QObject::tr("Fine");
-      case (3): return QObject::tr("Medium");
-      case (4): return QObject::tr("Coarse");
-      default: return QObject::tr("Exponential");
-    }
+  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 str = ", " + (timer.dir ? QObject::tr("Count Up") : QObject::tr("Count Down"));
-  return QObject::tr("%1:%2, ").arg(timer.val/60, 2, 10, QChar('0')).arg(timer.val%60, 2, 10, QChar('0')) + timer.mode.toString() + str;
+  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(ModelData * g_model)
+QString getProtocol(ModuleData & module)
 {
-  QString str = getProtocolStr(g_model->moduleData[0].protocol);
-
-  if (g_model->moduleData[0].protocol == PPM)
-    str.append(QObject::tr(": %1 Channels, %2usec Delay").arg(g_model->moduleData[0].channelsCount).arg(g_model->moduleData[0].ppmDelay));
+  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 if (!module.protocol == OFF)
+    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);
@@ -835,7 +886,7 @@ QString getPhasesStr(unsigned int phases, ModelData & model)
      for (int i=0; i<numphases;i++) {
        if (!(phases & (1<<i))) {
          if (count++ > 0) str += QString(", ");
-          str += getPhaseName(i+1, model.phaseData[i].name);
+          str += getPhaseName(i+1, model.flightModeData[i].name);
        }
      }
    }
@@ -849,18 +900,37 @@ QString getPhasesStr(unsigned int phases, ModelData & model)
  }
 }

-QString getCenterBeep(ModelData * g_model)
+QString getCenterBeepStr(ModelData * g_model)
 {
-  //RETA123
  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(g_model->beepANACenter & 0x10) strl << "P1";
-  if(g_model->beepANACenter & 0x20) strl << "P2";
-  if(g_model->beepANACenter & 0x40) strl << "P3";
-  if(g_model->beepANACenter & 0x80) strl << "LS";
+  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(", ");
 }

@@ -978,3 +1048,52 @@ QString index2version(int index)
    return QString();
  }
 }
+
+int qunlink(const QString & fileName)
+{
+  QByteArray ba = fileName.toLatin1();
+  return unlink(ba.constData());
+}
+
+QString generateProcessUniqueTempFileName(const QString & fileName)
+{
+  QString sanitizedFileName = fileName;
+  sanitizedFileName.remove('/');
+  return QDir::tempPath() + QString("/%1-").arg(QCoreApplication::applicationPid()) + sanitizedFileName;
+}
+
+bool isTempFileName(const QString & fileName)
+{
+  return fileName.startsWith(QDir::tempPath());
+}
+
+QString getSoundsPath(const GeneralSettings &generalSettings)
+{
+  QString path = g.profile[g.id()].sdPath() + "/SOUNDS/";
+  QString lang = generalSettings.ttsLanguage;
+  if (lang.isEmpty())
+    lang = "en";
+  path.append(lang);
+  return path;
+}
+
+QSet<QString> getFilesSet(const QString &path, const QStringList &filter, int maxLen)
+{
+  QSet<QString> result;
+  QDir dir(path);
+  if (dir.exists()) {
+    foreach (QString filename, dir.entryList(filter, QDir::Files)) {
+      QFileInfo file(filename);
+      QString name = file.completeBaseName();
+      if (name.length() <= maxLen) {
+        result.insert(name);
+      }
+    }
+  }
+  return result;
+}
+
+bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
+{
+  return s1.toLower() < s2.toLower();
+}
@@ -6,7 +6,7 @@

 extern const QColor colors[C9X_MAX_CURVES];

-#define TMR_NUM_OPTION  (TMR_VAROFS+2*9+2*GetCurrentFirmware()->getCapability(LogicalSwitches)-1)
+#define TMR_NUM_OPTION  (TMRMODE_COUNT+2*9+2*GetCurrentFirmware()->getCapability(LogicalSwitches)-1)

 //convert from mode 1 to mode generalSettings.stickMode
 //NOTICE!  =>  1..4 -> 1..4
@@ -37,14 +37,12 @@ class CompanionIcon: public QIcon {
    CompanionIcon(QString baseimage);
 };

-bool gvarsEnabled();
-
-class GVarGroup : public QObject {
+class GVarGroup: public QObject {

  Q_OBJECT

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

  protected slots:
    void gvarCBChanged(int);
@@ -52,13 +50,19 @@ class GVarGroup : public QObject {

  protected:
    QCheckBox *weightGV;
-    QSpinBox *weightSB;
+    QAbstractSpinBox *weightSB;
+    QSpinBox *sb;
+    QDoubleSpinBox *dsb;
    QComboBox *weightCB;
    int & weight;
-    const unsigned int flags;
+    double step;
    bool lock;
 };

+#define HIDE_DIFF             0x01
+#define HIDE_EXPO             0x02
+#define HIDE_NEGATIVE_CURVES  0x04
+
 class CurveGroup : public QObject {

  Q_OBJECT
@@ -69,6 +73,7 @@ class CurveGroup : public QObject {

  protected slots:
    void gvarCBChanged(int);
+    void typeChanged(int);
    void valuesChanged();

  protected:
@@ -82,23 +87,29 @@ class CurveGroup : public QObject {
    int lastType;
 };

-#define POPULATE_ONOFF        0x01
-#define POPULATE_TIMER_MODES  0x02
-void populateAndSwitchCB(QComboBox *b, const RawSwitch & value);
-void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettings & generalSettings, unsigned long attr=0);
+enum SwitchContext
+{
+  LogicalSwitchesContext,
+  CustomFunctionsContext,
+  TimersContext,
+  MixesContext
+};
+
+void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettings & generalSettings, SwitchContext context);

 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_SOURCES        1
-#define POPULATE_TRIMS          2
-#define POPULATE_SWITCHES       4
-#define POPULATE_GVARS          8
-#define POPULATE_TELEMETRY      16
-#define POPULATE_TELEMETRYEXT   32
-#define POPULATE_VIRTUAL_INPUTS 64
+#define POPULATE_SOURCES        (1<<0)
+#define POPULATE_TRIMS          (1<<1)
+#define POPULATE_SWITCHES       (1<<2)
+#define POPULATE_GVARS          (1<<3)
+#define POPULATE_TELEMETRY      (1<<4)
+#define POPULATE_TELEMETRYEXT   (1<<5)
+#define POPULATE_VIRTUAL_INPUTS (1<<6)
+#define POPULATE_SCRIPT_OUTPUTS (1<<7)

 #define GVARS_VARIANT 0x0001
 #define FRSKY_VARIANT 0x0002
@@ -114,8 +125,9 @@ int findmult(float value, float base);

 QString getTrimInc(ModelData * g_model);
 QString getTimerStr(TimerData & timer);
-QString getProtocol(ModelData * g_model);
-QString getCenterBeep(ModelData * g_model);
+QString getProtocol(ModuleData & module);
+QString getTrainerMode(const int trainermode, ModuleData & module);
+QString getCenterBeepStr(ModelData * g_model);

 /* FrSky helpers */
 QString getFrSkyAlarmType(int alarm);
@@ -132,4 +144,22 @@ QPixmap makePixMap( QImage image, QString firmwareType );
 int version2index(QString version);
 QString index2version(int index);

+class QTimeS : public QTime
+{
+  public:
+    QTimeS(int s) { int h = s/3600; s %= 3600; int m = s/60; s %=60; setHMS(h, m, s); };
+    QTimeS(const QTime & q) : QTime(q) {};
+    int seconds() const { return hour()*3600 + minute()*60 + second(); };
+};
+
+int qunlink(const QString & fileName);
+
+QString generateProcessUniqueTempFileName(const QString & fileName);
+bool isTempFileName(const QString & fileName);
+
+QString getSoundsPath(const GeneralSettings &generalSettings);
+QSet<QString> getFilesSet(const QString &path, const QStringList &filter, int maxLen);
+
+bool caseInsensitiveLessThan(const QString &s1, const QString &s2);
+
 #endif // HELPERS_H
@@ -7,7 +7,7 @@
    <x>0</x>
    <y>0</y>
    <width>685</width>
-    <height>418</height>
+    <height>432</height>
   </rect>
  </property>
  <property name="sizePolicy">
@@ -441,6 +441,25 @@
   </item>
  </layout>
 </widget>
+ <tabstops>
+  <tabstop>backLightColor</tabstop>
+  <tabstop>joystickCB</tabstop>
+  <tabstop>joystickChkB</tabstop>
+  <tabstop>joystickcalButton</tabstop>
+  <tabstop>simuSW</tabstop>
+  <tabstop>snapshotPath</tabstop>
+  <tabstop>snapshotPathButton</tabstop>
+  <tabstop>snapshotClipboardCKB</tabstop>
+  <tabstop>libraryPath</tabstop>
+  <tabstop>libraryPathButton</tabstop>
+  <tabstop>splashincludeCB</tabstop>
+  <tabstop>SplashFileName</tabstop>
+  <tabstop>SplashSelect</tabstop>
+  <tabstop>splashLibraryButton</tabstop>
+  <tabstop>clearImageButton</tabstop>
+  <tabstop>InvertPixels</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
 <resources>
  <include location="companion.qrc"/>
 </resources>
@@ -3,7 +3,27 @@

 #include <QtCore>
 #include <QtGui>
-#include "qcustomplot.h"
+#include "qcustomplot/qcustomplot.h"
+
+struct coords {
+  QVector<double> x, y;
+  double min_y;
+  double max_y;
+  bool secondRange;
+  QString name;
+};
+
+struct plotsCollection {
+  QVarLengthArray<struct coords> coords;
+  double min_x;
+  double max_x;
+  bool twoRanges;
+  bool tooManyRanges;
+  double rangeOneMin;
+  double rangeOneMax;
+  double rangeTwoMin;
+  double rangeTwoMax;
+};

 namespace Ui {
    class logsDialog;
@@ -12,14 +32,13 @@ namespace Ui {
 class logsDialog : public QDialog
 {
    Q_OBJECT
-  
-  
+
 public:
  explicit logsDialog(QWidget *parent = 0);
  ~logsDialog();
-  
+
 private slots:
-  void titleDoubleClick();
+  void titleDoubleClick(QMouseEvent *evt, QCPPlotTitle *title);
  void axisLabelDoubleClick(QCPAxis* axis, QCPAxis::SelectablePart part);
  void legendDoubleClick(QCPLegend* legend, QCPAbstractLegendItem* item);
  void selectionChanged();
@@ -27,23 +46,28 @@ private slots:
  void mouseWheel();
  void removeSelectedGraph();
  void removeAllGraphs();
-  void moveLegend();
  void plotLogs();
-  void plotValue(int index, int plot, int numplots);
-  void plottableItemDoubleClick(QCPAbstractPlottable *  plottable, QMouseEvent * event);
-  // void graphClicked(QCPAbstractPlottable *plottable);
  void on_fileOpen_BT_clicked();
  void on_sessions_CB_currentIndexChanged(int index);
  void on_mapsButton_clicked();
-  
+  void setRangeyAxis2(QCPRange range);
+
 private:
  QList<QStringList> csvlog;
  Ui::logsDialog *ui;
  bool cvsFileParse();
-  double GetScale(QString channel);
-  QList<QColor> palette;
  bool plotLock;
  QString logFilename;
+
+  QVarLengthArray<Qt::GlobalColor> colors;
+  QPen pen;
+
+  bool hasyAxis2;
+  double rangeRatio;
+  double rangeyAxisMin;
+  double rangeyAxisMax;
+  double rangeyAxis2Min;
+  double rangeyAxis2Max;
 };

 #endif // LOGSDIALOG_H
@@ -283,10 +283,21 @@
  <customwidget>
   <class>QCustomPlot</class>
   <extends>QWidget</extends>
-   <header>./qcustomplot.h</header>
+   <header>qcustomplot/qcustomplot.h</header>
   <container>1</container>
  </customwidget>
 </customwidgets>
+ <tabstops>
+  <tabstop>FileName_LE</tabstop>
+  <tabstop>fileOpen_BT</tabstop>
+  <tabstop>FieldsTW</tabstop>
+  <tabstop>ZoomX_ChkB</tabstop>
+  <tabstop>ZoomY_ChkB</tabstop>
+  <tabstop>Reset_PB</tabstop>
+  <tabstop>sessions_CB</tabstop>
+  <tabstop>logTable</tabstop>
+  <tabstop>mapsButton</tabstop>
+ </tabstops>
 <resources>
  <include location="companion.qrc"/>
 </resources>
@@ -64,9 +64,8 @@
 #include "helpers.h"
 #include "appdata.h"
 #include "radionotfound.h"
-#include "googleanalytics.h"
-#include "firmwares/opentx/opentxinterface.h" // TODO get rid of this include

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

 #ifdef __APPLE__
@@ -164,8 +163,6 @@ MainWindow::MainWindow():
    if (printing) {
      QTimer::singleShot(0, this, SLOT(autoClose()));
    }
-
-    ga.sendPageView("Home");
 }

 void MainWindow::displayWarnings()
@@ -187,6 +184,44 @@ void MainWindow::displayWarnings()
  }
 }

+QString MainWindow::getBackupPath() {
+  QString backupPath;
+  bool backupEnable = g.profile[g.id()].penableBackup();
+  if (backupEnable) {
+    backupPath=g.profile[g.id()].pBackupDir();
+    if (!backupPath.isEmpty()) {
+      if (!QDir(backupPath).exists()) {
+        backupEnable = false;
+      }
+    } 
+    else {
+      backupEnable = false;
+    }        
+  }
+  if (!backupEnable) {
+    backupEnable=g.enableBackup();
+    backupPath = g.backupDir();
+    if (!backupPath.isEmpty()) {
+      if (!QDir(backupPath).exists()) {
+        backupEnable = false;
+      }
+    }
+    else {
+      backupEnable = false;
+    }
+  }
+  if ((g.enableBackup() || g.profile[g.id()].penableBackup()) && !(backupEnable) && !IS_TARANIS(GetEepromInterface()->getBoard())) {
+    if (!QDir(backupPath).exists()) {
+      QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist"));
+    }      
+  } 
+  else {
+    backupEnable=false;
+  }
+  if (!backupEnable) backupPath.clear();
+  return backupPath;
+}
+
 void MainWindow::doAutoUpdates()
 {
  if (g.autoCheckApp())
@@ -233,7 +268,7 @@ void MainWindow::checkForUpdates()
  }
  else if (checkForUpdatesState & CHECK_FIRMWARE) {
    checkForUpdatesState -= CHECK_FIRMWARE;
-    QString stamp = GetFirmware(current_firmware_variant.id)->getStampUrl();
+    QString stamp = GetCurrentFirmware()->getStampUrl();
    if (!stamp.isEmpty()) {
      networkManager = new QNetworkAccessManager(this);
      connect(networkManager, SIGNAL(finished(QNetworkReply*)), this, SLOT(checkForFirmwareUpdateFinished(QNetworkReply*)));
@@ -365,7 +400,7 @@ void MainWindow::firmwareDownloadAccepted()
      return;
    }
    file.close();
-    g.fwRev.set(current_firmware_variant.id, version2index(firmwareVersionString));
+    g.fwRev.set(current_firmware_variant->getId(), version2index(firmwareVersionString));
    if (g.profile[g.id()].burnFirmware()) {
      int ret = QMessageBox::question(this, "Companion", tr("Do you want to write the firmware to the radio now ?"), QMessageBox::Yes | QMessageBox::No);
      if (ret == QMessageBox::Yes) {
@@ -400,7 +435,7 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
        download = true;
      }
      else {
-        int currentVersion = g.fwRev.get(current_firmware_variant.id);
+        int currentVersion = g.fwRev.get(current_firmware_variant->getId());
        QString currentVersionString = index2version(currentVersion);

        QMessageBox msgBox;
@@ -409,10 +444,10 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
        layout->addItem(horizontalSpacer, layout->rowCount(), 0, 1, layout->columnCount());

        if (currentVersion == 0) {
-          QString rn = GetFirmware(current_firmware_variant.id)->getReleaseNotesUrl();
+          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?").arg(current_firmware_variant.id).arg(versionString));
+          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));
          QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole);
          msgBox.addButton(trUtf8("No"), QMessageBox::NoRole);
          if (!rn.isEmpty()) {
@@ -438,10 +473,10 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
          }
        }
        else if (version > currentVersion) {
-          QString rn = GetFirmware(current_firmware_variant.id)->getReleaseNotesUrl();
+          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 ?").arg(current_firmware_variant.id).arg(currentVersionString).arg(versionString));
+          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));
          QAbstractButton *YesButton = msgBox.addButton(trUtf8("Yes"), QMessageBox::YesRole);
          msgBox.addButton(trUtf8("No"), QMessageBox::NoRole);
          if (!rn.isEmpty()) {
@@ -479,7 +514,7 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)
      if (ignore) {
        int res = QMessageBox::question(this, "Companion", tr("Ignore this release %1?").arg(versionString), QMessageBox::Yes | QMessageBox::No);
        if (res==QMessageBox::Yes)   {
-          g.fwRev.set(current_firmware_variant.id, version);
+          g.fwRev.set(current_firmware_variant->getId(), version);
        }
      }
      else if (download == true) {
@@ -496,10 +531,10 @@ void MainWindow::checkForFirmwareUpdateFinished(QNetworkReply * reply)

 void MainWindow::startFirmwareDownload()
 {
-  QString url = current_firmware_variant.getFirmwareUrl();
+  QString url = current_firmware_variant->getFirmwareUrl();
  qDebug() << url;
  QString ext = url.mid(url.lastIndexOf("."));
-  QString defaultFilename = g.flashDir() + "/" + current_firmware_variant.id;
+  QString defaultFilename = g.flashDir() + "/" + current_firmware_variant->getId();
  if (g.profile[g.id()].renameFwFiles()) {
    defaultFilename += "-" + firmwareVersionString;
  }
@@ -512,7 +547,6 @@ void MainWindow::startFirmwareDownload()
    downloadDialog * dd = new downloadDialog(this, url, filename);
    connect(dd, SIGNAL(accepted()), this, SLOT(firmwareDownloadAccepted()));
    dd->exec();
-    ga.sendEvent(getBoardName(GetCurrentFirmware()->getBoard()), "Download", url);
  }
 }

@@ -636,8 +670,7 @@ void MainWindow::loadProfile()  //TODO Load all variables - Also HW!
      int profnum=action->data().toInt();
      g.id( profnum );

-      // TODO Get rid of this global variable - The profile.firmware is the real source
-      current_firmware_variant = GetFirmwareVariant(g.profile[g.id()].fwType());  
+      current_firmware_variant = GetFirmware(g.profile[g.id()].fwType());

      foreach (QMdiSubWindow *window, mdiArea->subWindowList()) {
        MdiChild *mdiChild = qobject_cast<MdiChild *>(window->widget());
@@ -809,9 +842,9 @@ QStringList MainWindow::GetSambaArguments(const QString &tcl)
 {
    QStringList result;

-    QString tclFilename = QDir::tempPath() + "/temp.tcl";
+    QString tclFilename = generateProcessUniqueTempFileName("temp.tcl");
    if (QFile::exists(tclFilename)) {
-      unlink(tclFilename.toAscii());
+      qunlink(tclFilename);
    }
    QFile tclFile(tclFilename);
    if (!tclFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
@@ -951,21 +984,23 @@ QString MainWindow::FindMassstoragePath(QString filename)

 void MainWindow::readEeprom()
 {
-    QString tempDir = QDir::tempPath();
    QString tempFile;

    EEPROMInterface *eepromInterface = GetEepromInterface();

    if (IS_ARM(eepromInterface->getBoard())) 
-      tempFile = tempDir + "/temp.bin";
+      tempFile = generateProcessUniqueTempFileName("temp.bin");
    else
-      tempFile = tempDir + "/temp.hex";
+      tempFile += generateProcessUniqueTempFileName("temp.hex");
+
+    qDebug() << "MainWindow::readEeprom(): using temp file: " << tempFile;

    if (readEepromFromRadio(tempFile, tr("Read Models and Settings From Radio"))) {
      MdiChild *child = createMdiChild();
      child->newFile();
      child->loadFile(tempFile, false);
      child->show();
+      qunlink(tempFile);
    }
 }

@@ -980,11 +1015,12 @@ bool MainWindow::readFirmwareFromRadio(const QString filename)
    file.remove();
  }

-  g.flashDir(QFileInfo(filename).dir().absolutePath());
+  // g.flashDir(QFileInfo(filename).dir().absolutePath());

  if (IS_ARM(GetCurrentFirmware()->getBoard())) {
    QString path = FindMassstoragePath("FIRMWARE.BIN");
    if (!path.isEmpty()) {
+      qDebug() << "MainWindow::readFirmwareFromRadio(): reading" << path << "into" << filename;
      QStringList str;
      str << path << filename;
      avrOutputDialog *ad = new avrOutputDialog(this, "", str, message);
@@ -997,6 +1033,7 @@ bool MainWindow::readFirmwareFromRadio(const QString filename)

  if (result == false) {
    QStringList str = GetReceiveFlashCommand(filename);
+    qDebug() << "MainWindow::readFirmwareFromRadio(): reading" << filename << "with avrdude:" << str;
    avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, message);
    ad->setWindowIcon(CompanionIcon("read_flash.png"));
    ad->exec();
@@ -1019,6 +1056,7 @@ bool MainWindow::writeFirmwareToRadio(const QString filename)
  if (IS_ARM(GetCurrentFirmware()->getBoard())) {
    QString path = FindMassstoragePath("FIRMWARE.BIN");
    if (!path.isEmpty()) {
+      qDebug() << "MainWindow::writeFirmwareToRadio(): writing" << path << "from" << filename;
      QStringList str;
      str << filename << path;
      avrOutputDialog *ad = new avrOutputDialog(this, "", str, message);
@@ -1031,6 +1069,7 @@ bool MainWindow::writeFirmwareToRadio(const QString filename)

  if (result == false) {
    QStringList str = GetSendFlashCommand(filename);
+    qDebug() << "MainWindow::writeFirmwareToRadio(): writing" << filename << "with avrdude:" << str;
    avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, message, AVR_DIALOG_CLOSE_IF_SUCCESSFUL);
    CompanionIcon iconw("write_flash.png");
    ad->setWindowIcon(iconw);
@@ -1047,7 +1086,10 @@ bool MainWindow::readEepromFromRadio(const QString filename, const QString messa

  QFile file(filename);
  if (file.exists()) {
-    file.remove();
+    if (!file.remove()) {
+      QMessageBox::warning(this, tr("Error"), tr("Could not delete temporary file: %1").arg(filename));
+      return false;
+    }
  }

  if (IS_ARM(GetCurrentFirmware()->getBoard())) {
@@ -1149,20 +1191,9 @@ void MainWindow::writeBackup()
      if (!isValidEEPROM(fileName))
        ret = QMessageBox::question(this, "Companion", tr("The file %1\nhas not been recognized as a valid Models and Settings file\nWrite anyway ?").arg(QFileInfo(fileName).fileName()), QMessageBox::Yes | QMessageBox::No);
      if (ret != QMessageBox::Yes) return;
-      bool backupEnable = g.enableBackup();
-      QString backupPath = g.backupDir();
-      if (!backupPath.isEmpty()) {
-        if (!QDir(backupPath).exists()) {
-          if (backupEnable) {
-            QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist"));
-          }
-          backupEnable = false;
-        }
-      }
-      else {
-        backupEnable = false;
-      }
-
+      bool backupEnable=true;
+      QString backupPath=getBackupPath();
+      if (backupPath.isEmpty()) backupEnable=false;
      if (backup) {
        if (backupEnable) {
          QString backupFile = backupPath + "/backup-" + QDateTime().currentDateTime().toString("yyyy-MM-dd-HHmmss") + ".bin";
@@ -1170,13 +1201,11 @@ void MainWindow::writeBackup()
            return;
        }
        int oldrev = getEpromVersion(fileName);
-        QString tempDir = QDir::tempPath();
-        QString tempFlash = tempDir + "/flash.bin";
-
+        QString tempFlash = generateProcessUniqueTempFileName("flash.bin");
        if (!readFirmwareFromRadio(tempFlash))
          return;

-        QString restoreFile = tempDir + "/compat.bin";
+        QString restoreFile = generateProcessUniqueTempFileName("compat.bin");
        if (!convertEEPROM(fileName, restoreFile, tempFlash)) {
         int ret = QMessageBox::question(this, "Error", tr("Cannot check Models and Settings compatibility! Continue anyway?") ,
                                              QMessageBox::Yes | QMessageBox::No);
@@ -1193,9 +1222,7 @@ void MainWindow::writeBackup()
          }
          fileName = restoreFile;
        }
-        QByteArray ba = tempFlash.toLatin1();
-        char *name = ba.data();
-        unlink(name);
+        qunlink(tempFlash);
      }
      else {
        if (backupEnable) {
@@ -1298,79 +1325,97 @@ bool MainWindow::convertEEPROM(QString backupFile, QString restoreFile, QString

 void MainWindow::writeFlash(QString fileToFlash)
 {
-    QString fileName;
-    bool backup = g.backupOnFlash();
-    if(!fileToFlash.isEmpty())
-      fileName = fileToFlash;
-    burnDialog *cd = new burnDialog(this, 2, &fileName, &backup);
-    cd->exec();
-    if (IS_TARANIS(GetEepromInterface()->getBoard()))
-      backup=false;
-    if (!fileName.isEmpty()) {
-      g.backupOnFlash(backup);
-      if (backup) {
-        QString tempDir    = QDir::tempPath();
-        QString backupFile = tempDir + "/backup.bin";
-        bool backupEnable=g.enableBackup();
-        QString backupPath=g.backupDir();
-        if (!backupPath.isEmpty() && !IS_TARANIS(GetEepromInterface()->getBoard())) {
-          if (!QDir(backupPath).exists()) {
-            if (backupEnable) {
-              QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist"));
-            }
-            backupEnable=false;
+  qDebug() << "MainWindow::writeFlash(): started with" << fileToFlash;
+  QString fileName;
+  bool backup = g.backupOnFlash();
+  if(!fileToFlash.isEmpty()) {
+    fileName = fileToFlash;
+  }
+
+  burnDialog *cd = new burnDialog(this, 2, &fileName, &backup);
+  cd->exec();
+  qDebug() << "MainWindow::writeFlash(): flashing " << fileName;
+  
+  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+    backup=false;
+  }
+
+  if (!fileName.isEmpty()) {
+    if (g.checkHardwareCompatibility()) {
+      QString tempFlash = generateProcessUniqueTempFileName("flash-check.bin");
+      if (!readFirmwareFromRadio(tempFlash)) {
+        QMessageBox::warning(this, tr("Firmware check failed"), tr("Could not check firmware from radio"));
+        return;
+      }
+      FlashInterface previousFlash(tempFlash);
+      qunlink(tempFlash);
+      FlashInterface newFlash(fileName);
+      qDebug() << "MainWindow::writeFlash(): checking firmware compatibility between " << tempFlash << "and" << fileName;
+      if (!newFlash.isHardwareCompatible(previousFlash)) {
+        QMessageBox::warning(this, tr("Firmware check failed"), tr("New firmware is not compatible with the one currently installed!"));
+        if (isTempFileName(fileName)) {
+          qDebug() << "MainWindow::writeFlash(): removing temporary file" << fileName;
+          qunlink(fileName);
+        }
+        return;
+      }
+    }
+    g.backupOnFlash(backup);
+    if (backup) {
+      bool backupEnable=true;
+      QString backupFile;
+      QString backupPath=getBackupPath();
+      if (backupPath.isEmpty()) {
+        backupEnable=false;
+        backupFile = generateProcessUniqueTempFileName("backup.bin");
+      }
+      else {
+        QDateTime datetime;
+        backupFile = backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin";
+      }
+
+      if (readEepromFromRadio(backupFile, tr("Backup Models and Settings From Radio"))) {
+        sleep(2);
+        int res = writeFirmwareToRadio(fileName);
+        if (res) {
+          QString restoreFile = generateProcessUniqueTempFileName("restore.bin");
+          if (!convertEEPROM(backupFile, restoreFile, fileName)) {
+            QMessageBox::warning(this, tr("Conversion failed"), tr("Cannot convert Models and Settings for use with this firmware, original data will be used"));
+            restoreFile = backupFile;
+          }
+          sleep(2);
+          if (!writeEepromToRadio(restoreFile, tr("Restore Models and Settings To Radio"))) {
+            QMessageBox::warning(this, tr("Restore failed"), tr("Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1").arg(backupFile));
          }
        }
        else {
-          backupEnable=false;
-        }
-
-        if (backupEnable) {
-          QDateTime datetime;
-          backupFile.clear();
-          backupFile = backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin";
-        }
-
-        if (readEepromFromRadio(backupFile, tr("Backup Models and Settings From Radio"))) {
-          sleep(1);
-          int res = writeFirmwareToRadio(fileName);
-          if (res) {
-            QString restoreFile = tempDir + "/restore.bin";
-            if (!convertEEPROM(backupFile, restoreFile, fileName)) {
-              QMessageBox::warning(this, tr("Conversion failed"), tr("Cannot convert Models and Settings for use with this firmware, original data will be used"));
-              restoreFile = backupFile;
-            }
-            sleep(1);
-            if (!writeEepromToRadio(restoreFile, tr("Restore Models and Settings To Radio"))) {
-              QMessageBox::warning(this, tr("Restore failed"), tr("Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1").arg(backupFile));
-            }
-          }
-          else {
-            QMessageBox::warning(this, tr("Firmware write failed"), tr("Could not write firmware to radio. The models and settings data file can be found at: %1").arg(backupFile));
-          }
-        }
-        else {
-          QMessageBox::warning(this, tr("Backup failed"), tr("Cannot backup existing Models and Settings from Radio. Firmware write process aborted"));
+          QMessageBox::warning(this, tr("Firmware write failed"), tr("Could not write firmware to radio. The models and settings data file can be found at: %1").arg(backupFile));
        }
      }
      else {
-        bool backupEnable=g.enableBackup();
-        QString backupPath=g.backupDir();
-        if (!QDir(backupPath).exists()) {
-          if (backupEnable) {
-            QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist"));
-          }
-          backupEnable=false;
-        }
-        if (backupEnable && !IS_TARANIS(GetEepromInterface()->getBoard())) {
-          QDateTime datetime;
-          QString backupFile = backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin";
-          readEepromFromRadio(backupFile, tr("Backup Models and Settings From Radio"));
-        }
-
-        writeFirmwareToRadio(fileName);
+        QMessageBox::warning(this, tr("Backup failed"), tr("Cannot backup existing Models and Settings from Radio. Firmware write process aborted"));
      }
    }
+    else {
+      bool backupEnable=true;
+      QString backupPath=getBackupPath();
+      if (backupPath.isEmpty()) {
+        backupEnable=false;
+      }
+      if (backupEnable && !IS_TARANIS(GetEepromInterface()->getBoard())) {
+        QDateTime datetime;
+        QString backupFile = backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin";
+        readEepromFromRadio(backupFile, tr("Backup Models and Settings From Radio"));
+        sleep(2);
+      }
+
+      writeFirmwareToRadio(fileName);
+    }
+    if (isTempFileName(fileName)) {
+      qDebug() << "MainWindow::writeFlash(): removing temporary file" << fileName;
+      qunlink(fileName);
+    }
+  }
 }

 void MainWindow::readBackup()
@@ -1412,7 +1457,7 @@ void MainWindow::burnFuses()

 void MainWindow::compare()
 {
-  CompareDialog *fd = new CompareDialog(this);
+  CompareDialog *fd = new CompareDialog(this,GetCurrentFirmware());
  fd->setAttribute(Qt::WA_DeleteOnClose, true);
  fd->show();
 }
@@ -1466,7 +1511,7 @@ void MainWindow::updateMenus()
    updateIconSizeActions();
    updateIconThemeActions();

-    setWindowTitle(tr("OpenTX Companion - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->getName()).arg( g.profile[g.id()].name() ));
+    setWindowTitle(tr("OpenTX Companion 2.0 - FW: %1 - Profile: %2").arg(GetCurrentFirmware()->getName()).arg( g.profile[g.id()].name() ));
 }

 MdiChild *MainWindow::createMdiChild()
@@ -1600,7 +1645,7 @@ void MainWindow::createActions()
    writeEepromAct =     addAct("write_eeprom.png",  tr("Write Models and Settings To Radio"),  tr("Write Models and Settings to Radio"),       SLOT(writeEeprom()));
    readEepromAct =      addAct("read_eeprom.png",   tr("Read Models and Settings From Radio"), tr("Read Models and Settings from Radio"),      SLOT(readEeprom()));
    burnConfigAct =      addAct("configure.png",     tr("Configure Communications..."), tr("Configure software for communicating with the Radio"), SLOT(burnConfig()));
-    writeBackupToRadioAct = addAct("write_eeprom_file.png", tr("Write Backup to Radio"), tr("Write Backup from file to to Radio"), SLOT(writeBackup()));
+    writeBackupToRadioAct = addAct("write_eeprom_file.png", tr("Write Backup to Radio"), tr("Write Backup from file to Radio"), SLOT(writeBackup()));
    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()));
    
@@ -82,6 +82,7 @@ class MainWindow : public QMainWindow
    void closeEvent(QCloseEvent *event);
    void dragEnterEvent(QDragEnterEvent *event);
    void dropEvent(QDropEvent *event);
+    QString getBackupPath();

  private slots:
    void openDocURL();
@@ -54,7 +54,6 @@
 #include "appdata.h"
 #include "wizarddialog.h"
 #include <QFileInfo>
-#include "googleanalytics.h"

 #if defined WIN32 || !defined __GNUC__
 #include <windows.h>
@@ -80,8 +79,6 @@ MdiChild::MdiChild():
  if (!(this->isMaximized() || this->isMinimized())) {
    adjustSize();
  }
-
-  ga.sendPageView(getBoardName(firmware->getBoard()) + " Models");
 }

 MdiChild::~MdiChild() 
@@ -404,7 +401,7 @@ bool MdiChild::saveFile(const QString &fileName, bool setCurrent)
    int eeprom_size = 0;

    if (fileType != FILE_TYPE_XML) {
-      eeprom_size = GetEepromInterface()->save(eeprom, radioData, GetCurrentFirmwareVariant(), 0/*last version*/);
+      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;
@@ -519,23 +516,14 @@ QString MdiChild::strippedName(const QString &fullFileName)

 void MdiChild::writeEeprom()  // write to Tx
 {
-  bool backupEnable=g.enableBackup();
-  QString backupPath=g.backupDir();
-  if (!backupPath.isEmpty()) {
-    if (!QDir(backupPath).exists()) {
-      if (backupEnable) {
-        QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist"));
-      }
-      backupEnable=false;
-    }
-  }
-  else {
+  bool backupEnable=true;
+  QString backupPath=((MainWindow *)this->parent())->getBackupPath();
+  if (backupPath.isEmpty()) {
    backupEnable=false;
  }
  QString stickCal=g.profile[g.id()].stickPotCalib();
  burnConfigDialog bcd;
-  QString tempDir    = QDir::tempPath();
-  QString tempFile = tempDir + "/temp.bin";
+  QString tempFile = generateProcessUniqueTempFileName("temp.bin");
  saveFile(tempFile, false);
  if(!QFileInfo(tempFile).exists()) {
    QMessageBox::critical(this,tr("Error"), tr("Cannot write temporary file!"));
@@ -553,12 +541,12 @@ void MdiChild::writeEeprom()  // write to Tx
          return;
      }
      int oldrev=((MainWindow *)this->parent())->getEpromVersion(tempFile);
-      QString tempFlash=tempDir + "/flash.bin";
+      QString tempFlash = generateProcessUniqueTempFileName("flash.bin");

      if (!((MainWindow *)this->parent())->readFirmwareFromRadio(tempFlash))
        return;

-      QString restoreFile = tempDir + "/compat.bin";
+      QString restoreFile = generateProcessUniqueTempFileName("compat.bin");
      if (!((MainWindow *)this->parent())->convertEEPROM(tempFile, restoreFile, tempFlash)) {
        int ret = QMessageBox::question(this, tr("Error"), tr("Cannot check eeprom compatibility! Continue anyway?"), QMessageBox::Yes | QMessageBox::No);
        if (ret == QMessageBox::No)
@@ -574,9 +562,7 @@ void MdiChild::writeEeprom()  // write to Tx
        }
        tempFile=restoreFile;
      }
-      QByteArray ba = tempFlash.toLatin1();
-      char *name = ba.data(); 
-      unlink(name);
+      qunlink(tempFlash);
    }
    else {
      if (backupEnable) {
@@ -1,4 +1,5 @@
 #include "channels.h"
+#include "helpers.h"
 #include <QLabel>
 #include <QLineEdit>
 #include <QSpinBox>
@@ -6,6 +7,70 @@
 #include <QCheckBox>
 #include <QDoubleSpinBox>

+LimitsGroup::LimitsGroup(FirmwareInterface * firmware, QGridLayout *gridLayout, int row, int col, int & value, int min, int max, int deflt):
+  firmware(firmware),
+  spinbox(new QDoubleSpinBox()),
+  value(value),
+  displayStep(0.1)
+{
+  bool allowGVars = false;
+  int internalStep = 1;
+
+  spinbox->setProperty("index", row);
+  spinbox->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+  spinbox->setAccelerated(true);
+
+  if (firmware->getCapability(PPMUnitMicroseconds)) {
+    displayStep = 0.512;
+    spinbox->setDecimals(1);
+    spinbox->setSuffix("us");
+  }
+  else {
+    spinbox->setDecimals(0);
+    spinbox->setSuffix("%");
+  }
+
+  if (IS_TARANIS(firmware->getBoard()) || deflt == 0 /*it's the offset*/) {
+    spinbox->setDecimals(1);
+    allowGVars = true;
+  }
+  else {
+    internalStep *= 10;
+  }
+  
+  spinbox->setSingleStep(displayStep*internalStep);
+
+  QHBoxLayout * horizontalLayout = new QHBoxLayout();
+  QCheckBox * gv = new QCheckBox(QObject::tr("GV"));
+  horizontalLayout->addWidget(gv);
+  QComboBox * cb = new QComboBox();
+  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);
+}
+
+LimitsGroup::~LimitsGroup()
+{
+  delete gvarGroup;
+}
+
+void LimitsGroup::updateMinMax(int max)
+{
+  if (spinbox->maximum() == 0) {
+    spinbox->setMinimum(-max*displayStep);
+    if (value < -max) {
+      value = -max;
+    }
+  }
+  if (spinbox->minimum() == 0) {
+    spinbox->setMaximum(max*displayStep);
+    if (value > max) {
+      value = max;
+    }
+  }
+}
+
 Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, FirmwareInterface * firmware):
  ModelPanel(parent, model, generalSettings, firmware)
 {
@@ -13,8 +78,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
  bool minimize = false;

  int col = 1;
-  if (firmware->getCapability(ChannelsName))
-  {
+  if (firmware->getCapability(ChannelsName)) {
    minimize=true;
    addLabel(gridLayout, tr("Name"), col++);
  }
@@ -52,44 +116,13 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
    }

    // Channel offset
-    QDoubleSpinBox * offset = new QDoubleSpinBox(this);
-    offset->setProperty("index", i);
-    offset->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    offset->setAccelerated(true);
-    offset->setDecimals(1);
-    offset->setMinimum(-100);
-    offset->setSingleStep(0.1);
-    offset->setValue(float(model.limitData[i].offset) / 10);
-    connect(offset, SIGNAL(editingFinished()), this, SLOT(offsetEdited()));
-    gridLayout->addWidget(offset, i+1, col++, 1, 1);
+    limitsGroups << new LimitsGroup(firmware, gridLayout, i+1, col++, model.limitData[i].offset, -1000, 1000, 0);

    // Channel min
-    QDoubleSpinBox * minSB = new QDoubleSpinBox(this);
-    minSB->setProperty("index", i);
-    minSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    minSB->setAccelerated(true);
-    minSB->setDecimals(1);
-    minSB->setMinimum(-model.getChannelsMax());
-    minSB->setSingleStep(0.1);
-    minSB->setMaximum(0);
-    minSB->setValue(float(model.limitData[i].min) / 10);
-    connect(minSB, SIGNAL(editingFinished()), this, SLOT(minEdited()));
-    gridLayout->addWidget(minSB, i+1, col++, 1, 1);
-    minSpins << minSB;
+    limitsGroups << new LimitsGroup(firmware, gridLayout, i+1, col++, model.limitData[i].min, -model.getChannelsMax()*10, 0, -1000);

    // Channel max
-    QDoubleSpinBox * maxSB = new QDoubleSpinBox(this);
-    maxSB->setProperty("index", i);
-    maxSB->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    maxSB->setAccelerated(true);
-    maxSB->setDecimals(1);
-    maxSB->setMinimum(0);
-    maxSB->setSingleStep(0.1);
-    maxSB->setMaximum(model.getChannelsMax());
-    maxSB->setValue(float(model.limitData[i].max) / 10);
-    connect(maxSB, SIGNAL(editingFinished()), this, SLOT(maxEdited()));
-    gridLayout->addWidget(maxSB, i+1, col++, 1, 1);
-    maxSpins << maxSB;
+    limitsGroups << new LimitsGroup(firmware, gridLayout, i+1, col++, model.limitData[i].max, 0, model.getChannelsMax()*10, 1000);

    // Channel inversion
    QComboBox * invCB = new QComboBox(this);
@@ -117,6 +150,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
      QSpinBox * center = new QSpinBox(this);
      center->setProperty("index", i);
      center->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+      center->setSuffix("us");
      center->setMinimum(1375);
      center->setMaximum(1625);
      center->setValue(1500);
@@ -134,6 +168,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
      gridLayout->addWidget(symlimits, i+1, col++, 1, 1);
    }
  }
+
  // Push the rows up
  addVSpring(gridLayout, 0,firmware->getCapability(Outputs)+1);

@@ -142,6 +177,9 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera

 Channels::~Channels()
 {
+  foreach(LimitsGroup *group, limitsGroups) {
+    delete group;
+  }
 }

 void Channels::symlimitsEdited()
@@ -164,39 +202,14 @@ void Channels::nameEdited()
  }
 }

-void Channels::offsetEdited()
-{
-  QDoubleSpinBox *dsb = qobject_cast<QDoubleSpinBox*>(sender());
-  int index = dsb->property("index").toInt();
-  model.limitData[index].offset = round(dsb->value() * 10);
-  emit modified();
-}
-
-void Channels::minEdited()
-{
-  QDoubleSpinBox *sb = qobject_cast<QDoubleSpinBox*>(sender());
-  int index = sb->property("index").toInt();
-  model.limitData[index].min = round(sb->value() * 10);
-  emit modified();
-}
-
-void Channels::maxEdited()
-{
-  QDoubleSpinBox *sb = qobject_cast<QDoubleSpinBox*>(sender());
-  int index = sb->property("index").toInt();
-  model.limitData[index].max = round(sb->value() * 10);
-  emit modified();
-}
-
 void Channels::refreshExtendedLimits()
 {
-  for (int i=0; i<firmware->getCapability(Outputs); i++) {
-    QDoubleSpinBox * minDSB = minSpins[i];
-    QDoubleSpinBox * maxDSB = maxSpins[i];
-    
-    minDSB->setMinimum(-model.getChannelsMax());
-    maxDSB->setMaximum(model.getChannelsMax());
+  int channelMax = model.getChannelsMax();
+
+  foreach(LimitsGroup *group, limitsGroups) {
+    group->updateMinMax(10*channelMax);
  }
+
  emit modified(); 
 }

@@ -4,6 +4,24 @@
 #include "modelpanel.h"
 #include <QSpinBox>

+class GVarGroup;
+
+class LimitsGroup
+{
+  public:
+    LimitsGroup(FirmwareInterface * firmware, QGridLayout *gridLayout, int row, int col, int & value, int min, int max, int deflt);
+    ~LimitsGroup();
+
+    void updateMinMax(int max);
+
+  protected:
+    FirmwareInterface * firmware;
+    QDoubleSpinBox * spinbox;
+    GVarGroup * gvarGroup;
+    int & value;
+    double displayStep;
+};
+
 class Channels : public ModelPanel
 {
    Q_OBJECT
@@ -13,8 +31,7 @@ class Channels : public ModelPanel
    ~Channels();
    
  private:
-    QVector<QDoubleSpinBox *> minSpins;
-    QVector<QDoubleSpinBox *> maxSpins;
+    QVector<LimitsGroup *> limitsGroups;

  public slots:
    void refreshExtendedLimits();
@@ -22,9 +39,6 @@ class Channels : public ModelPanel
  private slots:
    void symlimitsEdited();
    void nameEdited();
-    void offsetEdited();
-    void minEdited();
-    void maxEdited();
    void invEdited();
    void curveEdited();
    void ppmcenterEdited();
@@ -109,19 +109,29 @@ Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSet
  QGraphicsScene *scene = new QGraphicsScene(ui->curvePreview);
  scene->setItemIndexMethod(QGraphicsScene::NoIndex);
  ui->curvePreview->setScene(scene);
-
-  for (int i=0; i<firmware->getCapability(NumCurves); i++) {
+  int numcurves=firmware->getCapability(NumCurves);
+  int limit;
+  if (numcurves>16) {
+      limit=numcurves/2;
+  } else {
+      limit=numcurves;
+  }
+  for (int i=0; i<numcurves; i++) {
    visibleCurves[i] = false;

    // The reset curve button
    QPushButton * reset = new QPushButton(this);
    reset->setProperty("index", i);
    reset->setMinimumSize(QSize(0, 0));
+    reset->setMaximumSize(QSize(16, 16));
    reset->setIcon(CompanionIcon("clear.png"));
    reset->setIconSize(QSize(14, 14));
    connect(reset, SIGNAL(clicked()), this, SLOT(resetCurve()));
-    ui->curvesLayout->addWidget(reset, i, 0, 1, 1);
-
+    if (i<limit) {
+      ui->curvesLayout->addWidget(reset, i, 0, 1, 1);
+    } else {
+      ui->curvesLayout2->addWidget(reset, i-limit, 2, 1, 1);  
+    }
    // The edit curve button
    QPushButton * edit = new QPushButton(this);
    edit->setProperty("index", i);
@@ -136,17 +146,39 @@ Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSet
    edit->setPalette(palette);
    edit->setText(tr("Curve %1").arg(i+1));
    connect(edit, SIGNAL(clicked()), this, SLOT(editCurve()));
-    ui->curvesLayout->addWidget(edit, i, 1, 1, 1);
-
+    if (i<limit) {
+      ui->curvesLayout->addWidget(edit, i, 1, 1, 1);
+    } else {
+      ui->curvesLayout2->addWidget(edit, i-limit, 1, 1, 1);
+    }
+    
    // The curve plot checkbox
    QCheckBox * plot = new QCheckBox(this);
    plot->setProperty("index", i);
    plot->setPalette(palette);
    connect(plot, SIGNAL(toggled(bool)), this, SLOT(plotCurve(bool)));
-    ui->curvesLayout->addWidget(plot, i, 2, 1, 1);
+    if (i<limit) {
+      ui->curvesLayout->addWidget(plot, i, 2, 1, 1);
+    } else {
+      ui->curvesLayout2->addWidget(plot, i-limit, 0, 1, 1);
+    }
  }

+  QSpacerItem * item = new QSpacerItem(1,1, QSizePolicy::Fixed, QSizePolicy::Expanding);
+  ui->curvesLayout->addItem(item,limit+1,1,1,1,0);
+  if (limit!=numcurves) {
+    QSpacerItem * item2 = new QSpacerItem(1,1, QSizePolicy::Fixed, QSizePolicy::Expanding);
+    ui->curvesLayout2->addItem(item2,limit+1,1,1,1,0);
+  }
+  
  for (int i=0; i<C9X_MAX_POINTS; i++) {
+    spnx[i] = new QSpinBox(this);
+    spnx[i]->setProperty("index", i);
+    spnx[i]->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
+    spnx[i]->setAccelerated(true);
+    connect(spnx[i], SIGNAL(valueChanged(int)), this, SLOT(onPointEdited()));
+    ui->pointsLayout->addWidget(spnx[i], i, 0, 1, 1);
+
    spny[i] = new QSpinBox(this);
    spny[i]->setProperty("index", i);
    spny[i]->setMinimum(-100);
@@ -154,14 +186,7 @@ Curves::Curves(QWidget * parent, ModelData & model, GeneralSettings & generalSet
    spny[i]->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
    spny[i]->setAccelerated(true);
    connect(spny[i], SIGNAL(valueChanged(int)), this, SLOT(onPointEdited()));
-    ui->pointsLayout->addWidget(spny[i], i, 0, 1, 1);
-
-    spnx[i] = new QSpinBox(this);
-    spnx[i]->setProperty("index", i);
-    spnx[i]->setAlignment(Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter);
-    spnx[i]->setAccelerated(true);
-    connect(spnx[i], SIGNAL(valueChanged(int)), this, SLOT(onPointEdited()));
-    ui->pointsLayout->addWidget(spnx[i], i, 1, 1, 1);
+    ui->pointsLayout->addWidget(spny[i], i, 1, 1, 1);

    bool insert;
    if (firmware->getCapability(EnhancedCurves)) {
@@ -6,7 +6,7 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>718</width>
+    <width>605</width>
    <height>539</height>
   </rect>
  </property>
@@ -125,6 +125,9 @@
     </item>
    </layout>
   </item>
+   <item>
+    <layout class="QGridLayout" name="curvesLayout2"/>
+   </item>
   <item>
    <layout class="QVBoxLayout" name="verticalLayout_2">
     <item>
@@ -172,38 +175,25 @@
     <property name="title">
      <string>Curve Creator</string>
     </property>
-     <layout class="QGridLayout" name="gridLayout_76" rowstretch="0,0,0,0,0,0,0,0">
-      <item row="3" column="0">
-       <widget class="QLabel" name="yMidLabel">
+     <layout class="QGridLayout" name="gridLayout_2">
+      <item row="0" column="0">
+       <widget class="QLabel" name="curveTypeLabel_2">
        <property name="text">
-         <string>Y at X=0</string>
+         <string>Curve type</string>
        </property>
       </widget>
      </item>
-      <item row="4" column="1" colspan="3">
-       <widget class="QSpinBox" name="yMax">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimum">
-         <number>-100</number>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-       </widget>
+      <item row="1" column="0" colspan="2">
+       <widget class="QComboBox" name="curveType"/>
      </item>
-      <item row="4" column="0">
-       <widget class="QLabel" name="yMaxLabel">
+      <item row="2" column="0">
+       <widget class="QLabel" name="curveCoeffLabel">
        <property name="text">
-         <string>Y at X=100</string>
+         <string>Coefficient</string>
        </property>
       </widget>
      </item>
-      <item row="1" column="1" colspan="3">
+      <item row="2" column="1">
       <widget class="QSpinBox" name="curveCoeff">
        <property name="sizePolicy">
         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
@@ -219,7 +209,83 @@
        </property>
       </widget>
      </item>
-      <item row="5" column="1" colspan="3">
+      <item row="3" column="0">
+       <widget class="QLabel" name="yMinLabel">
+        <property name="text">
+         <string>Y at X=-100</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QSpinBox" name="yMin">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimum">
+         <number>-100</number>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0">
+       <widget class="QLabel" name="yMidLabel">
+        <property name="text">
+         <string>Y at X=0</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QSpinBox" name="yMid">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimum">
+         <number>-100</number>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="yMaxLabel">
+        <property name="text">
+         <string>Y at X=100</string>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1">
+       <widget class="QSpinBox" name="yMax">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="minimum">
+         <number>-100</number>
+        </property>
+        <property name="maximum">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="curveSideLabel">
+        <property name="text">
+         <string>Side</string>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1">
       <widget class="QComboBox" name="curveSide">
        <item>
         <property name="text">
@@ -238,77 +304,7 @@
        </item>
       </widget>
      </item>
-      <item row="2" column="1" colspan="3">
-       <widget class="QSpinBox" name="yMin">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimum">
-         <number>-100</number>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-       </widget>
-      </item>
-      <item row="6" column="0" colspan="4">
-       <widget class="QPushButton" name="curveApply">
-        <property name="text">
-         <string>Apply</string>
-        </property>
-       </widget>
-      </item>
-      <item row="5" column="0">
-       <widget class="QLabel" name="curveSideLabel">
-        <property name="text">
-         <string>Side</string>
-        </property>
-       </widget>
-      </item>
-      <item row="3" column="1" colspan="3">
-       <widget class="QSpinBox" name="yMid">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="minimum">
-         <number>-100</number>
-        </property>
-        <property name="maximum">
-         <number>100</number>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" colspan="3">
-       <widget class="QComboBox" name="curveType"/>
-      </item>
-      <item row="0" column="0">
-       <widget class="QLabel" name="curveTypeLabel_2">
-        <property name="text">
-         <string>Curve type</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="0">
-       <widget class="QLabel" name="yMinLabel">
-        <property name="text">
-         <string>Y at X=-100</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="curveCoeffLabel">
-        <property name="text">
-         <string>Coefficient</string>
-        </property>
-       </widget>
-      </item>
-      <item row="7" column="0">
+      <item row="8" column="0">
       <spacer name="verticalSpacer_3">
        <property name="orientation">
         <enum>Qt::Vertical</enum>
@@ -321,6 +317,13 @@
        </property>
       </spacer>
      </item>
+      <item row="7" column="0" colspan="2">
+       <widget class="QPushButton" name="curveApply">
+        <property name="text">
+         <string>Apply</string>
+        </property>
+       </widget>
+      </item>
     </layout>
    </widget>
   </item>
@@ -339,6 +342,19 @@
   </item>
  </layout>
 </widget>
+ <tabstops>
+  <tabstop>curvePreview</tabstop>
+  <tabstop>curvePoints</tabstop>
+  <tabstop>curveCustom</tabstop>
+  <tabstop>curveSmooth</tabstop>
+  <tabstop>curveName</tabstop>
+  <tabstop>curveCoeff</tabstop>
+  <tabstop>yMin</tabstop>
+  <tabstop>yMid</tabstop>
+  <tabstop>yMax</tabstop>
+  <tabstop>curveSide</tabstop>
+  <tabstop>curveApply</tabstop>
+ </tabstops>
 <resources/>
 <connections/>
 </ui>
@@ -1,10 +1,4 @@
 #include "customfunctions.h"
-#include <QLabel>
-#include <QLineEdit>
-#include <QSpinBox>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QDoubleSpinBox>
 #include "helpers.h"
 #include "appdata.h"

@@ -69,36 +63,29 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
  int num_fsw = firmware->getCapability(CustomFunctions);

  if (!firmware->getCapability(VoicesAsNumbers)) {
+    tracksSet = getFilesSet(getSoundsPath(generalSettings), QStringList() << "*.wav" << "*.WAV", firmware->getCapability(VoicesMaxLength));
    for (int i=0; i<num_fsw; i++) {
      if (model.funcSw[i].func==FuncPlayPrompt || model.funcSw[i].func==FuncBackgroundMusic) {
        QString temp = model.funcSw[i].paramarm;
        if (!temp.isEmpty()) {
-          if (!paramarmList.contains(temp)) {
-            paramarmList.append(temp);
-          }
+          tracksSet.insert(temp);
        }
      }
    }
+    qDebug() << tracksSet;
+  }

-    QString path = g.profile[g.id()].sdPath();
-    path.append("/SOUNDS/");
-    QString lang = generalSettings.ttsLanguage;
-    if (lang.isEmpty())
-      lang="en";
-    path.append(lang);
-    QDir qd(path);
-    int vml= firmware->getCapability(VoicesMaxLength);
-    if (qd.exists()) {
-      QStringList filters;
-      filters << "*.wav" << "*.WAV";
-      foreach ( QString file, qd.entryList(filters, QDir::Files) ) {
-        QFileInfo fi(file);
-        QString temp=fi.completeBaseName();
-        if (!paramarmList.contains(temp) && temp.length()<=vml) {
-          paramarmList.append(temp);
+  if (IS_TARANIS(firmware->getBoard())) {
+    scriptsSet = getFilesSet(g.profile[g.id()].sdPath() + "/SCRIPTS", QStringList() << "*.lua", firmware->getCapability(VoicesMaxLength));
+    for (int i=0; i<num_fsw; i++) {
+      if (model.funcSw[i].func==FuncPlayScript) {
+        QString temp = model.funcSw[i].paramarm;
+        if (!temp.isEmpty()) {
+          scriptsSet.insert(temp);
        }
      }
    }
+    qDebug() << scriptsSet;
  }

  CompanionIcon playIcon("play.png");
@@ -124,7 +111,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
    // The function
    fswtchFunc[i] = new QComboBox(this);
    fswtchFunc[i]->setProperty("index", i);
-    connect(fswtchFunc[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
+    connect(fswtchFunc[i], SIGNAL(currentIndexChanged(int)), this, SLOT(functionEdited()));
    gridLayout->addWidget(fswtchFunc[i], i+1, 2);

    QHBoxLayout *paramLayout = new QHBoxLayout();
@@ -149,6 +136,13 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
    connect(fswtchParam[i], SIGNAL(editingFinished()), this, SLOT(customFunctionEdited()));
    paramLayout->addWidget(fswtchParam[i]);

+    fswtchParamTime[i] = new QTimeEdit(this);
+    fswtchParamTime[i]->setProperty("index", i);
+    fswtchParamTime[i]->setAccelerated(true);
+    fswtchParamTime[i]->setDisplayFormat("hh:mm:ss");
+    connect(fswtchParamTime[i], SIGNAL(editingFinished()), this, SLOT(customFunctionEdited()));
+    paramLayout->addWidget(fswtchParamTime[i]);
+
    fswtchParamT[i] = new QComboBox(this);
    fswtchParamT[i]->setProperty("index", i);
    paramLayout->addWidget(fswtchParamT[i]);
@@ -161,7 +155,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,

    connect(fswtchParamArmT[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
    connect(fswtchParamArmT[i], SIGNAL(editTextChanged ( const QString)), this, SLOT(customFunctionEdited()));
-    
+
    fswtchBLcolor[i] = new QSlider(this);
    fswtchBLcolor[i]->setProperty("index", i);
    fswtchBLcolor[i]->setMinimum(0);
@@ -188,7 +182,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
    fswtchEnable[i] = new QCheckBox(this);
    fswtchEnable[i]->setProperty("index", i);
    fswtchEnable[i]->setText(tr("ON"));
-    fswtchEnable[i]->setFixedWidth( 50 );
+    fswtchEnable[i]->setFixedWidth( 80 );
    repeatLayout->addWidget(fswtchEnable[i], i+1);
    connect(fswtchEnable[i], SIGNAL(stateChanged(int)), this, SLOT(customFunctionEdited()));
  }
@@ -197,7 +191,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
  addDoubleSpring(gridLayout, 5, num_fsw+1);

  disableMouseScrolling();
-  
+
  lock = false;
 }

@@ -264,9 +258,16 @@ void CustomFunctionsPanel::playMusic()
      phononCurrent = -1;
    }
    else {
+      if (phononCurrent >= 0) {
+        playBT[phononCurrent]->setIcon(CompanionIcon("play.png"));
+      }
      phononCurrent = index;
      clickObject->clear();
+#ifdef __APPLE__
      clickObject->setCurrentSource(QUrl("file://"+track));
+#else
+      clickObject->setCurrentSource(QUrl(track));
+#endif
      clickObject->play();
      playBT[index]->setIcon(CompanionIcon("stop.png"));
    }
@@ -277,21 +278,32 @@ void CustomFunctionsPanel::playMusic()
 #define CUSTOM_FUNCTION_NUMERIC_PARAM  (1<<0)
 #define CUSTOM_FUNCTION_SOURCE_PARAM   (1<<1)
 #define CUSTOM_FUNCTION_FILE_PARAM     (1<<2)
-#define CUSTOM_FUNCTION_GV_MODE        (1<<3)
-#define CUSTOM_FUNCTION_GV_TOOGLE      (1<<4)
-#define CUSTOM_FUNCTION_ENABLE         (1<<5)
-#define CUSTOM_FUNCTION_REPEAT         (1<<6)
-#define CUSTOM_FUNCTION_PLAY           (1<<7)
-#define CUSTOM_FUNCTION_BL_COLOR       (1<<8)
+#define CUSTOM_FUNCTION_TIME_PARAM     (1<<3)
+#define CUSTOM_FUNCTION_GV_MODE        (1<<4)
+#define CUSTOM_FUNCTION_GV_TOOGLE      (1<<5)
+#define CUSTOM_FUNCTION_ENABLE         (1<<6)
+#define CUSTOM_FUNCTION_REPEAT         (1<<7)
+#define CUSTOM_FUNCTION_PLAY           (1<<8)
+#define CUSTOM_FUNCTION_BL_COLOR       (1<<9)

 void CustomFunctionsPanel::customFunctionEdited()
 {
  if (!lock) {
    lock = true;
-
    int index = sender()->property("index").toInt();
    refreshCustomFunction(index, true);
+    emit modified();
+    lock = false;
+  }
+}

+void CustomFunctionsPanel::functionEdited()
+{
+  if (!lock) {
+    lock = true;
+    int index = sender()->property("index").toInt();
+    fswtchParamArmT[index]->setCurrentIndex(0);
+    refreshCustomFunction(index, true);
    emit modified();
    lock = false;
  }
@@ -314,11 +326,12 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)

    int index = fswtchFunc[i]->currentIndex();

-    if (index>=FuncSafetyCh1 && index<=FuncSafetyCh32) {
+    if (index>=FuncOverrideCH1 && index<=FuncOverrideCH32) {
+      int channelsMax = model.getChannelsMax(true);
      fswtchParam[i]->setDecimals(0);
      fswtchParam[i]->setSingleStep(1);
-      fswtchParam[i]->setMinimum(-125);
-      fswtchParam[i]->setMaximum(125);
+      fswtchParam[i]->setMinimum(-channelsMax);
+      fswtchParam[i]->setMaximum(channelsMax);
      if (modified) {
        model.funcSw[i].param = fswtchParam[i]->value();
      }
@@ -364,13 +377,11 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
      widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE;
    }
    else if (index>=FuncSetTimer1 && index<=FuncSetTimer2) {
-      if (modified) model.funcSw[i].param = fswtchParam[i]->value();
-      fswtchParam[i]->setDecimals(0);
-      fswtchParam[i]->setSingleStep(1);
-      fswtchParam[i]->setMinimum(0);
-      fswtchParam[i]->setMaximum(59*60+59);
-      fswtchParam[i]->setValue(model.funcSw[i].param);
-      widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_ENABLE;
+      if (modified) model.funcSw[i].param = QTimeS(fswtchParamTime[i]->time()).seconds();
+      fswtchParamTime[i]->setMinimumTime(QTime(0, 0, 0));
+      fswtchParamTime[i]->setMaximumTime(QTime(0, 59, 59));
+      fswtchParamTime[i]->setTime(QTimeS(model.funcSw[i].param));
+      widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE;
    }
    else if (index==FuncVolume) {
      if (modified) model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
@@ -433,11 +444,9 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
              }
            }
          }
-          else {
-            populateFuncParamArmTCB(fswtchParamArmT[i], model.funcSw[i].paramarm, paramarmList);
-            if (fswtchParamArmT[i]->currentText() != "----") {
-              widgetsMask |= CUSTOM_FUNCTION_PLAY;
-            }
+          populateFuncParamArmTCB(fswtchParamArmT[i], model.funcSw[i].paramarm, tracksSet);
+          if (fswtchParamArmT[i]->currentText() != "----") {
+            widgetsMask |= CUSTOM_FUNCTION_PLAY;
          }
        }
      }
@@ -453,6 +462,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
            }
          }
        }
+        populateFuncParamArmTCB(fswtchParamArmT[i], model.funcSw[i].paramarm, tracksSet);
      }
      else if (index==FuncPlaySound) {
        if (modified) model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex();
@@ -465,6 +475,19 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
        widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM;
      }
    }
+    else if (index==FuncPlayScript) {
+      widgetsMask |= CUSTOM_FUNCTION_FILE_PARAM;
+      if (modified) {
+        memset(model.funcSw[i].paramarm, 0, sizeof(model.funcSw[i].paramarm));
+        int vml = 8/*TODO*/;
+        if (fswtchParamArmT[i]->currentText() != "----") {
+          for (int j=0; j<std::min(fswtchParamArmT[i]->currentText().length(), vml); j++) {
+            model.funcSw[i].paramarm[j] = fswtchParamArmT[i]->currentText().toAscii().at(j);
+          }
+        }
+      }
+      populateFuncParamArmTCB(fswtchParamArmT[i], model.funcSw[i].paramarm, scriptsSet);
+    }
    else if (index==FuncBacklight && IS_TARANIS_PLUS(GetEepromInterface()->getBoard())) {
      if (modified) model.funcSw[i].param = (uint8_t)fswtchBLcolor[i]->value();
      fswtchBLcolor[i]->setValue(model.funcSw[i].param);
@@ -481,6 +504,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
    }

    fswtchParam[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_NUMERIC_PARAM);
+    fswtchParamTime[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_TIME_PARAM);
    fswtchParamGV[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_TOOGLE);
    fswtchParamT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_SOURCE_PARAM);
    fswtchParamArmT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_FILE_PARAM);
@@ -502,11 +526,10 @@ void CustomFunctionsPanel::update()
  lock = true;
  for (int i=0; i<firmware->getCapability(CustomFunctions); i++) {
    if (!initialized) {
-      populateSwitchCB(fswtchSwtch[i], model.funcSw[i].swtch, generalSettings, POPULATE_ONOFF);
+      populateSwitchCB(fswtchSwtch[i], model.funcSw[i].swtch, generalSettings, CustomFunctionsContext);
      populateFuncCB(fswtchFunc[i], model.funcSw[i].func);
      populateGVmodeCB(fswtchGVmode[i], model.funcSw[i].adjustMode);
      populateFuncParamCB(fswtchParamT[i], model, model.funcSw[i].func, model.funcSw[i].param, model.funcSw[i].adjustMode);
-      populateFuncParamArmTCB(fswtchParamArmT[i], model.funcSw[i].paramarm, paramarmList);
    }
    refreshCustomFunction(i);
  }
@@ -523,11 +546,10 @@ void CustomFunctionsPanel::fswPaste()
    FuncSwData *fsw = &model.funcSw[selectedFunction];
    memcpy(fsw, fswData.mid(0, sizeof(FuncSwData)).constData(), sizeof(FuncSwData));
    lock = true;
-    populateSwitchCB(fswtchSwtch[selectedFunction], model.funcSw[selectedFunction].swtch, generalSettings, POPULATE_ONOFF);
+    populateSwitchCB(fswtchSwtch[selectedFunction], model.funcSw[selectedFunction].swtch, generalSettings, CustomFunctionsContext);
    populateFuncCB(fswtchFunc[selectedFunction], model.funcSw[selectedFunction].func);
    populateGVmodeCB(fswtchGVmode[selectedFunction], model.funcSw[selectedFunction].adjustMode);
    populateFuncParamCB(fswtchParamT[selectedFunction], model, model.funcSw[selectedFunction].func, model.funcSw[selectedFunction].param, model.funcSw[selectedFunction].adjustMode);
-    populateFuncParamArmTCB(fswtchParamArmT[selectedFunction], model.funcSw[selectedFunction].paramarm, paramarmList);
    refreshCustomFunction(selectedFunction);
    lock = false;
    emit modified();
@@ -539,7 +561,7 @@ void CustomFunctionsPanel::fswDelete()
  model.funcSw[selectedFunction].clear();
  // TODO update switch and func
  lock = true;
-  populateSwitchCB(fswtchSwtch[selectedFunction], model.funcSw[selectedFunction].swtch, generalSettings, POPULATE_ONOFF);
+  populateSwitchCB(fswtchSwtch[selectedFunction], model.funcSw[selectedFunction].swtch, generalSettings, CustomFunctionsContext);
  populateFuncCB(fswtchFunc[selectedFunction], model.funcSw[selectedFunction].func);
  refreshCustomFunction(selectedFunction);
  lock = false;
@@ -586,24 +608,14 @@ void CustomFunctionsPanel::populateFuncCB(QComboBox *b, unsigned int value)
  b->clear();
  for (unsigned int i=0; i<FuncCount; i++) {
    b->addItem(FuncSwData(AssignFunc(i)).funcToString());
-    if (!firmware->getCapability(HasVolume)) {
-      if (i==FuncVolume || i==FuncBackgroundMusic || i==FuncBackgroundMusicPause) {
-        QModelIndex index = b->model()->index(i, 0);
-        QVariant v(0);
-        b->model()->setData(index, v, Qt::UserRole - 1);
-      }
-    }
-    if ((i==FuncPlayHaptic) && !firmware->getCapability(Haptic)) {
-      QModelIndex index = b->model()->index(i, 0);
-      QVariant v(0);
-      b->model()->setData(index, v, Qt::UserRole - 1);
-    }
-    if ((i==FuncPlayBoth) && !firmware->getCapability(HasBeeper)) {
-      QModelIndex index = b->model()->index(i, 0);
-      QVariant v(0);
-      b->model()->setData(index, v, Qt::UserRole - 1);
-    }
-    if ((i==FuncLogs) && !firmware->getCapability(HasSDLogs)) {
+    if (((i>=FuncOverrideCH1 && i<=FuncOverrideCH32) && !firmware->getCapability(SafetyChannelCustomFunction)) ||
+        ((i==FuncVolume || i==FuncBackgroundMusic || i==FuncBackgroundMusicPause) && !firmware->getCapability(HasVolume)) ||
+        ((i==FuncPlayScript && !IS_TARANIS(firmware->getBoard()))) ||
+        ((i==FuncPlayHaptic) && !firmware->getCapability(Haptic)) ||
+        ((i==FuncPlayBoth) && !firmware->getCapability(HasBeeper)) ||
+        ((i==FuncLogs) && !firmware->getCapability(HasSDLogs)) ||
+        ((i>=FuncAdjustGV1 && i<=FuncAdjustGVLast) && !firmware->getCapability(Gvars))
+        ) {
      QModelIndex index = b->model()->index(i, 0);
      QVariant v(0);
      b->model()->setData(index, v, Qt::UserRole - 1);
@@ -623,14 +635,17 @@ void CustomFunctionsPanel::populateGVmodeCB(QComboBox *b, unsigned int value)
  b->setCurrentIndex(value);
 }

-void CustomFunctionsPanel::populateFuncParamArmTCB(QComboBox *b, char * value, QStringList & paramsList)
+void CustomFunctionsPanel::populateFuncParamArmTCB(QComboBox *b, char * value, const QSet<QString> &paramsList)
 {
  b->clear();
  b->addItem("----");

  bool added = false;
  QString currentvalue(value);
-  foreach ( QString entry, paramsList ) {
+  // 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);
@@ -676,7 +691,7 @@ void CustomFunctionsPanel::populateFuncParamCB(QComboBox *b, const ModelData & m
    b->setCurrentIndex(value);
  }
  else if (function==FuncVolume) {
-    populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_TRIMS);
+    populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_TRIMS);
  }
  else if (function==FuncPlayValue) {
    populateSourceCB(b, RawSource(value), model, POPULATE_SOURCES|POPULATE_VIRTUAL_INPUTS|POPULATE_SWITCHES|POPULATE_GVARS|POPULATE_TRIMS|POPULATE_TELEMETRYEXT);
@@ -7,6 +7,7 @@
 #include <QComboBox>
 #include <QDoubleSpinBox>
 #include <QPushButton>
+#include <QTimeEdit>
 #ifdef PHONON
 #include <phonon/audiooutput.h>
 #include <phonon/mediaobject.h>
@@ -43,6 +44,7 @@ class CustomFunctionsPanel : public ModelPanel

  private slots:
    void customFunctionEdited();
+    void functionEdited();
    void fsw_customContextMenuRequested(QPoint pos);
    void refreshCustomFunction(int index, bool modified=false);
    void onChildModified();
@@ -59,15 +61,17 @@ class CustomFunctionsPanel : public ModelPanel
    void populateFuncCB(QComboBox *b, unsigned int value);
    void populateGVmodeCB(QComboBox *b, unsigned int value);
    void populateFuncParamCB(QComboBox *b, const ModelData & model, uint function, unsigned int value, unsigned int adjustmode=0);
-    void populateFuncParamArmTCB(QComboBox *b, char * value, QStringList & paramsList);
+    void populateFuncParamArmTCB(QComboBox *b, char * value, const QSet<QString> & paramsList);

    bool initialized;
-    QStringList paramarmList;
+    QSet<QString> tracksSet;
+    QSet<QString> scriptsSet;
    int phononCurrent;
    QComboBox * fswtchSwtch[C9X_MAX_CUSTOM_FUNCTIONS];
    QComboBox * fswtchFunc[C9X_MAX_CUSTOM_FUNCTIONS];
    QCheckBox * fswtchParamGV[C9X_MAX_CUSTOM_FUNCTIONS];
    QDoubleSpinBox * fswtchParam[C9X_MAX_CUSTOM_FUNCTIONS];
+    QTimeEdit * fswtchParamTime[C9X_MAX_CUSTOM_FUNCTIONS];
    QPushButton * playBT[C9X_MAX_CUSTOM_FUNCTIONS];
    QComboBox * fswtchParamT[C9X_MAX_CUSTOM_FUNCTIONS];
    QComboBox * fswtchParamArmT[C9X_MAX_CUSTOM_FUNCTIONS];
@@ -31,9 +31,9 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
    ui->offsetCB->hide();
  }

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

-  populateSwitchCB(ui->switchesCB, ed->swtch, generalSettings);
+  populateSwitchCB(ui->switchesCB, ed->swtch, generalSettings, MixesContext);

  ui->sideCB->setCurrentIndex(ed->mode-1);

@@ -122,7 +122,7 @@ ExpoDialog::~ExpoDialog()
 void ExpoDialog::updateScale()
 {
  if (firmware->getCapability(VirtualInputs) && ed->srcRaw.type == SOURCE_TYPE_TELEMETRY) {
-    RawSourceRange range = ed->srcRaw.getRange();
+    RawSourceRange range = ed->srcRaw.getRange(model, generalSettings);
    ui->scaleLabel->show();
    ui->scale->show();
    ui->scale->setDecimals(range.decimals);
@@ -146,7 +146,7 @@ void ExpoDialog::valuesChanged()
      updateScale();
    }

-    RawSourceRange range = srcRaw.getRange();
+    RawSourceRange range = srcRaw.getRange(model, generalSettings);
    ed->scale = round(float(ui->scale->value()) / range.step);
    ed->carryTrim = 1 - ui->trimCB->currentIndex();
    ed->swtch  = RawSwitch(ui->switchesCB->itemData(ui->switchesCB->currentIndex()).toInt());
@@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>381</width>
-    <height>414</height>
+    <width>389</width>
+    <height>488</height>
   </rect>
  </property>
  <property name="sizePolicy">
@@ -481,6 +481,9 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</string
  <tabstop>weightGV</tabstop>
  <tabstop>weightSB</tabstop>
  <tabstop>weightCB</tabstop>
+  <tabstop>offsetGV</tabstop>
+  <tabstop>offsetSB</tabstop>
+  <tabstop>offsetCB</tabstop>
  <tabstop>curveTypeCB</tabstop>
  <tabstop>curveGVarCB</tabstop>
  <tabstop>curveValueCB</tabstop>
@@ -457,6 +457,24 @@
   </item>
  </layout>
 </widget>
+ <tabstops>
+  <tabstop>name</tabstop>
+  <tabstop>fadeIn</tabstop>
+  <tabstop>swtch</tabstop>
+  <tabstop>fadeOut</tabstop>
+  <tabstop>trim2Use</tabstop>
+  <tabstop>trim2Value</tabstop>
+  <tabstop>trim1Use</tabstop>
+  <tabstop>trim1Value</tabstop>
+  <tabstop>trim3Use</tabstop>
+  <tabstop>trim3Value</tabstop>
+  <tabstop>trim4Use</tabstop>
+  <tabstop>trim4Value</tabstop>
+  <tabstop>trim2Slider</tabstop>
+  <tabstop>trim3Slider</tabstop>
+  <tabstop>trim1Slider</tabstop>
+  <tabstop>trim4Slider</tabstop>
+ </tabstops>
 <resources/>
 <connections/>
 </ui>
@@ -9,10 +9,9 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
  ModelPanel(parent, model, generalSettings, firmware),
  ui(new Ui::FlightMode),
  phaseIdx(phaseIdx),
-  phase(model.phaseData[phaseIdx]),
+  phase(model.flightModeData[phaseIdx]),
  reCount(firmware->getCapability(RotaryEncoders)),
-  gvCount(((!firmware->getCapability(HasVariants)) || (GetCurrentFirmwareVariant() & GVARS_VARIANT)) ?
-      firmware->getCapability(Gvars) : 0)
+  gvCount(firmware->getCapability(Gvars))
 {
  ui->setupUi(this);

@@ -31,7 +30,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI

  // Phase switch
  if (phaseIdx > 0) {
-    populateSwitchCB(ui->swtch, phase.swtch, generalSettings);
+    populateSwitchCB(ui->swtch, phase.swtch, generalSettings, MixesContext);
    connect(ui->swtch, SIGNAL(currentIndexChanged(int)), this, SLOT(phaseSwitch_currentIndexChanged(int)));
  }
  else {
@@ -64,19 +63,25 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
  trimsValue << ui->trim1Value << ui->trim2Value << ui->trim3Value << ui->trim4Value;
  trimsSlider << ui->trim1Slider << ui->trim2Slider << ui->trim3Slider << ui->trim4Slider;

+  BoardEnum board = firmware->getBoard();
+
  for (int i=0; i<4; i++) {
    trimsLabel[i]->setText(labels[CONVERT_MODE(i+1)-1]);

    QComboBox * cb = trimsUse[i];
    cb->setProperty("index", i);
-    cb->addItem(QObject::tr("Trim disabled"), -1);
+    if (IS_TARANIS(board)) {
+      cb->addItem(QObject::tr("Trim disabled"), -1);
+    }
    for (int m=0; m<modesCount; m++) {
      if (m == phaseIdx) {
        cb->addItem(QObject::tr("Own Trim"), m*2);
      }
      else if (phaseIdx > 0) {
        cb->addItem(QObject::tr("Use Trim from Flight mode %1").arg(m), m*2);
-        cb->addItem(QObject::tr("Use Trim from Flight mode %1 + Own Trim as an offset").arg(m), m*2+1);
+        if (IS_TARANIS(board)) {
+          cb->addItem(QObject::tr("Use Trim from Flight mode %1 + Own Trim as an offset").arg(m), m*2+1);
+        }
      }
    }
    connect(cb, SIGNAL(currentIndexChanged(int)), this, SLOT(phaseTrimUse_currentIndexChanged(int)));
@@ -158,7 +163,7 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
      gvLayout->addWidget(gvValues[i], i, col++, 1, 1);
      
      // Popups
-      if (IS_TARANIS(GetEepromInterface()->getBoard()) && (phaseIdx == 0)) {
+      if (IS_TARANIS(board) && phaseIdx == 0) {
        gvPopups[i] = new QCheckBox(ui->gvGB);
        gvPopups[i]->setProperty("index", i);
        gvPopups[i]->setText(tr("Popup enabled"));
@@ -204,7 +209,9 @@ void FlightModePanel::update()

  if (ui->gvGB->isVisible()) {
    for (int i=0; i<gvCount; i++) {
-      gvNames[i]->setText(model.gvars_names[i]);
+      if (firmware->getCapability(GvarsName) > 0) {
+        gvNames[i]->setText(model.gvars_names[i]);
+      }
      gvValues[i]->setDisabled(model.isGVarLinked(phaseIdx, i));
      gvValues[i]->setValue(model.getGVarValue(phaseIdx, i));
      if (IS_TARANIS(GetEepromInterface()->getBoard()) && phaseIdx == 0) { 
@@ -216,10 +223,10 @@ void FlightModePanel::update()
  for (int i=0; i<reCount; i++) {    
    reValues[i]->setDisabled(false);
    int idx = phase.rotaryEncoders[i];
-    PhaseData *phasere = &phase;
+    FlightModeData *phasere = &phase;
    while (idx > 1024) {
      idx -= 1025;
-      phasere = &model.phaseData[idx];
+      phasere = &model.flightModeData[idx];
      idx = phasere->rotaryEncoders[i];
      reValues[i]->setDisabled(true);
    }
@@ -271,7 +278,11 @@ void FlightModePanel::trimUpdate(unsigned int trim)
    trimsSlider[trim]->setEnabled(false);
  }
  else {
-    trimsUse[trim]->setCurrentIndex(1 + 2*phase.trimRef[chn] + phase.trimMode[chn] - (phase.trimRef[chn] > phaseIdx ? 1 : 0));
+    BoardEnum board = firmware->getBoard();
+    if (IS_TARANIS(board))
+      trimsUse[trim]->setCurrentIndex(1 + 2*phase.trimRef[chn] + phase.trimMode[chn] - (phase.trimRef[chn] > phaseIdx ? 1 : 0));
+    else
+      trimsUse[trim]->setCurrentIndex(phase.trimRef[chn]);
    trimsValue[trim]->setEnabled(true);
    trimsSlider[trim]->setEnabled(true);
  }
@@ -306,10 +317,10 @@ void FlightModePanel::phaseGVUse_currentIndexChanged(int index)
    QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
    int gvar = comboBox->property("index").toInt();
    if (index == 0) {
-      phase.gvars[gvar]=0;
+      phase.gvars[gvar] = 0;
    }
    else {
-      phase.gvars[gvar] = 1024+index+(index>phaseIdx?1:0);
+      phase.gvars[gvar] = 1024 + index;
    }
    update();
    emit modified();
@@ -365,8 +376,15 @@ void FlightModePanel::phaseTrimUse_currentIndexChanged(int index)
      phase.trim[chn] = 0;
    }
    else {
-      phase.trimMode[chn] = data % 2;
-      phase.trimRef[chn] = data / 2;
+      BoardEnum board = firmware->getBoard();
+      if (IS_TARANIS(board)) {
+        phase.trimMode[chn] = data % 2;
+        phase.trimRef[chn] = data / 2;
+      }
+      else {
+        phase.trimMode[chn] = 0;
+        phase.trimRef[chn] = data / 2;
+      }
      phase.trim[chn] = 0;
    }
    trimUpdate(trim);
@@ -436,7 +454,7 @@ void FlightModesPanel::onPhaseModified()
 QString FlightModesPanel::getTabName(int index)
 {
  QString result = tr("Flight Mode %1").arg(index);
-  const char *name = model.phaseData[index].name;
+  const char *name = model.flightModeData[index].name;
  if (firmware->getCapability(FlightModesName) && strlen(name) > 0) {
    result += tr(" (%1)").arg(name);
  }
@@ -44,7 +44,7 @@ class FlightModePanel : public ModelPanel
  private:
    Ui::FlightMode *ui;
    int phaseIdx;
-    PhaseData & phase;
+    FlightModeData & phase;
    int reCount;
    int gvCount;
    QVector<QLabel *> trimsLabel;
@@ -28,7 +28,7 @@ void HeliPanel::update()
  lock = true;

  ui->swashTypeCB->setCurrentIndex(model.swashRingData.type);
-  populateSourceCB(ui->swashCollectiveCB, model.swashRingData.collectiveSource, model, POPULATE_SOURCES | POPULATE_SWITCHES | POPULATE_TRIMS);
+  populateSourceCB(ui->swashCollectiveCB, model.swashRingData.collectiveSource, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
  ui->swashRingValSB->setValue(model.swashRingData.value);
  ui->swashInvertELE->setChecked(model.swashRingData.invertELE);
  ui->swashInvertAIL->setChecked(model.swashRingData.invertAIL);
@@ -7,6 +7,10 @@ InputsPanel::InputsPanel(QWidget *parent, ModelData & model, GeneralSettings & g
  ModelPanel(parent, model, generalSettings, firmware),
  expoInserted(false)
 {
+  inputsCount = firmware->getCapability(VirtualInputs);
+  if (inputsCount == 0)
+    inputsCount = NUM_STICKS;
+
  QGridLayout * exposLayout = new QGridLayout(this);

  ExposlistWidget = new MixersList(this, true);
@@ -47,10 +51,6 @@ void InputsPanel::update()
 {
  lock = true;

-  int inputsCount = firmware->getCapability(VirtualInputs);
-  if (inputsCount == 0)
-    inputsCount = NUM_STICKS;
-
  // curDest -> destination channel
  // i -> mixer number
  QByteArray qba;
@@ -165,16 +165,16 @@ QString InputsPanel::getInputText(int dest, bool * new_ch)
    if (md->offset) str += " " + tr("Offset(%1)").arg(getGVarString(md->offset));

    if (firmware->getCapability(VirtualInputs)) {
-      str += " " + tr("Source(%1)").arg(md->srcRaw.toString());
+      str += " " + tr("Source(%1)").arg(md->srcRaw.toString(model));
      if (md->carryTrim>0) {
        str += " " + tr("NoTrim");
      }
      else if (md->carryTrim<0) {
-        str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString();
+        str += " " + RawSource(SOURCE_TYPE_TRIM, (-(md->carryTrim)-1)).toString(model);
      }
    }

-    if (md->curve.value) str += " " +  Qt::escape(md->curve.toString());
+    if (md->curve.value) str += " " +  md->curve.toString();

    QString phasesStr = getPhasesStr(md->phases, model);
    if (!phasesStr.isEmpty()) str += " " + phasesStr;
@@ -272,6 +272,9 @@ void InputsPanel::setSelectedByExpoList(QList<int> list)

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

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


    if ((ret == QMessageBox::Yes) || (!ask)) {
-        exposDeleteList(createExpoListFromSelected());
+        exposDeleteList(list);
        emit modified();
        update();
    }
@@ -443,6 +446,7 @@ void InputsPanel::expolistWidget_KeyPress(QKeyEvent *event)

 int InputsPanel::gm_moveExpo(int idx, bool dir) //true=inc=down false=dec=up
 {
+
    if(idx>C9X_MAX_EXPOS || (idx==C9X_MAX_EXPOS && dir)) return idx;

    int tdx = dir ? idx+1 : idx-1;
@@ -453,22 +457,27 @@ int InputsPanel::gm_moveExpo(int idx, bool dir) //true=inc=down false=dec=up
    if (!dir && tdx<0 && src.chn>0) {
      src.chn--;
      return idx;
-    } else if (!dir && tdx<0) {
+    }
+    else if (!dir && tdx<0) {
      return idx;
    }

-    if(memcmp(&src,&temp,sizeof(ExpoData))==0) return idx;
-    bool tgtempty=(memcmp(&tgt,&temp,sizeof(ExpoData))==0 ? 1:0);
-    if(tgt.chn!=src.chn || tgtempty) {
-        if ((dir)  && (src.chn<(NUM_STICKS-1))) src.chn++;
-        if ((!dir) && (src.chn>0)) src.chn--;
-        return idx;
+    if (memcmp(&src, &temp, sizeof(ExpoData)) == 0) {
+      return idx;
    }

-    //flip between idx and tgt
-    memcpy(&temp,&src,sizeof(ExpoData));
-    memcpy(&src,&tgt,sizeof(ExpoData));
-    memcpy(&tgt,&temp,sizeof(ExpoData));
+    bool tgtempty = (memcmp(&tgt, &temp, sizeof(ExpoData)) == 0);
+
+    if (tgt.chn!=src.chn || tgtempty) {
+      if ((dir)  && (src.chn<unsigned(inputsCount-1))) src.chn++;
+      if ((!dir) && (src.chn>0)) src.chn--;
+      return idx;
+    }
+
+    // flip between idx and tgt
+    memcpy(&temp, &src, sizeof(ExpoData));
+    memcpy(&src, &tgt, sizeof(ExpoData));
+    memcpy(&tgt, &temp, sizeof(ExpoData));
    return tdx;
 }

@@ -34,6 +34,7 @@ class InputsPanel : public ModelPanel
    bool expoInserted;
    MixersList *ExposlistWidget;
    bool firstLine;
+    int inputsCount;

    int getExpoIndex(unsigned int dch);
    bool gm_insertExpo(int idx);
@@ -11,6 +11,8 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
  ModelPanel(parent, model, generalSettings, firmware),
  selectedSwitch(0)
 {
+  int channelsMax = model.getChannelsMax(true);
+
  QGridLayout * gridLayout = new QGridLayout(this);

  int col = 1;
@@ -48,12 +50,12 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
    gridLayout->addWidget(cswitchSource1[i], i+1, 2);
    cswitchSource1[i]->setVisible(false);
    cswitchValue[i] = new QDoubleSpinBox(this);
-    cswitchValue[i]->setMaximum(125);
-    cswitchValue[i]->setMinimum(-125);
+    cswitchValue[i]->setMaximum(channelsMax);
+    cswitchValue[i]->setMinimum(-channelsMax);
    cswitchValue[i]->setAccelerated(true);
    cswitchValue[i]->setDecimals(0);
    cswitchValue[i]->setProperty("index", i);
-    connect(cswitchValue[i], SIGNAL(editingFinished()), this, SLOT(edited()));
+    connect(cswitchValue[i], SIGNAL(valueChanged(double)), this, SLOT(edited()));
    gridLayout->addWidget(cswitchValue[i], i+1, 2);
    cswitchValue[i]->setVisible(false);

@@ -66,22 +68,28 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
    cswitchSource2[i]->setVisible(false);
    cswitchOffset[i] = new QDoubleSpinBox(this);
    cswitchOffset[i]->setProperty("index",i);
-    cswitchOffset[i]->setMaximum(125);
-    cswitchOffset[i]->setMinimum(-125);
+    cswitchOffset[i]->setMaximum(channelsMax);
+    cswitchOffset[i]->setMinimum(-channelsMax);
    cswitchOffset[i]->setAccelerated(true);
    cswitchOffset[i]->setDecimals(0);
-    connect(cswitchOffset[i], SIGNAL(editingFinished()), this, SLOT(edited()));
+    connect(cswitchOffset[i], SIGNAL(valueChanged(double)), this, SLOT(edited()));
    cswitchOffset[i]->setVisible(false);
    v2Layout->addWidget(cswitchOffset[i]);
    cswitchOffset2[i] = new QDoubleSpinBox(this);
    cswitchOffset2[i]->setProperty("index",i);
-    cswitchOffset2[i]->setMaximum(125);
-    cswitchOffset2[i]->setMinimum(-125);
+    cswitchOffset2[i]->setMaximum(channelsMax);
+    cswitchOffset2[i]->setMinimum(-channelsMax);
    cswitchOffset2[i]->setAccelerated(true);
    cswitchOffset2[i]->setDecimals(0);
-    connect(cswitchOffset2[i], SIGNAL(editingFinished()), this, SLOT(edited()));
+    connect(cswitchOffset2[i], SIGNAL(valueChanged(double)), this, SLOT(edited()));
    cswitchOffset2[i]->setVisible(false);
    v2Layout->addWidget(cswitchOffset2[i]);
+    cswitchTOffset[i] = new QTimeEdit(this);
+    cswitchTOffset[i]->setProperty("index",i);
+    cswitchTOffset[i]->setAccelerated(true);
+    connect(cswitchTOffset[i],SIGNAL(editingFinished()),this,SLOT(edited()));
+    v2Layout->addWidget(cswitchTOffset[i]);
+    cswitchTOffset[i]->setVisible(false);
    gridLayout->addLayout(v2Layout, i+1, 3);

    // AND
@@ -132,14 +140,9 @@ void LogicalSwitchesPanel::v1Edited(int value)
    int i = sender()->property("index").toInt();
    model.customSw[i].val1 = cswitchSource1[i]->itemData(value).toInt();
    if (model.customSw[i].getFunctionFamily() == LS_FAMILY_VOFS) {
-      RawSource source = RawSource(model.customSw[i].val1, &model);
-      RawSourceRange range = source.getRange();
-      if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
-        model.customSw[i].val2 = (cswitchOffset[i]->value() / range.step);
-      }
-      else {
-        model.customSw[i].val2 = (cswitchOffset[i]->value() - range.offset) / range.step/* TODO - source.getRawOffset(model)*/;
-      }
+      RawSource source = RawSource(model.customSw[i].val1);
+      RawSourceRange range = source.getRange(model, generalSettings, model.customSw[i].getRangeFlags());
+      model.customSw[i].val2 = (cswitchOffset[i]->value() - range.offset) / range.step;
      setSwitchWidgetVisibility(i);
    }
    emit modified();
@@ -166,16 +169,20 @@ void LogicalSwitchesPanel::andEdited(int value)

 void LogicalSwitchesPanel::durationEdited(double duration)
 {
-  int index = sender()->property("index").toInt();
-  model.customSw[index].duration = (uint8_t)round(duration*10);
-  emit modified();
+  if (!lock) {
+    int index = sender()->property("index").toInt();
+    model.customSw[index].duration = (uint8_t)round(duration*10);
+    emit modified();
+  }
 }

 void LogicalSwitchesPanel::delayEdited(double delay)
 {
-  int index = sender()->property("index").toInt();
-  model.customSw[index].delay = (uint8_t)round(delay*10);
-  emit modified();
+  if (!lock) {
+    int index = sender()->property("index").toInt();
+    model.customSw[index].delay = (uint8_t)round(delay*10);
+    emit modified();
+  }
 }

 void LogicalSwitchesPanel::edited()
@@ -183,73 +190,86 @@ void LogicalSwitchesPanel::edited()
  if (!lock) {
    lock = true;
    int i = sender()->property("index").toInt();
-    int newFunc = csw[i]->itemData(csw[i]->currentIndex()).toInt();
-    bool chAr = (model.customSw[i].getFunctionFamily() != LogicalSwitchData(newFunc).getFunctionFamily());
-    model.customSw[i].func = newFunc;
-    if (chAr) {
-      if (model.customSw[i].getFunctionFamily() == LS_FAMILY_TIMER) {
+    CSFunctionFamily oldFuncFamily = model.customSw[i].getFunctionFamily();
+    model.customSw[i].func = csw[i]->itemData(csw[i]->currentIndex()).toInt();
+    CSFunctionFamily newFuncFamily = model.customSw[i].getFunctionFamily();
+
+    if (oldFuncFamily != newFuncFamily) {
+      if (newFuncFamily == LS_FAMILY_TIMER) {
        model.customSw[i].val1 = -119;
        model.customSw[i].val2 = -119;
      }
-      else if (model.customSw[i].getFunctionFamily() == LS_FAMILY_STAY) {
+      else if (newFuncFamily == LS_FAMILY_STAY) {
        model.customSw[i].val1 = 0;
        model.customSw[i].val2 = -129;
        model.customSw[i].val3 = 0;
      }
+      else if (newFuncFamily == LS_FAMILY_STICKY) {
+        model.customSw[i].val1 = 0;
+        model.customSw[i].val2 = 0;
+        model.customSw[i].delay = 0;
+      }
      else {
        model.customSw[i].val1 = 0;
        model.customSw[i].val2 = 0;
      }
-      model.customSw[i].andsw = 0;
      setSwitchWidgetVisibility(i);
    }

    RawSource source;
-    switch (model.customSw[i].getFunctionFamily())
+
+    switch (newFuncFamily)
    {
      case LS_FAMILY_VOFS:
      {
-        source = RawSource(model.customSw[i].val1, &model);
-        RawSourceRange range = source.getRange();
-        if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
-          model.customSw[i].val2 = (cswitchOffset[i]->value() / range.step);
-          cswitchOffset[i]->setValue(model.customSw[i].val2*range.step);
-        }
-        else {
-          model.customSw[i].val2 = round((cswitchOffset[i]->value()-range.offset)/range.step);
-          cswitchOffset[i]->setValue(model.customSw[i].val2*range.step + range.offset);
-        }
+        source = RawSource(model.customSw[i].val1);
+        RawSourceRange range = source.getRange(model, generalSettings, model.customSw[i].getRangeFlags());
+        double value = source.isTimeBased() ? QTimeS(cswitchTOffset[i]->time()).seconds() : cswitchOffset[i]->value();
+        model.customSw[i].val2 = round((value-range.offset)/range.step);;
+        value = model.customSw[i].val2*range.step + range.offset;
+        if (source.isTimeBased())
+          cswitchTOffset[i]->setTime(QTimeS(round(value)));
+        else
+          cswitchOffset[i]->setValue(value);
        break;
      }
      case LS_FAMILY_TIMER:
        model.customSw[i].val1 = TimToVal(cswitchValue[i]->value());
        model.customSw[i].val2 = TimToVal(cswitchOffset[i]->value());
-        updateTimerParam(cswitchValue[i], model.customSw[i].val1);
-        updateTimerParam(cswitchOffset[i], model.customSw[i].val2);
+        updateTimerParam(cswitchValue[i], model.customSw[i].val1, 0.1);
+        updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.1);
        break;
      case LS_FAMILY_STAY:
+        cswitchOffset2[i]->setSpecialValueText(tr("(instant)"));
        if (sender() == cswitchOffset[i]) {
          model.customSw[i].val2 = TimToVal(cswitchOffset[i]->value());
-          updateTimerParam(cswitchOffset[i], model.customSw[i].val2, true);
+          updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.0);
        }
        else {
          model.customSw[i].val3 = TimToVal(cswitchOffset2[i]->value()) - model.customSw[i].val2;
        }
-        updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, true);
+        updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1));
+        if (model.customSw[i].val3 == 0) {
+          cswitchOffset2[i]->setSuffix("(release)");
+        }
+        else {
+          cswitchOffset2[i]->setSuffix("");
+        }
        break;
      default:
        break;
    }
    emit modified();
    lock = false;
+    updateLine(i);
  }
 }

-void LogicalSwitchesPanel::updateTimerParam(QDoubleSpinBox *sb, int timer, bool allowZero)
+void LogicalSwitchesPanel::updateTimerParam(QDoubleSpinBox *sb, int timer, double minimum)
 {
  sb->setVisible(true);
  sb->setDecimals(1);
-  sb->setMinimum(allowZero ? 0.0 : 0.1);
+  sb->setMinimum(minimum);
  sb->setMaximum(175);
  float value = ValToTim(timer);
  if (value>=60)
@@ -266,54 +286,73 @@ void LogicalSwitchesPanel::updateTimerParam(QDoubleSpinBox *sb, int timer, bool
 #define VALUE1_VISIBLE   0x4
 #define VALUE2_VISIBLE   0x8
 #define VALUE3_VISIBLE   0x10
+#define VALUE_TO_VISIBLE 0x20
+#define DELAY_ENABLED    0x40

 void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
 {
  lock = true;

-  unsigned int mask = 0;
-  RawSource source = RawSource(model.customSw[i].val1, &model);
-  RawSourceRange range = source.getRange();
+  unsigned int mask = DELAY_ENABLED;
+  RawSource source = RawSource(model.customSw[i].val1);
+  RawSourceRange range = source.getRange(model, generalSettings, model.customSw[i].getRangeFlags());

  switch (model.customSw[i].getFunctionFamily())
  {
    case LS_FAMILY_VOFS:
-      mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE;
-      populateSourceCB(cswitchSource1[i], source, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+      mask |= SOURCE1_VISIBLE;
+      populateSourceCB(cswitchSource1[i], source, model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
      cswitchOffset[i]->setDecimals(range.decimals);
      cswitchOffset[i]->setSingleStep(range.step);
-      if (model.customSw[i].func == LS_FN_DPOS || model.customSw[i].func == LS_FN_DAPOS) {
-        cswitchOffset[i]->setMinimum(range.step*-127);
-        cswitchOffset[i]->setMaximum(range.step*127);
-        cswitchOffset[i]->setValue(range.step*model.customSw[i].val2);
+      if (source.isTimeBased()) {
+        mask |= VALUE_TO_VISIBLE;
+        int maxTime = round(range.max);
+        int value = round(range.step*model.customSw[i].val2 + range.offset);
+        cswitchTOffset[i]->setMaximumTime(QTimeS(maxTime));
+        cswitchTOffset[i]->setDisplayFormat((maxTime>=3600)?"hh:mm:ss":"mm:ss");
+        cswitchTOffset[i]->setTime(QTimeS(value));
      }
      else {
+        mask |= VALUE2_VISIBLE;
+        if (range.unit.isEmpty())
+          cswitchOffset[i]->setSuffix("");
+        else
+          cswitchOffset[i]->setSuffix(" " + range.unit);
        cswitchOffset[i]->setMinimum(range.min);
        cswitchOffset[i]->setMaximum(range.max);
        cswitchOffset[i]->setValue(range.step*(model.customSw[i].val2/* TODO+source.getRawOffset(model)*/)+range.offset);
      }
      break;
-    case LS_FAMILY_VBOOL:
    case LS_FAMILY_STICKY:
+      // no break
+    case LS_FAMILY_VBOOL:
      mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE;
-      populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings);
-      populateSwitchCB(cswitchSource2[i], RawSwitch(model.customSw[i].val2), generalSettings);
+      populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings, LogicalSwitchesContext);
+      populateSwitchCB(cswitchSource2[i], RawSwitch(model.customSw[i].val2), generalSettings, LogicalSwitchesContext);
      break;
    case LS_FAMILY_STAY:
      mask |= SOURCE1_VISIBLE | VALUE2_VISIBLE | VALUE3_VISIBLE;
-      populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings);
-      updateTimerParam(cswitchOffset[i], model.customSw[i].val2, true);
-      updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, true);
+      mask &= ~DELAY_ENABLED;
+      populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings, LogicalSwitchesContext);
+      updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.0);
+      updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1));
+      cswitchOffset2[i]->setSpecialValueText(tr("(instant)"));
+      if (model.customSw[i].val3 == 0) {
+        cswitchOffset2[i]->setSuffix(tr("(release)"));
+      }
+      else {
+        cswitchOffset2[i]->setSuffix("");
+      }
      break;
    case LS_FAMILY_VCOMP:
      mask |= SOURCE1_VISIBLE | SOURCE2_VISIBLE;
-      populateSourceCB(cswitchSource1[i], RawSource(model.customSw[i].val1), model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
-      populateSourceCB(cswitchSource2[i], RawSource(model.customSw[i].val2), model, POPULATE_SOURCES | POPULATE_TRIMS | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+      populateSourceCB(cswitchSource1[i], RawSource(model.customSw[i].val1), model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
+      populateSourceCB(cswitchSource2[i], RawSource(model.customSw[i].val2), model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_TRIMS | POPULATE_SWITCHES | POPULATE_TELEMETRY | (firmware->getCapability(GvarsInCS) ? POPULATE_GVARS : 0));
      break;
    case LS_FAMILY_TIMER:
      mask |= VALUE1_VISIBLE | VALUE2_VISIBLE;
-      updateTimerParam(cswitchValue[i], model.customSw[i].val1);
-      updateTimerParam(cswitchOffset[i], model.customSw[i].val2);
+      updateTimerParam(cswitchValue[i], model.customSw[i].val1, 0.1);
+      updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.1);
      break;
  }

@@ -322,7 +361,12 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
  cswitchValue[i]->setVisible(mask & VALUE1_VISIBLE);
  cswitchOffset[i]->setVisible(mask & VALUE2_VISIBLE);
  cswitchOffset2[i]->setVisible(mask & VALUE3_VISIBLE);
-
+  cswitchTOffset[i]->setVisible(mask & VALUE_TO_VISIBLE);
+  if (firmware->getCapability(LogicalSwitchesExt)) {
+    cswitchDelay[i]->setEnabled(mask & DELAY_ENABLED);
+    cswitchDuration[i]->setValue(model.customSw[i].duration/10.0);
+    cswitchDelay[i]->setValue(model.customSw[i].delay/10.0);
+  }
  lock = false;
 }

@@ -370,6 +414,34 @@ void LogicalSwitchesPanel::populateCSWCB(QComboBox *b, int value)
  b->setMaxVisibleItems(10);
 }

+void LogicalSwitchesPanel::populateAndSwitchCB(QComboBox *b, const RawSwitch & value)
+{
+  if (IS_ARM(firmware->getBoard())) {
+    populateSwitchCB(b, value, generalSettings, LogicalSwitchesContext);
+  }
+  else {
+    RawSwitch item;
+
+    b->clear();
+
+    item = RawSwitch(SWITCH_TYPE_NONE);
+    b->addItem(item.toString(), item.toValue());
+    if (item == value) b->setCurrentIndex(b->count()-1);
+
+    for (int i=1; i<=firmware->getCapability(SwitchesPositions); i++) {
+      item = RawSwitch(SWITCH_TYPE_SWITCH, i);
+      b->addItem(item.toString(), item.toValue());
+      if (item == value) b->setCurrentIndex(b->count()-1);
+    }
+
+    for (int i=1; i<=6; i++) {
+      item = RawSwitch(SWITCH_TYPE_VIRTUAL, i);
+      b->addItem(item.toString(), item.toValue());
+      if (item == value) b->setCurrentIndex(b->count()-1);
+    }
+  }
+}
+
 void LogicalSwitchesPanel::updateLine(int i)
 {
  lock = true;
@@ -378,10 +450,6 @@ void LogicalSwitchesPanel::updateLine(int i)
  setSwitchWidgetVisibility(i);
  lock = true;
  populateAndSwitchCB(cswitchAnd[i], RawSwitch(model.customSw[i].andsw));
-  if (firmware->getCapability(LogicalSwitchesExt)) {
-    cswitchDuration[i]->setValue(model.customSw[i].duration/10.0);
-    cswitchDelay[i]->setValue(model.customSw[i].delay/10.0);
-  }
  lock = false;
 }

@@ -4,6 +4,7 @@
 #include "modelpanel.h"
 #include <QComboBox>
 #include <QDoubleSpinBox>
+#include <QTimeEdit>

 class LogicalSwitchesPanel : public ModelPanel
 {
@@ -33,6 +34,7 @@ class LogicalSwitchesPanel : public ModelPanel
    QDoubleSpinBox  * cswitchValue[C9X_NUM_CSW];
    QDoubleSpinBox  * cswitchOffset[C9X_NUM_CSW];
    QDoubleSpinBox  * cswitchOffset2[C9X_NUM_CSW];
+    QTimeEdit  * cswitchTOffset[C9X_NUM_CSW];
    QComboBox * cswitchAnd[C9X_NUM_CSW];
    QDoubleSpinBox  * cswitchDuration[C9X_NUM_CSW];
    QDoubleSpinBox  * cswitchDelay[C9X_NUM_CSW];
@@ -42,8 +44,9 @@ class LogicalSwitchesPanel : public ModelPanel
    int selectedSwitch;

    void populateCSWCB(QComboBox *b, int value);
+    void populateAndSwitchCB(QComboBox *b, const RawSwitch & value);
    void updateLine(int index);
-    void updateTimerParam(QDoubleSpinBox *sb, int timer, bool allowZero=false);
+    void updateTimerParam(QDoubleSpinBox *sb, int timer, double minimum=0);

 };

@@ -19,14 +19,14 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G

    this->setWindowTitle(tr("DEST -> CH%1").arg(md->destCh));

-    populateSourceCB(ui->sourceCB, md->srcRaw, model, POPULATE_SOURCES | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
+    populateSourceCB(ui->sourceCB, md->srcRaw, model, POPULATE_SOURCES | POPULATE_SCRIPT_OUTPUTS | POPULATE_VIRTUAL_INPUTS | POPULATE_SWITCHES | POPULATE_TRIMS);
    ui->sourceCB->removeItem(0);

    int limit = firmware->getCapability(OffsetWeight);

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

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

@@ -76,7 +76,7 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
      }
    }

-    populateSwitchCB(ui->switchesCB, md->swtch, generalSettings);
+    populateSwitchCB(ui->switchesCB, md->swtch, generalSettings, MixesContext);
    ui->warningCB->setCurrentIndex(md->mixWarn);
    ui->mltpxCB->setCurrentIndex(md->mltpx);
    int scale=firmware->getCapability(SlowScale);  
@@ -142,7 +142,7 @@ void MixerDialog::valuesChanged()
  if (!lock) {
    lock = true;
    QCheckBox * cb_fp[] = {ui->cb_FP0,ui->cb_FP1,ui->cb_FP2,ui->cb_FP3,ui->cb_FP4,ui->cb_FP5,ui->cb_FP6,ui->cb_FP7,ui->cb_FP8 };
-    md->srcRaw  = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt(), &model);
+    md->srcRaw  = RawSource(ui->sourceCB->itemData(ui->sourceCB->currentIndex()).toInt());
    if (firmware->getCapability(HasNoExpo)) {
      bool drVisible = (md->srcRaw.type == SOURCE_TYPE_STICK && md->srcRaw.index < NUM_STICKS);
      ui->MixDR_CB->setEnabled(drVisible);
@@ -6,8 +6,8 @@
   <rect>
    <x>0</x>
    <y>0</y>
-    <width>364</width>
-    <height>434</height>
+    <width>412</width>
+    <height>541</height>
   </rect>
  </property>
  <property name="sizePolicy">
@@ -67,7 +67,7 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -96,7 +96,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -125,7 +125,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -148,7 +148,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -611,6 +611,39 @@ If blank then the mix is considered to be &quot;ON&quot; all the time.</string>
   </item>
  </layout>
 </widget>
+ <tabstops>
+  <tabstop>mixerName</tabstop>
+  <tabstop>sourceCB</tabstop>
+  <tabstop>weightGV</tabstop>
+  <tabstop>weightCB</tabstop>
+  <tabstop>weightSB</tabstop>
+  <tabstop>offsetGV</tabstop>
+  <tabstop>offsetCB</tabstop>
+  <tabstop>offsetSB</tabstop>
+  <tabstop>curveTypeCB</tabstop>
+  <tabstop>curveGVarCB</tabstop>
+  <tabstop>curveValueCB</tabstop>
+  <tabstop>curveValueSB</tabstop>
+  <tabstop>trimCB</tabstop>
+  <tabstop>MixDR_CB</tabstop>
+  <tabstop>cb_FP0</tabstop>
+  <tabstop>cb_FP1</tabstop>
+  <tabstop>cb_FP2</tabstop>
+  <tabstop>cb_FP3</tabstop>
+  <tabstop>cb_FP4</tabstop>
+  <tabstop>cb_FP5</tabstop>
+  <tabstop>cb_FP6</tabstop>
+  <tabstop>cb_FP7</tabstop>
+  <tabstop>cb_FP8</tabstop>
+  <tabstop>switchesCB</tabstop>
+  <tabstop>warningCB</tabstop>
+  <tabstop>mltpxCB</tabstop>
+  <tabstop>delayUpSB</tabstop>
+  <tabstop>slowUpSB</tabstop>
+  <tabstop>delayDownSB</tabstop>
+  <tabstop>slowDownSB</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
 <resources>
  <include location="../companion.qrc"/>
 </resources>
@@ -170,16 +170,12 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch)
      default:  str += "  "; break;
    };

-    //set mixer src model if it is unset (srcRaw needs this to generate proper toString() for input source type)
-    if (md->srcRaw.model == 0) 
-      md->srcRaw.model = &model;  
-    
-    //highlight source if needed
+    // highlight source if needed
    if ( (md->srcRaw.type == SOURCE_TYPE_CH) && (md->srcRaw.index+1 == (int)highlightedSource) ) {
-      str += " <b>" + Qt::escape(md->srcRaw.toString()) + "</b>"; 
+      str += " <b>" + Qt::escape(md->srcRaw.toString(model)) + "</b>";
    }
    else {
-      str += " " + Qt::escape(md->srcRaw.toString());
+      str += " " + Qt::escape(md->srcRaw.toString(model));
    }

    str += " " + Qt::escape(tr("Weight(%1)").arg(getGVarString(md->weight, true)));
@@ -192,7 +188,7 @@ QString MixesPanel::getMixerText(int dest, bool * new_ch)
    }

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

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

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

    if(ask)
@@ -331,7 +330,7 @@ void MixesPanel::mixersDelete(bool ask)


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

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

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

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

 ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, FirmwareInterface * firmware) :
  QDialog(parent),
@@ -29,7 +28,8 @@ ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, Firmw
  ui->pushButton->setIcon(CompanionIcon("simulate.png"));
  SetupPanel * setupPanel = new SetupPanel(this, model, generalSettings, firmware);
  addTab(setupPanel, tr("Setup"));
-  addTab(new HeliPanel(this, model, generalSettings, firmware), tr("Heli"));
+  if (firmware->getCapability(Heli))
+    addTab(new HeliPanel(this, model, generalSettings, firmware), tr("Heli"));
  addTab(new FlightModesPanel(this, model, generalSettings, firmware), tr("Flight Modes"));
  addTab(new InputsPanel(this, model, generalSettings, firmware), tr("Inputs"));
  addTab(new MixesPanel(this, model, generalSettings, firmware), tr("Mixes"));
@@ -43,8 +43,6 @@ ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, Firmw
    addTab(new TelemetryPanel(this, model, generalSettings, firmware), tr("Telemetry"));
    
  connect(setupPanel, SIGNAL(extendedLimitsToggled()), chnPanel, SLOT(refreshExtendedLimits()));
-
-  ga.sendPageView(getBoardName(firmware->getBoard()) + " ModelEdit");
 }

 ModelEdit::~ModelEdit()
@@ -94,6 +92,7 @@ void ModelEdit::addTab(ModelPanel *panel, QString text)
  panels << panel;
  QWidget * widget = new QWidget(ui->tabWidget);
  QVBoxLayout *baseLayout = new QVBoxLayout(widget);
+  panel->update();
  VerticalScrollArea * area = new VerticalScrollArea(widget, panel);
  baseLayout->addWidget(area);
  ui->tabWidget->addTab(widget, text);
@@ -122,6 +122,15 @@ qreal Node::getX()
    return 0;
 }

+void Node::setX(qreal newX)
+{
+    if(scene())
+    {
+        QRectF rect = scene()->sceneRect();
+        QGraphicsObject::setX(rect.left() + (newX+1) * rect.width()/2);
+    }
+}
+
 qreal Node::getY()
 {
    if(scene())
@@ -132,6 +141,15 @@ qreal Node::getY()
    return 0;
 }

+void Node::setY(qreal newY)
+{
+    if(scene())
+    {
+        QRectF rect = scene()->sceneRect();
+        QGraphicsObject::setY(rect.top() + (newY+1) * rect.height()/2);
+    }
+}
+
 QList<Edge *> Node::edges() const
 {
    return edgeList;
@@ -72,6 +72,8 @@ class Node : public QGraphicsObject
    int  getBallSize() {return ballSize;}
    qreal getX();
    qreal getY();
+    void setX(qreal newX);
+    void setY(qreal newX);

    void setCenteringX(bool val) {centerX = val;}
    void setCenteringY(bool val) {centerY = val;}
@@ -5,7 +5,7 @@
 #include "helpers.h"
 #include "appdata.h"

-TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, FirmwareInterface * firmware, QWidget *prevFocus):
  ModelPanel(parent, model, generalSettings, firmware),
  timer(timer),
  ui(new Ui::Timer)
@@ -15,7 +15,7 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
  lock = true;

  // Mode
-  populateSwitchCB(ui->mode, timer.mode, generalSettings, POPULATE_TIMER_MODES);
+  populateSwitchCB(ui->mode, timer.mode, generalSettings, TimersContext);

  if (!firmware->getCapability(PermTimers)) {
    ui->persistent->hide();
@@ -25,10 +25,21 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
  ui->countdownBeep->setField(&timer.countdownBeep, this);
  ui->countdownBeep->addItem(tr("Silent"), 0);
  ui->countdownBeep->addItem(tr("Beeps"), 1);
-  if (IS_ARM(GetEepromInterface()->getBoard()) || IS_2560(GetEepromInterface()->getBoard()))
+  if (IS_ARM(GetEepromInterface()->getBoard()) || IS_2560(GetEepromInterface()->getBoard())) {
    ui->countdownBeep->addItem(tr("Voice"), 2);
+  }
+
+  ui->persistent->setField(&timer.persistent, this);
+  ui->persistent->addItem(tr("Not persistent"), 0);
+  ui->persistent->addItem(tr("Persistent (flight)"), 1);
+  ui->persistent->addItem(tr("Persistent (manual reset)"), 2);

  disableMouseScrolling();
+  QWidget::setTabOrder(prevFocus, ui->value);
+  QWidget::setTabOrder(ui->value, ui->mode);
+  QWidget::setTabOrder(ui->mode, ui->countdownBeep);
+  QWidget::setTabOrder(ui->countdownBeep, ui->minuteBeep);
+  QWidget::setTabOrder(ui->minuteBeep, ui->persistent);

  lock = false;
 }
@@ -55,13 +66,17 @@ void TimerPanel::update()
    pvalue -= hours * 3600;
    int minutes = pvalue / 60;
    int seconds = pvalue % 60;
-    ui->persistent->setChecked(timer.persistent);
    ui->persistentValue->setText(QString(" %1(%2:%3:%4)").arg(sign<0 ? "-" :" ").arg(hours, 2, 10, QLatin1Char('0')).arg(minutes, 2, 10, QLatin1Char('0')).arg(seconds, 2, 10, QLatin1Char('0')));
  }

  ui->minuteBeep->setChecked(timer.minuteBeep);
 }

+QWidget * TimerPanel::getLastFocus()
+{
+  return ui->persistent;
+}
+
 void TimerPanel::on_value_editingFinished()
 {
  timer.val = ui->value->time().minute()*60 + ui->value->time().second();
@@ -76,12 +91,6 @@ void TimerPanel::on_mode_currentIndexChanged(int index)
  }
 }

-void TimerPanel::on_persistent_toggled(bool checked)
-{
-  timer.persistent = checked;
-  emit modified();
-}
-
 void TimerPanel::on_minuteBeep_toggled(bool checked)
 {
  timer.minuteBeep = checked;
@@ -180,6 +189,7 @@ void ModulePanel::update()
 {
  unsigned int mask = 0;
  Protocol protocol = (Protocol)module.protocol;
+  unsigned int max_rx_num = 63;

  if (moduleIdx >= 0) {
    mask |= MASK_PROTOCOL;
@@ -196,6 +206,7 @@ void ModulePanel::update()
      case DSMX:
        mask |= MASK_CHANNELS_RANGE | MASK_RX_NUMBER;
        module.channelsCount = 6;
+        max_rx_num = 20;
        break;
      case PPM:
        mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE| MASK_CHANNELS_COUNT;
@@ -211,8 +222,9 @@ void ModulePanel::update()

  ui->label_protocol->setVisible(mask & MASK_PROTOCOL);
  ui->protocol->setVisible(mask & MASK_PROTOCOL);
-  ui->label_rxNumber->setVisible(mask & MASK_FAILSAFES);
-  ui->rxNumber->setVisible(mask & MASK_FAILSAFES);
+  ui->label_rxNumber->setVisible(mask & MASK_RX_NUMBER);
+  ui->rxNumber->setVisible(mask & MASK_RX_NUMBER);
+  ui->rxNumber->setMaximum(max_rx_num);
  ui->rxNumber->setValue(model.modelId);
  ui->label_channelsStart->setVisible(mask & MASK_CHANNELS_RANGE);
  ui->channelsStart->setVisible(mask & MASK_CHANNELS_RANGE);
@@ -343,25 +355,10 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen

  ui->setupUi(this);

+  QRegExp rx(CHAR_FOR_NAMES_REGEX);
+  ui->name->setValidator(new QRegExpValidator(rx, this));
  ui->name->setMaxLength(IS_TARANIS(firmware->getBoard()) ? 12 : 10);

-  for (int i=0; i<C9X_MAX_TIMERS; i++) {
-    timers[i] = new TimerPanel(this, model, model.timers[i], generalSettings, firmware);
-    ui->gridLayout->addWidget(timers[i], 1+i, 1);
-    connect(timers[i], SIGNAL(modified()), this, SLOT(onChildModified()));
-  }
-
-  for (int i=0; i<firmware->getCapability(NumModules); i++) {
-    modules[i] = new ModulePanel(this, model, model.moduleData[i], generalSettings, firmware, i);
-    ui->modulesLayout->addWidget(modules[i]);
-    connect(modules[i], SIGNAL(modified()), this, SLOT(onChildModified()));
-  }
-
-  if (firmware->getCapability(ModelTrainerEnable)) {
-    modules[C9X_NUM_MODULES] = new ModulePanel(this, model, model.moduleData[C9X_NUM_MODULES], generalSettings, firmware, -1);
-    ui->modulesLayout->addWidget(modules[C9X_NUM_MODULES]);
-  }
-
  if (firmware->getCapability(ModelImage)) {
    QStringList items;
    items.append("");
@@ -408,12 +405,21 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
    ui->modelImage_label->hide();
    ui->imagePreview->hide();
  }
+
+  QWidget *prevFocus = ui->image;
+  for (int i=0; i<C9X_MAX_TIMERS; i++) {
+    timers[i] = new TimerPanel(this, model, model.timers[i], generalSettings, firmware, prevFocus);
+    ui->gridLayout->addWidget(timers[i], 1+i, 1);
+    connect(timers[i], SIGNAL(modified()), this, SLOT(onChildModified()));
+    prevFocus = timers[i]->getLastFocus();
+  }
  
  if (!firmware->getCapability(HasDisplayText)) {
    ui->displayText->hide();
  }

  // Beep Center checkboxes
+  prevFocus = ui->displayText;
  int analogs = 4 + firmware->getCapability(Pots);
  for (int i=0; i<analogs+firmware->getCapability(RotaryEncoders); i++) {
    QCheckBox * checkbox = new QCheckBox(this);
@@ -425,6 +431,8 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
    if (!IS_TARANIS_PLUS(firmware->getBoard()) && i==6) {
        checkbox->hide();
    }
+    QWidget::setTabOrder(prevFocus, checkbox);
+    prevFocus = checkbox;
  }

  // Startup switches warnings
@@ -461,10 +469,14 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
    connect(cb, SIGNAL(toggled(bool)), this, SLOT(startupSwitchToggled(bool)));
    startupSwitchesSliders << slider;
    startupSwitchesCheckboxes << cb;
+    QWidget::setTabOrder(prevFocus, slider);
+    QWidget::setTabOrder(slider, cb);
+    prevFocus = cb;
  }
  ui->switchesStartupLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, firmware->getCapability(Switches));

  // Pot warnings
+  prevFocus = ui->potWarningMode;
  if (IS_TARANIS(firmware->getBoard())) {
    for (int i=0; i<firmware->getCapability(Pots); i++) {
      QCheckBox * cb = new QCheckBox(this);
@@ -476,6 +488,8 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
      if (!IS_TARANIS_PLUS(firmware->getBoard()) && i==2) {
        cb->hide();
      }
+      QWidget::setTabOrder(prevFocus, cb);
+      prevFocus = cb;
    }
  }
  else {
@@ -483,6 +497,17 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
    ui->potWarningMode->hide();
  }

+  for (int i=0; i<firmware->getCapability(NumModules); i++) {
+    modules[i] = new ModulePanel(this, model, model.moduleData[i], generalSettings, firmware, i);
+    ui->modulesLayout->addWidget(modules[i]);
+    connect(modules[i], SIGNAL(modified()), this, SLOT(onChildModified()));
+  }
+
+  if (firmware->getCapability(ModelTrainerEnable)) {
+    modules[C9X_NUM_MODULES] = new ModulePanel(this, model, model.moduleData[C9X_NUM_MODULES], generalSettings, firmware, -1);
+    ui->modulesLayout->addWidget(modules[C9X_NUM_MODULES]);
+  }
+
  disableMouseScrolling();

  lock = false;
@@ -20,15 +20,15 @@ class TimerPanel : public ModelPanel
    Q_OBJECT

  public:
-    TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, FirmwareInterface * firmware);
+    TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, FirmwareInterface * firmware, QWidget *prevFocus);
    virtual ~TimerPanel();

    virtual void update();
+    QWidget * getLastFocus();

  private slots:
    void on_mode_currentIndexChanged(int index);
    void on_value_editingFinished();
-    void on_persistent_toggled(bool checked);
    void on_minuteBeep_toggled(bool checked);

  private:
--- a/Show More
+++ b/Show More