Release prep

Because omeone asked to to explain what means LDC today ...

.gitattributes

@@ -1 +1,112 @@
+# Handle line endings automatically for files detected as text
+# and leave all files detected as binary untouched.
+* text=auto
+
+#
+# The above will handle all files NOT found below
+#
+# These files are text and should be normalized (Convert crlf => lf)
+
+# Source files
+*.c text
+*.cc text
+*.cxx text
+*.cpp text
+*.c++ text
+*.hpp text
+*.h text
+*.h++ text
+*.hh text
+*.lua text
+*.pxd text
+*.py text
+*.py3 text
+*.pyw text
+*.pyx text
+*.pl text
+*.pm text
+*.sln text eol=crlf
+*.csproj text eol=crlf
+*.vbproj text eol=crlf
+*.vcxproj text eol=crlf
+*.vcproj text eol=crlf
+*.dbproj text eol=crlf
+*.fsproj text eol=crlf
+*.lsproj text eol=crlf
+*.wixproj text eol=crlf
+*.modelproj text eol=crlf
+*.sqlproj text eol=crlf
+*.wmaproj text eol=crlf
+*.xproj text eol=crlf
+*.props text eol=crlf
+*.filters text eol=crlf
+*.vcxitems text eol=crlf
 *.sh eol=lf
+
+# Compiled Object files
+*.slo binary
+*.lo binary
+*.o binary
+*.obj binary
+
+# Precompiled Headers
+*.gch binary
+*.pch binary
+
+# Compiled Dynamic libraries
+*.so binary
+*.dylib binary
+*.dll binary
+
+# Compiled Static libraries
+*.lai binary
+*.la binary
+*.a binary
+*.lib binary
+
+# Executables
+*.exe binary
+*.out binary
+*.app binary
+
+# Binary files
+*.db binary
+*.p binary
+*.pkl binary
+*.pyc binary
+*.pyd binary
+*.pyo binary
+
+# Documents
+*.doc diff=astextplain
+*.DOC diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot diff=astextplain
+*.DOT diff=astextplain
+*.pdf diff=astextplain
+*.PDF diff=astextplain
+*.rtf diff=astextplain
+*.RTF diff=astextplain
+*.md text
+*.adoc text
+*.textile text
+*.mustache text
+*.csv text
+*.tab text
+*.tsv text
+*.sql text
+
+# Graphics
+*.png binary
+*.jpg binary
+*.jpeg binary
+*.gif binary
+*.tif binary
+*.tiff binary
+*.ico binary
+# SVG treated as an asset (binary) by default. If you want to treat it as text,
+# comment-out the following line and uncomment the line after.
+*.svg binary
+#*.svg text
+*.eps binary

.gitignore

@@ -2,13 +2,7 @@
 /.*project
 /.settings
 /.autotools
-radio/src/bootloader/.dep/
-radio/src/bootloader/bootloader_ramBoot*
-*.lbm
-*.o
 /doc/
-*.stamp
-radio/src/lua/lua_fields_*.txt
-radio/src/lua/lua_exports_*.txt
 build*/
 cmake-build-*/
+/debian/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "radio/src/thirdparty/GCS_MAVLink/include_v1.0"]
+	path = radio/src/thirdparty/GCS_MAVLink/include_v1.0
+	url = https://github.com/mavlink/c_library_v1.git

.travis.yml

@@ -18,6 +18,7 @@ env:
     # - QT_BASE=57
     #- GCC_ARM=/opt/gcc-arm-none-eabi/bin
     - AVR_FLAVORS="AVR9X 9X GRUVIN9X MEGA2560"
+    - PYTHONPATH=${PYTHONPATH}:/usr/lib/python3/dist-packages
   matrix:
     #
     # ALL will build every individual board & DEFAULT, sequentially.
@@ -38,7 +39,8 @@ env:
     # - FLAVOR=X9D
     # - FLAVOR=X9D+
     # - FLAVOR=X9E
-    - FLAVOR=X12
+    - FLAVOR=HORUS
+    # - FLAVOR=X10
     # - FLAVOR=X12Sr10
     # - FLAVOR=X12S
 
@@ -69,7 +71,23 @@ install:
       # - tar xjf gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2
       # - mv gcc-arm-none-eabi-4_7-2013q3 /opt/gcc-arm-none-eabi
     fi
-  - sudo apt-get install -qq qt${QT_BASE}base qt${QT_BASE}multimedia qt${QT_BASE}tools; source /opt/qt${QT_BASE}/bin/qt${QT_BASE}-env.sh
+  - sudo apt-get install --yes --force-yes -qq qt${QT_BASE}base qt${QT_BASE}multimedia qt${QT_BASE}svg qt${QT_BASE}tools; source /opt/qt${QT_BASE}/bin/qt${QT_BASE}-env.sh
+
+addons:
+  sonarcloud:
+    organization: "opentx-github"
+    token:
+      secure: "BuQrGRijNpL2V/IQNcOxvjChj8PScfCdiv403EE73Nqb4+sB8YL92Fnzrnw9bC8wF7BVSDJVpYF0gbdaTzuCmaeZfM8NJK0TOJAbH6+B8bhIrU/V1SBuVjHQnndV/wysieruKnK/KxYJZqItgSlnPo+PmiFxtXJNlas0Kstb2O4="
+    # github_token:
+    #   secure: "Qkmp4VrQJtKgZ/pz65SNnCDiF4slgFfQS/3whyLXLcDbFb1Hv1oj7Hqz9EVDUSO2eEhgQGaOKkRc0CfAAOBwW6OvhE0xh7P1CJEjzOp6+3gI/LyZUNsqa+awVRZTsfm1YZaOPaPWJ7cI0uz3/OoSUeIecs4PDWPrQMGRlsrq7Q8="
+    branches:
+      - "2.2"
 
 script:
-  - ./tools/commit-tests.sh
+  - build-wrapper-linux-x86-64 --out-dir bw_output ./tools/commit-tests.sh
+  - sonar-scanner
+
+cache:
+  directories:
+    - '$HOME/.sonar/cache'
+

CMakeLists.txt

@@ -2,13 +2,11 @@ project(OpenTX)
 
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "2")
-set(VERSION_REVISION "0")
+set(VERSION_REVISION "1")
 set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
 set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
-message(STATUS "OpenTX ${VERSION}")
-
-set(SDCARD_REVISION "0005")
+set(SDCARD_REVISION "0013")
 set(SDCARD_VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
 
 cmake_minimum_required(VERSION 2.8)
@@ -23,6 +21,9 @@ endif()
 if(POLICY CMP0054)
   cmake_policy(SET CMP0054 NEW)
 endif()
+if(POLICY CMP0058)
+  cmake_policy(SET CMP0058 NEW)  # for ninja
+endif()
 
 set(CMAKE_COLOR_MAKEFILE ON)
 
@@ -37,23 +38,93 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
 
+include(Macros)
+today(DATE)
+now(TIME)
+git_id(GIT_STR)
+
+message(STATUS "OpenTX ${VERSION} @${GIT_STR}")
+
 # options shared by all targets
+
+option(APP_CUSTOM_DBG_HANDLER "Use custom message handler for debug output in all Qt apps." ON)
+set(APP_CUSTOM_DBG_LEVEL "0" CACHE STRING
+  "Debug output level: 0=debug+; 1=info+; 2=warn+; 3=critical+; 4=fatal only.")
+set(APP_CUSTOM_DBG_SHOW_FILE "DEFAULT" CACHE STRING
+  "Show source file names in debug output. 1/0/DEFAULT (default is ON with DEBUG builds).")
+
 option(VERBOSE_CMAKELISTS "Show extra information while processing CMakeLists.txt files." OFF)
 option(WARNINGS_AS_ERRORS "Treat any compiler warning as an error (adds -Werror flag)." OFF)
+
 if(WIN32)
   set(WIN_EXTRA_LIBS_PATH "C:/Programs" CACHE PATH
-    "Base path to extra libs/headers on Windows (SDL, dirent, pthreads, msinttypes folders should be in here).")
+    "Base path to extra libs/headers on Windows (SDL & pthreads folders should be in here).")
   list(APPEND CMAKE_PREFIX_PATH "${WIN_EXTRA_LIBS_PATH}" "${WIN_EXTRA_LIBS_PATH}/SDL")  # hints for FindSDL
 endif()
 
+# Python check
+find_package("PythonInterp")
+if(PYTHONINTERP_FOUND)
+  message(STATUS "Python found, version: ${PYTHON_VERSION_STRING}")
+  get_filename_component(PYTHON_DIRECTORY ${PYTHON_EXECUTABLE} DIRECTORY)
+else()
+  message(WARNING "Python not found! Most firmware and simu flavors not buildable.")
+  set(LUA NO)
+endif()
+
+find_package(Qt5Core)
 find_package(Qt5Widgets)
 find_package(Qt5Xml)
 find_package(Qt5LinguistTools)
 find_package(Qt5PrintSupport)
 find_package(Qt5Multimedia)
+find_package(Qt5Svg)
+
+if(Qt5Core_FOUND)
+  message(STATUS "Qt Version: ${Qt5Core_VERSION}")
+
+  ### Get locations of Qt binary executables & libs (libs are for distros, not for linking)
+  # first set up some hints
+  get_target_property(QtCore_LOCATION Qt5::Core LOCATION)
+  get_filename_component(qt_core_path ${QtCore_LOCATION} PATH)
+  if(APPLE)
+    get_filename_component(qt_core_path "${qt_core_path}/.." ABSOLUTE)
+  endif()
+
+  set(QT_LIB_DIR ${qt_core_path} CACHE PATH "Path to Qt libraries (.dll|.framework|.so).")
+  find_path(QT_BIN_DIR NAMES "qmake" "qmake.exe" HINTS "${CMAKE_PREFIX_PATH}/bin" "${qt_core_path}/../bin" "${qt_core_path}" DOC "Path to Qt binaries (qmake, lupdate, etc.).")
+  find_program(QT_QMAKE_EXECUTABLE qmake HINTS "${QT_BIN_DIR}" DOC "Location of qmake program.")
+  find_program(QT_LUPDATE_EXECUTABLE lupdate HINTS "${QT_BIN_DIR}" DOC "Location of Qt's 'lupdate' program for updating translation files.")
+
+  # Try to find Qt translations
+  if(QT_QMAKE_EXECUTABLE)
+    execute_process(
+      COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS
+      OUTPUT_VARIABLE qt_translations_hint
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+  endif()
+  find_path(QT_TRANSLATIONS_DIR NAMES "qt_en.qm" HINTS "${qt_translations_hint}" DOC "Path to prebuilt Qt translations (qt_*.qm).")
+
+  ### Common definitions for the Qt-based apps
+  list(APPEND APP_COMMON_DEFINES -DSIMU)
+  list(APPEND APP_COMMON_DEFINES -DQXT_STATIC)
+  list(APPEND APP_COMMON_DEFINES -DQT_USE_QSTRINGBUILDER)  # more efficient QString construction using % operator
+
+  if(APP_CUSTOM_DBG_HANDLER)
+    # provide full qDebug log context to our custom handler. This may also affect libsimulator, which is why it is here
+    list(APPEND APP_COMMON_DEFINES -DQT_MESSAGELOGCONTEXT)
+    list(APPEND APP_COMMON_DEFINES -DAPP_DBG_HANDLER_ENABLE=1)
+    if(APP_CUSTOM_DBG_LEVEL GREATER -1 AND APP_CUSTOM_DBG_LEVEL LESS 5)
+      list(APPEND APP_COMMON_DEFINES -DAPP_DBG_HANDLER_DEFAULT_LEVEL=${APP_CUSTOM_DBG_LEVEL})
+    endif()
+    if(NOT APP_CUSTOM_DBG_SHOW_FILE STREQUAL "DEFAULT" AND (APP_CUSTOM_DBG_SHOW_FILE STREQUAL "1" OR APP_CUSTOM_DBG_SHOW_FILE STREQUAL "0"))
+      list(APPEND APP_COMMON_DEFINES -DAPP_DBG_HANDLER_SHOW_SRC_PATH=${APP_CUSTOM_DBG_SHOW_FILE})
+    endif()
+  else()
+    list(APPEND APP_COMMON_DEFINES -DAPP_DBG_HANDLER_ENABLE=0)
+  endif()
 
-if(Qt5Widgets_FOUND)
-  message(STATUS "Qt Version: ${Qt5Widgets_VERSION}")
 else()
   message(WARNING "Qt not found! Companion and Simulator builds disabled.")
 endif()
@@ -67,13 +138,16 @@ if(NOT WIN32)
   endif()
 endif()
 
-if(Qt5Widgets_FOUND OR FOX_FOUND)
+if(Qt5Core_FOUND OR FOX_FOUND)
   set(SDL_BUILDING_LIBRARY YES)  # this prevents FindSDL from appending SDLmain lib to the results, which we don't want
   find_package("SDL")
   if(SDL_FOUND)
     message(STATUS "SDL Lib: ${SDL_LIBRARY}; Headers: ${SDL_INCLUDE_DIR}; Version: ${SDL_VERSION_STRING}")
+    if (NOT ${SDL_VERSION_STRING} VERSION_LESS "2.0")
+      message(FATAL_ERROR "OpenTX requires SDL 1.x, not 2.x")
+    endif()
   else()
-    message(STATUS "SDL not found! Joysticks support will be disabled. Simulator audio will not work.")
+    message(STATUS "SDL not found! Simulator audio, and joystick inputs, will not work.")
   endif()
 endif()
 
@@ -84,10 +158,11 @@ endif()
 
 # Windows-specific includes and libs shared by sub-projects
 if(WIN32)
-  list(APPEND WIN_INCLUDE_DIRS "${WIN_EXTRA_LIBS_PATH}/dirent/include")
+  list(APPEND WIN_INCLUDE_DIRS "${RADIO_SRC_DIRECTORY}/thirdparty/windows/dirent")
   if(MSVC)
-    set(WIN_PTHREAD_BASE_PATH "${WIN_EXTRA_LIBS_PATH}/pthreads/Pre-built.2")
-    list(APPEND WIN_INCLUDE_DIRS "${WIN_PTHREAD_BASE_PATH}/include" "${WIN_EXTRA_LIBS_PATH}/msinttypes")
+    list(APPEND WIN_INCLUDE_DIRS "${RADIO_SRC_DIRECTORY}/thirdparty/windows/msinttypes")
+    set(WIN_PTHREAD_BASE_PATH "${WIN_EXTRA_LIBS_PATH}/pthreads/Pre-built.2" CACHE PATH "Where to find pthreads include and lib folders.")
+    list(APPEND WIN_INCLUDE_DIRS "${WIN_PTHREAD_BASE_PATH}/include")
     find_file(WIN_PTHREAD_LIB pthreadVC2.lib PATHS "${WIN_PTHREAD_BASE_PATH}" PATH_SUFFIXES lib/x86 lib NO_DEFAULT_PATH)
     find_file(WIN_PTHREAD_DLL pthreadVC2.dll PATHS "${WIN_PTHREAD_BASE_PATH}" PATH_SUFFIXES lib/x86 lib dll/x86 dll NO_DEFAULT_PATH)
     if(WIN_PTHREAD_LIB)
@@ -103,13 +178,8 @@ if(WIN32)
   endif()
 endif()
 
-include(Macros)
-today(DATE)
-now(TIME)
-git_id(GIT_STR)
-
 add_subdirectory(${RADIO_SRC_DIRECTORY})
 
-if(Qt5Widgets_FOUND)
+if(Qt5Core_FOUND)
   add_subdirectory(${COMPANION_SRC_DIRECTORY})
 endif()

DONATIONS.txt

@@ -1,852 +0,0 @@
-<a href="http://frsky-rc.com">FrSky (monthly)</a>
-<a href="http://alofthobbies.com">Aloft Hobbies</a>
-<a href="http://jonathan.it">Jonathan Modellismo</a>
-<a href="http://wstech.de">WsTech</a>
-<a href="http://aviomotive.com">Aviomotive</a>
-<a href="http://boltrc.com">BoltRC</a>
-<a href="http://aerialtechhobbies.com">Aerial Tech Hobbies</a>
-<a href="http://litepilots.com">LitePilots</a>
-<a href="http://openpilot.com">David Ankers (OpenPilot)</a>
-<a href="http://3drobotics.com">3D Robotics</a>
-<a href="http://rcstudio.cz">RC Studio (monthly)</a>
-
-Mario Sette
-Felice Baratto
-Alessandro Mari
-Gianpiero Spontina
-Ingo Kuzniak
-Hans-Åke Rahm
-Tamas Varga
-Thomas Gregg
-Didier Christien
-Alain Pinard
-Sergio Melas
-Paul Montenot
-Chris Guy
-Adrien Gravouille
-Thomas Black
-Marc Lucht
-Zdenek Trojanek
-Martin Hotar
-Stefan Grundevik
-Fabio Eboli
-Federico Zotti
-Albin Esbjörnsson
-Kilian Hüttenhofer
-Stephen Stough
-Adilson Oliveira
-Robert Saint Marie
-Tad Leake
-Andreas Weitl
-Chan Lofland
-Dirk Kasten
-Denisov Alexander
-Timo Varppee
-Ondrej Hatapka
-Valérie Billon
-R. Scott Page
-Johan Cronje
-Renato Aranghelovici
-Jeffrey Irvin
-John Rodgers
-Kenneth Crump
-Damjan Adamic
-Martin Wilson
-Joe Street
-John Holdsworth
-Daniel Schwartz
-Dean Church (monthly)
-Michael Halse
-David Mark
-Ted Moss
-Jim Wagner
-Nicola Porzi
-Michael Halse
-Chewytm
-Espen Solbu
-Mike Frizell
-Bruce Jones
-Stefano Airaghi
-Dan Eeckhout
-Alex Calderhead
-Leonard MacKey
-Heung Jin Choi
-Mike Retterer
-Keith Wood
-Viljo Liukku
-Eric Beier
-Burt Pickard-Richardson
-Helmut Renz
-Rick Harms
-Vincenzo Vavala
-Patricia Martin
-Harald Klein
-Carl Petersen
-Douglas Burkett
-Clifford Evans
-Teodor Yantchev
-Jarad Berkman
-Christian Schulz
-Gregory J Shepherd
-Michael Shellim
-Ming Wang
-Bernard Lukaschek
-Nigel Chippindale
-Mike Perkins
-Ted Hammond 
-David Beanland
-Bernd Koehler
-Frédéric Duflos 
-Dave Fasken
-Heinrich Illig
-Michael Collins
-Michael Manning
-Craig Lorentz
-André Lasseret
-Felipe Alexandre de Oliveira
-Brian Harris
-Philippe Herbots
-Rainer Nelte
-Franck Bernhard
-Erhard Werner
-Stig Jøran Moen
-Keith Hertzog
-Christophe Dauvergne
-Tauno Rautakorpi
-Sven Assmus
-Paul Dittman
-Mike Matheny
-Cheryl Wynne
-Emay Toha
-Don Nolder
-André Lasseret
-Filip Lowette
-Arnaldo Gabella
-Fiorenzo Agnelli
-Michele Villa
-Christophe Rodriguez
-Larisa Filocamo
-Hartmut Sahm
-Åke Brodin
-Ted Moss
-Filippos Tigarakis
-Chewytm
-Eric Burdis
-Nigel Chippindale
-Michael Deasy
-Stephen Stough
-Kenneth Lilja (monthly)
-Robert Jero
-Gary Bancroft
-Robert Cotsford
-NorthSide
-George Constandinides
-Robert Schonk Jr
-Kevin Berkefeld
-Peter Webster
-Mike Matheny
-Martin Sniedze
-Fernando Rimoldi
-Sidney Fisher
-Bruce Anderson
-John Rodgers
-Ed Pare
-Thomas Kilduff
-Robert Ferguson
-Bryan Green
-Kevin Berkefeld
-Julien Michel
-Krittikun Chiraphanda
-Douglas Law
-Alberto Scotti
-Oliver Kunkel
-D. Joseph Frazier
-Heiko Polig
-Andrew Fernie
-Marco Lange
-Nick McMillan
-Michel Baily (monthly)
-Patrick Mullen
-Scott Campbell
-Erich Roeder
-Wayne Davy
-Michael Fontenot
-Willie Swanepoel
-Satoru Sasaki
-Tyler Darby
-Nicholas Crego
-Johan Moelich
-Timo Esser
-Brian Paddock
-Jean Pierre Parisy
-Norbert Martsch
-Jean-Marie Guitard
-Tilman Baumann
-Fred Larssen
-Ari Aalto
-Robert Sams 
-Kirk Robertson
-John Koontz
-Jeffery Golias
-Paul Robinson
-Dave Matison
-Mike Matheny
-Pino Agostino
-Graham Boucher
-Nelson Noura
-Joel Allamy
-Philip David Martin
-Sean Stephen
-Bruce Mackay
-Blake Spilman
-Timothy Pelletier
-Glen Roe (ShowMaster)
-Jan Van Ooteghem
-Lawrence Christensen
-Leo Duflou
-Bruce Wood
-Arnd Feige
-Tauno Rautakorpi
-Steve Coley
-Stefan Kiendl
-Gregory Nuspel
-Mitchell Brenner
-Ronnnie DePrez
-Ferenc Koller
-Robert Sessler
-Didier Lanot
-Rodney Hunt
-Steve Bernard
-Paul Nazaroff
-Gordon Ernenputsch
-Ksamak
-Marc Gittelman
-David Poole
-Ralph Sauer
-Karl-Heinz Gansel
-Michels Bernhard
-Thomas Demmelbauer
-Felice Baratto
-Michael Halse
-Horst Kampen
-Ian Gough
-Matthew Brett
-Lexington S Morley
-Clemens Drews
-Axel Stöckle
-Roberto Orsello
-Richard Ruck
-Hugh Caldwell
-Christian Marauli
-Albin Esbjörnsson
-Per Esbjörnsson
-Bernd Hohmann
-Sławomir Juszczak
-Stephen Henderson
-David Morgan
-Aloft Hobbies
-Netanel Hobara
-Cameron Galipo
-Doug Schafer
-Pietro Rossin
-Earl Killingsworth
-Victor B Wright
-Terry McKinley
-Марков Алексей
-Offer Shmuely
-Ian Lobley
-Stéphane Fortas
-Peter Mitrik
-Thomas Majewski
-ANF King
-Henrik Hammarström
-Kenneth Lilja
-R Wells
-Uwe Jordt
-Harald Wilczak
-Bernhard Lohmann
-Ferenc Koller
-Robert Ferguson
-Daniel Byers
-Tyler Darby
-Miguel Villalpando
-Kim Dong Hoon 
-Terry McKinley
-Walter Bell
-Clinton Linck
-Josep Clodas Sola 
-Thierry Martin
-Peter Mauro 
-Mitchell Brenner
-Yak
-Lluis Bullich Rañe 
-Steffen Rohr 
-Eric Jacquin
-Harvest Lane
-Ville Kuvaja
-DK-System
-Heinz Vogel
-Heung Jin Choi
-MMJS van der Helm 
-Dan Neelands
-Yashiro Masayuki
-Isaac Sloan
-Harold Baird
-Roy Bender
-Bradley Murchie
-Maximilian Süß
-Dean Jansa
-Ronald Donker
-Paul Oldenkamp
-Dietmar Drees
-Bradley Murchie
-Richard Fahie
-James Kaufman
-Henry Deucker
-Christian Fuchs
-Arold Reinders
-Robert Miller
-Mark Gaskievicz
-Roland Müller
-Frank Gewalt
-Remi Viard
-Reginald H Millsom
-Pierluigi Sommaruga
-A Harris
-Stefan Grunenberg 
-Francisco Gutierrez Muñoz
-Steve Coley
-Sean Cull
-Roberto Orsello
-David Finger
-Jean-Marie Oddo
-Mike Matheny
-Glen Roe (Showmaster)
-Arron Bates
-Tim Spurr
-Daniel Morgan
-Trent Ready
-Mark Maskiell
-Robert Crockford
-Mark Illum
-David McGuire
-Martyn Coles
-Jose Sobral
-Heung Jin Choi
-Tomasz Janiak
-Fabien Gagné
-Joe Street
-Micha Ronen
-Albert Blondin
-Klaus Schuebel
-Evening Shade Pottery
-Thomas Kilduff
-Sven Assmus
-Markus Eberl
-Nicholas Field
-Harald Wilczak
-John Grepps
-Anthony Burbidge
-Sherba Baine
-Gordon Evans
-Fred Figge
-Uwe Kuehn 
-David Beatty
-Aaron Stringer
-Alan J Wasserman
-Wolfgang Rauser
-Samuel Cook
-Friedrich Ipolt
-Barrington Cole 
-Charles Lakins
-Thos. O'Meara Photography
-Adam Chevalier
-Mike Mulligan
-Serge Michaux 
-Robert Young
-Wilco Hijink
-Roy Nixon
-Lexington S Morley
-Daryl Dacko
-Beat Zurflueh
-Piotr Kundu
-Kevin Berkefeld
-Tomasz Klys
-Mirco Didone'
-Christoph Schroeter
-Zdenek Trojanek
-Bryan Anderson
-Kamco Enterprises 
-Robert Bates
-Robert Brown  
-Dennis Marinus
-Ronald Van Putte
-Thomas Kvitle Jenssen
-Patrick Tuxbury 
-Istvan Magi
-Sasaki Satoru
-David Laburthe
-Vit Jelinek
-Pablo Gomez Martinez
-Alan Thoren
-Jack Clodfelter
-William Simon
-James Houck
-Peter Fithern
-Thomas Svedman
-TechFixPros
-Rafael Eric Suarez Nordlow
-Colin Rycroft
-Emanuel Stassar
-Michael Gregory
-Robert Russell
-Felix Kaiser
-Joshua Bardwell
-Davd Goodall
-Leonard MacKey
-Miles Kelly
-Sergio Robledo
-Mikael Wallbäck
-Daniel Malcman
-Paul Dittman
-Attilio Rausse
-Sidney Gates
-Andrea Montefusco
-Paul Luby
-Donald L Webster
-Kenneth Frehafer 
-Matthias Hase 
-Markus Wolf
-Andrew Fazio
-Stefan Künst
-Stephen Adams
-Tauno Rautakorpi
-Frank Houvenaghel
-George Neusse
-Andreja Rusjakovski
-Axel Stöckle
-Erwin Störrle
-Rodger Hopper
-Fernando Cesar
-Jonathan Gillis
-DK-System
-Lexington S Morley
-Bernd Koehler
-Davis RC
-Pete Johnson
-Patricia Martin
-Florian Tschacher
-Brian Spearing
-Craig Hall
-Joseph Case
-Harald Klein
-Robert Crockford
-Chris Boultinghouse
-Kitsew
-Georgios Papadopoulos
-Fourmost Products
-Dennis Miller
-Dave Matison
-Maximilian Radig
-Juan Rodriguez
-Robert Sessler
-John Murray
-Martin Sniedze
-David Poole
-Manfred Delakowitz
-Martijn Kruissen
-Jörgen Norman
-Nathan Kinney
-John Godden
-Larry Roper
-Mike Frizell
-Daniel Pospolita
-Peter Herz
-Don Mondrik
-Paul Fram
-Charles Knight
-Matthew Adams
-Kenneth Reed
-Gary Wild
-Christof Ramm
-Bruno Bedard
-Salih Samim Aydin
-Alexander Pils
-Andrew Scerbina
-Donovan Bodishbaugh
-Ray Dunn
-Burt Pickard-Richardson
-Robert Ferguson
-CY Enterprise 
-Michel Stathakis Neto
-Beat Zurflueh
-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
-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
-Donald Burke
-Ronald Donker
-Fredie Singh
-Patrizio Simoncini
-Harald Gabler
-Michael Brown
-Julien Gérard
-Alexandre d'Alton
-Peter Mergaerts
-Jan Houwers
-Christian Grandjean
-Roger Bergevin
-NorthSide
-Sigmund Martinsen
-Lionel Lafraise
-Gisli Ofeigsson 
-The Gruvin9x Project
-Manuel McLure
-Fernando Rimoldi
-Hiltenkamp Stephan
-Sandeep Kishore Jain
-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
-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
-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
-Claudio Piccinini
-John Jackson
-John Beech
-Rene TraaJohn Jackson
-Sebastien Charpentier (monthly)
-Nigel Hendriks
-Frédéric Devillard
-Albert Herzog
-Anindya Mukerjee
-Kenny Stanberry
-Tauno Rautakorpi
-Mathias Krapp
-Fernando Rimoldi
-Wolfgang Rauser
-Richard Shagam
-Stephen Bailey
-DK-System
-Casa Kuxtal
-Christopher Potts
-Douglas George
-Michael Banks
-Jon Wiltshire
-David Green
-Guy Willems
-Xavier Mestelan Pinon
-Maik Gottschalk 
-Scott Sparks
-John Dunning
-RAD51
-Ron Powell 
-Alain Labonne
-Carol Sills
-Franck Aßmann
-Larry Anderson
-Mikael Wallbäck
-Wes Warner
-Christoffer H Henni
-Donna Bayer
-Garry Ogilvie
-Karlheinz Sirsch
-Fred Larssen
-Rob Coppock 
-Franz Josef Hahn
-Serge Ribault
-Tanguy Le Moign
-Barrett Powell
-Patrice Lafeuille
-Martin Blume
-Marek Kopyto
-Marco Lange
-Gary Nix
-Jack Oliphant
-John Lever 
-Adolphe Montefiore
-Steven De Weerdt
-Håkan Berggen
-Ayelet Egosi
-Jean-Frederic Gaudreault
-Jim Wagner
-Lee Scott
-Roger Keatley
-Sherman Lovell
-Hugh Caldwell
-JB Fisher Company
-Michels Bernhard 
-Pietro Rossin
-Carsten Wache
-Brock White 
-Steven Poretz
-David Huelster
-Gordon Stahl (monthly)
-John Mathison
-Richard Duczmal
-Gregory Barron
-Marcel Fischer
-Klas Mälman
-Viljo Liukku
-Eric Smith
-Sven Assmus
-Luke Mole
-NorthSide
-Hannes Mössler 
-James Kaufman
-Ravi Gupta
-Lexington S Morley
-Ralph Segar 
-Frédéric Devillard
-Cory Theurer
-Valentinos Zachariou
-Garrett Paquette 
-Heung Jin Choi
-Kerry Cochrell
-Doug Miller
-Andrzej Weydmann
-Chair-man.nl
-Eric Beier	
-Jay Warren
-Marian Matej 
-Alastair Smith
-Timothy Senecal
-Dietmar Drees
-Bruce Jones
-Adil Busaidy
-Herman Hofman
-Jean Paul Michel
-Peter McHenry
-Julien lecoquierre
-Jean-Marie Clay
-Robert Nicoll
-Dan Nixon
-Ewald Moehring
-Giovanni Carnesecchi 
-Paul Dumsday
-Tadeusz Adamowski
-Andrew Newton
-Neil Horne
-Kerstin Appelqvist

README.md

@@ -1,9 +1,16 @@
-##OpenTX 2.2 Branch
+## OpenTX 2.2 Branch
 
-[![Build Status](https://travis-ci.org/opentx/opentx.svg?branch=next)](https://travis-ci.org/opentx/opentx)
+[![Travis build Status](https://travis-ci.org/opentx/opentx.svg?branch=2.2)](https://travis-ci.org/opentx/opentx)
+[![Quality Gate](https://sonarcloud.io/api/badges/gate?key=OpenTX:2.2)](https://sonarcloud.io/dashboard?id=OpenTX:2.2)
 [![Join the chat at https://opentx.rocket.chat](https://camo.githubusercontent.com/3d659054abd6ce21c0e47cf3b83a51bda69ca282/68747470733a2f2f64656d6f2e726f636b65742e636861742f696d616765732f6a6f696e2d636861742e737667)](https://opentx.rocket.chat)
 [![Donate using Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DJ9MASSKVW8WN)
 
 The ongoing development on 2.2.x is done in this branch.
 
-Refer to the opentx.wiki for information about setting up the tool chains for building OpenTX and OpenTX Companion as well as other development related issues.
+Refer to the [OpenTX wiki](https://github.com/opentx/opentx/wiki) for information about setting up the tool chains for building OpenTX and OpenTX Companion as well as other development related issues.
+
+Useful links:
+ * OpenTX Main Site http://www.open-tx.org/
+ * OpenTx University http://open-txu.org/
+ * OpenTX User Manual https://www.gitbook.com/book/opentx/opentx-taranis-manual/details
+ * OpenTX Lua Reference Guide https://www.gitbook.com/book/opentx/opentx-lua-reference-guide/details

cmake/Bitmaps.cmake

@@ -6,7 +6,7 @@ macro(add_bitmaps_target targetname filter width format)
     set(target ${target}.lbm)
     add_custom_command(
       OUTPUT ${target}
-      COMMAND python ${RADIO_DIRECTORY}/util/img2lbm.py ${bitmap} ${target} ${width} ${format} ${ARGN}
+      COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/img2lbm.py ${bitmap} ${target} ${width} ${format} ${ARGN}
       DEPENDS ${bitmap}
     )
     list(APPEND bitmaps_files ${target})
@@ -17,8 +17,8 @@ endmacro(add_bitmaps_target)
 macro(add_truetype_font_target radio name font size bold)
   set(target ${RADIO_SRC_DIRECTORY}/fonts/${radio}/font_${name})
   add_custom_target(ttf_${radio}_${name}
-    COMMAND ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${bold} ${target}
+    COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${bold} ${target}
     WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
   )
   set(ttf_${radio}_fonts_targets ${ttf_${radio}_fonts_targets} ttf_${radio}_${name})
-endmacro(add_truetype_font_target)
+endmacro(add_truetype_font_target)

cmake/FindLupdate.cmake

@@ -1,17 +0,0 @@
-# Locate lupdate binary from QT
-
-# This module defines
-# LUPDATE_EXECUTABLE, where is QT lupdate
-# LUPDATE_FOUND, if false, don't try to use lupdate
-
-FIND_PROGRAM( LUPDATE_EXECUTABLE
-  NAMES
-    lupdate lupdate-qt4
-)
-
-# if the program is found then we have it
-IF( LUPDATE_EXECUTABLE )
-  SET( LUPDATE_FOUND "YES" )
-ENDIF( LUPDATE_EXECUTABLE )
-
-MARK_AS_ADVANCED( LUPDATE_EXECUTABLE )

cmake/FindXercesC.cmake

@@ -1,68 +1,68 @@
-# Find Xerces-C
-# The following setings are defined
-# XERCESC_ROOT_DIR, the root of the include and lib directory
-# XERCESC_INCLUDE_DIR, the full path of the include dir (ADVANCED)
-# XERCESC_LIBRARIES, the name of the xerces-c library (ADVANCED)
-
-# Look for a root installation
-IF( MSVC )
-SET( XERCES_WINDIR C:/Programs/xerces-vc )
-ELSE( )
-SET( XERCES_WINDIR C:/Programs/xerces )
-ENDIF( )
-
-FIND_PATH(XERCESC_ROOT_DIR include/xercesc/parsers/SAXParser.hpp
-  ${XERCES_WINDIR}
-  "C:/mingw/msys/1.0/local"
-  "C:/Program Files/CodeSynthesis XSD 3.2"
-  /usr
-  /usr/local
-  "C:/MinGW"
-  $ENV{CODESYNTH}
-  DOC "The root of an installed xerces-c installation"
-)
-
-# try to find the header
-FIND_PATH(XERCESC_INCLUDE_DIR xercesc/parsers/SAXParser.hpp
-  ${XERCESC_ROOT_DIR}/include
-  /usr/include
-  /usr/local/include
-)
-
-# Find the library
-FIND_LIBRARY(XERCESC_LIBRARY
-  NAMES xerces-c xerces-c_3
-  PATHS
-    ${XERCESC_ROOT_DIR}/lib
-    ${XERCESC_ROOT_DIR}/lib/vc-9.0
-    ${XERCESC_ROOT_DIR}/lib64/vc-9.0
-    /usr/lib
-    /usr/local/lib
-  DOC "The name of the xerces-c library"
-)
-
-IF (XERCESC_ROOT_DIR)
-  IF (XERCESC_INCLUDE_DIR AND XERCESC_LIBRARY)
-    SET (XERCESC_FOUND TRUE)
-    SET (XERCESC_LIBRARIES "${XERCESC_LIBRARY}")
-    # FIXME: There should be a better way of handling this?
-    # FIXME: How can we test to see if the lib dir isn't
-    # FIXME: one of the default dirs?
-    LINK_DIRECTORIES(${XERCESC_ROOT_DIR}/lib)
-  ENDIF (XERCESC_INCLUDE_DIR AND XERCESC_LIBRARY)
-ENDIF (XERCESC_ROOT_DIR)
-
-IF (XERCESC_FOUND)
-  IF (NOT XERCESC_FIND_QUIETLY)
-    MESSAGE (STATUS "  found xerces-c: ${XERCESC_LIBRARY}")
-  ENDIF (NOT XERCESC_FIND_QUIETLY)
-ELSE (XERCESC_FOUND)
-  IF (XERCESC_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find Xerces-C")
-  ENDIF (XERCESC_FIND_REQUIRED)
-ENDIF (XERCESC_FOUND)
-
-MARK_AS_ADVANCED(
-  XERCESC_INCLUDE_DIR
-  XERCESC_LIBRARY
+# Find Xerces-C
+# The following setings are defined
+# XERCESC_ROOT_DIR, the root of the include and lib directory
+# XERCESC_INCLUDE_DIR, the full path of the include dir (ADVANCED)
+# XERCESC_LIBRARIES, the name of the xerces-c library (ADVANCED)
+
+# Look for a root installation
+IF( MSVC )
+SET( XERCES_WINDIR C:/Programs/xerces-vc )
+ELSE( )
+SET( XERCES_WINDIR C:/Programs/xerces )
+ENDIF( )
+
+FIND_PATH(XERCESC_ROOT_DIR include/xercesc/parsers/SAXParser.hpp
+  ${XERCES_WINDIR}
+  "C:/mingw/msys/1.0/local"
+  "C:/Program Files/CodeSynthesis XSD 3.2"
+  /usr
+  /usr/local
+  "C:/MinGW"
+  $ENV{CODESYNTH}
+  DOC "The root of an installed xerces-c installation"
+)
+
+# try to find the header
+FIND_PATH(XERCESC_INCLUDE_DIR xercesc/parsers/SAXParser.hpp
+  ${XERCESC_ROOT_DIR}/include
+  /usr/include
+  /usr/local/include
+)
+
+# Find the library
+FIND_LIBRARY(XERCESC_LIBRARY
+  NAMES xerces-c xerces-c_3
+  PATHS
+    ${XERCESC_ROOT_DIR}/lib
+    ${XERCESC_ROOT_DIR}/lib/vc-9.0
+    ${XERCESC_ROOT_DIR}/lib64/vc-9.0
+    /usr/lib
+    /usr/local/lib
+  DOC "The name of the xerces-c library"
+)
+
+IF (XERCESC_ROOT_DIR)
+  IF (XERCESC_INCLUDE_DIR AND XERCESC_LIBRARY)
+    SET (XERCESC_FOUND TRUE)
+    SET (XERCESC_LIBRARIES "${XERCESC_LIBRARY}")
+    # FIXME: There should be a better way of handling this?
+    # FIXME: How can we test to see if the lib dir isn't
+    # FIXME: one of the default dirs?
+    LINK_DIRECTORIES(${XERCESC_ROOT_DIR}/lib)
+  ENDIF (XERCESC_INCLUDE_DIR AND XERCESC_LIBRARY)
+ENDIF (XERCESC_ROOT_DIR)
+
+IF (XERCESC_FOUND)
+  IF (NOT XERCESC_FIND_QUIETLY)
+    MESSAGE (STATUS "  found xerces-c: ${XERCESC_LIBRARY}")
+  ENDIF (NOT XERCESC_FIND_QUIETLY)
+ELSE (XERCESC_FOUND)
+  IF (XERCESC_FIND_REQUIRED)
+    MESSAGE(FATAL_ERROR "Could not find Xerces-C")
+  ENDIF (XERCESC_FIND_REQUIRED)
+ENDIF (XERCESC_FOUND)
+
+MARK_AS_ADVANCED(
+  XERCESC_INCLUDE_DIR
+  XERCESC_LIBRARY
 )

cmake/Macros.cmake

@@ -1,14 +1,13 @@
 macro(today RESULT)
   if(WIN32)
     execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT})
-    string(REGEX REPLACE "(..)/(..)/(....).*" "\\1.\\2.\\3" ${RESULT} ${${RESULT}})
-    string(SUBSTRING ${${RESULT}} 0 10 ${RESULT})
+    string(REGEX REPLACE "[^0-9]*([0-9]+)[^0-9]([0-9]+)[^0-9]([0-9]+).*" "\\1-\\2-\\3" ${RESULT} ${${RESULT}})
   elseif(UNIX)
     execute_process(COMMAND "date" "+%Y-%m-%d" OUTPUT_VARIABLE ${RESULT})
     string(REGEX REPLACE "(....)-(..)-(..).*" "\\1-\\2-\\3" ${RESULT} ${${RESULT}})
   else(WIN32)
-    message(SEND_ERROR "date not implemented")
-    set(${RESULT} 00.00.0000)
+    message(WARNING "date not implemented")
+    set(${RESULT} 00-00-0000)
   endif(WIN32)
 endmacro(today)
 
@@ -20,22 +19,27 @@ macro(now RESULT)
     execute_process(COMMAND "date" "+%H:%M:%S" OUTPUT_VARIABLE ${RESULT})
     string(REGEX REPLACE "(..):(..):(..).*" "\\1:\\2:\\3" ${RESULT} ${${RESULT}})
   else(WIN32)
-    message(SEND_ERROR "time not implemented")
+    message(WARNING "time not implemented")
     set(${RESULT} 00:00:00)
   endif(WIN32)
 endmacro(now)
 
+find_package(Git)
+
 macro(git_id RESULT)
-  if(WIN32)
-    execute_process(COMMAND "cmd" " /C git --git-dir=${PROJECT_SOURCE_DIR}/.git rev-parse --short=8 HEAD" OUTPUT_VARIABLE ${RESULT})
-    string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})
-  elseif(UNIX)
-    execute_process(COMMAND "git" "--git-dir=${PROJECT_SOURCE_DIR}/.git" "rev-parse" "--short=8" "HEAD" OUTPUT_VARIABLE ${RESULT})
-    string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})
-  else(WIN32)
-    message(SEND_ERROR "Git ID implemented")
-    set(${RESULT} 0)
-  endif(WIN32)
+  set(${RESULT} 0)
+  if (GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
+    execute_process(COMMAND "${GIT_EXECUTABLE}" "--git-dir=${PROJECT_SOURCE_DIR}/.git" "rev-parse" "--short=8" "HEAD" OUTPUT_VARIABLE proc_out ERROR_VARIABLE proc_err)
+    if(proc_err)
+      message(WARNING "Git failed with error: ${proc_err}")
+    else()
+      string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${proc_out})
+    endif()
+  elseif(NOT GIT_FOUND)
+    message(WARNING "Git executable not found, revision number not available.")
+  else()
+    message(STATUS "Git repository not found, revision number not available.")
+  endif()
 endmacro(git_id)
 
 macro(use_cxx11)

companion/releasenotes.txt

@@ -1,5 +1,74 @@
+<h2>Version 2.2.0 / 2017-05-30</h2>
+
+Major release! Please see <a href=http://www.open-tx.org/2017/05/30/opentx-2.2.0>this page</a> for details.
+
+<h2>Version 2.1.9 / 2016-09-14</h2>
+
+<ul>
+<li>SD sync fixes (<a href=https://github.com/opentx/opentx/issues/3351>#3351</a>)</li>
+<li>Fixed: Telemetry mode "FrSky D (cable)" choice was missing for Taranis (<a href=https://github.com/opentx/opentx/issues/3372>#3372</a>)</li>
+<li>Show persistent option only for calculated sensors (<a href=https://github.com/opentx/opentx/issues/3454>#3454</a>)</li>
+<li>Fixed Flight mode clear command (<a href=https://github.com/opentx/opentx/issues/3214>#3214</a>)</li>
+<li>Fixed a problem with Rotary encoders linked to flight mode (could freeze Companion) (<a href=https://github.com/opentx/opentx/issues/3459>#3459</a>, <a href=https://github.com/opentx/opentx/issues/3470>#3470</a>)</li>
+<li>Telemetry simulator improvements: added fuel quantity sensor, increased RPM range (<a href=https://github.com/opentx/opentx/issues/3505>#3505</a>, <a href=https://github.com/opentx/opentx/issues/3506>#3506</a>)</li>
+<li>Implemented minimal support for the DYI Multimodule (<a href=https://github.com/opentx/opentx/issues/3526>#3526</a>)</li>
+<li>Fixed: GVar combo-box not being refreshed when GV check-box (re-)selected (<a href=https://github.com/opentx/opentx/issues/3518>#3518</a>)</li>
+<li>Fixed: Heli inversion not correctly shown/saved from Companion on Radios without virtual inputs (<a href=https://github.com/opentx/opentx/issues/3510>#3510</a>)</li>
+<li>Implemented print functions for the Heli setup screen (<a href=https://github.com/opentx/opentx/issues/3554>#3554</a>)</li>
+<li>Fixed: Flight modes linked trims display value (<a href=https://github.com/opentx/opentx/issues/3547>#3547</a>, <a href=https://github.com/opentx/opentx/issues/3568>#3568</a>)</li>
+<li>Fixed: New model global variables and rotary encoders initialisation (<a href=https://github.com/opentx/opentx/issues/3473>#3473</a>)</li>
+<li>Fixed: Prevent circular linked global variables and rotary encoders (<a href=https://github.com/opentx/opentx/issues/3472>#3472</a>)</li>
+<li>Fixed wrong log replay speed issue in Telemetry simulator (<a href=https://github.com/opentx/opentx/issues/3708>#3708</a>)</li>
+<li>Various texts and translations corrections</li>
+</ul>
+
+
+<h2>Version 2.1.8 / 2016-04-14</h2>
+
+<ul>
+<li>Telemetry Simulator sensor instance number fixed (<a href=https://github.com/opentx/opentx/issues/3207>#3207</a>)</li>
+<li>Fixed: Throttle Source combo-box was populated multiple times (<a href=https://github.com/opentx/opentx/issues/3222>#3222</a>)</li>
+<li>RTC option tool-tip corrected (<a href=https://github.com/opentx/opentx/issues/3225>#3225</a>)</li>
+<li>Fixed: Companion was looking for custom scripts at the wrong place (<a href=https://github.com/opentx/opentx/issues/3237>#3237</a>)</li>
+<li>Offset displayed in inputs screen (<a href=https://github.com/opentx/opentx/issues/3248>#3248</a>)</li>
+<li>Import/export handling was broken for Average formula telemetry sensors (<a href=https://github.com/opentx/opentx/issues/3262>#3262</a>)</li>
+<li>Fixed: Hardware Setup control types and names were not stored in profile (<a href=https://github.com/opentx/opentx/issues/3260>#3260</a>)</li>
+<li>Fixed voice language list (<a href=https://github.com/opentx/opentx/issues/3338>#3338</a>)</li>
+<li>Fixed data overflow in Special Functions Override Channel (<a href=https://github.com/opentx/opentx/issues/3347>#3347</a>)</li>
+<li>Fixed: Sync dialog new line problem (only present for some UI languages) (<a href=https://github.com/opentx/opentx/issues/3350>#3350</a>)</li>
+<li>Removed a few legacy timer limitations, fix non-working limit (<a href=https://github.com/opentx/opentx/issues/3301>#3301</a>)</li>
+<li>Default AVR fuse settings changed to disable JTAG interface (<a href=https://github.com/opentx/opentx/issues/3379>#3379</a>)</li>
+<li>Channel range fix (Start, Channels) in Model Settings, Setup page, int/ext module settings</li>
+<li>Use friendly GVAR names in dialogs (if available)  (<a href=https://github.com/opentx/opentx/issues/3353>#3353</a>)</li>
+<li>Various texts and translations corrections</li>
+</ul>
+
+
+<h2>Version 2.1.7 / 2016-01-04</h2>
+
+<ul>
+<li>Lua 'execute' failed in non-root directory (in Simulator) (<a href=https://github.com/opentx/opentx/issues/3024>#3024</a>)</li>
+<!-- this is disabled until the speed problem is fixed <li>Header line always visible in Outputs, Logical Switches and Special Functions (<a href=https://github.com/opentx/opentx/issues/2861>#2861</a>)</li> -->
+<li>LR12 changes: removed option for remote failsafe configuration, added in EU firmware variant</li>
+<li>Added Clear option to the flight mode context menu (right click on the Name label) (<a href=https://github.com/opentx/opentx/issues/3026>#3026</a>)</li>
+<li>New features for Telemetry Simulator: log replay, user friendly sensor values (<a href=https://github.com/opentx/opentx/issues/3124>#3124</a>)</li>
+<li>Added F7 key to reload LUA permanent scripts in radio simulator (<a href=https://github.com/opentx/opentx/issues/3141>#3141</a>)</li>
+<li>AR9X firmware flashing fall-back was wrong</li>
+<li>Command line options support added to standalone simulator (try "./simulator21 --help" on Linux and "simulator.exe /help" on Windows for usage) (<a href=https://github.com/opentx/opentx/issues/3160>#3160</a>)</li>
+<li>Various rounding problem fixed: Telemetry sensor Ratio parameter (<a href=https://github.com/opentx/opentx/issues/3117>#3117</a>),
+  Outputs Sub-trim, Min and Max values (<a href=https://github.com/opentx/opentx/issues/3156>#3156</a>)</li>
+<li>Fixed: telemetry sensors Ratio and Offset value increment/decrement step (<a href=https://github.com/opentx/opentx/issues/3121>#3121</a>)</li>
+<li>Hardware/Calibration tab split int two tabs (<a href=https://github.com/opentx/opentx/issues/2974>#2974</a>)</li>
+<li>Fixed Fahrenheit temperature conversion error (if PREC was not 0) (<a href=https://github.com/opentx/opentx/issues/3146>#3146</a>)</li>
+<li>Application Setting 'Enable automatic backup before writing firmware' was not saved (<a href=https://github.com/opentx/opentx/issues/3040>#3040</a>)</li>
+<li>Fixed RPM package problem on Fedora (<a href=https://github.com/opentx/opentx/issues/3130>#3130</a>)</li>
+<li>Fixed conversion errors when loading 2.0.x EEPE (<a href=https://github.com/opentx/opentx/issues/3177>#3177</a>)</li>
+<li>Various texts and translations corrections</li>
+</ul>
+
+
 <h2>Version 2.1.6 / 2015-11-11</h2>
-[Taranis]
+
 <ul>
 <li>Telemetry custom screen changes didn't emit modified signal (<a href=https://github.com/opentx/opentx/issues/3029>#3029</a>)</li>
 <li>Hide D8/LR12 when eu firmware option is selected</li>

companion/src/CMakeLists.txt

@@ -1,12 +1,20 @@
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+set(SIMULATOR_INSTALL_PREFIX "" CACHE STRING "Alternative simulator library search path")
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "(Linux|FreeBSD)")
   set(C9X_NAME_SUFFIX ${VERSION_MAJOR}${VERSION_MINOR})
   set(COMPANION_NAME "companion${C9X_NAME_SUFFIX}")
   set(SIMULATOR_NAME "simulator${C9X_NAME_SUFFIX}")
-  set(SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
-else(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  if (NOT ${SIMULATOR_INSTALL_PREFIX} STREQUAL "")
+    set(SIMULATOR_LIB_PATH ${SIMULATOR_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
+  else()
+    set(SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
+  endif()
+  message(STATUS "Simulators library search path: " ${SIMULATOR_LIB_PATH})
+  set(SIMULATOR_LIB_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
+else()
   set(COMPANION_NAME "companion")
   set(SIMULATOR_NAME "simulator")
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+endif()
 
 # This the name that the user will see in the generated DMG and what the application
 # will be called under /Applications. We include the version string to make installing
@@ -17,6 +25,7 @@ set(COMPANION_OSX_APP_BUNDLE_NAME "OpenTX Companion ${VERSION_MAJOR}.${VERSION_M
 # the binary (default homebrew path)
 set(DFU_UTIL_PATH "/usr/local/bin/dfu-util")
 set(AVRDUDE_PATH "/usr/local/bin/avrdude")
+set(AVRDUDE_CONF "/usr/local/etc/avrdude.conf")
 
 option(ALLOW_NIGHTLY_BUILDS "Allow nightly builds download / update") # Disabled by default
 if(ALLOW_NIGHTLY_BUILDS)
@@ -49,12 +58,9 @@ endif()
 if(SDL_FOUND)
   include_directories(${SDL_INCLUDE_DIR})
   add_definitions(-DJOYSTICKS)
-else()
-  remove_definitions(-DSIMU_AUDIO)
 endif()
 
-add_definitions(-DSIMU)
-add_definitions(-DQXT_STATIC)
+add_definitions(${APP_COMMON_DEFINES})  # set in top-level CMakeLists
 
 if(NOT MSVC)
   set(WARNING_FLAGS "${WARNING_FLAGS} -Wall")
@@ -95,15 +101,104 @@ use_cxx11()  # ensure gnu++11 in CXX_FLAGS with CMake < 3.1
 include_directories(
   ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}
   ${COMPANION_SRC_DIRECTORY}
   ${COMPANION_SRC_DIRECTORY}/shared
   ${SIMU_SRC_DIRECTORY}
-  ${COMPANION_SRC_DIRECTORY}/thirdparty/qxtcommandoptions
   ${COMPANION_SRC_DIRECTORY}/thirdparty/qcustomplot
   ${COMPANION_SRC_DIRECTORY}/thirdparty/miniz
   ${COMPANION_SRC_DIRECTORY}/storage
 )
 
+############# Do macro replacements on input files #############
+configure_file(${COMPANION_SRC_DIRECTORY}/version.h.in ${CMAKE_BINARY_DIR}/version.h @ONLY)
+configure_file(${COMPANION_SRC_DIRECTORY}/companion.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop @ONLY)
+configure_file(${COMPANION_SRC_DIRECTORY}/simulator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop @ONLY)
+
+############# Translations ###############
+
+### Generate .qm files and assemble resource (qrc) file.
+
+# available Companion translations (src/translations/*.ts)
+set(LANGUAGES cs de en es fi fr it pl sv zh_CN)
+foreach(language ${LANGUAGES})
+  list(APPEND companion_TS translations/companion_${language}.ts)
+endforeach(language)
+# .ts -> .qm
+qt5_add_translation(companion_QM ${companion_TS})
+
+# add Qt translations if found
+if(QT_TRANSLATIONS_DIR)
+  # Some languages have all translations in one qt_*.qm file and others break them up into modules, in which case we need qt_base_*.qm
+  file(GLOB qtbase_QM "${QT_TRANSLATIONS_DIR}/qtbase_*.qm")
+  file(GLOB qt_QM "${QT_TRANSLATIONS_DIR}/qt_??.qm")  # don't want to match "qt_help_*.qm"
+  list(APPEND qt_QM "${QT_TRANSLATIONS_DIR}/qt_zh_CN.qm" "${QT_TRANSLATIONS_DIR}/qt_zh_TW.qm")  # exceptions not matched by the GLOB
+else()
+  message(STATUS "QT_TRANSLATIONS_DIR not found, unable to package pre-built Qt translations with application.")
+endif()
+
+set(TRANSLATIONS_QRC "${CMAKE_CURRENT_BINARY_DIR}/translations.qrc")
+
+# Dynamically create translations.qrc file (XML) from all collected translation files.
+foreach(qm_file ${companion_QM} ${qt_QM} ${qtbase_QM})
+  get_filename_component(qm_file_name ${qm_file} NAME)
+  # Add file with full path and file name (w/out path) as alias to be used in actual code
+  set(TRANSLATION_FILES_LIST "${TRANSLATION_FILES_LIST}    <file alias=\"${qm_file_name}\">${qm_file}</file>\n")
+endforeach()
+configure_file(${COMPANION_SRC_DIRECTORY}/translations.qrc.in ${TRANSLATIONS_QRC} @ONLY)
+
+### Add optional "translations" target for updating .ts files
+if(QT_LUPDATE_EXECUTABLE)
+  add_custom_target(translations
+    WORKING_DIRECTORY ${COMPANION_SRC_DIRECTORY}
+    COMMAND ${QT_LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
+    )
+else()
+  message(STATUS "Qt lupdate not found, 'translations' target will not be availabe.")
+endif()
+
+############# Common lib ###############
+
+set(common_SRCS
+  appdebugmessagehandler.cpp
+  boards.cpp
+  customdebug.cpp
+  eeprominterface.cpp
+  helpers.cpp
+  radiodata.cpp
+  translations.cpp
+  firmwares/er9x/er9xeeprom.cpp
+  firmwares/er9x/er9xinterface.cpp
+  firmwares/ersky9x/ersky9xeeprom.cpp
+  firmwares/ersky9x/ersky9xinterface.cpp
+  firmwares/opentx/opentxeeprom.cpp
+  firmwares/opentx/opentxinterface.cpp
+  modeledit/node.cpp  # used in simulator
+  modeledit/edge.cpp  # used by node
+  )
+
+set(common_MOC_HDRS
+  appdebugmessagehandler.h
+  helpers.h
+  modeledit/node.h
+  )
+
+set(common_RESOURCES
+  companion.qrc
+  ${TRANSLATIONS_QRC}
+  )
+
+qt5_wrap_cpp(common_SRCS ${common_MOC_HDRS})
+qt5_add_resources(common_RCC ${common_RESOURCES})
+#add_custom_target(gen_qrc DEPENDS ${common_RCC} ${companion_QM})
+
+add_library(common ${common_SRCS} ${common_RCC})
+qt5_use_modules(common Core Xml Widgets)
+target_link_libraries(common PRIVATE simulation)
+#add_dependencies(common gen_qrc)
+
+set(CPN_COMMON_LIB common)
+
 ############# Supporting libraries ###############
 
 add_subdirectory(shared)
@@ -112,31 +207,10 @@ add_subdirectory(generaledit)
 add_subdirectory(simulation)
 add_subdirectory(storage)
 add_subdirectory(thirdparty/qcustomplot)
-add_subdirectory(thirdparty/qxtcommandoptions)
-
-############# Common lib ###############
-
-set(common_SRCS
-  boards.cpp
-  eeprominterface.cpp
-  radiodata.cpp
-  firmwares/er9x/er9xeeprom.cpp
-  firmwares/er9x/er9xinterface.cpp
-  firmwares/ersky9x/ersky9xeeprom.cpp
-  firmwares/ersky9x/ersky9xinterface.cpp
-  firmwares/opentx/opentxeeprom.cpp
-  firmwares/opentx/opentxinterface.cpp
-  )
-
-qt5_wrap_cpp(common_SRCS)
-
-add_library(common ${common_SRCS})
-qt5_use_modules(common Core Xml Widgets)
 
 ############# Companion ###############
 
 set(companion_SRCS
-  helpers.cpp
   helpers_html.cpp
   mdichild.cpp
   modelslist.cpp
@@ -145,7 +219,7 @@ set(companion_SRCS
   burnconfigdialog.cpp
   multimodelprinter.cpp
   comparedialog.cpp
-  contributorsdialog.cpp
+  creditsdialog.cpp
   releasenotesdialog.cpp
   releasenotesfirmwaredialog.cpp
   customizesplashdialog.cpp
@@ -168,6 +242,7 @@ set(companion_SRCS
   radionotfound.cpp
   wizarddata.cpp
   wizarddialog.cpp
+  multiprotocols.cpp
   )
 
 set(companion_MOC_HDRS
@@ -178,7 +253,7 @@ set(companion_MOC_HDRS
   printdialog.h
   fusesdialog.h
   logsdialog.h
-  contributorsdialog.h
+  creditsdialog.h
   releasenotesdialog.h
   releasenotesfirmwaredialog.h
   customizesplashdialog.h
@@ -195,7 +270,6 @@ set(companion_MOC_HDRS
   mdichild.h
   mainwindow.h
   radionotfound.h
-  helpers.h
   wizarddialog.h
   modelprinter.h
   multimodelprinter.h
@@ -222,84 +296,25 @@ set(companion_UIS
   radionotfound.ui
   )
 
-set(companion_RESOURCES
-  companion.qrc
-  ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
-  )
-
-configure_file(${COMPANION_SRC_DIRECTORY}/version.h.in ${CMAKE_BINARY_DIR}/version.h @ONLY)
-configure_file(${COMPANION_SRC_DIRECTORY}/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc @ONLY)
-configure_file(${COMPANION_SRC_DIRECTORY}/companion.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop @ONLY)
-configure_file(${COMPANION_SRC_DIRECTORY}/simulator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop @ONLY)
-
 if(WIN32)
-  list(APPEND companion_SRCS icon.rc)
+  set(icon_RC icon.rc)
 endif()
 
-include_directories(${CMAKE_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR})
-
-set(LANGUAGES pl de fr es it sv cs fi zh)
-foreach(language ${LANGUAGES})
-  list(APPEND companion_TS translations/companion_${language}.ts)
-endforeach(language)
-
 qt5_wrap_ui(companion_SRCS ${companion_UIS})
 qt5_wrap_cpp(companion_SRCS ${companion_MOC_HDRS})
-qt5_add_translation(companion_QM ${companion_TS})
-qt5_add_resources(companion_RCC ${companion_RESOURCES})
-add_custom_target(gen_qrc DEPENDS ${companion_RCC})
 
-add_definitions(-DQT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}")
-
-add_executable(${COMPANION_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${companion_SRCS} ${companion_RCC} ${companion_QM})
-
-add_dependencies(${COMPANION_NAME} gen_qrc)
+add_executable(${COMPANION_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${companion_SRCS} ${icon_RC})
 qt5_use_modules(${COMPANION_NAME} Core Widgets Network)
-
-target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit simulation common qcustomplot shared storage ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${WIN_LINK_LIBRARIES})
+target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit simulation ${CPN_COMMON_LIB} qcustomplot shared storage ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${WIN_LINK_LIBRARIES})
 
 PrintTargetReport("${COMPANION_NAME}")
 
 ############# Standalone simulator ###############
 
-set(simu_SRCS
-  modeledit/node.cpp
-  modeledit/edge.cpp
-  helpers.cpp
-  simulator.cpp
-  )
+set(simu_SRCS simulator.cpp )
 
-set(simu_MOC_HDRS
-  modeledit/node.h
-  helpers.h
-  )
-
-qt5_wrap_cpp(simu_SRCS ${simu_MOC_HDRS} )
-
-if(WIN32)
-  list(APPEND simu_SRCS icon.rc)
-endif()
-
-add_executable(${SIMULATOR_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${simu_SRCS} ${companion_RCC})
-
-add_dependencies(${SIMULATOR_NAME} gen_qrc)
-qt5_use_modules(${SIMULATOR_NAME} Core Widgets Multimedia)
-
-target_link_libraries(${SIMULATOR_NAME} PRIVATE simulation common shared storage qxtcommandoptions ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${WIN_LINK_LIBRARIES})
-
-############# Translations ####################
-
-find_package(Lupdate)
-if(LUPDATE_FOUND)
-  message(STATUS "Qt lupdate: " ${LUPDATE_EXECUTABLE})
-  add_custom_target(translations
-    WORKING_DIRECTORY ${COMPANION_SRC_DIRECTORY}
-    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
-    )
-else()
-  message(STATUS "Qt lupdate not found, 'translations' target will not be availabe.")
-endif()
+add_executable(${SIMULATOR_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${simu_SRCS} ${icon_RC})
+target_link_libraries(${SIMULATOR_NAME} PRIVATE simulation ${CPN_COMMON_LIB} storage ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${WIN_LINK_LIBRARIES})
 
 ############# Install ####################
 
@@ -319,7 +334,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   message(STATUS "install " ${CMAKE_BINARY_DIR} " to " ${CMAKE_INSTALL_PREFIX}/bin)
   install(TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
   install(TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-  install(FILES ${simulator_plugins} DESTINATION "${SIMULATOR_LIB_PATH}")
+  install(FILES ${simulator_plugins} DESTINATION "${SIMULATOR_LIB_INSTALL_PATH}")
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop DESTINATION share/applications RENAME companion${C9X_NAME_SUFFIX}.desktop)
   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop DESTINATION share/applications RENAME simulator${C9X_NAME_SUFFIX}.desktop)
   if(${CMAKE_INSTALL_PREFIX} MATCHES "/usr/local")
@@ -336,14 +351,14 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   install(FILES images/linuxicons/512x512/companion.png DESTINATION ${INSTALL_TEMP_SHR_PFX}share/icons/hicolor/512x512/apps RENAME companion${C9X_NAME_SUFFIX}.png)
   install(FILES images/linuxicons/scalable/companion.svg DESTINATION ${INSTALL_TEMP_SHR_PFX}share/icons/hicolor/scalable/apps RENAME companion${C9X_NAME_SUFFIX}.svg)
   install(FILES ../targets/linux/45-companion-taranis.rules DESTINATION ${INSTALL_TEMP_LIB_PFX}lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-taranis.rules)
+  install(FILES ../targets/linux/45-usbasp.rules DESTINATION ${INSTALL_TEMP_LIB_PFX}lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-usbasp.rules)
   # Linux specific code
   set(OperatingSystem "Linux")
 
 elseif(WIN32)
 
-  get_target_property(QtCore_LOCATION Qt5::Core LOCATION)
-  get_filename_component(QT_DLL_DIR ${QtCore_LOCATION} PATH)
-  set(INSTALL_TEMP_QTDLL_FILES Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5PrintSupport Qt5Multimedia)
+  set(QT_DLL_DIR ${QT_LIB_DIR})
+  set(INSTALL_TEMP_QTDLL_FILES Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5PrintSupport Qt5Multimedia Qt5Svg)
   set(INSTALL_TEMP_ICUDLL_FILES icudt54.dll icuin54.dll icuuc54.dll)
   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
     set(INSTALL_TEMP_QTDLL_SFX "d")
@@ -421,7 +436,7 @@ if(WIN32)
 
   set(SYSDIR "$ENV{windir}/system32")
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${COMPANION_NSI_IN_FILE} ${PROJECT_BINARY_DIR}/companion/companion.nsi @ONLY)
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${SIMULATOR_NSI_IN_FILE} ${PROJECT_BINARY_DIR}/companion/simulator.nsi @ONLY)
+  #configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${SIMULATOR_NSI_IN_FILE} ${PROJECT_BINARY_DIR}/companion/simulator.nsi @ONLY)
 
   find_program(NSIS_EXE makensis.exe PATHS
     "C:/Program Files/NSIS"
@@ -434,16 +449,16 @@ if(WIN32)
     DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion/companion.nsi
     COMMENT "Companion Windows NSIS Installer")
 
-  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/companion/simulator-install.exe
-    COMMAND "${NSIS_EXE}" ARGS ${PROJECT_BINARY_DIR}/companion/simulator.nsi
-    DEPENDS simulator ${PROJECT_BINARY_DIR}/companion/simulator.nsi
-    COMMENT "Simulator Windows NSIS Installer")
+#  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/companion/simulator-install.exe
+#    COMMAND "${NSIS_EXE}" ARGS ${PROJECT_BINARY_DIR}/companion/simulator.nsi
+#    DEPENDS simulator ${PROJECT_BINARY_DIR}/companion/simulator.nsi
+#    COMMENT "Simulator Windows NSIS Installer")
 
   add_custom_target(installer
     DEPENDS ${PROJECT_BINARY_DIR}/companion/companion-windows.exe
-    DEPENDS ${PROJECT_BINARY_DIR}/companion/simulator-windows.exe
+#    DEPENDS ${PROJECT_BINARY_DIR}/companion/simulator-windows.exe
     SOURCES ${PROJECT_BINARY_DIR}/companion/companion.nsi
-    SOURCES ${PROJECT_BINARY_DIR}/companion/simulator.nsi
+#    SOURCES ${PROJECT_BINARY_DIR}/companion/simulator.nsi
     )
 endif()
 
@@ -475,7 +490,6 @@ IF(APPLE)
       RUNTIME DESTINATION bin COMPONENT Runtime
       )
 
-
   install(FILES ${simulator_plugins} DESTINATION "${companion_res_dir}" COMPONENT Runtime)
 
   # Write qt.conf to tell qt where to find it plugins
@@ -489,7 +503,7 @@ IF(APPLE)
   install(DIRECTORY ${PROJECT_SOURCE_DIR}/companion/targets/mac/qt_menu.nib DESTINATION "${companion_res_dir}" COMPONENT Runtime)
 
   # manually add the required plugins
-  foreach (plugin ${Qt5Multimedia_PLUGINS} ${Qt5PrintSupport_PLUGINS} ${Qt5Gui_PLUGINS})
+  foreach (plugin ${Qt5Multimedia_PLUGINS} ${Qt5PrintSupport_PLUGINS} ${Qt5Gui_PLUGINS} ${Qt5Svg_PLUGINS})
     get_target_property(QPA_PLUGIN ${plugin} LOCATION)
     get_filename_component(QPA_PLUGIN_FILENAME ${QPA_PLUGIN} NAME)
     # Todo is there a nicer way to get the QT Plugin directory name?!
@@ -511,13 +525,12 @@ IF(APPLE)
   # Copy dfu-util and avrdude, resolve symlink first
   get_filename_component(DFU_UTIL_ABSOLUTE_PATH ${DFU_UTIL_PATH} REALPATH)
   get_filename_component(AVRDUDE_ABSOLUTE_PATH ${AVRDUDE_PATH} REALPATH)
+  get_filename_component(AVRDUDECONF_ABSOLUTE_PATH ${AVRDUDE_CONF} REALPATH)
   install(PROGRAMS ${DFU_UTIL_ABSOLUTE_PATH} ${AVRDUDE_ABSOLUTE_PATH} DESTINATION ${companion_res_dir} COMPONENT Runtime)
+  install(FILES ${AVRDUDECONF_ABSOLUTE_PATH} DESTINATION ${companion_res_dir} COMPONENT Runtime)
+  
   set(bundle_tools_path "\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/dfu-util;\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/avrdude")
-
-  # These needs to be relative to CMAKE_INSTALL_PREFIX
-  get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
-  get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
-  get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
+  
 
   # Include depencies (adding frameworks, fixing the embbeded libraries)
   # I get write errors without setting BU_CHMOD_BUNDLE_ITEMS even though it is
@@ -526,7 +539,7 @@ IF(APPLE)
    include(BundleUtilities)
    file(GLOB bundle_simulator_libs \"\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/libopentx-*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
    set(BU_CHMOD_BUNDLE_ITEMS on)
-   fixup_bundle(\"${APPS}\"   \"\${bundle_simulator_libs};${bundle_qt_libs};${bundle_tools_path}\"   \"${QT_LIBRARY_DIR}\")
+   fixup_bundle(\"${APPS}\"   \"\${bundle_simulator_libs};${bundle_qt_libs};${bundle_tools_path}\"   \"${QT_LIB_DIR}\")
    file(RENAME \"\${CMAKE_INSTALL_PREFIX}/${COMPANION_NAME}.app\" \"\${CMAKE_INSTALL_PREFIX}/${COMPANION_OSX_APP_BUNDLE_NAME}.app\")
    " COMPONENT Runtime)
 endif()
@@ -546,6 +559,7 @@ if(DPKG_PROGRAM)
   set(CPACK_DEBIAN_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
   set(CPACK_DEBIAN_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
   set(CPACK_DEBIAN_ARCHITECTURE $(CMAKE_SYSTEM_PROCESSOR))
+  set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt5multimedia5-plugins")
   set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 elseif(APPLE)
   set(CPACK_GENERATOR "DragNDrop")

companion/src/appdebugmessagehandler.cpp

@@ -0,0 +1,163 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "appdebugmessagehandler.h"
+
+#include <QFileDevice>
+
+AppDebugMessageHandler::AppDebugMessageHandler(QObject * parent) :
+  QObject(parent),
+  m_appDebugOutputLevel(APP_DBG_HANDLER_DEFAULT_LEVEL),
+  m_showSourcePath(APP_DBG_HANDLER_SHOW_SRC_PATH),
+  m_showFunctionDeclarations(APP_DBG_HANDLER_SHOW_FUNCTION_DECL)
+{
+  m_srcPathFilter = QRegularExpression("^" APP_DBG_HANDLER_SRC_PATH "[\\\\\\/](.*?)$", QRegularExpression::InvertedGreedinessOption);
+  m_functionFilter = QRegularExpression("^.+?(\\w+\\().+$");
+}
+
+AppDebugMessageHandler * AppDebugMessageHandler::instance()
+{
+  static AppDebugMessageHandler * _instance = NULL;
+#if APP_DBG_HANDLER_ENABLE
+  if(_instance == NULL && !qApp->closingDown())
+    _instance = new AppDebugMessageHandler(qApp);  // Ensure this object is cleaned up when the QApplication exits.
+#endif
+  return _instance;
+}
+
+void AppDebugMessageHandler::setAppDebugOutputLevel(const quint8 & appDebugOutputLevel)
+{
+  m_appDebugOutputLevel = appDebugOutputLevel;
+}
+
+void AppDebugMessageHandler::setShowSourcePath(bool showSourcePath)
+{
+  m_showSourcePath = showSourcePath;
+}
+
+void AppDebugMessageHandler::setShowFunctionDeclarations(bool showFunctionDeclarations)
+{
+  m_showFunctionDeclarations = showFunctionDeclarations;
+}
+
+void AppDebugMessageHandler::addOutputDevice(QIODevice * device)
+{
+  if (device && !m_outputDevices.contains(device))
+    m_outputDevices.append(device);
+}
+
+void AppDebugMessageHandler::removeOutputDevice(QIODevice * device)
+{
+  if (device) {
+    // no QVector::removeAll() in Qt < 5.4
+    int i = 0;
+    foreach (QIODevice * d, m_outputDevices) {
+      if (d == device)
+        m_outputDevices.remove(i);
+      ++i;
+    }
+  }
+}
+
+void AppDebugMessageHandler::installAppMessageHandler()
+{
+  m_defaultHandler = qInstallMessageHandler(g_appDebugMessageHandler);
+}
+
+void AppDebugMessageHandler::messageHandler(QtMsgType type, const QMessageLogContext & context, const QString & msg)
+{
+  static const char symbols[] = { 'D', 'W', 'E', 'X', 'I' };  // correspond to QtMsgType enum
+  // normalize types, QtDebugMsg stays 0, QtInfoMsg becomes 1, rest are QtMsgType + 1
+  quint8 lvl = type;
+  if (type == QtInfoMsg)
+    lvl = 1;
+  else if (type > QtDebugMsg)
+    ++lvl;
+
+  if (lvl < m_appDebugOutputLevel && type != QtFatalMsg)
+    return;
+
+#if defined(Q_OS_LINUX) && (QT_VERSION < QT_VERSION_CHECK(5, 3, 0))
+  // Filter out lots of QPainter warnings from undocked QDockWidgets... hackish but effective (only workaround found so far)
+  if (lvl == 2 && QString(context.function).contains("QPainter::"))
+    return;
+#endif
+
+  QString msgPattern = QString("[%1] ").arg(symbols[type]);
+
+  if (m_showSourcePath) {
+    QString file = QString("%1::").arg(context.file);
+    file.replace(m_srcPathFilter, "\\1");
+    msgPattern.append(file);
+  }
+  if (m_showFunctionDeclarations)
+    msgPattern.append(context.function);
+  else
+    msgPattern.append("%{function}()");
+
+  msgPattern.append(":%{line} -%{if-category} [%{category}]%{endif} %{message}");
+
+  if (type == QtFatalMsg)
+    msgPattern.append("\nBACKTRACE:\n%{backtrace depth=12 separator=\"\n\"}");
+
+  qSetMessagePattern(msgPattern);
+
+  if (!m_defaultHandler || m_outputDevices.size() || receivers(SIGNAL(messageOutput(quint8, const QString &)))) {
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
+    msgPattern = qFormatLogMessage(type, context, msg);
+#else
+    msgPattern.replace("%{line}", QString::number(context.line));
+    msgPattern.replace("%{if-category} [%{category}]%{endif}", QString(context.category));
+    msgPattern.replace("%{message}", msg);
+    if (!m_showFunctionDeclarations) {
+      QString func = context.function;
+      msgPattern.replace("%{function}", func.replace(m_functionFilter, "\\1)"));
+    }
+#endif
+
+    emit messageOutput(lvl, msgPattern);
+
+    foreach (QIODevice * d, m_outputDevices) {
+      if (d && d->isWritable() && (!d->property("level").isValid() || d->property("level").toInt() <= lvl)) {
+        d->write(qPrintable(msgPattern % "\n"));
+        if (QFileDevice * fd = qobject_cast<QFileDevice *>(d))
+          fd->flush();
+      }
+    }
+  }
+
+  // if (QThread::currentThread() == qApp->thread())  // gui thread
+
+  if (m_defaultHandler) {
+    m_defaultHandler(type, context, msg);
+  }
+  else {
+    fprintf(stderr, "%s", qPrintable(msgPattern));
+    if (type == QtFatalMsg)
+      abort();
+  }
+}
+
+// Message handler which is installed using qInstallMessageHandler. This needs to be global.
+void g_appDebugMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
+{
+  if (AppDebugMessageHandler::instance())
+    AppDebugMessageHandler::instance()->messageHandler(type, context, msg);
+}

companion/src/appdebugmessagehandler.h

@@ -0,0 +1,142 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef APPDEBUGMESSAGEHANDLER_H
+#define APPDEBUGMESSAGEHANDLER_H
+
+#include <cstdlib>
+#include <iostream>
+
+#include <QApplication>
+#include <QDebug>
+#include <QIODevice>
+#include <QMessageLogContext>
+#include <QObject>
+#include <QRegularExpression>
+#include <QString>
+
+/*
+ * Custom debug/message handler class to work in conjunction with qDebug() family of functions.
+ * Formats all stderr output generated by the application in a consistent manner.
+ * It can also be used by other event listeners to intercept messages they may be interested in (connect to messageOutput() signal).
+ *
+ * Include this header to use qInfo() safely with Qt < v5.5 (qInfo becomes alias for qDebug).
+ *
+ * Note that the default message format can still be overriden by setting QT_MESSAGE_PATTERN environment variable at _runtime_.
+ *   see: https://doc.qt.io/qt-5/qtglobal.html#qSetMessagePattern
+ *
+ * This is an app-wide "global" thread-safe singleton class, use it with AppDebugMessageHandler::instance().
+ *   For example, at start of application:
+ *
+ *     QApplication app(argc, argv);
+ *     AppDebugMessageHandler::instance()->installAppMessageHandler();
+ *
+ *  To connect to a signal:
+ *
+ *    connect(AppDebugMessageHandler::instance(), &AppDebugMessageHandler::messageOutput, this, &DebugOutput::onAppDebugMessage);
+ *
+ * This singleton will self-destruct upon QApplication termination.
+ *
+ */
+
+#if defined(QT_DEBUG) || defined(DEBUG)
+  #define APP_DBG_HANDLER_IS_DBG_BUILD          1
+#else
+  #define APP_DBG_HANDLER_IS_DBG_BUILD          0
+#endif
+
+// Enable/disable this custom handler handler entirely
+#ifndef APP_DBG_HANDLER_ENABLE
+  #define APP_DBG_HANDLER_ENABLE                1
+#endif
+
+// Default log level (can also be set with setAppDebugOutputLevel()):
+//   0 = debug+; 1 = info+; 2 = warn+; 3 = critical+; 4 = fatal only
+#ifndef APP_DBG_HANDLER_DEFAULT_LEVEL
+  #define APP_DBG_HANDLER_DEFAULT_LEVEL         0
+#endif
+
+// Include source file path/name in output (filtered with APP_DBG_HANDLER_SRC_PATH)
+#ifndef APP_DBG_HANDLER_SHOW_SRC_PATH
+  #define APP_DBG_HANDLER_SHOW_SRC_PATH         APP_DBG_HANDLER_IS_DBG_BUILD
+#endif
+
+// Show just the function Class::name vs. full declaration with return and param types
+#ifndef APP_DBG_HANDLER_SHOW_FUNCTION_DECL
+  #define APP_DBG_HANDLER_SHOW_FUNCTION_DECL    0
+#endif
+
+// base path for source file name filter, everything after this is kept; RegEx, non-greedy
+#ifndef APP_DBG_HANDLER_SRC_PATH
+  #define APP_DBG_HANDLER_SRC_PATH              ".*src"
+#endif
+
+// Make sure to include this header if using qInfo()
+#if (QT_VERSION < QT_VERSION_CHECK(5, 5, 0))
+  #if defined(QT_NO_INFO_OUTPUT)
+    #define qInfo      QT_NO_QDEBUG_MACRO
+  #else
+    #define qInfo      qDebug
+  #endif
+  #define QtInfoMsg    QtMsgType(4)
+#endif
+
+class AppDebugMessageHandler : public QObject
+{
+  Q_OBJECT
+
+  public:
+    // This class implements the singleton design pattern and is therefore publicly accessible only through instance().
+    static AppDebugMessageHandler * instance();
+    AppDebugMessageHandler(AppDebugMessageHandler const &) = delete;
+    void operator = (AppDebugMessageHandler const &)       = delete;
+
+    void setAppDebugOutputLevel(const quint8 & appDebugOutputLevel);
+    void setShowSourcePath(bool showSourcePath);
+    void setShowFunctionDeclarations(bool showFunctionDeclarations);
+    void addOutputDevice(QIODevice * device);
+    void removeOutputDevice(QIODevice * device);
+
+    void installAppMessageHandler();
+    void messageHandler(QtMsgType type, const QMessageLogContext & context, const QString & msg);
+
+  private:
+    // This class implements the singleton design pattern and therefore has only a private constructor.
+    explicit AppDebugMessageHandler(QObject * parent = Q_NULLPTR);
+    ~AppDebugMessageHandler() { }
+
+    QtMessageHandler m_defaultHandler;
+    QRegularExpression m_srcPathFilter;
+    QRegularExpression m_functionFilter;
+    quint8 m_appDebugOutputLevel;
+    QVector<QIODevice *> m_outputDevices;
+    bool m_showSourcePath;
+    bool m_showFunctionDeclarations;
+
+  signals:
+    void messageOutput(quint8 level, const QString & msg);
+};
+
+// Message handler which is installed using qInstallMessageHandler. This needs to be global.
+// Use AppDebugMessageHandler::instance()->installAppMessageHandler();
+//  instead of installing this function directly (it will verify this handler is enabled, etc).
+void g_appDebugMessageHandler(QtMsgType, const QMessageLogContext &, const QString &);
+
+#endif // APPDEBUGMESSAGEHANDLER_H

companion/src/apppreferencesdialog.cpp

@@ -23,13 +23,10 @@
 #include "mainwindow.h"
 #include "appdata.h"
 #include "helpers.h"
-#include "firmwareinterface.h"
-#ifdef JOYSTICKS
+#if defined(JOYSTICKS)
 #include "joystick.h"
 #include "joystickdialog.h"
 #endif
-#include <QDesktopServices>
-#include <QtGui>
 
 AppPreferencesDialog::AppPreferencesDialog(QWidget * parent) :
   QDialog(parent),
@@ -41,6 +38,8 @@ AppPreferencesDialog::AppPreferencesDialog(QWidget * parent) :
 
   initSettings();
   connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
+  connect(ui->opt_appDebugLog, &QCheckBox::toggled, this, &AppPreferencesDialog::toggleAppLogSettings);
+  connect(ui->opt_fwTraceLog, &QCheckBox::toggled, this, &AppPreferencesDialog::toggleAppLogSettings);
   connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
 
 #if !defined(JOYSTICKS)
@@ -61,13 +60,13 @@ AppPreferencesDialog::~AppPreferencesDialog()
 
 void AppPreferencesDialog::writeValues()
 {
-  g.useCompanionNightlyBuilds(ui->useCompanionNightlyBuilds->isChecked());
   g.autoCheckApp(ui->autoCheckCompanion->isChecked());
-  g.useFirmwareNightlyBuilds(ui->useFirmwareNightlyBuilds->isChecked());
+  g.OpenTxBranch(DownloadBranchType(ui->OpenTxBranch->currentIndex()));
   g.autoCheckFw(ui->autoCheckFirmware->isChecked());
   g.showSplash(ui->showSplash->isChecked());
   g.simuSW(ui->simuSW->isChecked());
-  g.useWizard(ui->modelWizard_CB->isChecked());
+  g.removeModelSlots(ui->opt_removeBlankSlots->isChecked());
+  g.newModelAction(ui->opt_newMdl_useWizard->isChecked() ? 1 : ui->opt_newMdl_useEditor->isChecked() ? 2 : 0);
   g.historySize(ui->historySize->value());
   g.backLight(ui->backLightColor->currentIndex());
   g.profile[g.id()].volumeGain(round(ui->volumeGain->value() * 10.0));
@@ -76,8 +75,12 @@ void AppPreferencesDialog::writeValues()
   g.embedSplashes(ui->splashincludeCB->currentIndex());
   g.enableBackup(ui->backupEnable->isChecked());
 
+  g.appDebugLog(ui->opt_appDebugLog->isChecked());
+  g.fwTraceLog(ui->opt_fwTraceLog->isChecked());
+  g.appLogsDir(ui->appLogsDir->text());
+
   if (ui->joystickChkB ->isChecked() && ui->joystickCB->isEnabled()) {
-    g.jsSupport(ui->joystickChkB ->isChecked());  
+    g.jsSupport(ui->joystickChkB ->isChecked());
     g.jsCtrl(ui->joystickCB ->currentIndex());
   }
   else {
@@ -100,12 +103,13 @@ void AppPreferencesDialog::writeValues()
     g.profile[g.id()].name(ui->profileNameLE->text());
 
   // If a new fw type has been choosen, several things need to reset
-  current_firmware_variant = getFirmwareVariant();
-  QString id = current_firmware_variant->getId();
+  Firmware::setCurrentVariant(getFirmwareVariant());
+  QString id = Firmware::getCurrentVariant()->getId();
   if (g.profile[g.id()].fwType() != id) {
     g.profile[g.id()].fwName("");
     g.profile[g.id()].initFwVariables();
     g.profile[g.id()].fwType(id);
+    emit firmwareProfileChanged(g.id());
   }
 }
 
@@ -129,13 +133,10 @@ void AppPreferencesDialog::initSettings()
     ui->snapshotPath->setDisabled(true);
     ui->snapshotPathButton->setDisabled(true);
   }
-#if defined(ALLOW_NIGHTLY_BUILDS)
-  ui->useCompanionNightlyBuilds->setChecked(g.useCompanionNightlyBuilds());
-  ui->useFirmwareNightlyBuilds->setChecked(g.useFirmwareNightlyBuilds());
-#else
-  ui->useCompanionNightlyBuilds->hide();
-  ui->useFirmwareNightlyBuilds->hide();
+#if !defined(ALLOW_NIGHTLY_BUILDS)
+  // TODO should we gray out nightly builds here?
 #endif
+  ui->OpenTxBranch->setCurrentIndex(g.OpenTxBranch());
   ui->autoCheckCompanion->setChecked(g.autoCheckApp());
   ui->autoCheckFirmware->setChecked(g.autoCheckFw());
   ui->showSplash->setChecked(g.showSplash());
@@ -148,7 +149,10 @@ void AppPreferencesDialog::initSettings()
   }
 
   ui->simuSW->setChecked(g.simuSW());
-  ui->modelWizard_CB->setChecked(g.useWizard());
+  ui->opt_removeBlankSlots->setChecked(g.removeModelSlots());
+  ui->opt_newMdl_useNone->setChecked(g.newModelAction() == 0);
+  ui->opt_newMdl_useWizard->setChecked(g.newModelAction() == 1);
+  ui->opt_newMdl_useEditor->setChecked(g.newModelAction() == 2);
   ui->libraryPath->setText(g.libDir());
   ui->ge_lineedit->setText(g.gePath());
 
@@ -163,10 +167,15 @@ void AppPreferencesDialog::initSettings()
     }
   }
   else {
-      ui->backupEnable->setDisabled(true);
+    ui->backupEnable->setDisabled(true);
   }
   ui->splashincludeCB->setCurrentIndex(g.embedSplashes());
 
+  ui->opt_appDebugLog->setChecked(g.appDebugLog());
+  ui->opt_fwTraceLog->setChecked(g.fwTraceLog());
+  ui->appLogsDir->setText(g.appLogsDir());
+  toggleAppLogSettings();
+
 #if defined(JOYSTICKS)
   ui->joystickChkB->setChecked(g.jsSupport());
   if (ui->joystickChkB->isChecked()) {
@@ -193,7 +202,7 @@ void AppPreferencesDialog::initSettings()
     ui->joystickCB->setDisabled(true);
     ui->joystickcalButton->setDisabled(true);
   }
-#endif  
+#endif
   //  Profile Tab Inits
   ui->channelorderCB->setCurrentIndex(g.profile[g.id()].channelOrder());
   ui->stickmodeCB->setCurrentIndex(g.profile[g.id()].defaultMode());
@@ -213,9 +222,6 @@ void AppPreferencesDialog::initSettings()
   }
 
   ui->profileNameLE->setText(g.profile[g.id()].name());
-  ui->SplashFileName->setText(g.profile[g.id()].splashFile());
-
-  displayImage( g.profile[g.id()].splashFile() );
 
   QString hwSettings;
   if (g.profile[g.id()].stickPotCalib() == "" ) {
@@ -230,15 +236,14 @@ void AppPreferencesDialog::initSettings()
   }
   ui->lblGeneralSettings->setText(hwSettings);
 
-  Firmware * current_firmware = getCurrentFirmware();
-
-  foreach(Firmware * firmware, firmwares) {
+  QString currType = QStringList(g.profile[g.id()].fwType().split('-').mid(0, 2)).join('-');
+  foreach(Firmware * firmware, Firmware::getRegisteredFirmwares()) {
     ui->downloadVerCB->addItem(firmware->getName(), firmware->getId());
-    if (current_firmware->getFirmwareBase() == firmware) {
+    if (currType == firmware->getId()) {
       ui->downloadVerCB->setCurrentIndex(ui->downloadVerCB->count() - 1);
     }
   }
-  
+
   baseFirmwareChanged();
 }
 
@@ -285,6 +290,15 @@ void AppPreferencesDialog::on_ProfilebackupPathButton_clicked()
   }
 }
 
+
+void AppPreferencesDialog::on_btn_appLogsDir_clicked()
+{
+  QString fileName = QFileDialog::getExistingDirectory(this, tr("Select a folder for application logs"), ui->appLogsDir->text());
+  if (!fileName.isEmpty()) {
+    ui->appLogsDir->setText(fileName);
+  }
+}
+
 void AppPreferencesDialog::on_ge_pathButton_clicked()
 {
   QString fileName = QFileDialog::getOpenFileName(this, tr("Select Google Earth executable"),ui->ge_lineedit->text());
@@ -292,7 +306,7 @@ void AppPreferencesDialog::on_ge_pathButton_clicked()
     ui->ge_lineedit->setText(fileName);
   }
 }
- 
+
 #if defined(JOYSTICKS)
 void AppPreferencesDialog::on_joystickChkB_clicked() {
   if (ui->joystickChkB->isChecked()) {
@@ -336,27 +350,18 @@ void AppPreferencesDialog::on_sdPathButton_clicked()
   }
 }
 
-void AppPreferencesDialog::on_removeProfileButton_clicked()
-{
-  if ( g.id() == 0 ) {
-     QMessageBox::information(this, tr("Not possible to remove profile"), tr("The default profile can not be removed."));
-  }
-  else {
-    g.profile[g.id()].remove();
-    g.id( 0 );
-    initSettings();
-  }
-}
-
 bool AppPreferencesDialog::displayImage(const QString & fileName)
 {
   // Start by clearing the label
   ui->imageLabel->clear();
 
-  QImage image(fileName);
-  if (image.isNull()) 
+  if (fileName.isEmpty())
     return false;
-  
+
+  QImage image(fileName);
+  if (image.isNull())
+    return false;
+
   ui->imageLabel->setPixmap(makePixMap(image));
   ui->imageLabel->setFixedSize(getCurrentFirmware()->getCapability(LcdWidth), getCurrentFirmware()->getCapability(LcdHeight));
   return true;
@@ -374,7 +379,7 @@ void AppPreferencesDialog::on_SplashSelect_clicked()
 
   if (!fileName.isEmpty()){
     g.imagesDir(QFileInfo(fileName).dir().absolutePath());
-   
+
     displayImage(fileName);
     ui->SplashFileName->setText(fileName);
   }
@@ -391,14 +396,13 @@ void AppPreferencesDialog::showVoice(bool show)
 {
   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());
+  QString selected_firmware = ui->downloadVerCB->currentData().toString();
 
-  foreach(Firmware * firmware, firmwares) {
+  foreach(Firmware * firmware, Firmware::getRegisteredFirmwares()) {
     if (firmware->getId() == selected_firmware) {
       populateFirmwareOptions(firmware);
       break;
@@ -408,31 +412,31 @@ void AppPreferencesDialog::baseFirmwareChanged()
 
 Firmware * AppPreferencesDialog::getFirmwareVariant()
 {
-  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
+  QString selected_firmware = ui->downloadVerCB->currentData().toString();
 
-  foreach(Firmware * firmware, firmwares) {
+  foreach(Firmware * firmware, Firmware::getRegisteredFirmwares()) {
     QString id = firmware->getId();
     if (id == selected_firmware) {
       foreach(QCheckBox *cb, optionsCheckBoxes) {
         if (cb->isChecked()) {
-          id += QString("-") + cb->text();
+          id += "-" + cb->text();
         }
       }
 
       if (voice && voice->isChecked()) {
-        id += QString("-tts") + ui->voiceCombo->currentText();
+        id += "-tts" + ui->voiceCombo->currentText();
       }
 
       if (ui->langCombo->count()) {
-        id += QString("-") + ui->langCombo->currentText();
+        id += "-" + ui->langCombo->currentText();
       }
 
-      return getFirmware(id);
+      return Firmware::getFirmwareForId(id);
     }
   }
 
   // Should never occur...
-  return default_firmware_variant;
+  return Firmware::getDefaultVariant();
 }
 
 void AppPreferencesDialog::firmwareOptionChanged(bool state)
@@ -443,8 +447,8 @@ void AppPreferencesDialog::firmwareOptionChanged(bool state)
   }
   Firmware * firmware=NULL;
   if (cb && state) {
-    QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-    foreach(firmware, firmwares) {
+    QVariant selected_firmware = ui->downloadVerCB->currentData();
+    foreach(firmware, Firmware::getRegisteredFirmwares()) {
       if (firmware->getId() == selected_firmware) {
         foreach(QList<Option> opts, firmware->opts) {
           foreach(Option opt, opts) {
@@ -464,7 +468,15 @@ void AppPreferencesDialog::firmwareOptionChanged(bool state)
         }
       }
     }
-  } 
+  }
+}
+
+void AppPreferencesDialog::toggleAppLogSettings()
+{
+  bool vis = (ui->opt_appDebugLog->isChecked() || ui->opt_fwTraceLog->isChecked());
+  ui->appLogsDir->setVisible(vis);
+  ui->lbl_appLogsDir->setVisible(vis);
+  ui->btn_appLogsDir->setVisible(vis);
 }
 
 void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware)
@@ -473,7 +485,7 @@ void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware)
 
   updateLock = true;
 
-  QString id = current_firmware_variant->getId();
+  QString id = Firmware::getCurrentVariant()->getId();
   ui->langCombo->clear();
   foreach(const char *lang, parent->languages) {
     ui->langCombo->addItem(lang);
@@ -528,12 +540,23 @@ void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware)
 
   showVoice(voice && voice->isChecked());
 
+  // TODO: Remove once splash replacement supported on Horus
+  // NOTE: 480x272 image causes issues on screens <800px high, needs a solution like scrolling once reinstated
+  if (IS_HORUS(parent->getBoard())) {
+    ui->widget_splashImage->hide();
+    ui->SplashFileName->setText("");
+  }
+  else {
+    ui->widget_splashImage->show();
+    ui->SplashFileName->setText(g.profile[g.id()].splashFile());
+    displayImage(g.profile[g.id()].splashFile());
+  }
+
   updateLock = false;
-  QTimer::singleShot(0, this, SLOT(shrink()));
+  QTimer::singleShot(50, this, SLOT(shrink()));
 }
 
 void AppPreferencesDialog::shrink()
 {
-  resize(0,0);
+  adjustSize();
 }
-

companion/src/apppreferencesdialog.h

@@ -40,6 +40,9 @@ class AppPreferencesDialog : public QDialog
     ~AppPreferencesDialog();
     Joystick * joystick;
 
+  signals:
+    void firmwareProfileChanged(int profId);
+
   private:
     QList<QCheckBox *> optionsCheckBoxes;
     bool updateLock;
@@ -59,6 +62,7 @@ class AppPreferencesDialog : public QDialog
     void shrink();
     void baseFirmwareChanged();
     void firmwareOptionChanged(bool state);
+    void toggleAppLogSettings();
 
     void writeValues();
     void on_libraryPathButton_clicked();
@@ -69,9 +73,9 @@ class AppPreferencesDialog : public QDialog
     void on_ge_pathButton_clicked();
 
     void on_sdPathButton_clicked();
-    void on_removeProfileButton_clicked();
     void on_SplashSelect_clicked();
     void on_clearImageButton_clicked();
+    void on_btn_appLogsDir_clicked();
 
 #if defined(JOYSTICKS)
     void on_joystickChkB_clicked();

companion/src/boards.cpp

@@ -21,79 +21,264 @@
 #include "boards.h"
 #include "macros.h"
 
+// TODO remove all those constants
+// Update: These are now all only used within this class.
+//  External access is only via getEEpromSize() and getFlashSize()
+
+#define EESIZE_STOCK                   2048
+#define EESIZE_M128                    4096
+#define EESIZE_GRUVIN9X                4096
+#define EESIZE_TARANIS                 (32*1024)
+#define EESIZE_SKY9X                   (128*4096)
+#define EESIZE_9XRPRO                  (128*4096)
+#define EESIZE_MAX                     EESIZE_9XRPRO
+
+// getFlashSize() (and these macros) is only used by radiointerface::getDfuArgs (perhaps can find a better way?)
+#define FSIZE_STOCK                    (64*1024)
+#define FSIZE_M128                     (128*1024)
+#define FSIZE_GRUVIN9X                 (256*1024)
+#define FSIZE_TARANIS                  (512*1024)
+#define FSIZE_SKY9X                    (256*1024)
+#define FSIZE_9XRPRO                   (512*1024)
+#define FSIZE_HORUS                    (2048*1024)
+#define FSIZE_MAX                      FSIZE_HORUS
+
 using namespace Board;
 
-int getEEpromSize(Board::Type board)
+void Boards::setBoardType(const Type & board)
+{
+  if (board >= BOARD_UNKNOWN && board < BOARD_ENUM_COUNT)
+    m_boardType = board;
+  else
+    m_boardType = BOARD_UNKNOWN;
+}
+
+const int Boards::getEEpromSize(Board::Type board)
 {
   switch (board) {
-    case Board::BOARD_STOCK:
+    case BOARD_STOCK:
       return EESIZE_STOCK;
-    case Board::BOARD_M128:
+    case BOARD_M128:
       return EESIZE_M128;
-    case Board::BOARD_MEGA2560:
-    case Board::BOARD_GRUVIN9X:
+    case BOARD_MEGA2560:
+    case BOARD_GRUVIN9X:
       return EESIZE_GRUVIN9X;
-    case Board::BOARD_SKY9X:
+    case BOARD_SKY9X:
       return EESIZE_SKY9X;
-    case Board::BOARD_9XRPRO:
-    case Board::BOARD_AR9X:
+    case BOARD_9XRPRO:
+    case BOARD_AR9X:
       return EESIZE_9XRPRO;
-    case Board::BOARD_TARANIS_X7:
-    case Board::BOARD_TARANIS_X9D:
-    case Board::BOARD_TARANIS_X9DP:
-    case Board::BOARD_TARANIS_X9E:
-    case Board::BOARD_FLAMENCO:
+    case BOARD_TARANIS_X7:
+    case BOARD_TARANIS_X9D:
+    case BOARD_TARANIS_X9DP:
+    case BOARD_TARANIS_X9E:
+    case BOARD_FLAMENCO:
       return EESIZE_TARANIS;
+    case BOARD_UNKNOWN:
+      return EESIZE_MAX;
     default:
       return 0; // unlimited
   }
 }
 
-Board::SwitchInfo getSwitchInfo(Board::Type board, unsigned index)
+const int Boards::getFlashSize(Type board)
+{
+  switch (board) {
+    case BOARD_STOCK:
+      return FSIZE_STOCK;
+    case BOARD_M128:
+      return FSIZE_M128;
+    case BOARD_MEGA2560:
+    case BOARD_GRUVIN9X:
+      return FSIZE_GRUVIN9X;
+    case BOARD_SKY9X:
+      return FSIZE_SKY9X;
+    case BOARD_9XRPRO:
+    case BOARD_AR9X:
+      return FSIZE_9XRPRO;
+    case BOARD_TARANIS_X9D:
+    case BOARD_TARANIS_X9DP:
+    case BOARD_TARANIS_X9E:
+    case BOARD_TARANIS_X7:
+    case BOARD_FLAMENCO:
+      return FSIZE_TARANIS;
+    case BOARD_X12S:
+    case BOARD_X10:
+      return FSIZE_HORUS;
+    case BOARD_UNKNOWN:
+      return FSIZE_MAX;
+    default:
+      return 0;
+  }
+}
+
+const SwitchInfo Boards::getSwitchInfo(Board::Type board, unsigned index)
 {
   if (IS_TARANIS_X7(board)) {
-    const Board::SwitchInfo switches[] = {{Board::SWITCH_3POS,   "SA"},
-                                          {Board::SWITCH_3POS,   "SB"},
-                                          {Board::SWITCH_3POS,   "SC"},
-                                          {Board::SWITCH_3POS,   "SD"},
-                                          {Board::SWITCH_2POS,   "SF"},
-                                          {Board::SWITCH_TOGGLE, "SH"}};
+    const Board::SwitchInfo switches[] = {
+      {SWITCH_3POS,   "SA"},
+      {SWITCH_3POS,   "SB"},
+      {SWITCH_3POS,   "SC"},
+      {SWITCH_3POS,   "SD"},
+      {SWITCH_2POS,   "SF"},
+      {SWITCH_TOGGLE, "SH"}
+    };
     if (index < DIM(switches))
       return switches[index];
   }
   else if (IS_HORUS_OR_TARANIS(board)) {
-    const Board::SwitchInfo switches[] = {{Board::SWITCH_3POS,   "SA"},
-                                          {Board::SWITCH_3POS,   "SB"},
-                                          {Board::SWITCH_3POS,   "SC"},
-                                          {Board::SWITCH_3POS,   "SD"},
-                                          {Board::SWITCH_3POS,   "SE"},
-                                          {Board::SWITCH_2POS,   "SF"},
-                                          {Board::SWITCH_3POS,   "SG"},
-                                          {Board::SWITCH_TOGGLE, "SH"},
-                                          {Board::SWITCH_3POS,   "SI"},
-                                          {Board::SWITCH_3POS,   "SJ"},
-                                          {Board::SWITCH_3POS,   "SK"},
-                                          {Board::SWITCH_3POS,   "SL"},
-                                          {Board::SWITCH_3POS,   "SM"},
-                                          {Board::SWITCH_3POS,   "SN"},
-                                          {Board::SWITCH_3POS,   "SO"},
-                                          {Board::SWITCH_3POS,   "SP"},
-                                          {Board::SWITCH_3POS,   "SQ"},
-                                          {Board::SWITCH_3POS,   "SR"}};
+    const Board::SwitchInfo switches[] = {
+      {SWITCH_3POS,   "SA"},
+      {SWITCH_3POS,   "SB"},
+      {SWITCH_3POS,   "SC"},
+      {SWITCH_3POS,   "SD"},
+      {SWITCH_3POS,   "SE"},
+      {SWITCH_2POS,   "SF"},
+      {SWITCH_3POS,   "SG"},
+      {SWITCH_TOGGLE, "SH"},
+      {SWITCH_3POS,   "SI"},
+      {SWITCH_3POS,   "SJ"},
+      {SWITCH_3POS,   "SK"},
+      {SWITCH_3POS,   "SL"},
+      {SWITCH_3POS,   "SM"},
+      {SWITCH_3POS,   "SN"},
+      {SWITCH_3POS,   "SO"},
+      {SWITCH_3POS,   "SP"},
+      {SWITCH_3POS,   "SQ"},
+      {SWITCH_3POS,   "SR"}
+    };
     if (index < DIM(switches))
       return switches[index];
   }
   else {
-    const Board::SwitchInfo switches[] = {{Board::SWITCH_2POS,   "THR"},
-                                          {Board::SWITCH_2POS,   "RUD"},
-                                          {Board::SWITCH_2POS,   "ELE"},
-                                          {Board::SWITCH_3POS,   "3POS"},
-                                          {Board::SWITCH_2POS,   "AIL"},
-                                          {Board::SWITCH_2POS,   "GEA"},
-                                          {Board::SWITCH_TOGGLE, "TRN"}};
+    const Board::SwitchInfo switches[] = {
+      {SWITCH_3POS,   "3POS"},
+      {SWITCH_2POS,   "THR"},
+      {SWITCH_2POS,   "RUD"},
+      {SWITCH_2POS,   "ELE"},
+      {SWITCH_2POS,   "AIL"},
+      {SWITCH_2POS,   "GEA"},
+      {SWITCH_TOGGLE, "TRN"}
+    };
     if (index < DIM(switches))
       return switches[index];
   }
 
-  return {Board::SWITCH_NOT_AVAILABLE, "???"};
-}
+  return {SWITCH_NOT_AVAILABLE, "???"};
+}
+
+const int Boards::getCapability(Board::Type board, Board::Capability capability)
+{
+  switch (capability) {
+    case Sticks:
+      return 4;
+
+    case Pots:
+      if (IS_TARANIS_X7(board))
+        return 2;
+      else if (IS_TARANIS_X9E(board))
+        return 4;
+      else
+        return 3;
+
+    case Sliders:
+      if (IS_HORUS_X12S(board) || IS_TARANIS_X9E(board))
+        return 4;
+      else if (IS_TARANIS_X9D(board) || IS_HORUS_X10(board))
+        return 2;
+      else
+        return 0;
+
+    case MouseAnalogs:
+      if (IS_HORUS_X12S(board))
+        return 2;
+      else
+        return 0;
+
+    case Switches:
+      if (IS_TARANIS_X9E(board))
+        return 18;
+      else if (IS_TARANIS_X7(board))
+        return 6;
+      else if (IS_HORUS_OR_TARANIS(board))
+        return 8;
+      else
+        return 7;
+
+    case FactoryInstalledSwitches:
+      if (IS_TARANIS_X9E(board))
+        return 8;
+      else
+        return getCapability(board, Switches);
+
+    case SwitchPositions:
+      if (IS_HORUS_OR_TARANIS(board))
+        return getCapability(board, Switches) * 3;
+      else
+        return 9;
+
+    case NumTrims:
+      if (IS_HORUS(board))
+        return 6;
+      else
+        return 4;
+
+    case NumTrimSwitches:
+      return getCapability(board, NumTrims) * 2;
+  }
+
+  return 0;
+}
+
+const QString Boards::getAxisName(int index)
+{
+  const QString axes[] = {
+    QObject::tr("Left Horizontal"),
+    QObject::tr("Left Vertical"),
+    QObject::tr("Right Vertical"),
+    QObject::tr("Right Horizontal"),
+    QObject::tr("Aux. 1"),
+    QObject::tr("Aux. 2"),
+  };
+  if (index < (int)DIM(axes))
+    return axes[index];
+  else
+    return QObject::tr("Unknown");
+}
+
+/* Currently unused
+
+const QString Boards::getBoardName(Board::Type board)
+{
+  switch (board) {
+    case BOARD_STOCK:
+      return "9X";
+    case BOARD_M128:
+      return "9X128";
+    case BOARD_GRUVIN9X:
+      return "Gruvin9x";
+    case BOARD_MEGA2560:
+      return "MEGA2560";
+    case BOARD_TARANIS_X7:
+      return "Taranis X7";
+    case BOARD_TARANIS_X9D:
+      return "Taranis X9D";
+    case BOARD_TARANIS_X9DP:
+      return "Taranis X9D+";
+    case BOARD_TARANIS_X9E:
+      return "Taranis X9E";
+    case BOARD_SKY9X:
+      return "Sky9x";
+    case BOARD_9XRPRO:
+      return "9XR-PRO";
+    case BOARD_AR9X:
+      return "AR9X";
+    case BOARD_X12S:
+      return "Horus";
+    case BOARD_X10:
+      return "X10";
+    default:
+      return QObject::tr("Unknown");
+  }
+}
+*/

companion/src/boards.h

@@ -21,13 +21,17 @@
 #ifndef _BOARDS_H_
 #define _BOARDS_H_
 
+#include <QObject>
+#include <QString>
+
 // TODO create a Board class with all these functions
 
 namespace Board {
 
   enum Type
   {
-    BOARD_STOCK,
+    BOARD_UNKNOWN = -1,
+    BOARD_STOCK = 0,
     BOARD_M128,
     BOARD_MEGA2560,
     BOARD_GRUVIN9X,
@@ -39,8 +43,9 @@ namespace Board {
     BOARD_TARANIS_X9DP,
     BOARD_TARANIS_X9E,
     BOARD_FLAMENCO,
-    BOARD_HORUS,
-    BOARD_UNKNOWN = -1
+    BOARD_X12S,
+    BOARD_X10,
+    BOARD_ENUM_COUNT
   };
 
   enum PotType
@@ -65,10 +70,57 @@ namespace Board {
     SWITCH_3POS
   };
 
+  enum StickAxes {
+    STICK_AXIS_LH = 0,
+    STICK_AXIS_LV,
+    STICK_AXIS_RV,
+    STICK_AXIS_RH,
+    STICK_AXIS_COUNT
+  };
+
+  enum TrimAxes {
+    TRIM_AXIS_LH = 0,
+    TRIM_AXIS_LV,
+    TRIM_AXIS_RV,
+    TRIM_AXIS_RH,
+    TRIM_AXIS_T5,
+    TRIM_AXIS_T6,
+    TRIM_AXIS_COUNT
+  };
+
+  enum TrimSwitches
+  {
+    TRIM_SW_LH_DEC,
+    TRIM_SW_LH_INC,
+    TRIM_SW_LV_DEC,
+    TRIM_SW_LV_INC,
+    TRIM_SW_RV_DEC,
+    TRIM_SW_RV_INC,
+    TRIM_SW_RH_DEC,
+    TRIM_SW_RH_INC,
+    TRIM_SW_T5_DEC,
+    TRIM_SW_T5_INC,
+    TRIM_SW_T6_DEC,
+    TRIM_SW_T6_INC,
+    TRIM_SW_COUNT
+  };
+
+  enum Capability {
+    Sticks,
+    Pots,
+    Sliders,
+    MouseAnalogs,
+    Switches,
+    SwitchPositions,
+    FactoryInstalledSwitches,
+    NumTrims,
+    NumTrimSwitches
+  };
+
   struct SwitchInfo
   {
     SwitchType config;
-    const char * name;
+    QString name;
   };
 
   struct SwitchPosition {
@@ -80,29 +132,41 @@ namespace Board {
       unsigned int index;
       unsigned int position;
   };
+
 }
 
-// TODO remove all those constants
-#define EESIZE_STOCK                   2048
-#define EESIZE_M128                    4096
-#define EESIZE_GRUVIN9X                4096
-#define EESIZE_TARANIS                 (32*1024)
-#define EESIZE_SKY9X                   (128*4096)
-#define EESIZE_9XRPRO                  (128*4096)
-#define EESIZE_MAX                     EESIZE_9XRPRO
+class Boards
+{
+  public:
 
-// TODO remove all those constants
-#define FSIZE_STOCK                    (64*1024)
-#define FSIZE_M128                     (128*1024)
-#define FSIZE_GRUVIN9X                 (256*1024)
-#define FSIZE_TARANIS                  (512*1024)
-#define FSIZE_SKY9X                    (256*1024)
-#define FSIZE_9XRPRO                   (512*1024)
-#define FSIZE_HORUS                    (2048*1024)
-#define FSIZE_MAX                      FSIZE_HORUS
+    Boards(Board::Type board)
+    {
+      setBoardType(board);
+    }
 
-int getEEpromSize(Board::Type board);
-Board::SwitchInfo getSwitchInfo(Board::Type board, unsigned index);
+    void setBoardType(const Board::Type & board);
+    Board::Type getBoardType() const { return m_boardType; }
+
+    const int getEEpromSize() { return getEEpromSize(m_boardType); }
+    const int getFlashSize() { return getFlashSize(m_boardType); }
+    const Board::SwitchInfo getSwitchInfo(unsigned index) { return getSwitchInfo(m_boardType, index); }
+    const int getCapability(Board::Capability capability) { return getCapability(m_boardType, capability); }
+
+    static const int getEEpromSize(Board::Type board);
+    static const int getFlashSize(Board::Type board);
+    static const Board::SwitchInfo getSwitchInfo(Board::Type board, unsigned index);
+    static const int getCapability(Board::Type board, Board::Capability capability);
+    static const QString getAxisName(int index);
+
+  protected:
+
+    Board::Type m_boardType;
+};
+
+// temporary aliases for transition period, use Boards class instead.
+#define getBoardCapability(b__, c__)   Boards::getCapability(b__, c__)
+#define getEEpromSize(b__)             Boards::getEEpromSize(b__)
+#define getSwitchInfo(b__, i__)        Boards::getSwitchInfo(b__, i__)
 
 #define IS_9X(board)                   (board==Board::BOARD_STOCK || board==Board::BOARD_M128)
 #define IS_STOCK(board)                (board==Board::BOARD_STOCK)
@@ -115,7 +179,9 @@ Board::SwitchInfo getSwitchInfo(Board::Type board, unsigned index);
 #define IS_TARANIS_PLUS(board)         (board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E)
 #define IS_TARANIS_X9E(board)          (board==Board::BOARD_TARANIS_X9E)
 #define IS_TARANIS(board)              (IS_TARANIS_X9(board) || IS_TARANIS_X7(board))
-#define IS_HORUS(board)                (board==Board::BOARD_HORUS)
+#define IS_HORUS_X12S(board)           (board==Board::BOARD_X12S)
+#define IS_HORUS_X10(board)            (board==Board::BOARD_X10)
+#define IS_HORUS(board)                (IS_HORUS_X12S(board) || IS_HORUS_X10(board))
 #define IS_HORUS_OR_TARANIS(board)     (IS_HORUS(board) || IS_TARANIS(board))
 #define IS_FLAMENCO(board)             (board==Board::BOARD_FLAMENCO)
 #define IS_STM32(board)                (IS_TARANIS(board) || IS_HORUS(board) || IS_FLAMENCO(board))

companion/src/burnconfigdialog.cpp

@@ -105,6 +105,18 @@ burnConfigDialog::~burnConfigDialog()
     delete ui;
 }
 
+QStringList burnConfigDialog::getAvrdudeArgs()
+{
+    QStringList args = avrArgs;
+    if (!avrPort.isEmpty())
+      args << "-P" << avrPort;
+
+#if defined(__APPLE__)
+    args << "-C" << QFileInfo(QApplication::applicationDirPath() + "/../Resources/avrdude.conf").absoluteFilePath();
+#endif
+    return args;
+}
+
 void burnConfigDialog::getSettings()
 {
     avrLoc   = g.avrdudeLocation();
@@ -125,6 +137,11 @@ void burnConfigDialog::getSettings()
       sambaLoc = "/usr/local/bin/sam-ba";
     if ( dfuLoc.isEmpty())
       dfuLoc = QFileInfo(QApplication::applicationDirPath() + "/../Resources/dfu-util").absoluteFilePath();
+#elif defined __FreeBSD__
+    if (avrLoc.isEmpty())
+      avrLoc = "/usr/local/bin/avrdude";
+    if (dfuLoc.isEmpty())
+      dfuLoc = "/usr/local/bin/dfu-util";
 #else
     if ( avrLoc.isEmpty())
       avrLoc = "/usr/bin/avrdude";

companion/src/burnconfigdialog.h

@@ -42,7 +42,7 @@ public:
     QString getAVRDUDE() {return avrLoc;}
     QString getSAMBA() {return sambaLoc;}
     QString getDFU() {return dfuLoc;}
-    QStringList getAvrdudeArgs() { QStringList args = avrArgs; if (!avrPort.isEmpty()) args << "-P" << avrPort; return args; }
+    QStringList getAvrdudeArgs();
     QStringList getDFUArgs() {return dfuArgs;}
     QString getProgrammer() {return avrProgrammer;}
     QString getMCU() {return avrMCU;}

companion/src/companion.cpp

@@ -19,27 +19,25 @@
  */
 
 #include <QApplication>
-#include <QTranslator>
+#include <QDateTime>
 #include <QDir>
+#include <QFile>
 #include <QSplashScreen>
 #if defined(JOYSTICKS) || defined(SIMU_AUDIO)
   #include <SDL.h>
   #undef main
 #endif
+
+#include "appdebugmessagehandler.h"
+#include "customdebug.h"
 #include "mainwindow.h"
 #include "version.h"
 #include "appdata.h"
 #include "storage.h"
-
-#if defined _MSC_VER || !defined __GNUC__
-#include <windows.h>
-#define sleep(x) Sleep(x*1000)
-#else
-#include <unistd.h>
-#endif
+#include "translations.h"
 
 #ifdef __APPLE__
-#include <QProxyStyle> 
+#include <QProxyStyle>
 
 class MyProxyStyle : public QProxyStyle
  {
@@ -55,18 +53,38 @@ class MyProxyStyle : public QProxyStyle
 
 int main(int argc, char *argv[])
 {
-  Q_INIT_RESOURCE(companion);
-
 #if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
+  /* From doc: This attribute must be set before Q(Gui)Application is constructed. */
   QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #endif
 
   QApplication app(argc, argv);
-  app.setApplicationName("OpenTX Companion");
-  app.setOrganizationName("OpenTX");
-  app.setOrganizationDomain("open-tx.org");
+  app.setApplicationName(APP_COMPANION);
+  app.setOrganizationName(COMPANY);
+  app.setOrganizationDomain(COMPANY_DOMAIN);
   app.setAttribute(Qt::AA_DontShowIconsInMenus, false);
 
+  Q_INIT_RESOURCE(companion);
+
+  if (AppDebugMessageHandler::instance())
+    AppDebugMessageHandler::instance()->installAppMessageHandler();
+
+  CustomDebug::setFilterRules();
+
+  if (!g.hasCurrentSettings()) {
+    QString previousVersion;
+    if (g.findPreviousVersionSettings(&previousVersion)) {
+       QMessageBox msgBox;
+       msgBox.setText(QObject::tr("We have found existing settings for Companion version: %1.\nDo you want to import them?").arg(previousVersion));
+       msgBox.setIcon(QMessageBox::Information);
+       msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
+       msgBox.setDefaultButton(QMessageBox::Yes);
+       int ret = msgBox.exec();
+
+       if (ret == QMessageBox::Yes)
+  	     g.importSettings(previousVersion);
+    }
+  }
   g.init();
 
   QStringList strl = QApplication::arguments();
@@ -76,18 +94,20 @@ int main(int argc, char *argv[])
     exit(0);
   }
 
+  QFile dbgLog;
+  if (AppDebugMessageHandler::instance() && g.appDebugLog() && !g.appLogsDir().isEmpty() && QDir().mkpath(g.appLogsDir())) {
+    QString fn = g.appLogsDir() % "/CompanionDebug_" % QDateTime::currentDateTime().toString("yy-MM-dd_HH-mm-ss") % ".log";
+    dbgLog.setFileName(fn);
+    if (dbgLog.open(QIODevice::WriteOnly | QIODevice::Text)) {
+      AppDebugMessageHandler::instance()->addOutputDevice(&dbgLog);
+    }
+  }
+
 #ifdef __APPLE__
   app.setStyle(new MyProxyStyle);
 #endif
 
-  QTranslator companionTranslator;
-  companionTranslator.load(":/companion_" + g.locale());
-  QTranslator qtTranslator;
-  qtTranslator.load((QString)"qt_" + g.locale().left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-  app.installTranslator(&companionTranslator);
-  app.installTranslator(&qtTranslator);
-
-  // QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+  Translations::installTranslators();
 
 #if defined(JOYSTICKS) || defined(SIMU_AUDIO)
   uint32_t sdlFlags = 0;
@@ -101,13 +121,13 @@ int main(int argc, char *argv[])
     fprintf(stderr, "ERROR: couldn't initialize SDL: %s\n", SDL_GetError());
   }
 #endif
-  
+
   registerStorageFactories();
   registerOpenTxFirmwares();
-  registerSimulators();
+  SimulatorLoader::registerSimulators();
 
   if (g.profile[g.id()].fwType().isEmpty()){
-    g.profile[g.id()].fwType(default_firmware_variant->getId());
+    g.profile[g.id()].fwType(Firmware::getDefaultVariant()->getId());
     g.profile[g.id()].fwName("");
   }
 
@@ -117,7 +137,7 @@ int main(int argc, char *argv[])
   QPixmap pixmap = QPixmap(splashScreen);
   QSplashScreen *splash = new QSplashScreen(pixmap);
 
-  current_firmware_variant = getFirmware(g.profile[g.id()].fwType());
+  Firmware::setCurrentVariant(Firmware::getFirmwareForId(g.profile[g.id()].fwType()));
 
   MainWindow *mainWin = new MainWindow();
   if (g.showSplash()) {
@@ -134,13 +154,20 @@ int main(int argc, char *argv[])
   delete splash;
   delete mainWin;
 
-  unregisterSimulators();
+  SimulatorLoader::unregisterSimulators();
   unregisterOpenTxFirmwares();
-  unregisterEEpromInterfaces();
+  unregisterStorageFactories();
 
 #if defined(JOYSTICKS) || defined(SIMU_AUDIO)
   SDL_Quit();
 #endif
 
+  qDebug() << "COMPANION EXIT" << result;
+
+  if (dbgLog.isOpen()) {
+    AppDebugMessageHandler::instance()->removeOutputDevice(&dbgLog);
+    dbgLog.close();
+  }
+
   return result;
 }

companion/src/companion.qrc

@@ -3,7 +3,6 @@
     <file>images/customize.png</file>
     <file>icon.png</file>
     <file>../../CREDITS.txt</file>
-    <file>../../DONATIONS.txt</file>
     <file>../releasenotes.txt</file>
     <file>images/screenshot.png</file>
     <file>images/splash.png</file>
@@ -12,23 +11,68 @@
     <file>images/track.png</file>
     <file>images/track0.png</file>
     <file>images/taranison.png</file>
-    <file>images/simulator/icons/8/lock-locked.png</file>
-    <file>images/simulator/icons/8/lock-unlocked.png</file>
-    <file>images/simulator/Horus/middle.png</file>
-    <file>images/simulator/Horus/left.png</file>
-    <file>images/simulator/Horus/right.png</file>
-    <file>images/simulator/Horus/top.png</file>
-    <file>images/simulator/Horus/bottom.png</file>
-    <file>images/simulator/Horus/led.png</file>
-    <file>images/simulator/Horus/border-right.png</file>
-    <file>images/simulator/Horus/left_btn1.png</file>
-    <file>images/simulator/Horus/left_btn2.png</file>
-    <file>images/simulator/Horus/left_scrnsht.png</file>
-    <file>images/simulator/Horus/right_btnU.png</file>
-    <file>images/simulator/Horus/right_btnL.png</file>
-    <file>images/simulator/Horus/right_btnD.png</file>
-    <file>images/simulator/Horus/right_btnR.png</file>
-    <file>images/simulator/Horus/right_ent.png</file>    
+    <file>images/simulator/icons/svg/arrow_click.svg</file>
+    <file>images/simulator/icons/svg/camera.svg</file>
+    <file>images/simulator/icons/svg/camera-active.svg</file>
+    <file>images/simulator/icons/svg/console.svg</file>
+    <file>images/simulator/icons/svg/console-active.svg</file>
+    <file>images/simulator/icons/svg/eraser.svg</file>
+    <file>images/simulator/icons/svg/eraser-active.svg</file>
+    <file>images/simulator/icons/svg/fixed_x.svg</file>
+    <file>images/simulator/icons/svg/fixed_x-on.svg</file>
+    <file>images/simulator/icons/svg/fixed_y.svg</file>
+    <file>images/simulator/icons/svg/fixed_y-on.svg</file>
+    <file>images/simulator/icons/svg/folder_open.svg</file>
+    <file>images/simulator/icons/svg/hold_x.svg</file>
+    <file>images/simulator/icons/svg/hold_x-on.svg</file>
+    <file>images/simulator/icons/svg/hold_y.svg</file>
+    <file>images/simulator/icons/svg/hold_y-on.svg</file>
+    <file>images/simulator/icons/svg/info.svg</file>
+    <file>images/simulator/icons/svg/info-active.svg</file>
+    <file>images/simulator/icons/svg/joystick_settings.svg</file>
+    <file>images/simulator/icons/svg/joystick_settings-active.svg</file>
+    <file>images/simulator/icons/svg/line_horiz.svg</file>
+    <file>images/simulator/icons/svg/mouse.svg</file>
+    <file>images/simulator/icons/svg/toggle_lock.svg</file>
+    <file>images/simulator/icons/svg/toggle_lock-on.svg</file>
+    <file>images/simulator/icons/svg/radio_outputs.svg</file>
+    <file>images/simulator/icons/svg/radio_outputs-active.svg</file>
+    <file>images/simulator/icons/svg/reload_script.svg</file>
+    <file>images/simulator/icons/svg/reload_script-active.svg</file>
+    <file>images/simulator/icons/svg/restart.svg</file>
+    <file>images/simulator/icons/svg/restart-active.svg</file>
+    <file>images/simulator/icons/svg/telemetry.svg</file>
+    <file>images/simulator/icons/svg/telemetry-active.svg</file>
+    <file>images/simulator/icons/svg/trainer.svg</file>
+    <file>images/simulator/icons/svg/trainer-active.svg</file>
+    <file>images/simulator/icons/svg/word_wrap.svg</file>
+    <file>images/simulator/icons/svg/word_wrap-on.svg</file>
+    <file>images/simulator/X12/middle.png</file>
+    <file>images/simulator/X12/left.png</file>
+    <file>images/simulator/X12/right.png</file>
+    <file>images/simulator/X12/top.png</file>
+    <file>images/simulator/X12/bottom.png</file>
+    <file>images/simulator/X12/led.png</file>
+    <file>images/simulator/X12/border-right.png</file>
+    <file>images/simulator/X12/left_btn1.png</file>
+    <file>images/simulator/X12/left_btn2.png</file>
+    <file>images/simulator/X12/left_scrnsht.png</file>
+    <file>images/simulator/X12/right_btnU.png</file>
+    <file>images/simulator/X12/right_btnL.png</file>
+    <file>images/simulator/X12/right_btnD.png</file>
+    <file>images/simulator/X12/right_btnR.png</file>
+    <file>images/simulator/X12/right_ent.png</file>
+    <file>images/simulator/X10/left.png</file>
+    <file>images/simulator/X10/right.png</file>
+    <file>images/simulator/X10/top.png</file>
+    <file>images/simulator/X10/bottom.png</file>
+    <file>images/simulator/X10/left_mdl.png</file>
+    <file>images/simulator/X10/left_page.png</file>
+    <file>images/simulator/X10/left_scrnsht.png</file>
+    <file>images/simulator/X10/left_rtn.png</file>
+    <file>images/simulator/X10/left_sys.png</file>
+    <file>images/simulator/X10/left_tele.png</file>
+    <file>images/simulator/X10/right_ent.png</file>    
     <file>images/simulator/9X/9xdb.png</file>
     <file>images/simulator/9X/9xdl.png</file>
     <file>images/simulator/9X/9xdr.png</file>
@@ -83,6 +127,15 @@
     <file>images/simulator/X7/right.png</file>
     <file>images/simulator/X7/right_ent.png</file>
     <file>images/simulator/X7/top.png</file>
+    <file>images/simulator/X9E/bottom.png</file>
+    <file>images/simulator/X9E/left.png</file>
+    <file>images/simulator/X9E/left_exit.png</file>
+    <file>images/simulator/X9E/left_menu.png</file>
+    <file>images/simulator/X9E/left_page.png</file>
+    <file>images/simulator/X9E/left_scrnshot.png</file>
+    <file>images/simulator/X9E/right.png</file>
+    <file>images/simulator/X9E/right_enter.png</file>
+    <file>images/simulator/X9E/top.png</file>
     <file>images/wizard/ailerons.png</file>
     <file>images/wizard/airbrakes.png</file>
     <file>images/wizard/elevons.png</file> 
@@ -180,6 +233,8 @@
     <file>images/library/10702.png</file>
     <file>images/library/10801.png</file>
     <file>images/library/10802.png</file>
+    <file>themes/default/style.css</file>
+    <file>themes/default/style-osx.css</file>
     <file>themes/monochrome/16/paintbrush.png</file>
     <file>themes/monochrome/16/open.png</file>
     <file>themes/monochrome/16/edit.png</file>
@@ -575,6 +630,7 @@
     <file>themes/monoblue/16/contributors.png</file>
     <file>themes/monoblue/16/stop.png</file>
     <file>themes/monoblue/16/write_eeprom.png</file>
+    <file>themes/monoblue/16/sdsync.png</file>
     <file>themes/monoblue/24/paintbrush.png</file>
     <file>themes/monoblue/24/open.png</file>
     <file>themes/monoblue/24/edit.png</file>
@@ -618,6 +674,7 @@
     <file>themes/monoblue/24/contributors.png</file>
     <file>themes/monoblue/24/stop.png</file>
     <file>themes/monoblue/24/write_eeprom.png</file>
+    <file>themes/monoblue/24/sdsync.png</file>
     <file>themes/monoblue/32/paintbrush.png</file>
     <file>themes/monoblue/32/open.png</file>
     <file>themes/monoblue/32/edit.png</file>
@@ -661,6 +718,7 @@
     <file>themes/monoblue/32/contributors.png</file>
     <file>themes/monoblue/32/stop.png</file>
     <file>themes/monoblue/32/write_eeprom.png</file>
+    <file>themes/monoblue/32/sdsync.png</file>
     <file>themes/monoblue/48/paintbrush.png</file>
     <file>themes/monoblue/48/open.png</file>
     <file>themes/monoblue/48/edit.png</file>
@@ -704,6 +762,7 @@
     <file>themes/monoblue/48/contributors.png</file>
     <file>themes/monoblue/48/stop.png</file>
     <file>themes/monoblue/48/write_eeprom.png</file>
+    <file>themes/monoblue/48/sdsync.png</file>
     <file>themes/monowhite/16/paintbrush.png</file>
     <file>themes/monowhite/16/open.png</file>
     <file>themes/monowhite/16/edit.png</file>
@@ -747,6 +806,7 @@
     <file>themes/monowhite/16/contributors.png</file>
     <file>themes/monowhite/16/stop.png</file>
     <file>themes/monowhite/16/write_eeprom.png</file>
+    <file>themes/monowhite/16/sdsync.png</file>
     <file>themes/monowhite/24/paintbrush.png</file>
     <file>themes/monowhite/24/open.png</file>
     <file>themes/monowhite/24/edit.png</file>
@@ -790,6 +850,7 @@
     <file>themes/monowhite/24/contributors.png</file>
     <file>themes/monowhite/24/stop.png</file>
     <file>themes/monowhite/24/write_eeprom.png</file>
+    <file>themes/monowhite/24/sdsync.png</file>
     <file>themes/monowhite/32/paintbrush.png</file>
     <file>themes/monowhite/32/open.png</file>
     <file>themes/monowhite/32/edit.png</file>
@@ -833,6 +894,7 @@
     <file>themes/monowhite/32/contributors.png</file>
     <file>themes/monowhite/32/stop.png</file>
     <file>themes/monowhite/32/write_eeprom.png</file>
+    <file>themes/monowhite/32/sdsync.png</file>
     <file>themes/monowhite/48/paintbrush.png</file>
     <file>themes/monowhite/48/open.png</file>
     <file>themes/monowhite/48/edit.png</file>
@@ -876,6 +938,7 @@
     <file>themes/monowhite/48/contributors.png</file>
     <file>themes/monowhite/48/stop.png</file>
     <file>themes/monowhite/48/write_eeprom.png</file>
+    <file>themes/monowhite/48/sdsync.png</file>
     <file>themes/yerico/16/paintbrush.png</file>
     <file>themes/yerico/16/open.png</file>
     <file>themes/yerico/16/edit.png</file>

companion/src/comparedialog.cpp

@@ -20,42 +20,46 @@
 
 #include "comparedialog.h"
 #include "ui_comparedialog.h"
+#include "appdata.h"
 #include "helpers.h"
+#include "modelslist.h"
 #include <QPrinter>
 #include <QPrintDialog>
 
-class DragDropHeader {
-  public:
-    DragDropHeader():
-      general_settings(false),
-      models_count(0)
-    {
-    }
-    bool general_settings;
-    uint8_t models_count;
-    uint8_t models[CPN_MAX_MODELS];
-};
+//class DragDropHeader {
+//  public:
+//    DragDropHeader():
+//      general_settings(false),
+//      models_count(0)
+//    {
+//    }
+//    bool general_settings;
+//    uint8_t models_count;
+//    uint8_t models[CPN_MAX_MODELS];
+//};
 
 CompareDialog::CompareDialog(QWidget * parent, Firmware * firmware):
-  QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
-  multimodelprinter(firmware),
-  model1Valid(false),
-  model2Valid(false),
+  QDialog(parent, Qt::Window),
+  multimodelprinter(new MultiModelPrinter(firmware)),
   ui(new Ui::CompareDialog)
 {
   ui->setupUi(this);
-
   setWindowIcon(CompanionIcon("compare.png"));
   setAcceptDrops(true);
+  if (!g.compareWinGeo().isEmpty()) {
+    restoreGeometry(g.compareWinGeo());
+  }
+}
 
-  //setDragDropOverwriteMode(true);
-  //setDropIndicatorShown(true);
-  // TODO scroll to top ... ui->textEdit->scrollToAnchor("1");
+CompareDialog::~CompareDialog()
+{
+  delete multimodelprinter;
+  delete ui;
 }
 
 void CompareDialog::dragMoveEvent(QDragMoveEvent * event)
 {
-  if (event->mimeData()->hasFormat("application/x-companion")) {   
+  if (event->mimeData()->hasFormat("application/x-companion-modeldata")) {
     event->acceptProposedAction();
   }
   else {
@@ -65,8 +69,7 @@ void CompareDialog::dragMoveEvent(QDragMoveEvent * event)
 
 void CompareDialog::dragEnterEvent(QDragEnterEvent * event)
 {
-  // accept just text/uri-list mime format
-  if (event->mimeData()->hasFormat("application/x-companion")) {   
+  if (event->mimeData()->hasFormat("application/x-companion-modeldata")) {
     event->acceptProposedAction();
   }
   else {
@@ -79,55 +82,85 @@ void CompareDialog::dragLeaveEvent(QDragLeaveEvent * event)
   event->accept();
 }
 
-bool CompareDialog::handleDroppedModel(const QMimeData * mimeData, ModelData & model, QLabel * label)
+bool CompareDialog::handleMimeData(const QMimeData * mimeData)
 {
-  if (mimeData->hasFormat("application/x-companion")) {
-    QByteArray gmData = mimeData->data("application/x-companion");
-    DragDropHeader * header = (DragDropHeader *)gmData.data();
-    if (!header->general_settings) {
-      char * gData = gmData.data() + sizeof(DragDropHeader);
-      if (gData[0] == 'M') {
-        ModelData * modeltemp = (ModelData *)(gData + 1);
-        if (modeltemp->used) {
-          memcpy(&model, modeltemp, sizeof(ModelData));
-          QString name(model.name);
-          if (!name.isEmpty())
-            label->setText(name);
-          else
-            label->setText(tr("No name"));
-          return true;
-        }
-      }
-    }
+  QVector<ModelData> mList;
+  GeneralSettings gs;
+  if (!TreeModel::decodeMimeData(mimeData, &mList, &gs) || mList.isEmpty())
+    return false;
+  for (int i=0; i < mList.size(); ++i) {
+    GMData data;
+    data.model = mList[i];
+    data.gs = gs;
+    modelsList.append(data);
   }
-  return false;
+  return true;
+}
+
+void CompareDialog::closeEvent(QCloseEvent * event)
+{
+  g.compareWinGeo(saveGeometry());
 }
 
 void CompareDialog::dropEvent(QDropEvent *event)
 {
-  QLabel * child = qobject_cast<QLabel*>(childAt(event->pos()));
-  if (!child) return;
-  if (child->objectName().contains("label_1")) {   
-    model1Valid = handleDroppedModel(event->mimeData(), model1, ui->label_1);
-  }
-  else if (child->objectName().contains("label_2")) {
-    model2Valid = handleDroppedModel(event->mimeData(), model2, ui->label_2);
-  }
-  event->accept();
-  if (model1Valid && model2Valid) {
-    multimodelprinter.setModel(0, model1);
-    multimodelprinter.setModel(1, model2);
-    ui->textEdit->setHtml(multimodelprinter.print(ui->textEdit->document()));
+  if (handleMimeData(event->mimeData())) {
+    event->accept();
+    compare();
   }
 }
 
-void CompareDialog::closeEvent(QCloseEvent *event) 
+void CompareDialog::compare()
 {
+  QLayoutItem *child;
+  while ((child = ui->layout_modelNames->takeAt(0))) {
+    if (child->widget())
+      delete child->widget();
+    delete child;
+  }
+
+  multimodelprinter->clearModels();
+  ui->textEdit->clear();
+
+  for (int i=0; i < modelsList.size(); ++i) {
+    multimodelprinter->setModel(i, &modelsList[i].model, &modelsList[i].gs);
+    QString name(modelsList.at(i).model.name);
+    if (name.isEmpty())
+      name = tr("Unnamed Model %1").arg(i+1);
+
+    QWidget * hdr = new QWidget(this);
+    hdr->setLayout(new QHBoxLayout());
+    hdr->layout()->setContentsMargins(0, 0, 0, 0);
+    hdr->layout()->setSpacing(2);
+    QToolButton * btn = new QToolButton(hdr);
+    btn->setIcon(CompanionIcon("clear.png"));
+    btn->setProperty("index", i);
+    btn->setFixedSize(18, 18);
+    btn->setToolTip(tr("Click to remove this model."));
+    hdr->layout()->addWidget(btn);
+    QLabel * lbl = new QLabel(name, this);
+    lbl->setStyleSheet("font-weight: bold;");
+    hdr->layout()->addWidget(lbl);
+    connect(btn, &QToolButton::clicked, this, &CompareDialog::removeModelBtnClicked);
+
+    ui->layout_modelNames->addWidget(hdr);
+  }
+  if (modelsList.size())
+    ui->textEdit->setHtml(multimodelprinter->print(ui->textEdit->document()));
 }
 
-CompareDialog::~CompareDialog()
+void CompareDialog::removeModel(int idx)
 {
-  delete ui;
+  if (idx < modelsList.size()) {
+    modelsList.remove(idx);
+    compare();
+  }
+}
+
+void CompareDialog::removeModelBtnClicked()
+{
+  if (sender() && sender()->property("index").isValid())
+    removeModel(sender()->property("index").toInt());
 }
 
 void CompareDialog::on_printButton_clicked()

companion/src/comparedialog.h

@@ -35,27 +35,32 @@ class CompareDialog : public QDialog
   public:
     CompareDialog(QWidget *parent, Firmware * firmware);
     ~CompareDialog();
-    
+
   protected:
-    MultiModelPrinter multimodelprinter;
-    ModelData model1;
-    ModelData model2;
-    bool model1Valid;
-    bool model2Valid;
+    struct GMData {
+        ModelData model;
+        GeneralSettings gs;
+    };
+
+    MultiModelPrinter * multimodelprinter;
+    QVector<GMData> modelsList;
+    QMap<int, GMData> modelsMap;
     Ui::CompareDialog * ui;
-    
+
   protected slots:
+    void removeModelBtnClicked();
     void on_printButton_clicked();
     void on_printFileButton_clicked();
-    
+
   protected:
-    void closeEvent(QCloseEvent * event);
-    bool handleDroppedModel(const QMimeData * mimeData, ModelData & model, QLabel * label);
-    void dropEvent(QDropEvent *event);
-    void dragMoveEvent(QDragMoveEvent *event);
-    void dragEnterEvent(QDragEnterEvent *event);
-    void dragLeaveEvent(QDragLeaveEvent *event);
-    void printDiff();
+    virtual void closeEvent(QCloseEvent * event);
+    virtual void dragMoveEvent(QDragMoveEvent *event);
+    virtual void dragEnterEvent(QDragEnterEvent *event);
+    virtual void dragLeaveEvent(QDragLeaveEvent *event);
+    virtual void dropEvent(QDropEvent *event);
+    bool handleMimeData(const QMimeData * mimeData);
+    void compare();
+    void removeModel(int idx);
 };
 
 #endif // _COMPAREDIALOG_H_

companion/src/comparedialog.ui

@@ -29,63 +29,22 @@
    <string>Compare Models</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QLabel" name="label_1">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="acceptDrops">
-        <bool>true</bool>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">color:green;</string>
-       </property>
-       <property name="text">
-        <string>Drag first model here</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_2">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="acceptDrops">
-        <bool>true</bool>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">color:red;</string>
-       </property>
-       <property name="text">
-        <string>Drag second model here</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0">
+   <item row="2" column="0">
     <widget class="QTextEdit" name="textEdit">
      <property name="readOnly">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>To compare models, drag and drop them anywhere in this window.</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
@@ -122,11 +81,28 @@
      </item>
     </layout>
    </item>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="layout_modelNames">
+     <property name="spacing">
+      <number>6</number>
+     </property>
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+    </layout>
+   </item>
   </layout>
  </widget>
- <resources>
-  <include location="companion.qrc"/>
- </resources>
+ <resources/>
  <connections>
   <connection>
    <sender>closeButton</sender>

companion/src/constants.h

@@ -21,6 +21,8 @@
 #ifndef _CONSTANTS_H_
 #define _CONSTANTS_H_
 
+#include <QCoreApplication>
+
 #define CPN_MAX_MODELS                 60
 #define CPN_MAX_TIMERS                 3
 #define CPN_MAX_FLIGHT_MODES           9
@@ -30,34 +32,48 @@
 #define CPN_MAX_CURVES                 32
 #define CPN_MAX_POINTS                 17
 #define CPN_MAX_GVARS                  9
-#define CPN_MAX_ENCODERS               2
+#define CPN_MAX_ENCODERS               2  // rotary encoders
 #define CPN_MAX_CHNOUT                 32 // number of real output channels
-#define CPN_MAX_CSW                    64 // number of custom switches
-#define CPN_MAX_CUSTOM_FUNCTIONS       64 // number of functions assigned to switches
+#define CPN_MAX_LOGICAL_SWITCHES       64 // number of custom switches
+#define CPN_MAX_SPECIAL_FUNCTIONS      64 // number of functions assigned to switches
 #define CPN_MAX_MODULES                2
-#define CPN_MAX_STICKS                 4
-#define CPN_MAX_AUX_TRIMS              2
-#define CPN_MAX_POTS                   8
+#define CPN_MAX_STICKS                 Board::STICK_AXIS_COUNT
+#define CPN_MAX_TRIMS                  Board::TRIM_AXIS_COUNT
+#define CPN_MAX_TRIM_SW                Board::TRIM_SW_COUNT
+#define CPN_MAX_KNOBS                  4
+#define CPN_MAX_SLIDERS                4
+#define CPN_MAX_POTS                   (CPN_MAX_KNOBS + CPN_MAX_SLIDERS)
 #define CPN_MAX_CYC                    3
 #define CPN_MAX_SWITCHES               32
 #define CPN_MAX_KEYS                   32
 #define CPN_MAX_MOUSE_ANALOGS          2
+#define CPN_MAX_ANALOGS                (CPN_MAX_STICKS + CPN_MAX_POTS + CPN_MAX_MOUSE_ANALOGS)
 
-#define HEX_FILES_FILTER              "HEX files (*.hex);;"
-#define BIN_FILES_FILTER              "BIN files (*.bin);;"
-#define DFU_FILES_FILTER              "DFU files (*.dfu);;"
-#define EEPE_FILES_FILTER             "EEPE files (*.eepe);;"
-#define OTX_FILES_FILTER              "OpenTX files (*.otx);;"
-#define EEPROM_FILES_FILTER           "Radio and Models settings files (*.otx *.eepe *.bin *.hex);;" OTX_FILES_FILTER EEPE_FILES_FILTER BIN_FILES_FILTER HEX_FILES_FILTER
-#define FLASH_FILES_FILTER            "FLASH files (*.bin *.hex *.dfu);;" BIN_FILES_FILTER HEX_FILES_FILTER DFU_FILES_FILTER
-#define EXTERNAL_EEPROM_FILES_FILTER  "EEPROM files (*.bin *.hex);;" BIN_FILES_FILTER HEX_FILES_FILTER
-#define ER9X_EEPROM_FILE_TYPE         "ER9X_EEPROM_FILE"
-#define EEPE_EEPROM_FILE_HEADER       "EEPE EEPROM FILE"
-#define EEPE_MODEL_FILE_HEADER        "EEPE MODEL FILE"
+#define CPN_STR_FILES                  QCoreApplication::translate("Companion", "files")
+#define CPN_STR_RAD_MOD_SETTINGS       QCoreApplication::translate("Companion", "Radio and Models settings")
+#define HEX_FILES_FILTER               "HEX " % CPN_STR_FILES % " (*.hex);;"
+#define BIN_FILES_FILTER               "BIN " % CPN_STR_FILES % " (*.bin);;"
+#define DFU_FILES_FILTER               "DFU " % CPN_STR_FILES % " (*.dfu);;"
+#define EEPE_FILES_FILTER              "EEPE " % CPN_STR_FILES % " (*.eepe);;"
+#define OTX_FILES_FILTER               "OpenTX " % CPN_STR_FILES % " (*.otx);;"
+#define EEPROM_FILES_FILTER            CPN_STR_RAD_MOD_SETTINGS % " " % CPN_STR_FILES % " (*.otx *.eepe *.bin *.hex);;" % OTX_FILES_FILTER % EEPE_FILES_FILTER % BIN_FILES_FILTER % HEX_FILES_FILTER
+#define FLASH_FILES_FILTER             "FLASH " % CPN_STR_FILES % " (*.bin *.hex *.dfu);;" % BIN_FILES_FILTER % HEX_FILES_FILTER % DFU_FILES_FILTER
+#define EXTERNAL_EEPROM_FILES_FILTER   "EEPROM " % CPN_STR_FILES % " (*.bin *.hex);;" % BIN_FILES_FILTER % HEX_FILES_FILTER
+#define ER9X_EEPROM_FILE_TYPE          "ER9X_EEPROM_FILE"
+#define EEPE_EEPROM_FILE_HEADER        "EEPE EEPROM FILE"
+#define EEPE_MODEL_FILE_HEADER         "EEPE MODEL FILE"
 
-const char * const ARROW_LEFT  = "\xE2\x86\x90";
-const char * const ARROW_UP    = "\xE2\x86\x91";
-const char * const ARROW_RIGHT = "\xE2\x86\x92";
-const char * const ARROW_DOWN  = "\xE2\x86\x93";
+#define CPN_STR_SW_INDICATOR_UP        QCoreApplication::translate("RawSwitch", "\xE2\x86\x91")  // Switch up position indicator: Up arrow, or similar.
+#define CPN_STR_SW_INDICATOR_DN        QCoreApplication::translate("RawSwitch", "\xE2\x86\x93")  // Switch down position indicator: Down arrow, or similar.
+#define CPN_STR_SW_INDICATOR_NEUT      QCoreApplication::translate("RawSwitch", "-")             // Switch neutral (middle) position indicator.
+#define CPN_STR_SW_INDICATOR_REV       QCoreApplication::translate("RawSwitch", "!")             // Switch reversed logic (NOT) indicator.
+
+enum DownloadBranchType {
+  BRANCH_RELEASE_STABLE,
+  BRANCH_RC_TESTING,
+  BRANCH_NIGHTLY_UNSTABLE
+};
+
+Q_DECLARE_METATYPE(DownloadBranchType)
 
 #endif // _CONSTANTS_H_

companion/src/creditsdialog.cpp

@@ -18,12 +18,12 @@
  * GNU General Public License for more details.
  */
 
-#include "contributorsdialog.h"
+#include "creditsdialog.h"
 #include "ui_htmldialog.h"
 #include "helpers.h"
 #include <QFile>
 
-ContributorsDialog::ContributorsDialog(QWidget * parent):
+CreditsDialog::CreditsDialog(QWidget * parent):
   QDialog(parent),
   ui(new Ui::HtmlDialog)
 {
@@ -42,42 +42,8 @@ ContributorsDialog::ContributorsDialog(QWidget * parent):
                 "</head>"
                 "<body class=\"normal\">";
 
-  QFile credits(":/CREDITS.txt");
-  if (credits.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    QStringList names;
-    while (!credits.atEnd()) {
-      QByteArray line = credits.readLine();
-      if (line.trimmed() == "")
-        break;
-      names.append(line.trimmed());
-    }
-    str.append(formatTable(tr("Main Developers"), names, 3));
-
-    names.clear();
-    while (!credits.atEnd()) {
-      QByteArray line = credits.readLine();
-      names.append(line.trimmed());
-    }
-    str.append(formatTable(tr("Other contributors"), names, 3));
-  }
-
-  QFile donations(":/DONATIONS.txt");
-  if (donations.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    QStringList names;
-    while (!donations.atEnd()) {
-      QByteArray line = donations.readLine();
-      if (line.trimmed() == "")
-        break;
-      names.append(line.trimmed());
-    }
-    str.append(formatTable(tr("Companies and projects who have donated to OpenTX"), names, 3));
-
-    names.clear();
-    while (!donations.atEnd()) {
-      QByteArray line = donations.readLine();
-      names.append(line);
-    }
-    str.append(formatTable(tr("People who have donated to OpenTX"), names, 6));
+  foreach(CreditsSection section, readCredits()) {
+    str.append(formatTable(sectionTitle(section.title), section.names, 3));
   }
 
   str.append("<table><tr><td class=\"normal\">&nbsp;</td></tr>" \
@@ -87,9 +53,9 @@ ContributorsDialog::ContributorsDialog(QWidget * parent):
 #if 0
   QFile blacklist(":/BLACKLIST.txt");
   if (blacklist.open(QIODevice::ReadOnly | QIODevice::Text)) {
-	QStringList names;
-	names << blacklist.readAll();
-	str.append(formatTable(tr("OpenTX Blacklist"), names, 1));
+    QStringList names;
+    names << blacklist.readAll();
+    str.append(formatTable(tr("OpenTX Blacklist"), names, 1));
   }
 #endif
 
@@ -99,12 +65,45 @@ ContributorsDialog::ContributorsDialog(QWidget * parent):
   ui->textEditor->setOpenExternalLinks(true);
 }
 
-ContributorsDialog::~ContributorsDialog()
+CreditsDialog::~CreditsDialog()
 {
   delete ui;
 }
 
-QString ContributorsDialog::formatTable(const QString & title, const QStringList & names, int columns)
+QList<CreditsDialog::CreditsSection> CreditsDialog::readCredits()
+{
+  QFile credits(":/CREDITS.txt");
+  QList<CreditsSection> result;
+  if (credits.open(QIODevice::ReadOnly | QIODevice::Text)) {
+    while (!credits.atEnd()) {
+      QByteArray line = credits.readLine().trimmed();
+      if (line.size() >= 2) {
+        if (line.startsWith("[") && line.endsWith("]")) {
+          result.push_back(CreditsSection(line.mid(1, line.size() - 2)));
+        } else {
+          result.back().addName(line);
+        }
+      }
+    }
+  }
+  return result;
+}
+
+QString CreditsDialog::sectionTitle(const QString & title)
+{
+  if (title == "Main developers")
+    return tr("Main developers");
+  else if (title == "Translators")
+    return tr("Translators");
+  else if (title == "Companies and projects who have donated to OpenTX")
+    return tr("Companies and projects who have donated to OpenTX");
+  else if (title == "People who have donated to OpenTX")
+    return tr("People who have donated to OpenTX");
+  else
+    return tr("Other contributors");
+}
+
+QString CreditsDialog::formatTable(const QString & title, const QStringList & names, int columns)
 {
   const float cwidth = 100.0 / columns;
   QString str = "<table width=\"100%\" border=0 cellspacing=0 cellpadding=2>" \

companion/src/creditsdialog.h

@@ -18,8 +18,8 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _CONTRIBUTORSDIALOG_H_
-#define _CONTRIBUTORSDIALOG_H_
+#ifndef _CREDITSDIALOG_H_
+#define _CREDITSDIALOG_H_
 
 #include <QDialog>
 
@@ -27,17 +27,36 @@ namespace Ui {
   class HtmlDialog;
 }
 
-class ContributorsDialog : public QDialog
+class CreditsDialog : public QDialog
 {
   Q_OBJECT
 
+  class CreditsSection
+  {
+    public:
+      CreditsSection(const QString & title):
+        title(title)
+      {
+      }
+
+      void addName(const QString & name)
+      {
+        names.push_back(name);
+      }
+
+      QString title;
+      QStringList names;
+  };
+
   public:
-    explicit ContributorsDialog(QWidget * parent = 0);
-    ~ContributorsDialog();
+    explicit CreditsDialog(QWidget * parent = 0);
+    ~CreditsDialog();
 
   private:
     Ui::HtmlDialog * ui;
+    QList<CreditsSection> readCredits();
+    QString sectionTitle(const QString & title);
     QString formatTable(const QString & title, const QStringList & names, int colums);
 };
 
-#endif // _CONTRIBUTORSDIALOG_H_
+#endif // _CREDITSDIALOG_H_

companion/src/customdebug.cpp

@@ -0,0 +1,40 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include "customdebug.h"
+
+Q_LOGGING_CATEGORY(eepromImport, "eeprom.import")
+
+Q_LOGGING_CATEGORY(simulatorInterfaceLoader, "simulator.interface.loader")
+
+void CustomDebug::setFilterRules()
+{
+  QString rules;
+  rules.append("eeprom.import=");
+#if defined(DEBUG_STORAGE_IMPORT)
+  rules.append("true\n");
+#else
+  rules.append("false\n");
+#endif
+
+  rules.append("simulator.interface.*=true\n");
+
+  QLoggingCategory::setFilterRules(rules);
+}

companion/src/customdebug.h

@@ -21,15 +21,18 @@
 #ifndef _CUSTOMDEBUG_H_
 #define _CUSTOMDEBUG_H_
 
-#include <QDebug>
+#include <QLoggingCategory>
 
 // Controls the generation of debug output for EEPROM import
-#if defined(DEBUG_STORAGE_IMPORT)
-  inline QDebug eepromImportDebug() { return QDebug(QtDebugMsg); }
-#else
-  #undef eepromImportDebug
-  inline QNoDebug eepromImportDebug() { return QNoDebug(); }
-#endif
+Q_DECLARE_LOGGING_CATEGORY(eepromImport)  // "eeprom.import"
 
+// Controls the generation of debug output of SimulatorLoader class
+Q_DECLARE_LOGGING_CATEGORY(simulatorInterfaceLoader)  // "simulator.interface.loader"
+
+class CustomDebug
+{
+  public:
+    static void setFilterRules();
+};
 
 #endif // _CUSTOMDEBUG_H_

companion/src/customizesplashdialog.cpp

@@ -150,11 +150,9 @@ bool Side::saveImage()
   return true;
 }
 
-//*** customizeSplashDialog Class ***
-
-customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
+CustomizeSplashDialog::CustomizeSplashDialog(QWidget *parent) :
   QDialog(parent),
-  ui(new Ui::customizeSplashDialog)
+  ui(new Ui::CustomizeSplashDialog)
 {
   ui->setupUi(this);
   setWindowIcon(CompanionIcon("paintbrush.png"));
@@ -185,22 +183,22 @@ customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
   resize(0,0);
 }
 
-customizeSplashDialog::~customizeSplashDialog()
+CustomizeSplashDialog::~CustomizeSplashDialog()
 {
   delete ui;
 }
 
-void customizeSplashDialog::on_copyRightToLeftButton_clicked() {
+void CustomizeSplashDialog::on_copyRightToLeftButton_clicked() {
   left.copyImage(right);
 }
-void customizeSplashDialog::on_copyLeftToRightButton_clicked() {
+void CustomizeSplashDialog::on_copyLeftToRightButton_clicked() {
 right.copyImage(left);
 }
 
 
-void customizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);}
-void customizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);}
-void customizeSplashDialog::loadFirmware(Side side)
+void CustomizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);}
+void CustomizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);}
+void CustomizeSplashDialog::loadFirmware(Side side)
 {
   QString fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER);
   if (!fileName.isEmpty()) {
@@ -212,9 +210,9 @@ void customizeSplashDialog::loadFirmware(Side side)
   side.markSourceButton();
 }
 
-void customizeSplashDialog::on_leftLoadPictButton_clicked() {loadPicture(left);}
-void customizeSplashDialog::on_rightLoadPictButton_clicked() {loadPicture(right);}
-void customizeSplashDialog::loadPicture(Side side)
+void CustomizeSplashDialog::on_leftLoadPictButton_clicked() {loadPicture(left);}
+void CustomizeSplashDialog::on_rightLoadPictButton_clicked() {loadPicture(right);}
+void CustomizeSplashDialog::loadPicture(Side side)
 {
   QString supportedImageFormats;
   for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) {
@@ -232,9 +230,9 @@ void customizeSplashDialog::loadPicture(Side side)
   side.markSourceButton();
 }
 
-void customizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);}
-void customizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);}
-void customizeSplashDialog::loadProfile(Side side)
+void CustomizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);}
+void CustomizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);}
+void CustomizeSplashDialog::loadProfile(Side side)
 {
   QString fileName=g.profile[g.id()].splashFile();
 
@@ -245,9 +243,9 @@ void customizeSplashDialog::loadProfile(Side side)
   side.markSourceButton();
 }
 
-void customizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);}
-void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);}
-void customizeSplashDialog::libraryButton_clicked( Side side )
+void CustomizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);}
+void CustomizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);}
+void CustomizeSplashDialog::libraryButton_clicked( Side side )
 {
   QString fileName;
   SplashLibraryDialog *ld = new SplashLibraryDialog(this,&fileName);
@@ -258,9 +256,9 @@ void customizeSplashDialog::libraryButton_clicked( Side side )
   }
 }
 
-void customizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);}
-void customizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);}
-void customizeSplashDialog::saveButton_clicked( Side side )
+void CustomizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);}
+void CustomizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);}
+void CustomizeSplashDialog::saveButton_clicked( Side side )
 {
   if (side.saveImage()){
     QMessageBox::information(this, tr("File Saved"), tr("The image was saved to the file %1").arg(*side.saveToFileName));
@@ -272,9 +270,9 @@ void customizeSplashDialog::saveButton_clicked( Side side )
     QMessageBox::critical(this, tr("File Save Error"), tr("Failed to write image to %1").arg(*side.saveToFileName));
 }
 
-void customizeSplashDialog::on_leftInvertButton_clicked(){invertButton_clicked(left);}
-void customizeSplashDialog::on_rightInvertButton_clicked(){invertButton_clicked(right);}
-void customizeSplashDialog::invertButton_clicked(Side side)
+void CustomizeSplashDialog::on_leftInvertButton_clicked(){invertButton_clicked(left);}
+void CustomizeSplashDialog::on_rightInvertButton_clicked(){invertButton_clicked(right);}
+void CustomizeSplashDialog::invertButton_clicked(Side side)
 {
   QImage image = side.imageLabel->pixmap()->toImage();
   image.invertPixels();

companion/src/customizesplashdialog.h

@@ -26,7 +26,7 @@
 
 namespace Ui
 {
-  class customizeSplashDialog;
+  class CustomizeSplashDialog;
 }
 
 const int WIDTH_TARANIS = 212;
@@ -63,15 +63,15 @@ private:
   LCDFormat *format;
 };
 
-class customizeSplashDialog : public QDialog
+class CustomizeSplashDialog : public QDialog
 {
   Q_OBJECT
   Side left;
   Side right;
 
 public:
-  explicit customizeSplashDialog(QWidget *parent = 0);
-  ~customizeSplashDialog();
+  explicit CustomizeSplashDialog(QWidget *parent = 0);
+  ~CustomizeSplashDialog();
 
 private slots:
   void on_leftLoadFwButton_clicked();
@@ -99,7 +99,7 @@ private:
   void saveButton_clicked( Side );
   void invertButton_clicked( Side );
 
-  Ui::customizeSplashDialog *ui;
+  Ui::CustomizeSplashDialog *ui;
   enum sideEnum { LEFT, RIGHT };
 };
 

companion/src/customizesplashdialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>customizeSplashDialog</class>
- <widget class="QDialog" name="customizeSplashDialog">
+ <class>CustomizeSplashDialog</class>
+ <widget class="QDialog" name="CustomizeSplashDialog">
   <property name="enabled">
    <bool>true</bool>
   </property>

companion/src/eepromimportexport.h

@@ -26,15 +26,24 @@
 
 class DataField {
   public:
-    DataField(const char *name=""):
+    DataField(DataField * parent, const char * name=""):
+      parent(parent),
       name(name)
     {
     }
-    virtual const char *getName() { return name; }
-    virtual ~DataField() { }
+
+    virtual ~DataField()
+    {
+    }
+
+    virtual const QString & getName()
+    {
+      return name;
+    }
+
+    virtual unsigned int size() = 0;
     virtual void ExportBits(QBitArray & output) = 0;
     virtual void ImportBits(const QBitArray & input) = 0;
-    virtual unsigned int size() = 0;
 
     QBitArray bytesToBits(QByteArray bytes)
     {
@@ -84,9 +93,9 @@ class DataField {
       int result = (offset+bits.count()) % 8;
       for (int i=0; i<level; i++) printf("  ");
       if (bits.count() % 8 == 0)
-        printf("%s (%dbytes) ", getName(), bytes.count());
+        printf("%s (%dbytes) ", getName().toLatin1().constData(), bytes.count());
       else
-        printf("%s (%dbits) ", getName(), bits.count());
+        printf("%s (%dbits) ", getName().toLatin1().constData(), bits.count());
       for (int i=0; i<bytes.count(); i++) {
         unsigned char c = bytes[i];
         if ((i==0 && offset) || (i==bytes.count()-1 && result!=0))
@@ -99,13 +108,24 @@ class DataField {
     }
 
   protected:
-    const char *name;
+    virtual void setError(const QString & error)
+    {
+      if (parent) {
+        parent->setError(error);
+      }
+      else {
+        qWarning() << qPrintable(error);
+      }
+    }
+
+    DataField * parent;
+    QString name;
 };
 
 class ProxyField: public DataField {
   public:
-    ProxyField():
-      DataField("Proxy")
+    explicit ProxyField(DataField * parent):
+      DataField(parent, "Proxy")
     {
     }
 
@@ -116,24 +136,24 @@ class ProxyField: public DataField {
 template<class container, int N>
 class BaseUnsignedField: public DataField {
   public:
-    explicit BaseUnsignedField(container & field):
-      DataField("Unsigned"),
+    BaseUnsignedField(DataField * parent, container & field):
+      DataField(parent, "Unsigned"),
       field(field),
       min(0),
       max(std::numeric_limits<container>::max())
     {
     }
 
-    BaseUnsignedField(container & field, const char * name):
-      DataField(name),
+    BaseUnsignedField(DataField * parent, container & field, const char * name):
+      DataField(parent, name),
       field(field),
       min(0),
       max(std::numeric_limits<container>::max())
     {
     }
 
-    BaseUnsignedField(container & field, container min, container max, const char * name="Unsigned"):
-      DataField(name),
+    BaseUnsignedField(DataField * parent, container & field, container min, container max, const char * name="Unsigned"):
+      DataField(parent, name),
       field(field),
       min(min),
       max(max)
@@ -161,7 +181,7 @@ class BaseUnsignedField: public DataField {
         if (input[i])
           field |= ((container)1<<i);
       }
-      eepromImportDebug() << QString("\timported %1<%2>: 0x%3(%4)").arg(name).arg(N).arg(field, 0, 16).arg(field);
+      qCDebug(eepromImport) << QString("\timported %1<%2>: 0x%3(%4)").arg(name).arg(N).arg(field, 0, 16).arg(field);
     }
 
     virtual unsigned int size()
@@ -182,18 +202,18 @@ template <int N>
 class UnsignedField : public BaseUnsignedField<unsigned int, N>
 {
   public:
-    explicit UnsignedField(unsigned int & field):
-      BaseUnsignedField<unsigned int, N>(field)
+    UnsignedField(DataField * parent, unsigned int & field):
+      BaseUnsignedField<unsigned int, N>(parent, field)
     {
     }
 
-    UnsignedField(unsigned int & field, const char *name):
-      BaseUnsignedField<unsigned int, N>(field, name)
+    UnsignedField(DataField * parent, unsigned int & field, const char *name):
+      BaseUnsignedField<unsigned int, N>(parent, field, name)
     {
     }
 
-    UnsignedField(unsigned int & field, unsigned int min, unsigned int max, const char *name="Unsigned"):
-      BaseUnsignedField<unsigned int, N>(field, min, max, name)
+    UnsignedField(DataField * parent, unsigned int & field, unsigned int min, unsigned int max, const char *name="Unsigned"):
+      BaseUnsignedField<unsigned int, N>(parent, field, min, max, name)
     {
     }
 };
@@ -201,8 +221,8 @@ class UnsignedField : public BaseUnsignedField<unsigned int, N>
 template<int N>
 class BoolField: public DataField {
   public:
-    explicit BoolField(bool & field):
-      DataField("Bool"),
+    explicit BoolField(DataField * parent, bool & field):
+      DataField(parent, "Bool"),
       field(field)
     {
     }
@@ -218,7 +238,7 @@ class BoolField: public DataField {
     virtual void ImportBits(const QBitArray & input)
     {
       field = input[0] ? true : false;
-      eepromImportDebug() << QString("\timported %1<%2>: 0x%3(%4)").arg(name).arg(N).arg(field, 0, 16).arg(field);
+      qCDebug(eepromImport) << QString("\timported %1<%2>: 0x%3(%4)").arg(name).arg(N).arg(field, 0, 16).arg(field);
     }
 
     virtual unsigned int size()
@@ -236,24 +256,24 @@ class BoolField: public DataField {
 template<int N>
 class SignedField: public DataField {
   public:
-    SignedField(int & field):
-      DataField("Signed"),
+    SignedField(DataField * parent, int & field):
+      DataField(parent, "Signed"),
       field(field),
       min(INT_MIN),
       max(INT_MAX)
     {
     }
 
-    SignedField(int & field, const char *name):
-      DataField(name),
+    SignedField(DataField * parent, int & field, const char *name):
+      DataField(parent, name),
       field(field),
       min(INT_MIN),
       max(INT_MAX)
     {
     }
 
-    SignedField(int & field, int min, int max, const char *name="Signed"):
-      DataField(name),
+    SignedField(DataField * parent, int & field, int min, int max, const char *name="Signed"):
+      DataField(parent, name),
       field(field),
       min(min),
       max(max)
@@ -288,7 +308,7 @@ class SignedField: public DataField {
       }
 
       field = (int)value;
-      eepromImportDebug() << QString("\timported %1<%2>: 0x%3(%4)").arg(name).arg(N).arg(field, 0, 16).arg(field);
+      qCDebug(eepromImport) << QString("\timported %1<%2>: 0x%3(%4)").arg(name).arg(N).arg(field, 0, 16).arg(field);
     }
 
     virtual unsigned int size()
@@ -305,8 +325,8 @@ class SignedField: public DataField {
 template<int N>
 class SpareBitsField: public UnsignedField<N> {
   public:
-    SpareBitsField():
-      UnsignedField<N>(spare, 0, 0, "Spare"),
+    SpareBitsField(DataField * parent):
+      UnsignedField<N>(parent, spare, 0, 0, "Spare"),
       spare(0)
     {
     }
@@ -317,8 +337,8 @@ class SpareBitsField: public UnsignedField<N> {
 template<int N>
 class CharField: public DataField {
   public:
-    CharField(char * field, bool truncate=true, const char * name="Char"):
-      DataField(name),
+    CharField(DataField * parent, char * field, bool truncate=true, const char * name="Char"):
+      DataField(parent, name),
       field(field),
       truncate(truncate)
     {
@@ -349,7 +369,7 @@ class CharField: public DataField {
         }
         field[i] = idx;
       }
-      eepromImportDebug() << QString("\timported %1<%2>: '%3'").arg(name).arg(N).arg(field);
+      qCDebug(eepromImport) << QString("\timported %1<%2>: '%3'").arg(name).arg(N).arg(field);
     }
 
     virtual unsigned int size()
@@ -368,8 +388,8 @@ char idx2char(int8_t idx);
 template<int N>
 class ZCharField: public DataField {
   public:
-    ZCharField(char * field, const char * name = "ZChar"):
-      DataField(name),
+    ZCharField(DataField * parent, char * field, const char * name = "ZChar"):
+      DataField(parent, name),
       field(field)
     {
     }
@@ -407,7 +427,7 @@ class ZCharField: public DataField {
         else
           break;
       }
-      eepromImportDebug() << QString("\timported %1<%2>: '%3'").arg(name).arg(N).arg(field);
+      qCDebug(eepromImport) << QString("\timported %1<%2>: '%3'").arg(name).arg(N).arg(field);
     }
 
     virtual unsigned int size()
@@ -421,19 +441,19 @@ class ZCharField: public DataField {
 
 class StructField: public DataField {
   public:
-    StructField(const char * name="Struct"):
-      DataField(name)
+    StructField(DataField * parent, const char * name="Struct"):
+      DataField(parent, name)
     {
     }
 
     ~StructField() {
-      foreach(DataField *field, fields) {
+      foreach(DataField * field, fields) {
         delete field;
       }
     }
 
-    inline void Append(DataField *field) {
-      //eepromImportDebug() << QString("StructField(%1) appending field: %2").arg(name).arg(field->getName());
+    inline void Append(DataField * field) {
+      //qCDebug(eepromImport) << QString("StructField(%1) appending field: %2").arg(name).arg(field->getName());
       fields.append(field);
     }
 
@@ -451,7 +471,7 @@ class StructField: public DataField {
 
     virtual void ImportBits(const QBitArray & input)
     {
-      eepromImportDebug() << QString("\timporting %1[%2]:").arg(name).arg(fields.size());
+      qCDebug(eepromImport) << QString("\timporting %1[%2]:").arg(name).arg(fields.size());
       int offset = 0;
       foreach(DataField *field, fields) {
         unsigned int size = field->size();
@@ -475,7 +495,7 @@ class StructField: public DataField {
     virtual int Dump(int level=0, int offset=0)
     {
       for (int i=0; i<level; i++) printf("  ");
-      printf("%s (%d bytes)\n", getName(), size()/8);
+      printf("%s (%d bytes)\n", getName().toLatin1().constData(), size()/8);
       foreach(DataField *field, fields) {
         offset = field->Dump(level+1, offset);
       }
@@ -488,8 +508,8 @@ class StructField: public DataField {
 
 class TransformedField: public DataField {
   public:
-    TransformedField(DataField & field):
-      DataField(),
+    TransformedField(DataField * parent, DataField & field):
+      DataField(parent),
       field(field)
     {
     }
@@ -506,13 +526,13 @@ class TransformedField: public DataField {
 
     virtual void ImportBits(const QBitArray & input)
     {
-      eepromImportDebug() << QString("\timporting TransformedField %1:").arg(field.getName());
+      qCDebug(eepromImport) << QString("\timporting TransformedField %1:").arg(field.getName());
       field.ImportBits(input);
       afterImport();
     }
 
 
-    virtual const char *getName()
+    virtual const QString & getName()
     {
       return field.getName();
     }
@@ -544,7 +564,7 @@ class ConversionTable {
       after = 0;
 
       for (std::list<ConversionTuple>::iterator it=exportTable.begin(); it!=exportTable.end(); it++) {
-        ConversionTuple tuple = *it;
+        ConversionTuple & tuple = *it;
         if (before == tuple.a) {
           after = tuple.b;
           return true;
@@ -559,7 +579,7 @@ class ConversionTable {
       after = 0;
 
       for (std::list<ConversionTuple>::iterator it=importTable.begin(); it!=importTable.end(); it++) {
-        ConversionTuple tuple = *it;
+        ConversionTuple & tuple = *it;
         if (before == tuple.b) {
           after = tuple.a;
           return true;
@@ -607,9 +627,9 @@ class ConversionTable {
 template<class T>
 class ConversionField: public TransformedField {
   public:
-    ConversionField(int & field, ConversionTable *table, const char *name, const QString & error = ""):
-      TransformedField(internalField),
-      internalField(_field, name),
+    ConversionField(DataField * parent, int & field, ConversionTable *table, const char *name, const QString & error = ""):
+      TransformedField(parent, internalField),
+      internalField(this, _field, name),
       field(field),
       _field(0),
       table(table),
@@ -623,9 +643,9 @@ class ConversionField: public TransformedField {
     {
     }
 
-    ConversionField(unsigned int & field, ConversionTable *table, const char *name, const QString & error = ""):
-      TransformedField(internalField),
-      internalField((unsigned int &)_field, name),
+    ConversionField(DataField * parent, unsigned int & field, ConversionTable *table, const char *name, const QString & error = ""):
+      TransformedField(parent, internalField),
+      internalField(this, (unsigned int &)_field, name),
       field((int &)field),
       _field(0),
       table(table),
@@ -639,9 +659,9 @@ class ConversionField: public TransformedField {
     {
     }
 
-    ConversionField(int & field, int (*exportFunc)(int), int (*importFunc)(int)):
-      TransformedField(internalField),
-      internalField(_field),
+    ConversionField(DataField * parent, int & field, int (*exportFunc)(int), int (*importFunc)(int)):
+      TransformedField(parent, internalField),
+      internalField(this, _field),
       field(field),
       _field(0),
       table(NULL),
@@ -655,9 +675,9 @@ class ConversionField: public TransformedField {
     {
     }
 
-    ConversionField(int & field, int shift, int scale=0, int min=INT_MIN, int max=INT_MAX, const char *name = "Signed shifted"):
-      TransformedField(internalField),
-      internalField(_field, name),
+    ConversionField(DataField * parent, int & field, int shift, int scale=0, int min=INT_MIN, int max=INT_MAX, const char *name = "Signed shifted"):
+      TransformedField(parent, internalField),
+      internalField(this, _field, name),
       field(field),
       _field(0),
       table(NULL),
@@ -671,9 +691,9 @@ class ConversionField: public TransformedField {
     {
     }
 
-    ConversionField(unsigned int & field, int shift, int scale=0):
-      TransformedField(internalField),
-      internalField((unsigned int &)_field),
+    ConversionField(DataField * parent, unsigned int & field, int shift, int scale=0):
+      TransformedField(parent, internalField),
+      internalField(this, (unsigned int &)_field),
       field((int &)field),
       _field(0),
       table(NULL),
@@ -696,16 +716,19 @@ class ConversionField: public TransformedField {
       }
 
       if (table) {
-        if (table->exportValue(_field, _field))
-          return;
-        if (!error.isEmpty())
-          EEPROMWarnings.push_back(error);
+        if (!table->exportValue(_field, _field)) {
+          setError(error.isEmpty() ? QObject::tr("Conversion error on field %1").arg(name) : error);
+        }
+        return;
       }
 
       if (shift) {
-        if (_field < min) _field = min + shift;
-        else if (_field > max) _field = max + shift;
-        else _field += shift;
+        if (_field < min)
+          _field = min + shift;
+        else if (_field > max)
+          _field = max + shift;
+        else
+          _field += shift;
       }
 
       if (exportFunc) {
@@ -733,7 +756,7 @@ class ConversionField: public TransformedField {
       if (scale) {
         field *= scale;
       }
-      eepromImportDebug() << QString("\timported ConversionField<%1>:").arg(internalField.getName()) << QString(" before: %1, after: %2").arg(_field).arg(field);
+      qCDebug(eepromImport) << QString("\timported ConversionField<%1>:").arg(internalField.getName()) << QString(" before: %1, after: %2").arg(_field).arg(field);
     }
 
   protected:

companion/src/eeprominterface.cpp

@@ -28,6 +28,7 @@
 #include "wizarddata.h"
 #include "firmwareinterface.h"
 #include "macros.h"
+#include "multiprotocols.h"
 #include <stdio.h>
 #include <list>
 #include <float.h>
@@ -35,8 +36,6 @@
 #include <stdlib.h>
 #include <bitset>
 
-std::list<QString> EEPROMWarnings;
-
 const uint8_t chout_ar[] = { // First number is 0..23 -> template setup,  Second is relevant channel out
   1,2,3,4 , 1,2,4,3 , 1,3,2,4 , 1,3,4,2 , 1,4,2,3 , 1,4,3,2,
   2,1,3,4 , 2,1,4,3 , 2,3,1,4 , 2,3,4,1 , 2,4,1,3 , 2,4,3,1,
@@ -115,6 +114,23 @@ void getEEPROMZString(char *dst, const char *src, int size)
   }
 }
 
+QString getElementName(const QString & prefix, unsigned int index, const char * name = NULL, bool padding = false)
+{
+  QString result = prefix;
+  if (padding)
+    result += QString("%1").arg(index, 2, 10, QChar('0'));
+  else
+    result += QString("%1").arg(index);
+  if (name) {
+    QString trimmed = QString(name).trimmed();
+    if (trimmed.length() > 0) {
+      result += ":" + QString(name).trimmed();
+    }
+  }
+  return result;
+}
+
+
 float ValToTim(int value)
 {
    return ((value < -109 ? 129+value : (value < 7 ? (113+value)*5 : (53+value)*10))/10.0);
@@ -135,27 +151,6 @@ int TimToVal(float value)
   return (temp-129);
 }
 
-QString getSignedStr(int value)
-{
-  return value > 0 ? QString("+%1").arg(value) : QString("%1").arg(value);
-}
-
-QString getGVarString(int16_t val, bool sign)
-{
-  if (val >= -10000 && val <= 10000) {
-    if (sign)
-      return QString("%1%").arg(getSignedStr(val));
-    else
-      return QString("%1%").arg(val);
-  }
-  else {
-    if (val<0)
-      return QObject::tr("-GV%1").arg(-val-10000);
-    else
-      return QObject::tr("GV%1").arg(val-10000);
-  }
-}
-
 void SensorData::updateUnit()
 {
   if (type == TELEM_TYPE_CALCULATED) {
@@ -240,7 +235,7 @@ RawSourceRange RawSource::getRange(const ModelData * model, const GeneralSetting
 {
   RawSourceRange result;
 
-  Firmware * firmware = getCurrentFirmware();
+  Firmware * firmware = Firmware::getCurrentVariant();
   int board = firmware->getBoard();
   bool singleprec = (flags & RANGE_SINGLE_PRECISION);
 
@@ -495,16 +490,10 @@ RawSourceRange RawSource::getRange(const ModelData * model, const GeneralSetting
   return result;
 }
 
-QString RotaryEncoderString(int index)
-{
-  static const QString rotary[]  = { QObject::tr("REa"), QObject::tr("REb") };
-  return CHECK_IN_ARRAY(rotary, index);
-}
-
-QString RawSource::toString(const ModelData * model) const
+QString RawSource::toString(const ModelData * model, const GeneralSettings * const generalSettings) const
 {
   static const QString trims[] = {
-    QObject::tr("TrmR"), QObject::tr("TrmE"), QObject::tr("TrmT"), QObject::tr("TrmA")
+    QObject::tr("TrmR"), QObject::tr("TrmE"), QObject::tr("TrmT"), QObject::tr("TrmA"), QObject::tr("Trm5"), QObject::tr("Trm6")
   };
 
   static const QString special[] = {
@@ -526,73 +515,137 @@ QString RawSource::toString(const ModelData * model) const
     QObject::tr("ACC"), QObject::tr("GPS Time"),
   };
 
+  static const QString rotary[]  = { QObject::tr("REa"), QObject::tr("REb") };
+
   if (index<0) {
     return QObject::tr("----");
   }
 
+  QString result;
+  int genAryIdx = 0;
   switch (type) {
     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]);
-      }
-      return result;
+      const char * name = NULL;
+      if (model)
+        name = model->inputNames[index];
+      return getElementName(QCoreApplication::translate("Input", "I"), index + 1, name);
     }
+
     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 getCurrentFirmware()->getAnalogInputName(index);
+      if (generalSettings) {
+        if (isPot(&genAryIdx))
+          result = QString(generalSettings->potName[genAryIdx]);
+        else if (isSlider(&genAryIdx))
+          result = QString(generalSettings->sliderName[genAryIdx]);
+        else if (isStick(&genAryIdx))
+          result = QString(generalSettings->stickName[genAryIdx]);
+      }
+      if (result.isEmpty())
+        result = getCurrentFirmware()->getAnalogInputName(index);;
+      return result;
+
     case SOURCE_TYPE_TRIM:
       return CHECK_IN_ARRAY(trims, index);
     case SOURCE_TYPE_ROTARY_ENCODER:
-      return RotaryEncoderString(index);
+      return CHECK_IN_ARRAY(rotary, index);
     case SOURCE_TYPE_MAX:
       return QObject::tr("MAX");
+
     case SOURCE_TYPE_SWITCH:
-      return getSwitchInfo(getCurrentBoard(), index).name;
+      if (generalSettings)
+        result = QString(generalSettings->switchName[index]);
+      if (result.isEmpty())
+        result = getSwitchInfo(getCurrentBoard(), index).name;
+      return result;
+
     case SOURCE_TYPE_CUSTOM_SWITCH:
-      return QObject::tr("L%1").arg(index+1);
+      return RawSwitch(SWITCH_TYPE_VIRTUAL, index+1).toString();
+
     case SOURCE_TYPE_CYC:
       return QObject::tr("CYC%1").arg(index+1);
+
     case SOURCE_TYPE_PPM:
-      return QObject::tr("TR%1").arg(index+1);
+      return getElementName(QCoreApplication::translate("Trainer", "TR"), index + 1);
+
     case SOURCE_TYPE_CH:
-      return QObject::tr("CH%1").arg(index+1);
+    {
+      const char * name = NULL;
+      if (getCurrentFirmware()->getCapability(ChannelsName) && model)
+        name = model->limitData[index].name;
+      return getElementName(QCoreApplication::translate("Channel", "CH"), index + 1, name);
+    }
+
     case SOURCE_TYPE_SPECIAL:
       return CHECK_IN_ARRAY(special, index);
+
     case SOURCE_TYPE_TELEMETRY:
       if (IS_ARM(getCurrentBoard())) {
         div_t qr = div(index, 3);
-        QString result = QString(model ? model->sensorData[qr.quot].label : QString("[T%1]").arg(qr.quot+1));
-        if (qr.rem) result += qr.rem == 1 ? "-" : "+";
+        result = getElementName(QCoreApplication::translate("Telemetry", "TELE"), qr.quot+1, model ? model->sensorData[qr.quot].label : NULL);
+        if (qr.rem)
+          result += (qr.rem == 1 ? "-" : "+");
         return result;
       }
       else {
         return CHECK_IN_ARRAY(telemetry, index);
       }
+
     case SOURCE_TYPE_GVAR:
-      return QObject::tr("GV%1").arg(index+1);
+    {
+      const char * name = NULL;
+      if (getCurrentFirmware()->getCapability(GvarsName) && model)
+        name = model->gvarData[index].name;
+      return getElementName(QCoreApplication::translate("Global Variable", "GV"), index + 1, name);
+    }
+
     default:
       return QObject::tr("----");
   }
 }
 
-bool RawSource::isPot() const
+bool RawSource::isStick(int * stickIndex) const
 {
-  return (type == SOURCE_TYPE_STICK &&
-          index >= CPN_MAX_STICKS &&
-          index < CPN_MAX_STICKS+getCurrentFirmware()->getCapability(Pots));
+  if (type == SOURCE_TYPE_STICK && index < getBoardCapability(getCurrentBoard(), Board::Sticks)) {
+    if (stickIndex)
+      *stickIndex = index;
+    return true;
+  }
+  return false;
 }
 
-bool RawSource::isSlider() const
+bool RawSource::isPot(int * potsIndex) const
 {
-  return (type == SOURCE_TYPE_STICK &&
-          index >= CPN_MAX_STICKS+getCurrentFirmware()->getCapability(Pots) &&
-          index < CPN_MAX_STICKS+getCurrentFirmware()->getCapability(Pots)+getCurrentFirmware()->getCapability(Sliders));
+  if (type == SOURCE_TYPE_STICK &&
+          index >= getBoardCapability(getCurrentBoard(), Board::Sticks) &&
+          index < getBoardCapability(getCurrentBoard(), Board::Sticks) + getBoardCapability(getCurrentBoard(), Board::Pots)) {
+    if (potsIndex)
+      *potsIndex = index - getBoardCapability(getCurrentBoard(), Board::Sticks);
+    return true;
+  }
+  return false;
 }
 
-QString RawSwitch::toString(Board::Type board) const
+bool RawSource::isSlider(int * sliderIndex) const
+{
+  if (type == SOURCE_TYPE_STICK &&
+          index >= getBoardCapability(getCurrentBoard(), Board::Sticks) + getBoardCapability(getCurrentBoard(), Board::Pots) &&
+          index < getBoardCapability(getCurrentBoard(), Board::Sticks) + getBoardCapability(getCurrentBoard(), Board::Pots) + getBoardCapability(getCurrentBoard(), Board::Sliders)) {
+    if (sliderIndex)
+      *sliderIndex = index - getBoardCapability(getCurrentBoard(), Board::Sticks) - getBoardCapability(getCurrentBoard(), Board::Pots);
+    return true;
+  }
+  return false;
+}
+
+/*
+ * RawSwitch
+ */
+
+QString RawSwitch::toString(Board::Type board, const GeneralSettings * const generalSettings, const ModelData * const modelData) const
 {
   if (board == Board::BOARD_UNKNOWN) {
     board = getCurrentBoard();
@@ -604,21 +657,13 @@ QString RawSwitch::toString(Board::Type board) const
     QString("AIL"), QString("GEA"), QString("TRN")
   };
 
-  static const QString flightModes[] = {
-    QObject::tr("FM0"), QObject::tr("FM1"), QObject::tr("FM2"), QObject::tr("FM3"), QObject::tr("FM4"), QObject::tr("FM5"), QObject::tr("FM6"), QObject::tr("FM7"), QObject::tr("FM8")
-  };
-
-  static const QString multiposPots[] = {
-    QObject::tr("S11"), QObject::tr("S12"), QObject::tr("S13"), QObject::tr("S14"), QObject::tr("S15"), QObject::tr("S16"),
-    QObject::tr("S21"), QObject::tr("S22"), QObject::tr("S23"), QObject::tr("S24"), QObject::tr("S25"), QObject::tr("S26"),
-    QObject::tr("S31"), QObject::tr("S32"), QObject::tr("S33"), QObject::tr("S34"), QObject::tr("S35"), QObject::tr("S36")
-  };
-
   static const QString trimsSwitches[] = {
     QObject::tr("RudTrim Left"), QObject::tr("RudTrim Right"),
     QObject::tr("EleTrim Down"), QObject::tr("EleTrim Up"),
     QObject::tr("ThrTrim Down"), QObject::tr("ThrTrim Up"),
-    QObject::tr("AilTrim Left"), QObject::tr("AilTrim Right")
+    QObject::tr("AilTrim Left"), QObject::tr("AilTrim Right"),
+    QObject::tr("Trim 5 Down"), QObject::tr("Trim 5 Up"),
+    QObject::tr("Trim 6 Down"), QObject::tr("Trim 6 Up")
   };
 
   static const QString rotaryEncoders[] = {
@@ -630,64 +675,127 @@ QString RawSwitch::toString(Board::Type board) const
     QObject::tr("THs"), QObject::tr("TH%"), QObject::tr("THt")
   };
 
+  const QStringList directionIndicators = QStringList()
+      << CPN_STR_SW_INDICATOR_UP
+      << CPN_STR_SW_INDICATOR_NEUT
+      << CPN_STR_SW_INDICATOR_DN;
+
   if (index < 0) {
-    return QString("!") + RawSwitch(type, -index).toString();
+    return CPN_STR_SW_INDICATOR_REV % RawSwitch(type, -index).toString(board, generalSettings, modelData);
   }
   else {
+    QString swName;
+    div_t qr;
     switch(type) {
       case SWITCH_TYPE_SWITCH:
         if (IS_HORUS_OR_TARANIS(board)) {
-          div_t qr = div(index-1, 3);
-          Board::SwitchInfo switchInfo = getSwitchInfo(board, qr.quot);
-          const char * positions[] = { ARROW_UP, "-", ARROW_DOWN };
-          return QString(switchInfo.name) + QString(positions[qr.rem]);
+          qr = div(index-1, 3);
+          if (generalSettings)
+            swName = QString(generalSettings->switchName[qr.quot]);
+          if (swName.isEmpty())
+            swName = getSwitchInfo(board, qr.quot).name;
+          return swName + directionIndicators.at(qr.rem > -1 && qr.rem < directionIndicators.size() ? qr.rem : 1);
         }
         else {
           return CHECK_IN_ARRAY(switches9X, index - 1);
         }
+
       case SWITCH_TYPE_VIRTUAL:
-        return QObject::tr("L%1").arg(index);
+        return getElementName(QCoreApplication::translate("Logic Switch", "L"), index, NULL, true);
+
       case SWITCH_TYPE_MULTIPOS_POT:
-        return CHECK_IN_ARRAY(multiposPots, index-1);
+        if (!getCurrentFirmware()->getCapability(MultiposPotsPositions))
+          return QObject::tr("???");
+        qr = div(index - 1, getCurrentFirmware()->getCapability(MultiposPotsPositions));
+        if (generalSettings && qr.quot < (int)DIM(generalSettings->potConfig))
+          swName = QString(generalSettings->potName[qr.quot]);
+        if (swName.isEmpty())
+          swName = getCurrentFirmware()->getAnalogInputName(qr.quot + getBoardCapability(board, Board::Sticks));;
+        return swName + "_" + QString::number(qr.rem + 1);
+
       case SWITCH_TYPE_TRIM:
         return CHECK_IN_ARRAY(trimsSwitches, index-1);
+
       case SWITCH_TYPE_ROTARY_ENCODER:
         return CHECK_IN_ARRAY(rotaryEncoders, index-1);
+
       case SWITCH_TYPE_ON:
         return QObject::tr("ON");
+
       case SWITCH_TYPE_OFF:
         return QObject::tr("OFF");
+
       case SWITCH_TYPE_ONE:
         return QObject::tr("One");
+
       case SWITCH_TYPE_FLIGHT_MODE:
-        return CHECK_IN_ARRAY(flightModes, index-1);
+        return getElementName(QCoreApplication::translate("Flight mode", "FM"), index - 1, modelData ? modelData->flightModeData[index-1].name : NULL);
+
       case SWITCH_TYPE_NONE:
         return QObject::tr("----");
+
       case SWITCH_TYPE_TIMER_MODE:
         return CHECK_IN_ARRAY(timerModes, index);
+
+      case SWITCH_TYPE_SENSOR:
+        return getElementName(QCoreApplication::translate("Telemetry", "TELE"), index, modelData ? modelData->sensorData[index-1].label : NULL);
+
+      case SWITCH_TYPE_TELEMETRY:
+        return QObject::tr("Telemetry");
+
       default:
         return QObject::tr("???");
     }
   }
 }
 
-QString CurveReference::toString() const
+
+/*
+ * CurveReference
+ */
+
+QString CurveReference::toString(const ModelData * model, bool verbose) const
 {
   if (value == 0) {
     return "----";
   }
-  else {
-    switch(type) {
-      case CURVE_REF_DIFF:
-        return QObject::tr("Diff(%1)").arg(getGVarString(value));
-      case CURVE_REF_EXPO:
-        return QObject::tr("Expo(%1)").arg(getGVarString(value));
-      case CURVE_REF_FUNC:
-        return QObject::tr("Function(%1)").arg(QString("x>0" "x<0" "|x|" "f>0" "f<0" "|f|").mid(3*(value-1), 3));
-      default:
-        return QString(value > 0 ? QObject::tr("Curve(%1)") : QObject::tr("!Curve(%1)")).arg(abs(value));
-    }
+
+  QString ret;
+  unsigned idx = abs(value) - 1;
+
+  switch(type) {
+    case CURVE_REF_DIFF:
+      ret = QObject::tr("Diff(%1)").arg(Helpers::getAdjustmentString(value, model));
+      break;
+
+    case CURVE_REF_EXPO:
+      ret = QObject::tr("Expo(%1)").arg(Helpers::getAdjustmentString(value, model));
+      break;
+
+    case CURVE_REF_FUNC:
+      ret = QString("x>0" "x<0" "|x|" "f>0" "f<0" "|f|").mid(3*(value-1), 3);
+      if (verbose)
+        ret = QObject::tr("Function(%1)").arg(ret);
+      break;
+
+    default:
+      if (model)
+        ret = model->curves[idx].nameToString(idx);
+      else
+        ret = CurveData().nameToString(idx);
+      if (verbose)
+        ret = QObject::tr("Curve(%1)").arg(ret);
+      if (value < 0)
+        ret.prepend(CPN_STR_SW_INDICATOR_REV);
+      break;
   }
+
+  return ret;
+}
+
+bool LogicalSwitchData::isEmpty() const
+{
+  return (func == 0);
 }
 
 CSFunctionFamily LogicalSwitchData::getFunctionFamily() const
@@ -774,10 +882,15 @@ void CustomFunctionData::clear()
   }
 }
 
-QString CustomFunctionData::funcToString() const
+bool CustomFunctionData::isEmpty() const
+{
+  return (swtch.type == SWITCH_TYPE_NONE);
+}
+
+QString CustomFunctionData::funcToString(const ModelData * model) const
 {
   if (func >= FuncOverrideCH1 && func <= FuncOverrideCH32)
-    return QObject::tr("Override %1").arg(RawSource(SOURCE_TYPE_CH, func).toString());
+    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)
@@ -821,7 +934,7 @@ QString CustomFunctionData::funcToString() const
   else if (func == FuncBackgroundMusicPause)
     return QObject::tr("Background Music Pause");
   else if (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast)
-    return QObject::tr("Adjust GV%1").arg(func-FuncAdjustGV1+1);
+    return QObject::tr("Adjust %1").arg(RawSource(SOURCE_TYPE_GVAR, func-FuncAdjustGV1).toString(model));
   else if (func == FuncSetFailsafeInternalModule)
     return QObject::tr("SetFailsafe Int. Module");
   else if (func == FuncSetFailsafeExternalModule)
@@ -842,7 +955,7 @@ QString CustomFunctionData::funcToString() const
 void CustomFunctionData::populateResetParams(const ModelData * model, QComboBox * b, unsigned int value = 0)
 {
   int val = 0;
-  Firmware * firmware = getCurrentFirmware();
+  Firmware * firmware = Firmware::getCurrentVariant();
   Board::Type board = firmware->getBoard();
 
   b->addItem(QObject::tr("Timer1"), val++);
@@ -996,6 +1109,11 @@ bool CurveData::isEmpty() const
   return true;
 }
 
+QString CurveData::nameToString(const int idx) const
+{
+  return getElementName(QCoreApplication::translate("Curve", "CV"), idx + 1, name);
+}
+
 QString LimitData::minToString() const
 {
   return QString::number((qreal)min/10);
@@ -1045,13 +1163,13 @@ bool GeneralSettings::switchSourceAllowedTaranis(int index) const
 
 bool GeneralSettings::isPotAvailable(int index) const
 {
-  if (index<0 || index>getCurrentFirmware()->getCapability(Pots)) return false;
+  if (index<0 || index>getBoardCapability(getCurrentBoard(), Board::Pots)) return false;
   return potConfig[index] != Board::POT_NONE;
 }
 
 bool GeneralSettings::isSliderAvailable(int index) const
 {
-  if (index<0 || index>getCurrentFirmware()->getCapability(Sliders)) return false;
+  if (index<0 || index>getBoardCapability(getCurrentBoard(), Board::Sliders)) return false;
   return sliderConfig[index] != Board::SLIDER_NONE;
 }
 
@@ -1060,19 +1178,40 @@ GeneralSettings::GeneralSettings()
   memset(this, 0, sizeof(GeneralSettings));
 
   contrast  = 25;
-  vBatWarn  = 90;
 
-  for (int i=0; i<CPN_MAX_STICKS+CPN_MAX_POTS; ++i) {
+  for (int i=0; i < CPN_MAX_ANALOGS; ++i) {
     calibMid[i]     = 0x200;
     calibSpanNeg[i] = 0x180;
     calibSpanPos[i] = 0x180;
   }
 
-  Firmware * firmware = getCurrentFirmware();
+  Firmware * firmware = Firmware::getCurrentVariant();
   Board::Type board = firmware->getBoard();
 
-  for (int i=0; i<firmware->getCapability(FactoryInstalledSwitches); i++) {
-    switchConfig[i] = getSwitchInfo(board, i).config;
+  // vBatWarn is voltage in 100mV, vBatMin is in 100mV but with -9V offset, vBatMax has a -12V offset
+  vBatWarn  = 90;
+  if (IS_TARANIS_X9E(board) || IS_HORUS_X12S(board)) {
+    // NI-MH 9.6V
+    vBatWarn = 87;
+    vBatMin = -5;   //8,5V
+    vBatMax = -5;   //11,5V
+  }
+  else if (IS_HORUS_X10(board)) {
+    // Lipo 2V
+    vBatWarn = 66;
+    vBatMin = -28; // 6.2V
+    vBatMax = -38;   // 8.2V
+  }
+  else if (IS_TARANIS(board)) {
+    // NI-MH 7.2V, X9D, X9D+ and X7
+    vBatWarn = 65;
+    vBatMin = -30; //6V
+    vBatMax = -40; //8V
+  }
+
+
+    for (int i=0; i<getBoardCapability(board, Board::FactoryInstalledSwitches); i++) {
+    switchConfig[i] = Boards::getSwitchInfo(board, i).config;
   }
 
   backlightMode = 3; // keys and sticks
@@ -1101,13 +1240,13 @@ GeneralSettings::GeneralSettings()
     potConfig[2] = Board::POT_WITHOUT_DETENT;
   }
 
-  if (IS_HORUS(board) || IS_TARANIS_X9E(board)) {
+  if (IS_HORUS_X12S(board) || IS_TARANIS_X9E(board)) {
     sliderConfig[0] = Board::SLIDER_WITH_DETENT;
     sliderConfig[1] = Board::SLIDER_WITH_DETENT;
     sliderConfig[2] = Board::SLIDER_WITH_DETENT;
     sliderConfig[3] = Board::SLIDER_WITH_DETENT;
   }
-  else if (IS_TARANIS(board) && !IS_TARANIS_X7(board)) {
+  else if (IS_TARANIS_X9(board) || IS_HORUS_X10(board)) {
     sliderConfig[0] = Board::SLIDER_WITH_DETENT;
     sliderConfig[1] = Board::SLIDER_WITH_DETENT;
   }
@@ -1116,27 +1255,27 @@ GeneralSettings::GeneralSettings()
     speakerVolume = 12;
   }
 
-  if (IS_TARANIS_X9E(board)) {
+  if (IS_HORUS(board) || IS_TARANIS_X9E(board) || IS_TARANIS_X7(board)) {
     strcpy(bluetoothName, "Taranis");
   }
 
-  templateSetup = g.profile[g.id()].channelOrder();
-  stickMode = g.profile[g.id()].defaultMode();
+  templateSetup = g.profile[g.sessionId()].channelOrder();
+  stickMode = g.profile[g.sessionId()].defaultMode();
 
-  QString t_calib = g.profile[g.id()].stickPotCalib();
-  int potsnum = getCurrentFirmware()->getCapability(Pots);
+  QString t_calib = g.profile[g.sessionId()].stickPotCalib();
+  int potsnum = getBoardCapability(getCurrentBoard(), Board::Pots);
   if (!t_calib.isEmpty()) {
-    QString t_trainercalib=g.profile[g.id()].trainerCalib();
-    int8_t t_txVoltageCalibration=(int8_t)g.profile[g.id()].txVoltageCalibration();
-    int8_t t_txCurrentCalibration=(int8_t)g.profile[g.id()].txCurrentCalibration();
-    int8_t t_PPM_Multiplier=(int8_t)g.profile[g.id()].ppmMultiplier();
-    uint8_t t_stickMode=(uint8_t)g.profile[g.id()].gsStickMode();
-    uint8_t t_vBatWarn=(uint8_t)g.profile[g.id()].vBatWarn();
-    QString t_DisplaySet=g.profile[g.id()].display();
-    QString t_BeeperSet=g.profile[g.id()].beeper();
-    QString t_HapticSet=g.profile[g.id()].haptic();
-    QString t_SpeakerSet=g.profile[g.id()].speaker();
-    QString t_CountrySet=g.profile[g.id()].countryCode();
+    QString t_trainercalib=g.profile[g.sessionId()].trainerCalib();
+    int8_t t_txVoltageCalibration=(int8_t)g.profile[g.sessionId()].txVoltageCalibration();
+    int8_t t_txCurrentCalibration=(int8_t)g.profile[g.sessionId()].txCurrentCalibration();
+    int8_t t_PPM_Multiplier=(int8_t)g.profile[g.sessionId()].ppmMultiplier();
+    uint8_t t_stickMode=(uint8_t)g.profile[g.sessionId()].gsStickMode();
+    uint8_t t_vBatWarn=(uint8_t)g.profile[g.sessionId()].vBatWarn();
+    QString t_DisplaySet=g.profile[g.sessionId()].display();
+    QString t_BeeperSet=g.profile[g.sessionId()].beeper();
+    QString t_HapticSet=g.profile[g.sessionId()].haptic();
+    QString t_SpeakerSet=g.profile[g.sessionId()].speaker();
+    QString t_CountrySet=g.profile[g.sessionId()].countryCode();
 
     if ((t_calib.length()==(CPN_MAX_STICKS+potsnum)*12) && (t_trainercalib.length()==16)) {
       QString Byte;
@@ -1296,8 +1435,6 @@ void FrSkyData::clear()
   mAhPersistent = 0;
   storedMah = 0;
   fasOffset = 0;
-  rssiAlarms[0].clear(2, 45);
-  rssiAlarms[1].clear(3, 42);
   for (int i=0; i<4; i++)
     screens[i].clear();
   varioSource = 2/*VARIO*/;
@@ -1422,14 +1559,10 @@ void ModelData::clearMixes()
     mixData[i].clear();
 }
 
-RadioData::RadioData()
-{
-  models.resize(getCurrentFirmware()->getCapability(Models));
-}
-
 void ModelData::clear()
 {
   memset(this, 0, sizeof(ModelData));
+  modelIndex = -1;  // an invalid index, this is managed by the TreeView data model
   moduleData[0].channelsCount = 8;
   moduleData[1].channelsStart = 0;
   moduleData[1].channelsCount = 8;
@@ -1452,15 +1585,18 @@ void ModelData::clear()
   for (int i=0; i<CPN_MAX_FLIGHT_MODES; i++) {
     flightModeData[i].clear(i);
   }
+  for (int i=0; i<CPN_MAX_GVARS; i++) {
+    gvarData[i].clear();
+  }
   clearInputs();
   clearMixes();
   for (int i=0; i<CPN_MAX_CHNOUT; i++)
     limitData[i].clear();
   for (int i=0; i<CPN_MAX_STICKS; i++)
     expoData[i].clear();
-  for (int i=0; i<CPN_MAX_CSW; i++)
+  for (int i=0; i<CPN_MAX_LOGICAL_SWITCHES; i++)
     logicalSw[i].clear();
-  for (int i=0; i<CPN_MAX_CUSTOM_FUNCTIONS; i++)
+  for (int i=0; i<CPN_MAX_SPECIAL_FUNCTIONS; i++)
     customFn[i].clear();
   for (int i=0; i<CPN_MAX_CURVES; i++)
     curves[i].clear(5);
@@ -1468,6 +1604,7 @@ void ModelData::clear()
     timers[i].clear();
   swashRingData.clear();
   frsky.clear();
+  rssiAlarms.clear();
   for (int i=0; i<CPN_MAX_SENSORS; i++)
     sensorData[i].clear();
 
@@ -1584,8 +1721,8 @@ bool ModelData::isGVarLinked(int phaseIdx, int gvarIdx)
 int ModelData::getGVarFieldValue(int phaseIdx, int gvarIdx)
 {
   int idx = flightModeData[phaseIdx].gvars[gvarIdx];
-  for (int i=0; idx>1024 && i<CPN_MAX_FLIGHT_MODES; i++) {
-    int nextPhase = idx - 1025;
+  for (int i=0; idx>GVAR_MAX_VALUE && i<CPN_MAX_FLIGHT_MODES; i++) {
+    int nextPhase = idx - GVAR_MAX_VALUE - 1;
     if (nextPhase >= phaseIdx) nextPhase += 1;
     phaseIdx = nextPhase;
     idx = flightModeData[phaseIdx].gvars[gvarIdx];
@@ -1654,6 +1791,29 @@ int ModelData::getChannelsMax(bool forceExtendedLimits) const
     return 100;
 }
 
+bool ModelData::isAvailable(const RawSwitch & swtch) const
+{
+  unsigned index = abs(swtch.index) - 1;
+
+  if (swtch.type == SWITCH_TYPE_VIRTUAL) {
+    return logicalSw[index].func != LS_FN_OFF;
+  }
+  else if (swtch.type == SWITCH_TYPE_FLIGHT_MODE) {
+    return index == 0 || flightModeData[index].swtch.type != SWITCH_TYPE_NONE;
+  }
+  else if (swtch.type == SWITCH_TYPE_SENSOR) {
+    return strlen(sensorData[index].label) > 0;
+  }
+  else {
+    return true;
+  }
+}
+
+float ModelData::getGVarFieldValuePrec(int phaseIdx, int gvarIdx)
+{
+  return getGVarFieldValue(phaseIdx, gvarIdx) * gvarData[gvarIdx].multiplierGet();
+}
+
 QList<EEPROMInterface *> eepromInterfaces;
 
 void unregisterEEpromInterfaces()
@@ -1665,10 +1825,6 @@ void unregisterEEpromInterfaces()
   OpenTxEepromCleanup();
 }
 
-QList<Firmware *> firmwares;
-Firmware * default_firmware_variant;
-Firmware * current_firmware_variant;
-
 void ShowEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound)
 {
   std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
@@ -1709,7 +1865,7 @@ void ShowEepromWarnings(QWidget *parent, const QString &title, unsigned long err
   std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
   QStringList warningsList;
   if (errors.test(WARNING_WRONG_FIRMWARE)) { warningsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"); }
-  if (errors.test(OLD_VERSION)) { warningsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your eeprom is from an old version of OpenTX, upgrading!\n You should 'save as' to keep the old file as a backup."); }
+  if (errors.test(OLD_VERSION)) { warningsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your eeprom is from an old version of OpenTX, upgrading!\n To keep your original file as a backup, please choose File -> Save As specifying a different name."); }
 
   QMessageBox msgBox(parent);
   msgBox.setWindowTitle(title);
@@ -1720,75 +1876,22 @@ void ShowEepromWarnings(QWidget *parent, const QString &title, unsigned long err
   msgBox.exec();
 }
 
-QString getBoardName(Board::Type board)
-{
-  switch (board) {
-    case Board::BOARD_STOCK:
-      return "9X";
-    case Board::BOARD_M128:
-      return "9X128";
-    case Board::BOARD_GRUVIN9X:
-      return "Gruvin9x";
-    case Board::BOARD_MEGA2560:
-      return "MEGA2560";
-    case Board::BOARD_TARANIS_X7:
-      return "Taranis X7";
-    case Board::BOARD_TARANIS_X9D:
-      return "Taranis X9D";
-    case Board::BOARD_TARANIS_X9DP:
-      return "Taranis X9D+";
-    case Board::BOARD_TARANIS_X9E:
-      return "Taranis X9E";
-    case Board::BOARD_SKY9X:
-      return "Sky9x";
-    case Board::BOARD_9XRPRO:
-      return "9XR-PRO";
-    case Board::BOARD_AR9X:
-      return "AR9X";
-    case Board::BOARD_HORUS:
-      return "Horus";
-    default:
-      return "Unknown";
-  }
-}
+// static
+QVector<Firmware *> Firmware::registeredFirmwares;
+Firmware * Firmware::defaultVariant = NULL;
+Firmware * Firmware::currentVariant = NULL;
 
-const int Firmware::getFlashSize()
+// static
+Firmware * Firmware::getFirmwareForId(const QString & id)
 {
-  switch (board) {
-    case Board::BOARD_STOCK:
-      return FSIZE_STOCK;
-    case Board::BOARD_M128:
-      return FSIZE_M128;
-    case Board::BOARD_MEGA2560:
-    case Board::BOARD_GRUVIN9X:
-      return FSIZE_GRUVIN9X;
-    case Board::BOARD_SKY9X:
-      return FSIZE_SKY9X;
-    case Board::BOARD_9XRPRO:
-    case Board::BOARD_AR9X:
-      return FSIZE_9XRPRO;
-    case Board::BOARD_TARANIS_X9D:
-    case Board::BOARD_TARANIS_X9DP:
-    case Board::BOARD_TARANIS_X9E:
-    case Board::BOARD_FLAMENCO:
-      return FSIZE_TARANIS;
-    case Board::BOARD_HORUS:
-      return FSIZE_HORUS;
-    default:
-      return 0;
-  }
-}
-
-Firmware * getFirmware(const QString & id)
-{
-  foreach(Firmware * firmware, firmwares) {
+  foreach(Firmware * firmware, registeredFirmwares) {
     Firmware * result = firmware->getFirmwareVariant(id);
     if (result) {
       return result;
     }
   }
 
-  return default_firmware_variant;
+  return defaultVariant;
 }
 
 void Firmware::addOption(const char *option, QString tooltip, uint32_t variant)
@@ -1833,56 +1936,6 @@ void Firmware::addOptions(Option options[])
   this->opts.push_back(opts);
 }
 
-SimulatorInterface * getCurrentSimulator()
-{
-  QString firmwareId = getCurrentFirmware()->getId();
-  SimulatorFactory * factory = getSimulatorFactory(firmwareId);
-  if (factory)
-    return factory->create();
-  else
-    return NULL;
-}
-
-unsigned int getNumSubtypes(MultiModuleRFProtocols type)
-{
-  switch (type) {
-    case MM_RF_PROTO_HISKY:
-    case MM_RF_PROTO_SYMAX:
-    case MM_RF_PROTO_KN:
-    case MM_RF_PROTO_SLT:
-    case MM_RF_PROTO_FY326:
-    case MM_RF_PROTO_BAYANG:
-    case MM_RF_PROTO_V2X2:
-      return 2;
-
-    case MM_RF_PROTO_Q2X2:
-    case MM_RF_PROTO_CG023:
-      return 3;
-
-    case MM_RF_PROTO_FRSKY:
-    case MM_RF_PROTO_DSM2:
-    case MM_RF_PROTO_MT99XX:
-    case MM_RF_PROTO_HONTAI:
-    case MM_RF_PROTO_AFHDS2A:
-    case MM_RF_PROTO_Q303:
-      return 4;
-
-    case MM_RF_PROTO_FLYSKY:
-    case MM_RF_PROTO_MJXQ:
-    case MM_RF_PROTO_YD717:
-      return 5;
-
-    case MM_RF_PROTO_WK_2X01:
-      return 6;
-
-    case MM_RF_PROTO_CX10:
-      return 8;
-    default:
-      return 1;
-  }
-
-}
-
 void FlightModeData::clear(const int phase)
 {
   memset(this, 0, sizeof(FlightModeData));
@@ -1895,3 +1948,67 @@ void FlightModeData::clear(const int phase)
     }
   }
 }
+
+QString GVarData::unitToString() const
+{
+  switch (unit) {
+    case GVAR_UNIT_NUMBER:
+      return QObject::tr("");
+    case GVAR_UNIT_PERCENT:
+      return QObject::tr("%");
+    default:
+      return QObject::tr("?");  //  highlight unknown value
+  }
+}
+
+QString GVarData::precToString() const
+{
+  switch (prec) {
+    case GVAR_PREC_MUL10:
+      return QObject::tr("0._");
+    case GVAR_PREC_MUL1:
+      return QObject::tr("0.0");
+    default:
+      return QObject::tr("?.?");  //  highlight unknown value
+  }
+}
+
+int GVarData::multiplierSet()
+{
+  return (prec == 0 ? 1 : 10);
+}
+
+float GVarData::multiplierGet() const
+{
+  return (prec == 0 ? 1 : 0.1);
+}
+
+void GVarData::setMin(float val)
+{
+  min = (val * multiplierSet()) - GVAR_MIN_VALUE;
+}
+
+void GVarData::setMax(float val)
+{
+  max = GVAR_MAX_VALUE - (val * multiplierSet());
+}
+
+int GVarData::getMin() const
+{
+  return GVAR_MIN_VALUE + min;
+}
+
+int GVarData::getMax() const
+{
+  return GVAR_MAX_VALUE - max;
+}
+
+float GVarData::getMinPrec() const
+{
+  return getMin() * multiplierGet();
+}
+
+float GVarData::getMaxPrec() const
+{
+  return getMax() * multiplierGet();
+}

companion/src/eeprominterface.h

@@ -21,6 +21,7 @@
 #ifndef _EEPROMINTERFACE_H_
 #define _EEPROMINTERFACE_H_
 
+#include "macros.h"
 #include "radiodata.h"
 #include "../../radio/src/definitions.h"
 #include "simulatorinterface.h"
@@ -29,8 +30,6 @@
 #include <iostream>
 #include <QDebug>
 
-QString RotaryEncoderString(int index);
-
 const uint8_t modn12x3[4][4]= {
   {1, 2, 3, 4},
   {1, 3, 2, 4},
@@ -51,12 +50,6 @@ enum Capability {
   VoicesMaxLength,
   MultiLangVoice,
   ModelImage,
-  Pots,
-  Sliders,
-  Switches,
-  FactoryInstalledSwitches,
-  SwitchesPositions,
-  NumTrimSwitches,
   CustomFunctions,
   SafetyChannelCustomFunction,
   LogicalSwitches,
@@ -67,7 +60,8 @@ enum Capability {
   Outputs,
   ChannelsName,
   ExtraInputs,
-  ExtendedTrims,
+  TrimsRange,
+  ExtendedTrimsRange,
   NumCurves,
   NumCurvePoints,
   OffsetWeight,
@@ -75,6 +69,8 @@ enum Capability {
   SoundMod,
   SoundPitch,
   MaxVolume,
+  MaxContrast,
+  MinContrast,
   Haptic,
   HasBeeper,
   ModelTrainerEnable,
@@ -144,7 +140,6 @@ enum Capability {
   MavlinkTelemetry,
   HasInputDiff,
   HasMixerExpo,
-  MixersMonitor,
   HasBatMeterRange,
   DangerousFunctions,
   HasModelCategories
@@ -184,8 +179,6 @@ class EEPROMInterface
 
 };
 
-extern std::list<QString> EEPROMWarnings;
-
 /* EEPROM string conversion functions */
 void setEEPROMString(char *dst, const char *src, int size);
 void getEEPROMString(char *dst, const char *src, int size);
@@ -193,9 +186,6 @@ void getEEPROMString(char *dst, const char *src, int size);
 float ValToTim(int value);
 int TimToVal(float value);
 
-QString getSignedStr(int value);
-QString getGVarString(int16_t val, bool sign=false);
-
 inline int applyStickMode(int stick, unsigned int mode)
 {
   if (mode == 0 || mode > 4) {
@@ -203,14 +193,8 @@ inline int applyStickMode(int stick, unsigned int mode)
     return stick;
   }
 
-  const unsigned int stickModes[]= {
-      1, 2, 3, 4,
-      1, 3, 2, 4,
-      4, 2, 3, 1,
-      4, 3, 2, 1 };
-
   if (stick >= 1 && stick <= 4)
-    return stickModes[(mode-1)*4 + stick - 1];
+    return modn12x3[mode-1][stick-1];
   else
     return stick;
 }
@@ -283,7 +267,7 @@ class Firmware {
     {
       return base ? base : this;
     }
-    
+
     virtual Firmware * getFirmwareVariant(const QString & id) { return NULL; }
 
     unsigned int getVariantNumber();
@@ -306,12 +290,12 @@ class Firmware {
     {
       return board;
     }
-    
+
     void setEEpromInterface(EEPROMInterface * eeprom)
     {
       eepromInterface = eeprom;
     }
-    
+
     EEPROMInterface * getEEpromInterface()
     {
       return eepromInterface;
@@ -337,11 +321,41 @@ class Firmware {
 
     const int getFlashSize();
 
+    static Firmware * getFirmwareForId(const QString & id);
+
+    static QVector<Firmware *> getRegisteredFirmwares()
+    {
+      return registeredFirmwares;
+    }
+    static void addRegisteredFirmware(Firmware * fw)
+    {
+      registeredFirmwares.append(fw);
+    }
+
+    static Firmware * getDefaultVariant()
+    {
+      return defaultVariant;
+    }
+    static void setDefaultVariant(Firmware * value)
+    {
+      defaultVariant = value;
+    }
+
+    static Firmware * getCurrentVariant()
+    {
+      return currentVariant;
+    }
+    static void setCurrentVariant(Firmware * value)
+    {
+      currentVariant = value;
+    }
+
   public:
     QList<const char *> languages;
     QList<const char *> ttslanguages;
     QList< QList<Option> > opts;
 
+
   protected:
     QString id;
     QString name;
@@ -350,32 +364,28 @@ class Firmware {
     Firmware * base;
     EEPROMInterface * eepromInterface;
 
+    static QVector<Firmware *> registeredFirmwares;
+    static Firmware * defaultVariant;
+    static Firmware * currentVariant;
+
   private:
     Firmware();
 
 };
 
-extern QList<Firmware *> firmwares;
-extern Firmware * default_firmware_variant;
-extern Firmware * current_firmware_variant;
-
-Firmware * getFirmware(const QString & id);
-
 inline Firmware * getCurrentFirmware()
 {
-  return current_firmware_variant;
+  return Firmware::getCurrentVariant();
 }
 
-SimulatorInterface * getCurrentSimulator();
-
 inline EEPROMInterface * getCurrentEEpromInterface()
 {
-  return getCurrentFirmware()->getEEpromInterface();
+  return Firmware::getCurrentVariant()->getEEpromInterface();
 }
 
 inline Board::Type getCurrentBoard()
 {
-  return getCurrentFirmware()->getBoard();
+  return Firmware::getCurrentVariant()->getBoard();
 }
 
 inline int divRoundClosest(const int n, const int d)
@@ -383,7 +393,12 @@ inline int divRoundClosest(const int n, const int d)
   return ((n < 0) ^ (d < 0)) ? ((n - d/2)/d) : ((n + d/2)/d);
 }
 
-#define CHECK_IN_ARRAY(T, index) ((unsigned int)index < (unsigned int)(sizeof(T)/sizeof(T[0])) ? T[(unsigned int)index] : "???")
+inline int calcRESXto100(int x)
+{
+  return divRoundClosest(x*100, 1024);
+}
+
+#define CHECK_IN_ARRAY(T, index) ((unsigned int)index < DIM(T) ? T[(unsigned int)index] : "???")
 
 extern QList<EEPROMInterface *> eepromInterfaces;
 

companion/src/firmwares/er9x/er9xeeprom.cpp

@@ -95,7 +95,6 @@ Er9xGeneral::operator GeneralSettings ()
 
   result.view = std::min((uint8_t)4, view);
   result.disableThrottleWarning = disableThrottleWarning;
-  result.switchWarning = disableSwitchWarning ? 0 : -1;
   result.disableMemoryWarning = disableMemoryWarning;
 
   switch (beeperVal) {

companion/src/firmwares/er9x/er9xinterface.cpp

@@ -82,7 +82,9 @@ inline void applyStickModeToModel(Er9xModelData & model, unsigned int mode)
 #if 0
 unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  std::cout << "trying er9x xml import... ";
+  QDebug dbg = qDebug();
+  dbg.setAutoInsertSpaces(false);
+  dbg << "trying er9x xml import... ";
 
   std::bitset<NUM_ERRORS> errors;
 
@@ -94,7 +96,7 @@ unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
   }
   else {
     radioData.generalSettings=er9xGeneral;
-    std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
+    dbg << "version " << (unsigned int)er9xGeneral.myVers << " ";
   }
   for (int i=0; i<getCapability(Models); i++) {
     Er9xModelData er9xModel;
@@ -104,7 +106,7 @@ unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
       radioData.models[i] = er9xModel;
     }
   }
-  std::cout << "ok\n";
+  dbg << "ok";
   errors.set(ALL_OK);
   return errors.to_ulong();
 }
@@ -112,36 +114,38 @@ unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 
 unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
-  std::cout << "trying er9x import... ";
+  QDebug dbg = qDebug();
+  dbg.setAutoInsertSpaces(false);
+  dbg << "trying er9x import... ";
 
   std::bitset<NUM_ERRORS> errors;
 
-  if (size != getEEpromSize(Board::BOARD_STOCK)) {
-    std::cout << "wrong size\n";
+  if (size != Boards::getEEpromSize(Board::BOARD_STOCK)) {
+    dbg << "wrong size";
     errors.set(WRONG_SIZE);
     return errors.to_ulong();
   }
 
   if (!efile->EeFsOpen((uint8_t *)eeprom, size, Board::BOARD_STOCK)) {
-    std::cout << "wrong file system\n";
+    dbg << "wrong file system";
     errors.set(WRONG_FILE_SYSTEM);
     return errors.to_ulong();
   }
-    
+
   efile->openRd(FILE_GENERAL);
   Er9xGeneral er9xGeneral;
 
   if (efile->readRlc1((uint8_t*)&er9xGeneral, 1) != 1) {
-    std::cout << "no\n";
+    dbg << "no";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
   }
 
-  std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
+  dbg << "version " << (unsigned int)er9xGeneral.myVers << " ";
 
   switch(er9xGeneral.myVers) {
     case 3:
-      std::cout << "(old gruvin9x) ";
+      dbg << "(old gruvin9x) ";
     case 4:
 //    case 5:
     case 6:
@@ -151,20 +155,20 @@ unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, i
     case 10:
       break;
     default:
-      std::cout << "not er9x\n";
+      dbg << "not er9x";
       errors.set(NOT_ER9X);
       return errors.to_ulong();
   }
 
   efile->openRd(FILE_GENERAL);
   if (!efile->readRlc1((uint8_t*)&er9xGeneral, sizeof(Er9xGeneral))) {
-    std::cout << "ko\n";
+    dbg << "ko";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
 
   }
   radioData.generalSettings = er9xGeneral;
-  
+
   for (int i=0; i<getCapability(Models); i++) {
     Er9xModelData er9xModel;
     efile->openRd(FILE_MODEL(i));
@@ -174,10 +178,10 @@ unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, i
     else {
       applyStickModeToModel(er9xModel, radioData.generalSettings.stickMode+1);
       radioData.models[i] = er9xModel;
-    } 
+    }
   }
 
-  std::cout << "ok\n";
+  dbg << "ok";
   errors.set(ALL_OK);
   return errors.to_ulong();
 }
@@ -329,4 +333,4 @@ int Er9xInterface::getCapability(Capability capability)
     default:
       return 0;
   }
-}
+}

companion/src/firmwares/ersky9x/ersky9xeeprom.cpp

@@ -120,7 +120,6 @@ Ersky9xGeneral::operator GeneralSettings ()
   result.trainer = trainer;
   result.view = std::min((uint8_t)4, view);
   result.disableThrottleWarning = disableThrottleWarning;
-  result.switchWarning = disableSwitchWarning ? 0 : -1;
   result.disableMemoryWarning = disableMemoryWarning;
 
   switch (beeperVal) {

companion/src/firmwares/ersky9x/ersky9xinterface.cpp

@@ -116,7 +116,9 @@ inline void applyStickModeToModel(Ersky9xModelData_v11 & model, unsigned int mod
 #if 0
 unsigned long Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  std::cout << "trying ersky9x xml import... ";
+  QDebug dbg = qDebug();
+  dbg.setAutoInsertSpaces(false);
+  dbg << "trying ersky9x xml import... ";
 
   std::bitset<NUM_ERRORS> errors;
 
@@ -128,25 +130,25 @@ unsigned long Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
   }
   else {
     radioData.generalSettings=ersky9xGeneral;
-    std::cout << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
+    dbg << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
   }
   for(int i=0; i<getCapability(Models); i++) {
     if (ersky9xGeneral.myVers == 10) {
       if (!loadModelDataXML<Ersky9xModelData_v10>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
-        std::cout << "ko\n";
+        dbg << "ko";
         errors.set(UNKNOWN_ERROR);
         return errors.to_ulong();
       }
     }
     else {
       if (!loadModelDataXML<Ersky9xModelData_v11>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
-        std::cout << "ko\n";
+        dbg << "ko";
         errors.set(UNKNOWN_ERROR);
         return errors.to_ulong();
       }
     }
   }
-  std::cout << "ok\n";
+  dbg << "ok";
   errors.set(ALL_OK);
   return errors.to_ulong();
 }
@@ -154,32 +156,34 @@ unsigned long Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 
 unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
-  std::cout << "trying ersky9x import... ";
+  QDebug dbg = qDebug();
+  dbg.setAutoInsertSpaces(false);
+  dbg << "trying ersky9x import... ";
 
   std::bitset<NUM_ERRORS> errors;
 
-  if (size != EESIZE_SKY9X) {
-    std::cout << "wrong size\n";
+  if (size != Boards::getEEpromSize(Board::BOARD_SKY9X)) {
+    dbg << "wrong size";
     errors.set(WRONG_SIZE);
     return errors.to_ulong();
   }
 
   if (!efile->EeFsOpen((uint8_t *)eeprom, size, Board::BOARD_SKY9X)) {
-    std::cout << "wrong file system\n";
+    dbg << "wrong file system";
     errors.set(WRONG_FILE_SYSTEM);
     return errors.to_ulong();
   }
-    
+
   efile->openRd(FILE_GENERAL);
   Ersky9xGeneral ersky9xGeneral;
 
   if (efile->readRlc2((uint8_t*)&ersky9xGeneral, 1) != 1) {
-    std::cout << "no\n";
+    dbg << "no";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
   }
 
-  std::cout << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
+  dbg << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
 
   switch(ersky9xGeneral.myVers) {
     case 10:
@@ -187,24 +191,24 @@ unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom
     case 11:
       break;
     default:
-      std::cout << "not ersky9x\n";
+      dbg << "not ersky9x";
       errors.set(NOT_ERSKY9X);
       return errors.to_ulong();
   }
   efile->openRd(FILE_GENERAL);
   if (!efile->readRlc2((uint8_t*)&ersky9xGeneral, sizeof(Ersky9xGeneral))) {
-    std::cout << "ko\n";
+    dbg << "ko";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
   }
   radioData.generalSettings = ersky9xGeneral;
-  
+
   for (int i=0; i<getCapability(Models); i++) {
     uint8_t buffer[4096];
     uint size;
     memset(buffer,0,sizeof(buffer));
     efile->openRd(FILE_MODEL(i));
-    
+
 //    if (!efile->readRlc2((uint8_t*)&ersky9xModel, sizeof(Ersky9xModelData))) {
     size = efile->readRlc2(buffer, 4096);
     if (!size) {
@@ -222,10 +226,10 @@ unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom
         applyStickModeToModel(ersky9xModel, radioData.generalSettings.stickMode+1);
         radioData.models[i] = ersky9xModel;
       }
-    } 
+    }
   }
 
-  std::cout << "ok\n";
+  dbg << "ok";
   errors.set(ALL_OK);
   return errors.to_ulong();
 }
@@ -382,4 +386,4 @@ int Ersky9xInterface::getCapability(Capability capability)
     default:
       return 0;
   }
-}
+}

companion/src/firmwares/opentx/opentxeeprom.h

@@ -40,19 +40,30 @@ class OpenTxGeneralData: public TransformedField {
   public:
     OpenTxGeneralData(GeneralSettings & generalData, Board::Type board, unsigned int version, unsigned int variant=0);
 
-    virtual const char * getName() { return internalField.getName(); }
+    virtual const QString & getName() { return internalField.getName(); }
+
+    QStringList errors()
+    {
+      return _errors;
+    }
 
   protected:
     virtual void beforeExport();
     virtual void afterImport();
 
+    virtual void setError(const QString & error)
+    {
+      qWarning() << error;
+      _errors << error;
+    }
+
     StructField internalField;
     GeneralSettings & generalData;
     Board::Type board;
     unsigned int version;
     int inputsCount;
     unsigned int chkSum;
-    // unsigned int potsType[4];
+    QStringList _errors;
 };
 
 class ProtocolsConversionTable: public ConversionTable
@@ -87,9 +98,11 @@ class ProtocolsConversionTable: public ConversionTable
         addConversion(PULSES_DSM2, val++);
         addConversion(PULSES_DSMX, val++);
       }
-      if (IS_HORUS_OR_TARANIS(board)) {
-    	  addConversion(PULSES_CROSSFIRE, val++);
+      if (IS_ARM(board)) {
+        addConversion(PULSES_CROSSFIRE, val++);
         addConversion(PULSES_MULTIMODULE, val++);
+        addConversion(PULSES_PXX_R9M, val++);
+        addConversion(PULSES_SBUS, val++);
       }
     }
 };
@@ -109,23 +122,33 @@ class OpenTxModelData: public TransformedField {
   public:
     OpenTxModelData(ModelData & modelData, Board::Type board, unsigned int version, unsigned int variant);
 
-    virtual const char * getName() { return internalField.getName(); }
+    virtual const QString & getName() { return internalField.getName(); }
+
+    QStringList errors()
+    {
+      return _errors;
+    }
 
   protected:
     virtual void beforeExport();
     virtual void afterImport();
 
+    virtual void setError(const QString & error)
+    {
+      qWarning() << error;
+      _errors << error;
+    }
+
     StructField internalField;
     ModelData & modelData;
     Board::Type board;
     unsigned int version;
     unsigned int variant;
-
-  private:
     char name[256];
     int subprotocols[CPN_MAX_MODULES+1/*trainer*/];
     ProtocolsConversionTable protocolsConversionTable;
     ChannelsConversionTable channelsConversionTable;
+    QStringList _errors;
 };
 
 void OpenTxEepromCleanup(void);

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -26,11 +26,15 @@
 #include <QMessageBox>
 #include <QTime>
 #include <QUrl>
+#include <companion/src/storage/storage.h>
 
 using namespace Board;
 
-#define OPENTX_FIRMWARE_DOWNLOADS        "http://downloads-22.open-tx.org/firmware"
-#define OPENTX_NIGHT_FIRMWARE_DOWNLOADS  "http://downloads-22.open-tx.org/nightly/firmware"
+const char * const OPENTX_FIRMWARE_DOWNLOAD_URL[] = {
+  "https://downloads.open-tx.org/2.2/release/firmware",
+  "https://downloads.open-tx.org/2.2/rc/firmware",
+  "https://downloads.open-tx.org/2.2/nightlies/firmware"
+};
 
 #define FILE_TYP_GENERAL 1
 #define FILE_TYP_MODEL   2
@@ -86,36 +90,15 @@ const char * OpenTxEepromInterface::getName()
       return "OpenTX for ar9x board / 9X";
     case BOARD_FLAMENCO:
       return "OpenTX for Flamenco experimental";
-    case BOARD_HORUS:
+    case BOARD_X12S:
       return "OpenTX for FrSky Horus";
+    case BOARD_X10:
+      return "OpenTX for FrSky X10";
     default:
       return "OpenTX for an unknown board";
   }
 }
 
-uint32_t OpenTxEepromInterface::getFourCC()
-{
-  switch (board) {
-    case BOARD_HORUS:
-      return 0x3478746F;
-    case BOARD_TARANIS_X7:
-      return 0x3678746F;
-    case BOARD_TARANIS_X9E:
-      return 0x3578746F;
-    case BOARD_TARANIS_X9D:
-    case BOARD_TARANIS_X9DP:
-      return 0x3378746F;
-    case BOARD_SKY9X:
-    case BOARD_AR9X:
-      return 0x3278746F;
-    case BOARD_MEGA2560:
-    case BOARD_GRUVIN9X:
-      return 0x3178746F;
-    default:
-      return 0;
-  }
-}
-
 bool OpenTxEepromInterface::loadRadioSettingsFromRLE(GeneralSettings & settings, RleFile * rleFile, uint8_t version)
 {
   QByteArray data(sizeof(settings), 0); // GeneralSettings should be always bigger than the EEPROM struct
@@ -127,7 +110,7 @@ bool OpenTxEepromInterface::loadRadioSettingsFromRLE(GeneralSettings & settings,
     return checkVariant(settings.version, settings.variant);
   }
   else {
-    std::cout << " error when loading general settings";
+    qWarning() << " error when loading general settings";
     return false;
   }
 }
@@ -160,7 +143,7 @@ bool OpenTxEepromInterface::saveToByteArray(const T & src, QByteArray & data, ui
   // manager.Dump();
   manager.Export(raw);
   data.resize(8);
-  *((uint32_t*)&data.data()[0]) = getFourCC();
+  *((uint32_t*)&data.data()[0]) = StorageFormat::getFourCC(board);
   data[4] = version;
   data[5] = 'M';
   *((uint16_t*)&data.data()[6]) = raw.size();
@@ -183,12 +166,12 @@ template <class T, class M>
 bool OpenTxEepromInterface::loadFromByteArray(T & dest, const QByteArray & data)
 {
   uint32_t fourcc = *((uint32_t*)&data.data()[0]);
-  if (getFourCC() != fourcc) {
+  if (StorageFormat::getFourCC(board) != fourcc) {
     if (IS_HORUS(board) && fourcc == 0x3178396F) {
-      qDebug() << QString().sprintf("%s: Deprecated fourcc used %x vs %x", getName(), fourcc, getFourCC());
+      qDebug() << QString().sprintf("%s: Deprecated fourcc used %x vs %x", getName(), fourcc, StorageFormat::getFourCC(board));
     }
     else {
-      qDebug() << QString().sprintf("%s: Wrong fourcc %x vs %x", getName(), fourcc, getFourCC());
+      qDebug() << QString().sprintf("%s: Wrong fourcc %x vs %x", getName(), fourcc, StorageFormat::getFourCC(board));
       return false;
     }
   }
@@ -198,36 +181,15 @@ bool OpenTxEepromInterface::loadFromByteArray(T & dest, const QByteArray & data)
   return loadFromByteArray<T, M>(dest, raw, version);
 }
 
-template<class T>
-bool
-OpenTxEepromInterface::saveRadioSettings(GeneralSettings &settings, Board::Type board, uint8_t version, uint32_t variant)
-{
-  T open9xSettings(settings, board, version, variant);
-  // open9xSettings.Dump();
-  QByteArray eeprom;
-  open9xSettings.Export(eeprom);
-  int sz = efile->writeRlc2(FILE_GENERAL, FILE_TYP_GENERAL, (const uint8_t *) eeprom.constData(), eeprom.size());
-  return (sz == eeprom.size());
-}
-
-template<class T>
-bool OpenTxEepromInterface::saveModel(unsigned int index, ModelData &model, uint8_t version, uint32_t variant)
-{
-  T open9xModel(model, board, version, variant);
-  // open9xModel.Dump();
-  QByteArray eeprom;
-  open9xModel.Export(eeprom);
-  int sz = efile->writeRlc2(FILE_MODEL(index), FILE_TYP_MODEL, (const uint8_t *) eeprom.constData(), eeprom.size());
-  return (sz == eeprom.size());
-}
-
 unsigned long OpenTxEepromInterface::load(RadioData &radioData, const uint8_t * eeprom, int size)
 {
-  std::cout << "trying " << getName() << " import...";
+  QDebug dbg = qDebug();
+  dbg.setAutoInsertSpaces(false);
+  dbg << "trying " << getName() << " import...";
 
   std::bitset<NUM_ERRORS> errors;
 
-  if (size != getEEpromSize(board)) {
+  if (size != Boards::getEEpromSize(board)) {
     if (size == 4096) {
       int notnull = false;
       for (int i = 2048; i < 4096; i++) {
@@ -236,7 +198,7 @@ unsigned long OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *
         }
       }
       if (notnull) {
-        std::cout << " wrong size (" << size << ")\n";
+        dbg << " wrong size (" << size << ")";
         errors.set(WRONG_SIZE);
         return errors.to_ulong();
       }
@@ -247,14 +209,14 @@ unsigned long OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *
       }
     }
     else {
-      std::cout << " wrong size (" << size << "/" << getEEpromSize(board) << ")\n";
+      dbg << " wrong size (" << size << "/" << Boards::getEEpromSize(board) << ")";
       errors.set(WRONG_SIZE);
       return errors.to_ulong();
     }
   }
 
   if (!efile->EeFsOpen((uint8_t *) eeprom, size, board)) {
-    std::cout << " wrong file system\n";
+    dbg << " wrong file system";
     errors.set(WRONG_FILE_SYSTEM);
     return errors.to_ulong();
   }
@@ -263,37 +225,38 @@ unsigned long OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *
 
   uint8_t version;
   if (efile->readRlc2(&version, 1) != 1) {
-    std::cout << " no\n";
+    dbg << " no";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
   }
 
-  std::cout << " version " << (unsigned int) version;
+  dbg << " version " << (unsigned int) version;
 
   EepromLoadErrors version_error = checkVersion(version);
   if (version_error == OLD_VERSION) {
     errors.set(version_error);
     errors.set(HAS_WARNINGS);
+    ShowEepromWarnings(NULL, QObject::tr("Warning"), errors.to_ulong());
   }
   else if (version_error == NOT_OPENTX) {
-    std::cout << " not open9x\n";
+    dbg << " not open9x";
     errors.set(version_error);
     return errors.to_ulong();
   }
 
   if (!loadRadioSettingsFromRLE(radioData.generalSettings, efile, version)) {
-    std::cout << " ko\n";
+    dbg << " ko";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
   }
 
-  std::cout << " variant " << radioData.generalSettings.variant;
+  dbg << " variant " << radioData.generalSettings.variant;
   if (getCurrentFirmware()->getCapability(Models) == 0) {
     radioData.models.resize(firmware->getCapability(Models));
   }
   for (int i = 0; i < firmware->getCapability(Models); i++) {
-    if (!loadModelFromRLE(radioData.models[i], efile, i, version, radioData.generalSettings.variant)) {
-      std::cout << " ko\n";
+    if (i < (int)radioData.models.size() && !loadModelFromRLE(radioData.models[i], efile, i, version, radioData.generalSettings.variant)) {
+      dbg << " ko";
       errors.set(UNKNOWN_ERROR);
       if (getCurrentFirmware()->getCapability(Models) == 0) {
         radioData.models.resize(i);
@@ -301,8 +264,7 @@ unsigned long OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *
       return errors.to_ulong();
     }
   }
-
-  std::cout << " ok\n";
+  dbg << " ok";
   errors.set(ALL_OK);
   return errors.to_ulong();
 }
@@ -321,15 +283,36 @@ uint8_t OpenTxEepromInterface::getLastDataVersion(Board::Type board)
   }
 }
 
+void OpenTxEepromInterface::showErrors(const QString & title, const QStringList & errors)
+{
+  QString msg;
+  if (errors.empty()) {
+    msg = QObject::tr("Unknown error");
+  }
+  else {
+    int noErrorsToDisplay = std::min((int)errors.size(), 10);
+    for (int n = 0; n < noErrorsToDisplay; n++) {
+      msg += " -" + errors.at(n) + "\n";
+    }
+    if (noErrorsToDisplay < errors.size()) {
+      msg += QObject::tr(" ... plus %1 errors").arg(errors.size() - noErrorsToDisplay) + "\n" + msg;
+    }
+  }
+
+  QMessageBox::warning(NULL,
+                       QObject::tr("Error"),
+                       title + "\n" + msg);
+}
+
 int OpenTxEepromInterface::save(uint8_t * eeprom, const RadioData & radioData, uint8_t version, uint32_t variant)
 {
-  EEPROMWarnings.clear();
+  // TODO QMessageBox::warning should not be called here
 
   if (version == 0) {
     version = getLastDataVersion(board);
   }
 
-  int size = getEEpromSize(board);
+  int size = Boards::getEEpromSize(board);
 
   efile->EeFsCreate(eeprom, size, board, version);
 
@@ -343,36 +326,30 @@ int OpenTxEepromInterface::save(uint8_t * eeprom, const RadioData & radioData, u
     variant |= TARANIS_X7_VARIANT;
   }
 
-  int result = saveRadioSettings<OpenTxGeneralData>((GeneralSettings &)radioData.generalSettings, board, version, variant);
-  if (!result) {
+  OpenTxGeneralData generator((GeneralSettings &)radioData.generalSettings, board, version, variant);
+  // generator.Dump();
+  QByteArray data;
+  generator.Export(data);
+  int sz = efile->writeRlc2(FILE_GENERAL, FILE_TYP_GENERAL, (const uint8_t *)data.constData(), data.size());
+  if (sz == 0 || generator.errors().count() > 0) {
+    showErrors(QObject::tr("Cannot write radio settings"), generator.errors());
     return 0;
   }
 
   for (int i = 0; i < getCurrentFirmware()->getCapability(Models); i++) {
-    if (!radioData.models[i].isEmpty()) {
-      result = saveModel<OpenTxModelData>(i, (ModelData &)radioData.models[i], version, variant);
-      if (!result) {
+    if (i < (int)radioData.models.size() && !radioData.models[i].isEmpty()) {
+      OpenTxModelData generator((ModelData &)radioData.models[i], board, version, variant);
+      // generator.Dump();
+      QByteArray data;
+      generator.Export(data);
+      int sz = efile->writeRlc2(FILE_MODEL(i), FILE_TYP_MODEL, (const uint8_t *)data.constData(), data.size());
+      if (sz == 0 || generator.errors().count() > 0) {
+        showErrors(QObject::tr("Cannot write model %1").arg(radioData.models[i].name), generator.errors());
         return 0;
       }
     }
   }
 
-  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" + msg);
-  }
-
   return size;
 }
 
@@ -384,8 +361,8 @@ int OpenTxEepromInterface::getSize(const ModelData &model)
   if (model.isEmpty())
     return 0;
 
-  QByteArray tmp(EESIZE_MAX, 0);
-  efile->EeFsCreate((uint8_t *) tmp.data(), EESIZE_MAX, board, 255/*version max*/);
+  QByteArray tmp(Boards::getEEpromSize(Board::BOARD_UNKNOWN), 0);
+  efile->EeFsCreate((uint8_t *) tmp.data(), Boards::getEEpromSize(Board::BOARD_UNKNOWN), board, 255/*version max*/);
 
   OpenTxModelData open9xModel((ModelData &) model, board, 255/*version max*/, getCurrentFirmware()->getVariantNumber());
 
@@ -403,8 +380,8 @@ int OpenTxEepromInterface::getSize(const GeneralSettings &settings)
   if (IS_SKY9X(board))
     return 0;
 
-  QByteArray tmp(EESIZE_MAX, 0);
-  efile->EeFsCreate((uint8_t *) tmp.data(), EESIZE_MAX, board, 255);
+  QByteArray tmp(Boards::getEEpromSize(Board::BOARD_UNKNOWN), 0);
+  efile->EeFsCreate((uint8_t *) tmp.data(), Boards::getEEpromSize(Board::BOARD_UNKNOWN), board, 255);
 
   OpenTxGeneralData open9xGeneral((GeneralSettings &) settings, board, 255, getCurrentFirmware()->getVariantNumber());
   // open9xGeneral.Dump();
@@ -433,7 +410,7 @@ Firmware * OpenTxFirmware::getFirmwareVariant(const QString &id)
   }
 }
 
-int OpenTxFirmware::getCapability(Capability capability)
+int OpenTxFirmware::getCapability(::Capability capability)
 {
   switch (capability) {
     case Models:
@@ -495,7 +472,7 @@ int OpenTxFirmware::getCapability(Capability capability)
     case FlightModesName:
       return (IS_HORUS_OR_TARANIS(board) ? 10 : 6);
     case GvarsName:
-      return (IS_9X(board) ? 0 : 6);
+      return (IS_9X(board) ? 0 : 3);
     case GvarsInCS:
     case HasFAIMode:
       return 1;
@@ -517,52 +494,6 @@ int OpenTxFirmware::getCapability(Capability capability)
         return 0;
     case PermTimers:
       return (IS_2560(board) || IS_ARM(board));
-    case Pots:
-      if (IS_HORUS(board))
-        return 3;
-      else if (IS_TARANIS_X7(board))
-        return 2;
-      else if (IS_TARANIS_X9E(board))
-        return 4;
-      else if (IS_TARANIS(board))
-        return 3;
-      else
-        return 3;
-    case Sliders:
-      if (IS_HORUS(board))
-        return 4;
-      else if (IS_TARANIS_X7(board))
-        return 0;
-      else if (IS_TARANIS_X9E(board))
-        return 4;
-      else if (IS_TARANIS(board))
-        return 2;
-      else
-        return 0;
-    case Switches:
-      if (IS_TARANIS_X9E(board))
-        return 18;
-      else if (IS_TARANIS_X7(board))
-        return 6;
-      else if (IS_HORUS_OR_TARANIS(board))
-        return 8;
-      else
-        return 7;
-    case FactoryInstalledSwitches:
-      if (IS_TARANIS_X9E(board))
-        return 8;
-      else
-        return getCapability(Switches);
-    case SwitchesPositions:
-      if (IS_HORUS_OR_TARANIS(board))
-        return getCapability(Switches) * 3;
-      else
-        return 9;
-    case NumTrimSwitches:
-      if (IS_HORUS(board))
-        return 12;
-      else
-        return 8;
     case CustomFunctions:
       if (IS_ARM(board))
         return 64;
@@ -598,7 +529,7 @@ int OpenTxFirmware::getCapability(Capability capability)
     case VoicesAsNumbers:
       return (IS_ARM(board) ? 0 : 1);
     case VoicesMaxLength:
-      return (IS_ARM(board) ? (IS_TARANIS(board) ? 8 : 6) : 0);
+      return (IS_ARM(board) ? (IS_TARANIS_X9(board) ? 8 : 6) : 0);
     case MultiLangVoice:
       return (IS_ARM(board) ? 1 : 0);
     case SoundPitch:
@@ -612,26 +543,38 @@ int OpenTxFirmware::getCapability(Capability capability)
         return 0;
     case MaxVolume:
       return (IS_ARM(board) ? 23 : 7);
+    case MaxContrast:
+      if (IS_TARANIS_X7(board))
+        return 30;
+      else
+        return 45;
+    case MinContrast:
+      if (IS_TARANIS_X9(board))
+        return 0;
+      else
+        return 10;
     case HasSoundMixer:
       return (IS_ARM(board) ? 1 : 0);
     case ExtraInputs:
       return 1;
-    case ExtendedTrims:
+    case TrimsRange:
+      return 125;
+    case ExtendedTrimsRange:
       return 500;
     case Simulation:
       return 1;
     case NumCurves:
       return (HAS_LARGE_LCD(board) ? 32 : (IS_ARM(board) ? 16 : 8));
     case HasMixerNames:
-      return (IS_ARM(board) ? (IS_HORUS_OR_TARANIS(board) ? 8 : 6) : false);
+      return (IS_ARM(board) ? (IS_TARANIS_X9(board) ? 8 : 6) : false);
     case HasExpoNames:
-      return (IS_ARM(board) ? (IS_HORUS_OR_TARANIS(board) ? 8 : 6) : false);
+      return (IS_ARM(board) ? (IS_TARANIS_X9(board) ? 8 : 6) : false);
     case HasNoExpo:
       return (IS_HORUS_OR_TARANIS(board) ? false : true);
     case ChannelsName:
       return (IS_ARM(board) ? (HAS_LARGE_LCD(board) ? 6 : 4) : 0);
     case HasCvNames:
-      return (IS_HORUS_OR_TARANIS(board) ? 1 : 0);
+      return (IS_ARM(board) ? 1 : 0);
     case Telemetry:
       if (IS_2560(board) || IS_ARM(board) || id.contains("frsky") || id.contains("telemetrez"))
         return TM_HASTELEMETRY | TM_HASOFFSET | TM_HASWSHH;
@@ -718,7 +661,7 @@ int OpenTxFirmware::getCapability(Capability capability)
     case GlobalFunctions:
       return IS_ARM(board) ? 64 : 0;
     case VirtualInputs:
-      return IS_ARM(board) ? 64 : 0;
+      return IS_ARM(board) ? 32 : 0;
     case InputsLength:
       return HAS_LARGE_LCD(board) ? 4 : 3;
     case TrainerInputs:
@@ -760,8 +703,6 @@ int OpenTxFirmware::getCapability(Capability capability)
     case HasInputDiff:
     case HasMixerExpo:
       return (IS_HORUS_OR_TARANIS(board) ? true : false);
-    case MixersMonitor:
-      return id.contains("mixersmon") ? 1 : 0;
     case HasBatMeterRange:
       return (IS_HORUS_OR_TARANIS(board) ? true : id.contains("battgraph"));
     case DangerousFunctions:
@@ -775,49 +716,71 @@ int OpenTxFirmware::getCapability(Capability capability)
 
 QString OpenTxFirmware::getAnalogInputName(unsigned int index)
 {
-  if (index < 4) {
-    const QString sticks[] = { QObject::tr("Rud"),
-                               QObject::tr("Ele"),
-                               QObject::tr("Thr"),
-                               QObject::tr("Ail") };
+  if ((int)index < getBoardCapability(board, Board::Sticks)) {
+    const QString sticks[] = {
+      QObject::tr("Rud"),
+      QObject::tr("Ele"),
+      QObject::tr("Thr"),
+      QObject::tr("Ail")
+    };
     return sticks[index];
   }
 
-  index -= 4;
+  index -= getBoardCapability(board, Board::Sticks);
 
   if (IS_9X(board) || IS_2560(board) || IS_SKY9X(board)) {
-    const QString pots[]  = { QObject::tr("P1"),
-                              QObject::tr("P2"),
-                              QObject::tr("P3") };
+    const QString pots[] = {
+      QObject::tr("P1"),
+      QObject::tr("P2"),
+      QObject::tr("P3")
+    };
     return CHECK_IN_ARRAY(pots, index);
   }
   else if (IS_TARANIS_X9E(board)) {
-    const QString pots[] = { QObject::tr("F1"),
-                             QObject::tr("F2"),
-                             QObject::tr("F3"),
-                             QObject::tr("F4"),
-                             QObject::tr("S1"),
-                             QObject::tr("S2"),
-                             QObject::tr("LS"),
-                             QObject::tr("RS") };
+    const QString pots[] = {
+      QObject::tr("F1"),
+      QObject::tr("F2"),
+      QObject::tr("F3"),
+      QObject::tr("F4"),
+      QObject::tr("S1"),
+      QObject::tr("S2"),
+      QObject::tr("LS"),
+      QObject::tr("RS")
+    };
     return CHECK_IN_ARRAY(pots, index);
   }
   else if (IS_TARANIS(board)) {
-    const QString pots[] = {QObject::tr("S1"),
-                            QObject::tr("S2"),
-                            QObject::tr("S3"),
-                            QObject::tr("LS"),
-                            QObject::tr("RS")};
+    const QString pots[] = {
+      QObject::tr("S1"),
+      QObject::tr("S2"),
+      QObject::tr("S3"),
+      QObject::tr("LS"),
+      QObject::tr("RS")
+    };
     return CHECK_IN_ARRAY(pots, index);
   }
-  else if (IS_HORUS(board)) {
-    const QString pots[] = {QObject::tr("S1"),
-                            QObject::tr("6P"),
-                            QObject::tr("S2"),
-                            QObject::tr("L1"),
-                            QObject::tr("L2"),
-                            QObject::tr("LS"),
-                            QObject::tr("RS")};
+  else if (IS_HORUS_X12S(board)) {
+    const QString pots[] = {
+      QObject::tr("S1"),
+      QObject::tr("6P"),
+      QObject::tr("S2"),
+      QObject::tr("L1"),
+      QObject::tr("L2"),
+      QObject::tr("LS"),
+      QObject::tr("RS"),
+      QObject::tr("JSx"),
+      QObject::tr("JSy")
+    };
+    return CHECK_IN_ARRAY(pots, index);
+  }
+  else if (IS_HORUS_X10(board)) {
+    const QString pots[] = {
+      QObject::tr("S1"),
+      QObject::tr("6P"),
+      QObject::tr("S2"),
+      QObject::tr("LS"),
+      QObject::tr("RS")
+    };
     return CHECK_IN_ARRAY(pots, index);
   }
   else {
@@ -860,11 +823,13 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
           case PULSES_PXX_XJT_X16:
           case PULSES_PXX_XJT_D8:
           case PULSES_PXX_XJT_LR12:
+          case PULSES_PXX_R9M:
             //case PULSES_PXX_DJT:     // Unavailable for now
           case PULSES_LP45:
           case PULSES_DSM2:
           case PULSES_DSMX:
           case PULSES_CROSSFIRE:
+          case PULSES_SBUS:
             return 1;
           case PULSES_MULTIMODULE:
             return id.contains("multimodule") ? 1 : 0;
@@ -892,10 +857,14 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
           case PULSES_PXX_XJT_X16:
           case PULSES_PXX_XJT_D8:
           case PULSES_PXX_XJT_LR12:
+          case PULSES_PXX_R9M:
           case PULSES_LP45:
           case PULSES_DSM2:
           case PULSES_DSMX:
+          case PULSES_SBUS:
             return 1;
+          case PULSES_MULTIMODULE:
+            return id.contains("multimodule") ? 1 : 0;
           default:
             return 0;
         }
@@ -999,29 +968,29 @@ bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int vari
         efile->openRd(i);
         int sz = efile->readRlc2(tmp, sizeof(tmp));
         if (sz == 849) {
-          std::cout << " warning: M128 variant not set (but model size seems ok)";
+          qWarning() << " warning: M128 variant not set (but model size seems ok)";
           return true;
         }
       }
     }
-    std::cout << " wrong variant (" << variant << ")";
+    qWarning() << " wrong variant (" << variant << ")";
     return false;
   }
   else if (IS_TARANIS_X9E(board)) {
     if (variant != TARANIS_X9E_VARIANT) {
-      std::cout << " wrong variant (" << variant << ")";
+      qWarning() << " wrong variant (" << variant << ")";
       return false;
     }
   }
   else if (IS_TARANIS_X7(board)) {
     if (variant != TARANIS_X7_VARIANT) {
-      std::cout << " wrong variant (" << variant << ")";
+      qWarning() << " wrong variant (" << variant << ")";
       return false;
     }
   }
   else if (IS_TARANIS(board)) {
     if (variant != 0) {
-      std::cout << " wrong variant (" << variant << ")";
+      qWarning() << " wrong variant (" << variant << ")";
       return false;
     }
   }
@@ -1054,10 +1023,12 @@ unsigned long OpenTxEepromInterface::loadBackup(RadioData &radioData, const uint
 {
   std::bitset<NUM_ERRORS> errors;
 
-  std::cout << "trying " << getName() << " backup import...";
+  QDebug dbg = qDebug();
+  dbg.setAutoInsertSpaces(false);
+  dbg << "trying " << getName() << " backup import...";
 
   if (esize < 8 || memcmp(eeprom, "o9x", 3) != 0) {
-    std::cout << " no\n";
+    dbg << " no\n";
     errors.set(WRONG_SIZE);
     return errors.to_ulong();
   }
@@ -1074,13 +1045,13 @@ unsigned long OpenTxEepromInterface::loadBackup(RadioData &radioData, const uint
       backupBoard = BOARD_GRUVIN9X;
       break;
     default:
-      std::cout << " unknown board\n";
+      dbg << " unknown board";
       errors.set(UNKNOWN_BOARD);
       return errors.to_ulong();
   }
 
   if (backupBoard != board) {
-    std::cout << " not right board\n";
+    dbg << " not right board";
     errors.set(WRONG_BOARD);
     return errors.to_ulong();
   }
@@ -1090,7 +1061,7 @@ unsigned long OpenTxEepromInterface::loadBackup(RadioData &radioData, const uint
   uint16_t size = ((uint16_t) eeprom[7] << 8) + eeprom[6];
   uint16_t variant = ((uint16_t) eeprom[9] << 8) + eeprom[8];
 
-  std::cout << " version " << (unsigned int) version << " ";
+  dbg << " version " << (unsigned int) version << " ";
 
   EepromLoadErrors version_error = checkVersion(version);
   if (version_error == OLD_VERSION) {
@@ -1098,42 +1069,38 @@ unsigned long OpenTxEepromInterface::loadBackup(RadioData &radioData, const uint
     errors.set(HAS_WARNINGS);
   }
   else if (version_error == NOT_OPENTX) {
-    std::cout << " not open9x\n";
+    dbg << " not open9x";
     errors.set(version_error);
     return errors.to_ulong();
   }
 
   if (size > esize - 8) {
-    std::cout << " wrong size\n";
+    dbg << " wrong size";
     errors.set(WRONG_SIZE);
     return errors.to_ulong();
   }
 
   if (bcktype == 'M') {
     if (!loadModelFromBackup(radioData.models[index], &eeprom[8], size, version, variant)) {
-      std::cout << " ko\n";
+      dbg << " ko";
       errors.set(UNKNOWN_ERROR);
       return errors.to_ulong();
     }
   }
   else {
-    std::cout << " backup type not supported\n";
+    dbg << " backup type not supported";
     errors.set(BACKUP_NOT_SUPPORTED);
     return errors.to_ulong();
   }
 
-  std::cout << " ok\n";
+  dbg << " ok";
   errors.set(ALL_OK);
   return errors.to_ulong();
 }
 
 QString OpenTxFirmware::getFirmwareBaseUrl()
 {
-#if defined(ALLOW_NIGHTLY_BUILDS)
-  return (g.useFirmwareNightlyBuilds() ? OPENTX_NIGHT_FIRMWARE_DOWNLOADS : OPENTX_FIRMWARE_DOWNLOADS);
-#else
-  return OPENTX_FIRMWARE_DOWNLOADS;
-#endif
+  return OPENTX_FIRMWARE_DOWNLOAD_URL[g.boundedOpenTxBranch()];
 }
 
 QString OpenTxFirmware::getFirmwareUrl()
@@ -1172,25 +1139,25 @@ void addOpenTxCommonOptions(OpenTxFirmware * firmware)
   firmware->addOptions(fai_options);
 }
 
+void addOpenTxArmOptions(OpenTxFirmware * firmware)
+{
+  firmware->addOption("multimodule", QObject::tr("Support for the DIY-Multiprotocol-TX-Module"));
+  firmware->addOption("eu", QObject::tr("Removes D8 FrSky protocol support which is not legal for use in the EU on radios sold after Jan 1st, 2015"));
+}
+
 void addOpenTxFrskyOptions(OpenTxFirmware * firmware)
 {
   addOpenTxCommonOptions(firmware);
+  addOpenTxArmOptions(firmware);
   firmware->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
   firmware->addOption("nogvars", QObject::tr("Disable Global variables"));
-  firmware->addOption("lua", QObject::tr("Support for Lua model scripts"));
+  firmware->addOption("lua", QObject::tr("Enable Lua custom scripts screen"));
   firmware->addOption("luac", QObject::tr("Enable Lua compiler"));
-  Option usb_options[] = {{"massstorage", QObject::tr("Instead of Joystick emulation, USB connection is Mass Storage (as in the Bootloader)")},
-                          {"cli",         QObject::tr("Instead of Joystick emulation, USB connection is Command Line Interface")},
-                          {NULL}};
-  firmware->addOptions(usb_options);
-  firmware->addOption("eu", QObject::tr("Removes D8 FrSky protocol support which is not legal for use in the EU on radios sold after Jan 1st, 2015"));
-  firmware->addOption("multimodule", QObject::tr("Support for the DIY-Multiprotocol-TX-Module"));
 }
 
 void addOpenTxTaranisOptions(OpenTxFirmware * firmware)
 {
   addOpenTxFrskyOptions(firmware);
-  firmware->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
   firmware->addOption("internalppm", QObject::tr("Support for PPM internal module hack"));
   firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
 }
@@ -1208,6 +1175,16 @@ void addOpenTxLcdOptions(OpenTxFirmware * firmware)
   firmware->addOptions(lcd_options);
 }
 
+void addOpenTxVoiceOptions(OpenTxFirmware * firmware)
+{
+  Option voice_options[] = {
+    {"WTV20",     	QObject::tr("WTV20 voice module")},
+    {"JQ6500", 		QObject::tr("JQ6500 voice module")},
+    {NULL}
+  };
+  firmware->addOptions(voice_options);
+}
+
 QList<OpenTxEepromInterface *> opentxEEpromInterfaces;
 
 void registerOpenTxFirmware(OpenTxFirmware * firmware)
@@ -1216,7 +1193,7 @@ void registerOpenTxFirmware(OpenTxFirmware * firmware)
   firmware->setEEpromInterface(eepromInterface);
   opentxEEpromInterfaces.push_back(eepromInterface);
   eepromInterfaces.push_back(eepromInterface);
-  firmwares.push_back(firmware);
+  Firmware::addRegisteredFirmware(firmware);
 }
 
 void registerOpenTxFirmwares()
@@ -1262,12 +1239,20 @@ void registerOpenTxFirmwares()
   registerOpenTxFirmware(firmware);
 
   /* FrSky X7 board */
-  firmware = new OpenTxFirmware("opentx-x7", QObject::tr("FrSky Taranis X7"), BOARD_TARANIS_X7);
-  addOpenTxTaranisOptions(firmware);
+  firmware = new OpenTxFirmware("opentx-x7", QObject::tr("FrSky Taranis X7 / X7S"), BOARD_TARANIS_X7);
+  // No mixersmon for now
+  addOpenTxFrskyOptions(firmware);
+  firmware->addOption("internalppm", QObject::tr("Support for PPM internal module hack"));
+  firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  registerOpenTxFirmware(firmware);
+
+  /* FrSky X10 board */
+  firmware = new OpenTxFirmware("opentx-x10", QObject::tr("FrSky Horus X10 / X10S"), BOARD_X10);
+  addOpenTxFrskyOptions(firmware);
   registerOpenTxFirmware(firmware);
 
   /* FrSky Horus board */
-  firmware = new OpenTxFirmware("opentx-horus", QObject::tr("FrSky Horus"), BOARD_HORUS);
+  firmware = new OpenTxFirmware("opentx-x12s", QObject::tr("FrSky Horus X12S"), BOARD_X12S);
   addOpenTxFrskyOptions(firmware);
   firmware->addOption("pcbdev", QObject::tr("Use ONLY with first DEV pcb version"));
   registerOpenTxFirmware(firmware);
@@ -1275,7 +1260,6 @@ void registerOpenTxFirmwares()
   /* 9XR-Pro */
   firmware = new OpenTxFirmware("opentx-9xrpro", QObject::tr("Turnigy 9XR-PRO"), BOARD_9XRPRO);
   firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
-  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
   firmware->addOption("nofp", QObject::tr("No flight modes"));
   firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
   firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
@@ -1286,6 +1270,7 @@ void registerOpenTxFirmwares()
   firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
   firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
   firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  addOpenTxArmOptions(firmware);
   addOpenTxCommonOptions(firmware);
   registerOpenTxFirmware(firmware);
 
@@ -1423,7 +1408,6 @@ void registerOpenTxFirmwares()
   /* ar9x board */
   firmware = new OpenTxFirmware("opentx-ar9x", QObject::tr("9X with AR9X board"), BOARD_AR9X);
   firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
-  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
   firmware->addOption("nofp", QObject::tr("No flight modes"));
   firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
   firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
@@ -1437,13 +1421,13 @@ void registerOpenTxFirmwares()
   firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
 //  firmware->addOption("rtc", QObject::tr("Optional RTC added"));
 //  firmware->addOption("volume", QObject::tr("i2c volume control added"));
+  addOpenTxArmOptions(firmware);
   addOpenTxCommonOptions(firmware);
   registerOpenTxFirmware(firmware);
 
   /* Sky9x board */
   firmware = new OpenTxFirmware("opentx-sky9x", QObject::tr("9X with Sky9x board"), BOARD_SKY9X);
   firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
-  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
   firmware->addOption("nofp", QObject::tr("No flight modes"));
   firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
   firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
@@ -1455,6 +1439,7 @@ void registerOpenTxFirmwares()
   firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
   firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
   firmware->addOption("sqt5font", QObject::tr("Use alternative SQT5 font"));
+  addOpenTxArmOptions(firmware);
   addOpenTxCommonOptions(firmware);
   registerOpenTxFirmware(firmware);
 
@@ -1497,12 +1482,12 @@ void registerOpenTxFirmwares()
   firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
   firmware->addOption("sdcard", QObject::tr("Support for SD memory card"));
   firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
-  firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  //firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  addOpenTxVoiceOptions(firmware);
   firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
   firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
   firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
   firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  firmware->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
   firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
   firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
   firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
@@ -1515,15 +1500,16 @@ void registerOpenTxFirmwares()
   addOpenTxCommonOptions(firmware);
   registerOpenTxFirmware(firmware);
 
-  default_firmware_variant = getFirmware("opentx-x9d+");
-  current_firmware_variant = default_firmware_variant;
+  Firmware::setDefaultVariant(Firmware::getFirmwareForId("opentx-x9d+"));
+  Firmware::setCurrentVariant(Firmware::getDefaultVariant());
 }
 
 void unregisterOpenTxFirmwares()
 {
-  foreach (Firmware * f, firmwares) {
+  foreach (Firmware * f, Firmware::getRegisteredFirmwares()) {
     delete f;
   }
+  unregisterEEpromInterfaces();
 }
 
 template <class T, class M>

companion/src/firmwares/opentx/opentxinterface.h

@@ -67,17 +67,11 @@ class OpenTxEepromInterface : public EEPROMInterface
     bool loadRadioSettingsFromRLE(GeneralSettings & settings, RleFile * rleFile, uint8_t version);
     
     bool loadModelFromRLE(ModelData & model, RleFile * rleFile, unsigned int index, uint8_t version, uint32_t variant);
-    
-    template <class T>
-    bool saveModel(unsigned int index, ModelData & model, uint8_t version, uint32_t variant);
-    
-    template <class T>
-    bool saveRadioSettings(GeneralSettings & settings, Board::Type board, uint8_t version, uint32_t variant);
+
+    void showErrors(const QString & title, const QStringList & errors);
     
     uint8_t getLastDataVersion(Board::Type board);
     
-    uint32_t getFourCC();
-    
     RleFile * efile;
     
     OpenTxFirmware * firmware;

companion/src/flasheepromdialog.cpp

@@ -102,7 +102,7 @@ void FlashEEpromDialog::updateUI()
 
 void FlashEEpromDialog::on_eepromLoad_clicked()
 {
-  QString filename = QFileDialog::getOpenFileName(this, tr("Choose Radio Backup file"), g.eepromDir(), tr(EXTERNAL_EEPROM_FILES_FILTER));
+  QString filename = QFileDialog::getOpenFileName(this, tr("Choose Radio Backup file"), g.eepromDir(), EXTERNAL_EEPROM_FILES_FILTER);
   if (!filename.isEmpty()) {
     eepromFilename = filename;
     updateUI();
@@ -127,7 +127,7 @@ bool FlashEEpromDialog::patchCalibration()
 {
   QString calib = g.profile[g.id()].stickPotCalib();
   QString trainercalib = g.profile[g.id()].trainerCalib();
-  int potsnum = getCurrentFirmware()->getCapability(Pots);
+  int potsnum = getBoardCapability(getCurrentBoard(), Board::Pots);
   int8_t txVoltageCalibration = (int8_t) g.profile[g.id()].txVoltageCalibration();
   int8_t txCurrentCalibration = (int8_t) g.profile[g.id()].txCurrentCalibration();
   int8_t PPM_Multiplier = (int8_t) g.profile[g.id()].ppmMultiplier();
@@ -227,10 +227,9 @@ void FlashEEpromDialog::on_burnButton_clicked()
   if (patch) {
     QString filename = generateProcessUniqueTempFileName("temp.bin");
     QFile file(filename);
-    uint8_t *eeprom = (uint8_t*)malloc(getEEpromSize(getCurrentBoard()));
+    uint8_t *eeprom = (uint8_t*)malloc(Boards::getEEpromSize(getCurrentBoard()));
     int eeprom_size = getCurrentEEpromInterface()->save(eeprom, *radioData, 0, getCurrentFirmware()->getVariantNumber());
-    if (!eeprom_size) {
-      QMessageBox::warning(this, tr("Error"), tr("Cannot write file %1:\n%2.").arg(filename).arg(file.errorString()));
+    if (eeprom_size == 0) {
       return;
     }
     if (!file.open(QIODevice::WriteOnly)) {

companion/src/flasheepromdialog.h

@@ -21,12 +21,9 @@
 #ifndef _FLASHEEPROMDIALOG_H_
 #define _FLASHEEPROMDIALOG_H_
 
+#include <constants.h>
 #include <QtWidgets>
 
-#define HEX_FILES_FILTER               "HEX files (*.hex);;"
-#define BIN_FILES_FILTER               "BIN files (*.bin);;"
-#define EXTERNAL_EEPROM_FILES_FILTER   "EEPROM files (*.bin *.hex);;" BIN_FILES_FILTER HEX_FILES_FILTER
-
 namespace Ui
 {
   class FlashEEpromDialog;

companion/src/fwpreferencesdialog.cpp

@@ -21,25 +21,22 @@
 #include "fwpreferencesdialog.h"
 #include "ui_fwpreferencesdialog.h"
 #include "mainwindow.h"
-#include "eeprominterface.h"
 #include "helpers.h"
 #include "appdata.h"
-#include <QDesktopServices>
-#include <QtGui>
 
-FirmwarePreferencesDialog::FirmwarePreferencesDialog(QWidget *parent) :
+const char * const OPENTX_SDCARD_DOWNLOAD_URL[] = {
+  "https://downloads.open-tx.org/2.2/release/sdcard/",
+  "https://downloads.open-tx.org/2.2/rc/sdcard/",
+  "https://downloads.open-tx.org/2.2/nightlies/sdcard/"
+};
+
+FirmwarePreferencesDialog::FirmwarePreferencesDialog(QWidget * parent) :
   QDialog(parent),
   ui(new Ui::FirmwarePreferencesDialog)
 {
   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()
@@ -58,26 +55,26 @@ void FirmwarePreferencesDialog::initSettings()
 
 void FirmwarePreferencesDialog::on_checkFWUpdates_clicked()
 {
-  MainWindow * mw = (MainWindow *)this->parent();
+  MainWindow * mw = qobject_cast<MainWindow *>(this->parent());
   mw->checkForFirmwareUpdate();
   initSettings();
 }
 
 void FirmwarePreferencesDialog::on_fw_dnld_clicked()
 {
-  MainWindow * mw = (MainWindow *)this->parent();
+  MainWindow * mw = qobject_cast<MainWindow *>(this->parent());
   mw->dowloadLastFirmwareUpdate();
   initSettings();
 }
 
-void FirmwarePreferencesDialog::on_voice_dnld_clicked()
+void FirmwarePreferencesDialog::on_sd_dnld_clicked()
 {
-  QString url = "http://voices-21.open-tx.org/";
+  QString url = OPENTX_SDCARD_DOWNLOAD_URL[g.boundedOpenTxBranch()];
   QString fwType = g.profile[g.id()].fwType();
   QStringList list = fwType.split("-");
   QString firmware = QString("%1-%2").arg(list[0]).arg(list[1]);
-  url.append(QString("%1/%2/").arg(firmware).arg(ui->voiceCombo->currentText().toLower()));
+  if (g.boundedOpenTxBranch() != BRANCH_NIGHTLY_UNSTABLE) {
+    url.append(QString("%1/").arg(firmware));
+  }
   QDesktopServices::openUrl(url);
 }
-
-

companion/src/fwpreferencesdialog.h

@@ -45,7 +45,7 @@ class FirmwarePreferencesDialog : public QDialog
 
   private slots:
     void on_fw_dnld_clicked();
-    void on_voice_dnld_clicked();
+    void on_sd_dnld_clicked();
     void on_checkFWUpdates_clicked();
 };
 

companion/src/fwpreferencesdialog.ui

@@ -26,13 +26,22 @@
    <string>Downloads</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>6</number>
+   </property>
+   <property name="topMargin">
+    <number>6</number>
+   </property>
+   <property name="rightMargin">
+    <number>6</number>
+   </property>
+   <property name="bottomMargin">
+    <number>6</number>
+   </property>
    <property name="verticalSpacing">
     <number>2</number>
    </property>
-   <property name="margin">
-    <number>6</number>
-   </property>
-   <item row="24" column="5">
+   <item row="23" column="3">
     <widget class="QDialogButtonBox" name="buttonBox">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -42,7 +51,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="5">
+   <item row="3" column="3">
     <widget class="QPushButton" name="checkFWUpdates">
      <property name="minimumSize">
       <size>
@@ -55,75 +64,6 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="voiceLabel">
-     <property name="font">
-      <font>
-       <family>Sans Serif</family>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string>Voice</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="2">
-    <widget class="QComboBox" name="voiceCombo">
-     <property name="maximumSize">
-      <size>
-       <width>50</width>
-       <height>16777215</height>
-      </size>
-     </property>
-     <property name="toolTip">
-      <string>Set voice language.
-May be different from firmware language</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="5">
-    <widget class="QPushButton" name="voice_dnld">
-     <property name="text">
-      <string>Download Voice</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="5">
-    <widget class="QPushButton" name="fw_dnld">
-     <property name="text">
-      <string>Download FW</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="3">
-    <spacer name="horizontalSpacer_2">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>40</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="6" column="0" colspan="6">
-    <widget class="Line" name="voiceLine">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="23" column="0" colspan="6">
-    <widget class="Line" name="line_6">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
    <item row="0" column="0">
     <widget class="QLabel" name="label_6">
      <property name="sizePolicy">
@@ -147,20 +87,28 @@ May be different from firmware language</string>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" colspan="4">
-    <widget class="QLabel" name="fwTypeLbl">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
+   <item row="5" column="3">
+    <widget class="QPushButton" name="fw_dnld">
      <property name="text">
-      <string notr="true">FwType</string>
+      <string>Download firmware</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" colspan="2">
+   <item row="22" column="0" colspan="4">
+    <widget class="Line" name="line_6">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="3">
+    <widget class="QPushButton" name="sd_dnld">
+     <property name="text">
+      <string>Download SD contents</string>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="1" colspan="2">
     <widget class="QLabel" name="lastRevisionLbl">
      <property name="text">
       <string notr="true">-</string>
@@ -174,13 +122,38 @@ May be different from firmware language</string>
      </property>
     </widget>
    </item>
+   <item row="0" column="1" colspan="3">
+    <widget class="QLabel" name="fwTypeLbl">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string notr="true">FwType</string>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="2">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>40</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>checkFWUpdates</tabstop>
   <tabstop>fw_dnld</tabstop>
-  <tabstop>voiceCombo</tabstop>
-  <tabstop>voice_dnld</tabstop>
+  <tabstop>sd_dnld</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>

companion/src/generaledit/CMakeLists.txt

@@ -23,9 +23,10 @@ foreach(name ${generaledit_NAMES})
   set(generaledit_HDRS ${generaledit_HDRS} ${name}.h)
   set(generaledit_UIS  ${generaledit_UIS}  ${name}.ui)
 endforeach()
- 
+
 qt5_wrap_ui(generaledit_SRCS ${generaledit_UIS})
 qt5_wrap_cpp(generaledit_SRCS ${generaledit_HDRS})
 
 add_library(generaledit ${generaledit_SRCS})
-qt5_use_modules(generaledit Widgets Xml Multimedia)
+qt5_use_modules(generaledit Widgets Xml Multimedia)
+target_link_libraries(generaledit PRIVATE ${CPN_COMMON_LIB})

companion/src/generaledit/calibration.cpp

@@ -41,10 +41,10 @@ CalibrationPanel::CalibrationPanel(QWidget * parent, GeneralSettings & generalSe
   tableWidget->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
   tableWidget->setStyleSheet("QTableWidget {background-color: transparent;}");
   QStringList headerLabels;
-  headerLabels << QObject::tr("Negative span") << QObject::tr("Mid value") << QObject::tr("Positive span"); 
+  headerLabels << QObject::tr("Negative span") << QObject::tr("Mid value") << QObject::tr("Positive span");
   tableWidget->setHorizontalHeaderLabels(headerLabels);
 
-  int rows = CPN_MAX_STICKS + getCurrentFirmware()->getCapability(Pots) + getCurrentFirmware()->getCapability(Sliders);
+  int rows = CPN_MAX_STICKS + getBoardCapability(getCurrentBoard(), Board::Pots) + getBoardCapability(getCurrentBoard(), Board::Sliders) + getBoardCapability(getCurrentBoard(), Board::MouseAnalogs);
   tableWidget->setRowCount(rows);
 
   for(int i = 0; i < rows; ++i) {
@@ -80,7 +80,7 @@ void CalibrationPanel::onCellChanged(int value)
     emit modified();
   }
 }
-    
+
 int CalibrationPanel::getCalibrationValue(int row, int column)
 {
   switch(column) {

companion/src/generaledit/generaledit.cpp

@@ -99,10 +99,11 @@ void GeneralEdit::on_tabWidget_currentChanged(int index)
 
 void GeneralEdit::on_calretrieve_PB_clicked()
 {
+  Board::Type board = getCurrentBoard();
   int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();
   QString calib=g.profile[profile_id].stickPotCalib();
-  int potsnum=getCurrentFirmware()->getCapability(Pots)+getCurrentFirmware()->getCapability(Sliders);
-  int numSwPots=getCurrentFirmware()->getCapability(Switches)+getCurrentFirmware()->getCapability(Pots)+getCurrentFirmware()->getCapability(Sliders);
+  int potsnum=getBoardCapability(board, Board::Pots)+getBoardCapability(board, Board::Sliders);
+  int numSwPots=getBoardCapability(board, Board::Switches)+getBoardCapability(board, Board::Pots)+getBoardCapability(board, Board::Sliders);
   if (calib.isEmpty()) {
     return;
   }
@@ -162,8 +163,8 @@ void GeneralEdit::on_calretrieve_PB_clicked()
         qba = controlNames.mid(3*i,3).toLatin1();
         strcpy(generalSettings.stickName[i], qba.data());
       }
-      for (int i=0; i<(getCurrentFirmware()->getCapability(Switches)); i++) {
-        Byte=hwtypes.mid(i,1);
+      for (int i=0; i<getBoardCapability(board, Board::Switches); i++) {
+        Byte = hwtypes.mid(i, 1);
         byte16=(int16_t)Byte.toInt(&ok,16);
         qba=controlNames.mid(3*(i+CPN_MAX_STICKS),3).toLatin1();
         if (ok) {
@@ -171,8 +172,8 @@ void GeneralEdit::on_calretrieve_PB_clicked()
           strcpy(generalSettings.switchName[i], qba.data());
         }
       }
-      offset = getCurrentFirmware()->getCapability(Switches);
-      for (int i=0; i<(getCurrentFirmware()->getCapability(Pots)); i++) {
+      offset = getBoardCapability(board, Board::Switches);
+      for (int i=0; i<getBoardCapability(board, Board::Pots); i++) {
         Byte=hwtypes.mid(i+offset,1);
         byte16=(int16_t)Byte.toInt(&ok,16);
         qba=controlNames.mid(3*(i+CPN_MAX_STICKS+offset),3).toLatin1();
@@ -181,8 +182,8 @@ void GeneralEdit::on_calretrieve_PB_clicked()
           strcpy(generalSettings.potName[i], qba.data());
         }
       }
-      offset += getCurrentFirmware()->getCapability(Pots);
-      for (int i=0; i<(getCurrentFirmware()->getCapability(Sliders)); i++) {
+      offset += getBoardCapability(board, Board::Pots);
+      for (int i=0; i<getBoardCapability(board, Board::Sliders); i++) {
         Byte=hwtypes.mid(i+offset,1);
         byte16=(int16_t)Byte.toInt(&ok,16);
         qba=controlNames.mid(3*(i+CPN_MAX_STICKS+offset),3).toLatin1();
@@ -245,7 +246,7 @@ void GeneralEdit::on_calstore_PB_clicked()
   int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();
 
   QString name=g.profile[profile_id].name();
-  int potsnum=getCurrentFirmware()->getCapability(Pots)+getCurrentFirmware()->getCapability(Sliders);
+  int potsnum=getBoardCapability(getCurrentBoard(), Board::Pots)+getBoardCapability(getCurrentBoard(), Board::Sliders);
   if (name.isEmpty()) {
     ui->calstore_PB->setDisabled(true);
     return;
@@ -279,15 +280,15 @@ void GeneralEdit::on_calstore_PB_clicked()
     for (int i=0; i<CPN_MAX_STICKS; i++) {
       controlNames.append(QString("%1").arg(generalSettings.stickName[i], -3));
     }
-    for (int i=0; i<(getCurrentFirmware()->getCapability(Switches)); i++) {
+    for (int i=0; i<getBoardCapability(getCurrentBoard(), Board::Switches); i++) {
       hwtypes.append(QString("%1").arg((uint16_t)generalSettings.switchConfig[i], 1));
       controlNames.append(QString("%1").arg(generalSettings.switchName[i], -3));
     }
-    for (int i=0; i<(getCurrentFirmware()->getCapability(Pots)); i++) {
+    for (int i=0; i<getBoardCapability(getCurrentBoard(), Board::Pots); i++) {
       hwtypes.append(QString("%1").arg((uint16_t)generalSettings.potConfig[i], 1));
       controlNames.append(QString("%1").arg(generalSettings.potName[i], -3));
     }
-    for (int i=0; i<(getCurrentFirmware()->getCapability(Sliders)); i++) {
+    for (int i=0; i<getBoardCapability(getCurrentBoard(), Board::Sliders); i++) {
       hwtypes.append(QString("%1").arg((uint16_t)generalSettings.sliderConfig[i], 1));
       controlNames.append(QString("%1").arg(generalSettings.sliderName[i], -3));
     }

companion/src/generaledit/generaledit.ui

@@ -17,7 +17,7 @@
    </sizepolicy>
   </property>
   <property name="windowTitle">
-   <string>General Edit</string>
+   <string>Radio settings</string>
   </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>

companion/src/generaledit/generalsetup.cpp

@@ -27,11 +27,10 @@ ui(new Ui::GeneralSetup)
 {
   ui->setupUi(this);
 
-  QLabel * pmsl[] = {ui->ro_label,ui->ro1_label,ui->ro2_label,ui->ro3_label,ui->ro4_label,ui->ro5_label,ui->ro6_label,ui->ro7_label,ui->ro8_label, NULL};
-  QSlider * tpmsld[] = {ui->chkSA, ui->chkSB, ui->chkSC, ui->chkSD, ui->chkSE, ui->chkSF, ui->chkSG, ui->chkSH, NULL};
+  QLabel *pmsl[] = {ui->ro_label, ui->ro1_label, ui->ro2_label, ui->ro3_label, ui->ro4_label, ui->ro5_label, ui->ro6_label, ui->ro7_label, ui->ro8_label, NULL};
+  QSlider *tpmsld[] = {ui->chkSA, ui->chkSB, ui->chkSC, ui->chkSD, ui->chkSE, ui->chkSF, ui->chkSG, ui->chkSH, NULL};
 
   if (IS_TARANIS(firmware->getBoard())) {
-    ui->contrastSB->setMinimum(0);
     if (firmware->getId().contains("readonly")) {
       uint16_t switchstate = generalSettings.switchUnlockStates;
       ui->chkSA->setValue(switchstate & 0x3);
@@ -44,27 +43,27 @@ ui(new Ui::GeneralSetup)
       switchstate >>= 2;
       ui->chkSE->setValue(switchstate & 0x3);
       switchstate >>= 2;
-      ui->chkSF->setValue((switchstate & 0x3)/2);
+      ui->chkSF->setValue((switchstate & 0x3) / 2);
       switchstate >>= 2;
       ui->chkSG->setValue(switchstate & 0x3);
       switchstate >>= 2;
       ui->chkSH->setValue(switchstate & 0x3);
     }
     else {
-      for (int i=0; pmsl[i]; i++) {
+      for (int i = 0; pmsl[i]; i++) {
         pmsl[i]->hide();
       }
-      for (int i=0; tpmsld[i]; i++) {
+      for (int i = 0; tpmsld[i]; i++) {
         tpmsld[i]->hide();
       }
       this->layout()->removeItem(ui->TaranisReadOnlyUnlock);
     }
   }
   else {
-    for (int i=0; pmsl[i]; i++) {
+    for (int i = 0; pmsl[i]; i++) {
       pmsl[i]->hide();
     }
-    for (int i=0; tpmsld[i]; i++) {
+    for (int i = 0; tpmsld[i]; i++) {
       tpmsld[i]->hide();
     }
     this->layout()->removeItem(ui->TaranisReadOnlyUnlock);
@@ -112,10 +111,10 @@ ui(new Ui::GeneralSetup)
     ui->varioVolume_SL->setValue(generalSettings.varioVolume);
     ui->bgVolume_SL->setValue(generalSettings.backgroundVolume);
     ui->wavVolume_SL->setValue(generalSettings.wavVolume);
-    ui->varioP0_SB->setValue(700+(generalSettings.varioPitch*10));
+    ui->varioP0_SB->setValue(700 + (generalSettings.varioPitch * 10));
     updateVarioPitchRange();
-    ui->varioPMax_SB->setValue(700+(generalSettings.varioPitch*10)+1000+(generalSettings.varioRange*10));
-    ui->varioR0_SB->setValue(500+(generalSettings.varioRepeat*10));
+    ui->varioPMax_SB->setValue(700 + (generalSettings.varioPitch * 10) + 1000 + (generalSettings.varioRange * 10));
+    ui->varioR0_SB->setValue(500 + (generalSettings.varioRepeat * 10));
   }
 
   if (!firmware->getCapability(HasFAIMode)) {
@@ -152,11 +151,22 @@ ui(new Ui::GeneralSetup)
     ui->adjustRTC->hide();
   }
 
+  if (IS_STM32(firmware->getBoard())){
+    ui->usbModeCB->setCurrentIndex(generalSettings.usbMode);
+  }
+  else {
+    ui->usbModeLabel->hide();
+    ui->usbModeCB->hide();
+  }
+
   if (!firmware->getCapability(OptrexDisplay)) {
     ui->label_displayType->hide();
     ui->displayTypeCB->setDisabled(true);
     ui->displayTypeCB->hide();
   }
+  else {
+    ui->displayTypeCB->setCurrentIndex(generalSettings.optrexDisplay);
+  }
 
   if (!firmware->getCapability(HasVolume)) {
     ui->volume_SB->hide();
@@ -197,7 +207,7 @@ ui(new Ui::GeneralSetup)
   }
 
   int reCount = firmware->getCapability(RotaryEncoders);
-  if (reCount==0) {
+  if (reCount == 0) {
     ui->re_label->hide();
     ui->re_CB->hide();
   }
@@ -205,13 +215,23 @@ ui(new Ui::GeneralSetup)
     populateRotEncCB(reCount);
   }
 
+  ui->contrastSB->setMinimum(firmware->getCapability(MinContrast));
+  ui->contrastSB->setMaximum(firmware->getCapability(MaxContrast));
   ui->contrastSB->setValue(generalSettings.contrast);
+
   ui->battwarningDSB->setValue((double)generalSettings.vBatWarn/10);
   ui->backlightautoSB->setValue(generalSettings.backlightDelay*5);
   ui->inactimerSB->setValue(generalSettings.inactivityTimer);
 
-  ui->memwarnChkB->setChecked(!generalSettings.disableMemoryWarning);   //Default is zero=checked
-  ui->alarmwarnChkB->setChecked(!generalSettings.disableAlarmWarning);//Default is zero=checked
+  ui->memwarnChkB->setChecked(!generalSettings.disableMemoryWarning); // Default is zero=checked
+  ui->alarmwarnChkB->setChecked(!generalSettings.disableAlarmWarning); // Default is zero=checked
+
+  if (IS_ARM(firmware->getBoard())) {
+    ui->rssiPowerOffWarnChkB->setChecked(!generalSettings.disableRssiPoweroffAlarm); // Default is zero=checked
+  }
+  else {
+    ui->rssiPowerOffWarnChkB->hide();
+  }
 
   if (IS_HORUS(firmware->getBoard())) {
     ui->splashScreenChkB->hide();
@@ -325,6 +345,14 @@ void GeneralSetupPanel::on_backlightswCB_currentIndexChanged(int index)
   }
 }
 
+void GeneralSetupPanel::on_usbModeCB_currentIndexChanged(int index)
+{
+  if (!lock) {
+    generalSettings.usbMode = ui->usbModeCB->currentIndex();
+    emit modified();
+  }
+}
+
 void GeneralSetupPanel::on_backlightColor_SL_valueChanged()
 {
   if (!lock) {
@@ -607,18 +635,24 @@ void GeneralSetupPanel::on_inactimerSB_editingFinished()
   emit modified();
 }
 
-void GeneralSetupPanel::on_memwarnChkB_stateChanged(int )
+void GeneralSetupPanel::on_memwarnChkB_stateChanged(int)
 {
   generalSettings.disableMemoryWarning = ui->memwarnChkB->isChecked() ? 0 : 1;
   emit modified();
 }
 
-void GeneralSetupPanel::on_alarmwarnChkB_stateChanged(int )
+void GeneralSetupPanel::on_alarmwarnChkB_stateChanged(int)
 {
   generalSettings.disableAlarmWarning = ui->alarmwarnChkB->isChecked() ? 0 : 1;
   emit modified();
 }
 
+void GeneralSetupPanel::on_rssiPowerOffWarnChkB_stateChanged(int)
+{
+  generalSettings.disableRssiPoweroffAlarm = ui->rssiPowerOffWarnChkB->isChecked() ? 0 : 1;
+  emit modified();
+}
+
 void GeneralSetupPanel::on_beeperCB_currentIndexChanged(int index)
 {
   generalSettings.beeperMode = (GeneralSettings::BeeperMode)(index-2);

companion/src/generaledit/generalsetup.h

@@ -40,6 +40,7 @@ class GeneralSetupPanel : public GeneralPanel
     void on_splashScreenChkB_stateChanged(int);
     void on_splashScreenDuration_currentIndexChanged(int index);
     void on_alarmwarnChkB_stateChanged(int);
+    void on_rssiPowerOffWarnChkB_stateChanged(int);
     void on_gpsFormatCB_currentIndexChanged(int index);
     void on_displayTypeCB_currentIndexChanged(int index);
     void on_BLBright_SB_editingFinished();
@@ -58,6 +59,7 @@ class GeneralSetupPanel : public GeneralPanel
     void on_hapticmodeCB_currentIndexChanged(int index);
     void on_hapticLengthCB_currentIndexChanged(int index);
     void on_backlightswCB_currentIndexChanged(int index);
+    void on_usbModeCB_currentIndexChanged(int index);
     void on_backlightColor_SL_valueChanged();
     void on_mavbaud_CB_currentIndexChanged(int index);
     void on_voiceLang_CB_currentIndexChanged(int index);

companion/src/generaledit/hardware.cpp

@@ -21,9 +21,10 @@
 #include "hardware.h"
 #include "ui_hardware.h"
 
-void HardwarePanel::setupSwitchType(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos = true)
+void HardwarePanel::setupSwitchType(int index, QLabel * label, AutoLineEdit * name, AutoComboBox * type, bool threePos)
 {
-  if (IS_STM32(firmware->getBoard()) && index < firmware->getCapability(Switches)) {
+  Board::Type board = getCurrentBoard();
+  if (IS_STM32(board) && index < getBoardCapability(board, Board::Switches)) {
     type->addItem(tr("None"), Board::SWITCH_NOT_AVAILABLE);
     type->addItem(tr("2 Positions Toggle"), Board::SWITCH_TOGGLE);
     type->addItem(tr("2 Positions"), Board::SWITCH_2POS);
@@ -32,6 +33,14 @@ void HardwarePanel::setupSwitchType(int index, QLabel *label, AutoLineEdit *name
     }
     name->setField(generalSettings.switchName[index], 3, this);
     type->setField(generalSettings.switchConfig[index], this);
+    if (IS_TARANIS_X7(board)) {
+      if (index == 4) {
+        label->setText("SF");
+      }
+      else if (index == 5) {
+        label->setText("SH");
+      }
+    }
   }
   else {
     label->hide();
@@ -40,9 +49,11 @@ void HardwarePanel::setupSwitchType(int index, QLabel *label, AutoLineEdit *name
   }
 }
 
-void HardwarePanel::setupPotType(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
+void HardwarePanel::setupPotType(int index, QLabel * label, AutoLineEdit * name, AutoComboBox * type)
 {
-  if (IS_STM32(firmware->getBoard()) && index < firmware->getCapability(Pots)) {
+  Board::Type board = firmware->getBoard();
+
+  if (IS_STM32(board) && index < getBoardCapability(board, Board::Pots)) {
     label->setText(RawSource(SOURCE_TYPE_STICK, CPN_MAX_STICKS+index).toString());
     type->addItem(tr("None"), Board::POT_NONE);
     type->addItem(tr("Pot with detent"), Board::POT_WITH_DETENT);
@@ -60,8 +71,10 @@ void HardwarePanel::setupPotType(int index, QLabel *label, AutoLineEdit *name, A
 
 void HardwarePanel::setupSliderType(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
 {
-  if (IS_STM32(firmware->getBoard()) && index < firmware->getCapability(Sliders)) {
-    label->setText(RawSource(SOURCE_TYPE_STICK, CPN_MAX_STICKS+firmware->getCapability(Pots)+index).toString());
+  Board::Type board = firmware->getBoard();
+
+  if (IS_STM32(board) && index < getBoardCapability(board, Board::Sliders)) {
+    label->setText(RawSource(SOURCE_TYPE_STICK, CPN_MAX_STICKS+getBoardCapability(board, Board::Pots)+index).toString());
     type->addItem(tr("None"), Board::SLIDER_NONE);
     type->addItem(tr("Slider with detent"), Board::SLIDER_WITH_DETENT);
     name->setField(generalSettings.sliderName[index], 3, this);
@@ -79,7 +92,7 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
   ui(new Ui::Hardware)
 {
   ui->setupUi(this);
-  
+
   Board::Type board = firmware->getBoard();
 
   if (IS_STM32(board)) {
@@ -97,6 +110,8 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
     ui->thrName->hide();
     ui->ailLabel->hide();
     ui->ailName->hide();
+    ui->potsTypeSeparator_1->hide();
+    ui->potsTypeSeparator_2->hide();
   }
 
   setupPotType(0, ui->pot1Label, ui->pot1Name, ui->pot1Type);
@@ -128,10 +143,11 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
   setupSwitchType(16, ui->sqLabel, ui->sqName, ui->sqType);
   setupSwitchType(17, ui->srLabel, ui->srName, ui->srType);
 
-  if (IS_HORUS_OR_TARANIS(board) && !IS_TARANIS_X7(board)) {
+  if (IS_TARANIS(board) && !IS_TARANIS_X7(board)) {
     ui->serialPortMode->setCurrentIndex(generalSettings.hw_uartMode);
   }
   else {
+    ui->serialPortMode->setCurrentIndex(0);
     ui->serialPortMode->hide();
     ui->serialPortLabel->hide();
   }
@@ -147,10 +163,9 @@ HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings
   }
   else {
     ui->bluetoothLabel->hide();
-    ui->bluetoothEnable->hide();
-    ui->bluetoothName->hide();
+    ui->bluetoothWidget->hide();
   }
-  
+
   if (IS_HORUS_OR_TARANIS(board)) {
     ui->filterEnable->setChecked(!generalSettings.jitterFilter);
   }
@@ -175,39 +190,52 @@ void HardwarePanel::on_filterEnable_stateChanged()
 
 void HardwarePanel::on_PPM_MultiplierDSB_editingFinished()
 {
-  generalSettings.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
-  emit modified();
+  int val = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
+  if (generalSettings.PPM_Multiplier != val) {
+    generalSettings.PPM_Multiplier = val;
+    emit modified();
+  }
 }
 
 void HardwarePanel::on_PPM1_editingFinished()
 {
-  generalSettings.trainer.calib[0] = ui->PPM1->value();
-  emit modified();
+  if (generalSettings.trainer.calib[0] != ui->PPM1->value()) {
+    generalSettings.trainer.calib[0] = ui->PPM1->value();
+    emit modified();
+  }
 }
 
 void HardwarePanel::on_PPM2_editingFinished()
 {
-  generalSettings.trainer.calib[1] = ui->PPM2->value();
-  emit modified();
+  if (generalSettings.trainer.calib[1] != ui->PPM2->value()) {
+    generalSettings.trainer.calib[1] = ui->PPM2->value();
+    emit modified();
+  }
 }
 
 void HardwarePanel::on_PPM3_editingFinished()
 {
-  generalSettings.trainer.calib[2] = ui->PPM3->value();
-  emit modified();
+  if (generalSettings.trainer.calib[2] != ui->PPM3->value()) {
+    generalSettings.trainer.calib[2] = ui->PPM3->value();
+    emit modified();
+  }
 }
 
 void HardwarePanel::on_PPM4_editingFinished()
 {
-  generalSettings.trainer.calib[3] = ui->PPM4->value();
-  emit modified();
+  if (generalSettings.trainer.calib[3] != ui->PPM4->value()) {
+    generalSettings.trainer.calib[3] = ui->PPM4->value();
+    emit modified();
+  }
 }
 
 
-void HardwarePanel::on_txCurrentHardware_editingFinished()
+void HardwarePanel::on_txCurrentCalibration_editingFinished()
 {
-  generalSettings.txCurrentCalibration = ui->txCurrentCalibration->value();
-  emit modified();
+  if (generalSettings.txCurrentCalibration != ui->txCurrentCalibration->value()) {
+    generalSettings.txCurrentCalibration = ui->txCurrentCalibration->value();
+    emit modified();
+  }
 }
 
 void HardwarePanel::on_bluetoothEnable_stateChanged(int)
@@ -228,10 +256,12 @@ void HardwarePanel::setValues()
   ui->PPM_MultiplierDSB->setValue((qreal)(generalSettings.PPM_Multiplier+10)/10);
 }
 
-void HardwarePanel::on_txVoltageHardware_editingFinished()
+void HardwarePanel::on_txVoltageCalibration_editingFinished()
 {
-  generalSettings.txVoltageCalibration = ui->txVoltageCalibration->value()*10;
-  emit modified();
+  if (generalSettings.txVoltageCalibration != ui->txVoltageCalibration->value()*10) {
+    generalSettings.txVoltageCalibration = ui->txVoltageCalibration->value()*10;
+    emit modified();
+  }
 }
 
 void HardwarePanel::on_serialPortMode_currentIndexChanged(int index)

companion/src/generaledit/hardware.h

@@ -40,14 +40,14 @@ class HardwarePanel : public GeneralPanel
     virtual ~HardwarePanel();
 
   private slots:
-    void on_txVoltageHardware_editingFinished();
     void on_PPM1_editingFinished();
     void on_PPM2_editingFinished();
     void on_PPM3_editingFinished();
     void on_PPM4_editingFinished();
     void on_PPM_MultiplierDSB_editingFinished();
 
-    void on_txCurrentHardware_editingFinished();
+    void on_txCurrentCalibration_editingFinished();
+    void on_txVoltageCalibration_editingFinished();
     void on_bluetoothEnable_stateChanged(int);
     void on_filterEnable_stateChanged();
 
@@ -56,7 +56,7 @@ class HardwarePanel : public GeneralPanel
   protected:
     void setupPotType(int index, QLabel * label, AutoLineEdit * name, AutoComboBox * type);
     void setupSliderType(int index, QLabel * label, AutoLineEdit * name, AutoComboBox * type);
-    void setupSwitchType(int index, QLabel * label, AutoLineEdit * name, AutoComboBox * type, bool threePos);
+    void setupSwitchType(int index, QLabel * label, AutoLineEdit * name, AutoComboBox * type, bool threePos = true);
 
   private:
     Ui::Hardware *ui;

companion/src/generaledit/hardware.ui

@@ -6,14 +6,23 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>359</width>
-    <height>1594</height>
+    <width>470</width>
+    <height>1095</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Maximum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2" rowstretch="0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0">
+  <layout class="QGridLayout" name="gridLayout_2">
+   <property name="spacing">
+    <number>6</number>
+   </property>
    <item row="29" column="0">
     <widget class="QLabel" name="sqLabel">
      <property name="text">
@@ -125,19 +134,6 @@
      </property>
     </widget>
    </item>
-   <item row="12" column="0" colspan="5">
-    <widget class="Line" name="potsTypeSeparator_2">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>10</height>
-      </size>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
    <item row="5" column="1">
     <widget class="AutoLineEdit" name="pot2Name">
      <property name="maxLength">
@@ -730,32 +726,6 @@
      </property>
     </widget>
    </item>
-   <item row="31" column="0" colspan="4">
-    <widget class="Line" name="potsTypeSeparator_3">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>10</height>
-      </size>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="38" column="0" colspan="4">
-    <widget class="Line" name="potsTypeSeparator_4">
-     <property name="minimumSize">
-      <size>
-       <width>0</width>
-       <height>10</height>
-      </size>
-     </property>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
    <item row="25" column="0">
     <widget class="QLabel" name="smLabel">
      <property name="text">
@@ -1075,6 +1045,12 @@
    </item>
    <item row="32" column="0">
     <widget class="QLabel" name="bluetoothLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
      <property name="text">
       <string>Bluetooth</string>
      </property>
@@ -1090,24 +1066,6 @@
      </property>
     </widget>
    </item>
-   <item row="32" column="1">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QCheckBox" name="bluetoothEnable">
-       <property name="text">
-        <string/>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="AutoLineEdit" name="bluetoothName">
-       <property name="maxLength">
-        <number>10</number>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item row="33" column="1">
     <widget class="QCheckBox" name="filterEnable">
      <property name="text">
@@ -1122,19 +1080,116 @@
      </property>
     </widget>
    </item>
+   <item row="32" column="1">
+    <widget class="QWidget" name="bluetoothWidget" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <property name="leftMargin">
+       <number>0</number>
+      </property>
+      <property name="topMargin">
+       <number>0</number>
+      </property>
+      <property name="rightMargin">
+       <number>0</number>
+      </property>
+      <property name="bottomMargin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QCheckBox" name="bluetoothEnable">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Fixed</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>5</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item>
+       <widget class="QLabel" name="btNameLabel">
+        <property name="text">
+         <string>Device Name:</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="AutoLineEdit" name="bluetoothName">
+        <property name="maxLength">
+         <number>10</number>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="31" column="0" colspan="3">
+    <widget class="Line" name="potsTypeSeparator_2">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="38" column="0" colspan="3">
+    <widget class="Line" name="ppmSeparator">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="12" column="0" colspan="3">
+    <widget class="Line" name="potsTypeSeparator_1">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>10</height>
+      </size>
+     </property>
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>
-  <customwidget>
-   <class>AutoLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>autolineedit.h</header>
-  </customwidget>
   <customwidget>
    <class>AutoComboBox</class>
    <extends>QComboBox</extends>
    <header>autocombobox.h</header>
   </customwidget>
+  <customwidget>
+   <class>AutoLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>autolineedit.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections/>

companion/src/helpers.cpp

@@ -25,16 +25,18 @@
 #elif defined __GNUC__
   #include <unistd.h>
 #endif
-#if defined(WIN32) && defined(WIN_USE_CONSOLE_STDIO)
-  #include "windows.h"
-#endif
 
 #include "appdata.h"
+#include "macros.h"
 #include "helpers.h"
-#include "modeledit/modeledit.h"
-#include "simulatordialog.h"
+#include "simulatormainwindow.h"
 #include "storage/sdcard.h"
 
+#include <QLabel>
+#include <QMessageBox>
+
+using namespace Helpers;
+
 Stopwatch gStopwatch("global");
 
 const QColor colors[CPN_MAX_CURVES] = {
@@ -72,61 +74,11 @@ const QColor colors[CPN_MAX_CURVES] = {
   QColor(255,127,0),
 };
 
-void populateGvSourceCB(QComboBox *b, int value)
-{
-  QString strings[] = { QObject::tr("---"), QObject::tr("Rud Trim"), QObject::tr("Ele Trim"), QObject::tr("Thr Trim"), QObject::tr("Ail Trim"), QObject::tr("Rot Enc"), QObject::tr("Rud"), QObject::tr("Ele"), QObject::tr("Thr"), QObject::tr("Ail"), QObject::tr("P1"), QObject::tr("P2"), QObject::tr("P3")};
-  b->clear();
-  for (int i=0; i<= 12; i++) {
-    b->addItem(strings[i]);
-  }
-  b->setCurrentIndex(value);
-}
+/*
+ * GVarGroup
+*/
 
-void populateFileComboBox(QComboBox * b, const QSet<QString> & set, const QString & current)
-{
-  b->clear();
-  b->addItem("----");
-
-  bool added = false;
-  // Convert set into list and sort it alphabetically case insensitive
-  QStringList list = QStringList::fromSet(set);
-  qSort(list.begin(), list.end(), caseInsensitiveLessThan);
-  foreach (QString entry, list) {
-    b->addItem(entry);
-    if (entry == current) {
-      b->setCurrentIndex(b->count()-1);
-      added = true;
-    }
-  }
-
-  if (!added && !current.isEmpty()) {
-    b->addItem(current);
-    b->setCurrentIndex(b->count()-1);
-  }
-}
-
-void getFileComboBoxValue(QComboBox * b, char * dest, int length)
-{
-  memset(dest, 0, length+1);
-  if (b->currentText() != "----") {
-    strncpy(dest, b->currentText().toLatin1(), length);
-  }
-}
-
-void populatePhasesCB(QComboBox *b, int value)
-{
-  for (int i=-getCurrentFirmware()->getCapability(FlightModes); i<=getCurrentFirmware()->getCapability(FlightModes); i++) {
-    if (i < 0)
-      b->addItem(QObject::tr("!Flight mode %1").arg(-i-1), i);
-    else if (i > 0)
-      b->addItem(QObject::tr("Flight mode %1").arg(i-1), i);
-    else
-      b->addItem(QObject::tr("----"), 0);
-  }
-  b->setCurrentIndex(value + getCurrentFirmware()->getCapability(FlightModes));
-}
-
-GVarGroup::GVarGroup(QCheckBox * weightGV, QAbstractSpinBox * weightSB, QComboBox * weightCB, int & weight, const ModelData & model, const int deflt, const int mini, const int maxi, const double step, bool allowGvars, ModelPanel * panel):
+GVarGroup::GVarGroup(QCheckBox * weightGV, QAbstractSpinBox * weightSB, QComboBox * weightCB, int & weight, const ModelData & model, const int deflt, const int mini, const int maxi, const double step, bool allowGvars):
   QObject(),
   weightGV(weightGV),
   weightSB(weightSB),
@@ -135,11 +87,10 @@ GVarGroup::GVarGroup(QCheckBox * weightGV, QAbstractSpinBox * weightSB, QComboBo
   weightCB(weightCB),
   weight(weight),
   step(step),
-  lock(true),
-  panel(panel)
+  lock(true)
 {
   if (allowGvars && getCurrentFirmware()->getCapability(Gvars)) {
-    populateGVCB(*weightCB, weight, model);
+    Helpers::populateGVCB(*weightCB, weight, model);
     connect(weightGV, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
     connect(weightCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
   }
@@ -200,12 +151,15 @@ void GVarGroup::valuesChanged()
       weight = sb->value();
     else
       weight = round(dsb->value()/step);
-    if (panel)
-      emit panel->modified();
 
+    emit valueChanged();
   }
 }
 
+/*
+ * CurveGroup
+*/
+
 CurveGroup::CurveGroup(QComboBox * curveTypeCB, QCheckBox * curveGVarCB, QComboBox * curveValueCB, QSpinBox * curveValueSB, CurveReference & curve, const ModelData & model, unsigned int flags):
   QObject(),
   curveTypeCB(curveTypeCB),
@@ -247,7 +201,7 @@ void CurveGroup::update()
       curveGVarCB->setChecked(true);
       if (lastType != CurveReference::CURVE_REF_DIFF && lastType != CurveReference::CURVE_REF_EXPO) {
         lastType = curve.type;
-        populateGVCB(*curveValueCB, curve.value, model);
+        Helpers::populateGVCB(*curveValueCB, curve.value, model);
       }
       curveValueCB->show();
       curveValueSB->hide();
@@ -271,7 +225,7 @@ void CurveGroup::update()
           lastType = curve.type;
           curveValueCB->clear();
           for (int i=0; i<=6/*TODO constant*/; i++) {
-            curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_FUNC, i).toString());
+            curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_FUNC, i).toString(&model, false));
           }
         }
         curveValueCB->setCurrentIndex(curve.value);
@@ -283,7 +237,7 @@ void CurveGroup::update()
           lastType = curve.type;
           curveValueCB->clear();
           for (int i= ((flags & HIDE_NEGATIVE_CURVES) ? 0 : -numcurves); i<=numcurves; i++) {
-            curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, i).toString(), i);
+            curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, i).toString(&model, false), i);
             if (i == curve.value) {
               curveValueCB->setCurrentIndex(curveValueCB->count() - 1);
             }
@@ -364,7 +318,52 @@ void CurveGroup::valuesChanged()
   }
 }
 
-void populateGvarUseCB(QComboBox *b, unsigned int phase)
+/*
+ * Helpers namespace functions
+*/
+
+void Helpers::populateGVCB(QComboBox & b, int value, const ModelData & model)
+{
+  int count = getCurrentFirmware()->getCapability(Gvars);
+
+  b.clear();
+
+  for (int i=-count; i<=-1; i++) {
+    int16_t gval = (int16_t)(-10000+i);
+    b.addItem("-" + RawSource(SOURCE_TYPE_GVAR, abs(i)-1).toString(&model), gval);
+  }
+
+  for (int i=1; i<=count; i++) {
+    int16_t gval = (int16_t)(10000+i);
+    b.addItem(RawSource(SOURCE_TYPE_GVAR, i-1).toString(&model), gval);
+  }
+
+  b.setCurrentIndex(b.findData(value));
+  if (b.currentIndex() == -1)
+    b.setCurrentIndex(count);
+}
+
+// Returns Diff/Expo/Weight/Offset adjustment value as either a percentage or a global variable name.
+QString Helpers::getAdjustmentString(int16_t val, const ModelData * model, bool sign)
+{
+  QString ret;
+  if (val >= -10000 && val <= 10000) {
+    ret = "%1%";
+    if (sign && val > 0)
+      ret.prepend("+");
+    ret = ret.arg(val);
+  }
+  else {
+    ret = RawSource(SOURCE_TYPE_GVAR, abs(val) - 10001).toString(model);
+    if (val < 0)
+      ret.prepend("-");
+    else if (sign)
+      ret.prepend("+");
+  }
+  return ret;
+}
+
+void Helpers::populateGvarUseCB(QComboBox * b, unsigned int phase)
 {
   b->addItem(QObject::tr("Own value"));
   for (int i=0; i<getCurrentFirmware()->getCapability(FlightModes); i++) {
@@ -374,321 +373,143 @@ void populateGvarUseCB(QComboBox *b, unsigned int phase)
   }
 }
 
-void populateSwitchCB(QComboBox * b, const RawSwitch & value, const GeneralSettings & generalSettings, SwitchContext context)
+void Helpers::populateFileComboBox(QComboBox * b, const QSet<QString> & set, const QString & current)
 {
-  Board::Type board = getCurrentBoard();
-  RawSwitch item;
-
   b->clear();
+  b->addItem("----");
 
-  if (context != MixesContext && context != GlobalFunctionsContext) {
-    // !FMx
-    if (IS_ARM(board)) {
-      for (int i=-getCurrentFirmware()->getCapability(FlightModes); i<0; i++) {
-        item = RawSwitch(SWITCH_TYPE_FLIGHT_MODE, i);
-        b->addItem(item.toString(), item.toValue());
-        if (item == value) b->setCurrentIndex(b->count()-1);
-      }
+  bool added = false;
+  // Convert set into list and sort it alphabetically case insensitive
+  QStringList list = QStringList::fromSet(set);
+  qSort(list.begin(), list.end(), caseInsensitiveLessThan);
+  foreach (QString entry, list) {
+    b->addItem(entry);
+    if (entry == current) {
+      b->setCurrentIndex(b->count()-1);
+      added = true;
     }
   }
 
-  if (context != GlobalFunctionsContext) {
-    for (int i=-getCurrentFirmware()->getCapability(LogicalSwitches); i<0; i++) {
-      item = RawSwitch(SWITCH_TYPE_VIRTUAL, i);
-      b->addItem(item.toString(), item.toValue());
-      if (item == value) b->setCurrentIndex(b->count()-1);
-    }
-  }
-
-  for (int i=-getCurrentFirmware()->getCapability(RotaryEncoders); i<0; i++) {
-    item = RawSwitch(SWITCH_TYPE_ROTARY_ENCODER, i);
-    b->addItem(item.toString(), item.toValue());
-    if (item == value) b->setCurrentIndex(b->count()-1);
-  }
-
-  for (int i=-8; i<0; i++) {
-    item = RawSwitch(SWITCH_TYPE_TRIM, i);
-    b->addItem(item.toString(), item.toValue());
-    if (item == value) b->setCurrentIndex(b->count()-1);
-  }
-
-  for (int i=getCurrentFirmware()->getCapability(MultiposPots)-1; i>=0; i--) {
-    if (generalSettings.potConfig[i] == Board::POT_MULTIPOS_SWITCH) {
-      for (int j=-getCurrentFirmware()->getCapability(MultiposPotsPositions); j<0; j++) {
-        item = RawSwitch(SWITCH_TYPE_MULTIPOS_POT, -i*getCurrentFirmware()->getCapability(MultiposPotsPositions)+j);
-        b->addItem(item.toString(), item.toValue());
-        if (item == value) b->setCurrentIndex(b->count()-1);
-      }
-    }
-  }
-
-  for (int i=-getCurrentFirmware()->getCapability(SwitchesPositions); i<0; i++) {
-    item = RawSwitch(SWITCH_TYPE_SWITCH, i);
-    if (IS_HORUS_OR_TARANIS(board) && !generalSettings.switchPositionAllowedTaranis(i)) {
-      continue;
-    }
-    b->addItem(item.toString(), item.toValue());
-    if (item == value) b->setCurrentIndex(b->count()-1);
-  }
-
-  if (context == TimersContext) {
-    for (int i=0; i<5; i++) {
-      item = RawSwitch(SWITCH_TYPE_TIMER_MODE, i);
-      b->addItem(item.toString(), item.toValue());
-      if (item == value) b->setCurrentIndex(b->count()-1);
-    }
-  }
-  else {
-    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);
-    if (IS_HORUS_OR_TARANIS(board) && !generalSettings.switchPositionAllowedTaranis(i)) {
-      continue;
-    }
-    b->addItem(item.toString(), item.toValue());
-    if (item == value) b->setCurrentIndex(b->count()-1);
-  }
-
-  for (int i=0; i<getCurrentFirmware()->getCapability(MultiposPots); i++) {
-    if (generalSettings.potConfig[i] == Board::POT_MULTIPOS_SWITCH) {
-      for (int j=1; j<=getCurrentFirmware()->getCapability(MultiposPotsPositions); j++) {
-        item = RawSwitch(SWITCH_TYPE_MULTIPOS_POT, i*getCurrentFirmware()->getCapability(MultiposPotsPositions)+j);
-        b->addItem(item.toString(), item.toValue());
-        if (item == value) b->setCurrentIndex(b->count()-1);
-      }
-    }
-  }
-
-  for (int i=1; i<=8; i++) {
-    item = RawSwitch(SWITCH_TYPE_TRIM, i);
-    b->addItem(item.toString(), item.toValue());
-    if (item == value) b->setCurrentIndex(b->count()-1);
-  }
-
-  for (int i=1; i<=getCurrentFirmware()->getCapability(RotaryEncoders); i++) {
-    item = RawSwitch(SWITCH_TYPE_ROTARY_ENCODER, i);
-    b->addItem(item.toString(), item.toValue());
-    if (item == value) b->setCurrentIndex(b->count()-1);
-  }
-
-  if (context != GlobalFunctionsContext) {
-    for (int i=1; i<=getCurrentFirmware()->getCapability(LogicalSwitches); i++) {
-      item = RawSwitch(SWITCH_TYPE_VIRTUAL, i);
-      b->addItem(item.toString(), item.toValue());
-      if (item == value) b->setCurrentIndex(b->count()-1);
-    }
-  }
-
-  if (context == SpecialFunctionsContext || context == GlobalFunctionsContext) {
-    // ON
-    item = RawSwitch(SWITCH_TYPE_ON);
-    b->addItem(item.toString(), item.toValue());
-    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);
-  }
-
-  // FMx
-  if (context != MixesContext && context != GlobalFunctionsContext) {
-    if (IS_ARM(board)) {
-      for (int i=1; i<=getCurrentFirmware()->getCapability(FlightModes); i++) {
-        item = RawSwitch(SWITCH_TYPE_FLIGHT_MODE, i);
-        b->addItem(item.toString(), item.toValue());
-        if (item == value) b->setCurrentIndex(b->count()-1);
-      }
-    }
-  }
-
-  b->setMaxVisibleItems(10);
-}
-
-void populateGVCB(QComboBox & b, int value, const ModelData & model)
-{
-  bool selected = false;
-
-  b.clear();
-
-  int count = getCurrentFirmware()->getCapability(Gvars);
-  for (int i=-count; i<=-1; i++) {
-    int16_t gval = (int16_t)(-10000+i);
-    if (strlen(model.gvars_names[-i-1]) > 0)
-      b.addItem(QObject::tr("-GV%1 (%2)").arg(-i).arg(model.gvars_names[-i-1]), gval);
-    else
-      b.addItem(QObject::tr("-GV%1").arg(-i), gval);
-    if (value == gval) {
-      b.setCurrentIndex(b.count()-1);
-      selected = true;
-    }
-  }
-
-  for (int i=1; i<=count; i++) {
-    int16_t gval = (int16_t)(10000+i);
-    if (strlen(model.gvars_names[i-1]) > 0)
-      b.addItem(QObject::tr("GV%1 (%2)").arg(i).arg(model.gvars_names[i-1]), gval);
-    else
-      b.addItem(QObject::tr("GV%1").arg(i), gval);
-    if (value == gval) {
-      b.setCurrentIndex(b.count()-1);
-      selected = true;
-    }
-  }
-
-  if (!selected) {
-    b.setCurrentIndex(count);
+  if (!added && !current.isEmpty()) {
+    b->addItem(current);
+    b->setCurrentIndex(b->count()-1);
   }
 }
 
-void populateSourceCB(QComboBox *b, const RawSource & source, const GeneralSettings generalSettings, const ModelData * model, unsigned int flags)
+void Helpers::getFileComboBoxValue(QComboBox * b, char * dest, int length)
 {
-  Board::Type board = getCurrentBoard();
-  RawSource item;
+  memset(dest, 0, length+1);
+  if (b->currentText() != "----") {
+    strncpy(dest, b->currentText().toLatin1(), length);
+  }
+}
 
-  b->clear();
+void Helpers::addRawSourceItems(QStandardItemModel * itemModel, const RawSourceType & type, int count, const GeneralSettings * const generalSettings,
+                                const ModelData * const model, const int start, const QList<int> exclude)
+{
+  for (int i = start; i < start + count; i++) {
+    if (exclude.contains(i))
+      continue;
+
+    RawSource src = RawSource(type, i);
+    if (model) {
+      if (type == SOURCE_TYPE_VIRTUAL_INPUT && !model->isInputValid(i))
+        continue;
+    }
+    if (generalSettings) {
+      int genAryIdx = 0;
+      if (type == SOURCE_TYPE_STICK && ((src.isPot(&genAryIdx) && !generalSettings->isPotAvailable(genAryIdx)) || (src.isSlider(&genAryIdx) && !generalSettings->isSliderAvailable(genAryIdx))))
+        continue;
+    }
+
+    QStandardItem * modelItem = new QStandardItem(src.toString(model, generalSettings));
+    modelItem->setData(src.toValue(), Qt::UserRole);
+    itemModel->appendRow(modelItem);
+
+    if (type == SOURCE_TYPE_SWITCH && generalSettings && IS_HORUS_OR_TARANIS(getCurrentBoard()) && !generalSettings->switchSourceAllowedTaranis(i)) {
+      modelItem->setData(0, Qt::UserRole - 1);  // trick to disable an item
+    }
+  }
+}
+
+QStandardItemModel * Helpers::getRawSourceItemModel(const GeneralSettings * const generalSettings, const ModelData * const model, unsigned int flags)
+{
+  QStandardItemModel * itemModel = new QStandardItemModel();
+  Boards board = Boards(getCurrentBoard());
+  Firmware * fw = getCurrentFirmware();
 
   if (flags & POPULATE_NONE) {
-    item = RawSource(SOURCE_TYPE_NONE);
-    b->addItem(item.toString(model), item.toValue());
-    if (item == source) b->setCurrentIndex(b->count()-1);
+    addRawSourceItems(itemModel, SOURCE_TYPE_NONE, 1, generalSettings, model);
   }
 
   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);
-      }
+    for (int i=0; i < getCurrentFirmware()->getCapability(LuaScripts); i++) {
+      addRawSourceItems(itemModel, SOURCE_TYPE_LUA_OUTPUT, fw->getCapability(LuaOutputsPerScript), generalSettings, model, i * 16);
     }
   }
 
   if (model && (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);
-        b->addItem(item.toString(model), item.toValue());
-        if (item == source) b->setCurrentIndex(b->count()-1);
-      }
-    }
+    addRawSourceItems(itemModel, SOURCE_TYPE_VIRTUAL_INPUT, fw->getCapability(VirtualInputs), generalSettings, model);
   }
 
   if (flags & POPULATE_SOURCES) {
-    for (int i=0; i<CPN_MAX_STICKS+getCurrentFirmware()->getCapability(Pots)+getCurrentFirmware()->getCapability(Sliders); i++) {
-      item = RawSource(SOURCE_TYPE_STICK, i);
-      // skip unavailable pots and sliders
-      if (item.isPot() && !generalSettings.isPotAvailable(i-CPN_MAX_STICKS)) continue;
-      if (item.isSlider() && !generalSettings.isSliderAvailable(i-CPN_MAX_STICKS-getCurrentFirmware()->getCapability(Pots))) continue;
-      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(model), item.toValue());
-      if (item == source) b->setCurrentIndex(b->count()-1);
-    }
+    int totalSources = CPN_MAX_STICKS + board.getCapability(Board::Pots) + board.getCapability(Board::Sliders) +  board.getCapability(Board::MouseAnalogs);
+    addRawSourceItems(itemModel, SOURCE_TYPE_STICK, totalSources, generalSettings, model);
+    addRawSourceItems(itemModel, SOURCE_TYPE_ROTARY_ENCODER, fw->getCapability(RotaryEncoders), generalSettings, model);
   }
 
   if (flags & POPULATE_TRIMS) {
-    for (int i=0; i<4; i++) {
-      item = RawSource(SOURCE_TYPE_TRIM, i);
-      b->addItem(item.toString(model), item.toValue());
-      if (item == source) b->setCurrentIndex(b->count()-1);
-    }
+    addRawSourceItems(itemModel, SOURCE_TYPE_TRIM, board.getCapability(Board::NumTrims), generalSettings, model);
   }
 
   if (flags & POPULATE_SOURCES) {
-    item = RawSource(SOURCE_TYPE_MAX);
-    b->addItem(item.toString(model), item.toValue());
-    if (item == source) b->setCurrentIndex(b->count()-1);
+    addRawSourceItems(itemModel, SOURCE_TYPE_MAX, 1, generalSettings, model);
   }
 
   if (flags & POPULATE_SWITCHES) {
-    for (int i=0; i<getCurrentFirmware()->getCapability(Switches); i++) {
-      item = RawSource(SOURCE_TYPE_SWITCH, i);
-      b->addItem(item.toString(model), item.toValue());
-      if (IS_HORUS_OR_TARANIS(board) && !generalSettings.switchSourceAllowedTaranis(i)) {
-        QModelIndex index = b->model()->index(b->count()-1, 0);
-        QVariant v(0);
-        b->model()->setData(index, v, Qt::UserRole - 1);
-      }
-      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(model), item.toValue());
-      if (item == source) b->setCurrentIndex(b->count()-1);
-    }
+    addRawSourceItems(itemModel, SOURCE_TYPE_SWITCH, board.getCapability(Board::Switches), generalSettings, model);
+    addRawSourceItems(itemModel, SOURCE_TYPE_CUSTOM_SWITCH, fw->getCapability(LogicalSwitches), generalSettings, model);
   }
 
   if (flags & POPULATE_SOURCES) {
-    for (int i=0; i<CPN_MAX_CYC; i++) {
-      item = RawSource(SOURCE_TYPE_CYC, i);
-      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(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(model), item.toValue());
-      if (item == source) b->setCurrentIndex(b->count()-1);
-    }
+    addRawSourceItems(itemModel, SOURCE_TYPE_CYC, CPN_MAX_CYC, generalSettings, model);
+    addRawSourceItems(itemModel, SOURCE_TYPE_PPM, fw->getCapability(TrainerInputs), generalSettings, model);
+    addRawSourceItems(itemModel, SOURCE_TYPE_CH, fw->getCapability(Outputs), generalSettings, model);
   }
 
   if (flags & POPULATE_TELEMETRY) {
-    if (IS_ARM(getCurrentBoard())) {
-      for (int i=0; i<5; ++i) {
-        item = RawSource(SOURCE_TYPE_SPECIAL, i);
-        b->addItem(item.toString(model), item.toValue());
-        if (item == source) b->setCurrentIndex(b->count()-1);
-      }
-      for (int i=0; i<CPN_MAX_SENSORS; ++i) {
-        if (model && model->sensorData[i].isAvailable()) {    //this conditon must be false if we populate Global Functions where model = 0
-          for (int j=0; j<3; ++j) {
-            item = RawSource(SOURCE_TYPE_TELEMETRY, 3*i+j);
-            b->addItem(item.toString(model), item.toValue());
-            // qDebug() << item.toString(model) << source.toString(model);
-            if (item == source) b->setCurrentIndex(b->count()-1);
-          }
+    if (IS_ARM(board.getBoardType())) {
+      addRawSourceItems(itemModel, SOURCE_TYPE_SPECIAL, 5, generalSettings, model);
+
+      if (model) {
+        QList<int> exclude;
+        for (int i=0; i < CPN_MAX_SENSORS * 3; ++i) {
+          //this conditon must be false if we populate Global Functions where model = 0
+          if (!model->sensorData[div(i, 3).quot].isAvailable())
+            exclude << i;
         }
+        if (exclude.size() < CPN_MAX_SENSORS * 3)
+          addRawSourceItems(itemModel, SOURCE_TYPE_TELEMETRY, CPN_MAX_SENSORS * 3, generalSettings, model, 0, exclude);
       }
     }
     else {
-      for (int i=0; i<(flags & POPULATE_TELEMETRYEXT ? TELEMETRY_SOURCES_STATUS_COUNT : TELEMETRY_SOURCES_COUNT); i++) {
-        if (i==TELEMETRY_SOURCE_TX_TIME && !getCurrentFirmware()->getCapability(RtcTime))
-          continue;
-        if (i==TELEMETRY_SOURCE_SWR && !getCurrentFirmware()->getCapability(SportTelemetry))
-          continue;
-        if (i==TELEMETRY_SOURCE_TIMER3 && !IS_ARM(board))
-          continue;
-        item = RawSource(SOURCE_TYPE_TELEMETRY, i);
-        b->addItem(item.toString(model), item.toValue());
-        if (item == source) b->setCurrentIndex(b->count()-1);
-      }
+      QList<int> exclude;
+      if (!fw->getCapability(RtcTime))
+        exclude << TELEMETRY_SOURCE_TX_TIME;
+      if (!fw->getCapability(SportTelemetry))
+        exclude << TELEMETRY_SOURCE_SWR;
+      if (!IS_ARM(board.getBoardType()))
+        exclude << TELEMETRY_SOURCE_TIMER3;
+      int count = ((flags & POPULATE_TELEMETRYEXT) ? TELEMETRY_SOURCES_STATUS_COUNT : TELEMETRY_SOURCES_COUNT);
+      addRawSourceItems(itemModel, SOURCE_TYPE_TELEMETRY, count, generalSettings, model, 0, exclude);
     }
   }
 
   if (flags & POPULATE_GVARS) {
-    for (int i=0; i<getCurrentFirmware()->getCapability(Gvars); i++) {
-      item = RawSource(SOURCE_TYPE_GVAR, i);
-      b->addItem(item.toString(model), item.toValue());
-      if (item == source) b->setCurrentIndex(b->count()-1);
-    }
+    addRawSourceItems(itemModel, SOURCE_TYPE_GVAR, fw->getCapability(Gvars), generalSettings, model);
   }
 
-  b->setMaxVisibleItems(10);
+  return itemModel;
 }
 
 QString image2qstring(QImage image)
@@ -813,35 +634,44 @@ CompanionIcon::CompanionIcon(const QString &baseimage)
 
 void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
 {
-  SimulatorInterface * simulator = getCurrentSimulator();
-  if (simulator) {
-    RadioData * simuData = new RadioData(radioData);
-    unsigned int flags = 0;
+  QString fwId = SimulatorLoader::findSimulatorByFirmwareName(getCurrentFirmware()->getId());
+  if (fwId.isEmpty()) {
+    QMessageBox::warning(NULL,
+                         QObject::tr("Warning"),
+                         QObject::tr("Simulator for this firmware is not yet available"));
+    return;
+  }
 
-    if (modelIdx >= 0) {
-      flags |= SIMULATOR_FLAGS_NOTX;
-      simuData->setCurrentModel(modelIdx);
-    }
+  RadioData * simuData = new RadioData(radioData);
+  unsigned int flags = 0;
 
-    SimulatorDialog * dialog = new SimulatorDialog(parent, simulator, flags);
-    if (IS_HORUS(getCurrentBoard()) && !dialog->useTempDataPath(true)) {
-      QMessageBox::critical(NULL, QObject::tr("Data Load Error"), QObject::tr("Error: Could not create temporary directory in '%1'").arg(QDir::tempPath()));
-      delete dialog;
-      delete simuData;
-      return;
-    }
-    dialog->setRadioData(simuData);
-    qDebug() << __FILE__ << __LINE__ << "Starting" << getCurrentFirmware()->getName() << "simulation with SD path" << dialog->getSdPath() << "and models/settings path" << dialog->getDataPath();
-    dialog->start();
-    dialog->exec();
-    delete dialog;
-    // TODO Horus tmp directory is deleted on simulator close OR we could use it to get back data from the simulation
-    delete simuData;  // TODO same with simuData, could read it back and update the file data
+  if (modelIdx >= 0) {
+    flags |= SIMULATOR_FLAGS_NOTX;
+    simuData->setCurrentModel(modelIdx);
+  }
+
+  SimulatorMainWindow * dialog = new SimulatorMainWindow(parent, fwId, flags);
+  dialog->setWindowModality(Qt::ApplicationModal);
+  dialog->setAttribute(Qt::WA_DeleteOnClose);
+
+  QObject::connect(dialog, &SimulatorMainWindow::destroyed, [simuData] (void) {
+    // TODO simuData and Horus tmp directory is deleted on simulator close OR we could use it to get back data from the simulation
+    delete simuData;
+  });
+
+  QString resultMsg;
+  if (dialog->getExitStatus(&resultMsg)) {
+    if (resultMsg.isEmpty())
+      resultMsg = QObject::tr("Uknown error during Simulator startup.");
+    QMessageBox::critical(NULL, QObject::tr("Simulator Error"), resultMsg);
+    dialog->deleteLater();
+  }
+   else if (dialog->setRadioData(simuData)) {
+    dialog->show();
   }
   else {
-    QMessageBox::warning(NULL,
-      QObject::tr("Warning"),
-      QObject::tr("Simulator for this firmware is not yet available"));
+    QMessageBox::critical(NULL, QObject::tr("Data Load Error"), QObject::tr("Error occurred while starting simulator."));
+    dialog->deleteLater();
   }
 }
 
@@ -851,8 +681,8 @@ QPixmap makePixMap(const QImage & image)
   QImage result = image.scaled(firmware->getCapability(LcdWidth), firmware->getCapability(LcdHeight));
   if (firmware->getCapability(LcdDepth) == 4) {
     result = result.convertToFormat(QImage::Format_RGB32);
-    for (int i = 0; i < image.width(); ++i) {
-      for (int j = 0; j < image.height(); ++j) {
+    for (int i = 0; i < result.width(); ++i) {
+      for (int j = 0; j < result.height(); ++j) {
         QRgb col = result.pixel(i, j);
         int gray = qGray(col);
         result.setPixel(i, j, qRgb(gray, gray, gray));
@@ -866,13 +696,23 @@ QPixmap makePixMap(const QImage & image)
   return QPixmap::fromImage(result);
 }
 
+
 int version2index(const QString & version)
 {
   int result = 999;
-  QStringList parts = version.split("N");
-  if (parts.size() > 1)
-    result = parts[1].toInt(); // nightly build
-  parts = parts[0].split('.');
+  QStringList parts;
+  QString mainVersion = version;
+  if (version.contains("RC")) {
+    parts = version.split("RC");
+    result = parts[1].toInt() + 900; // RC0 = 900; RC1=901,..
+    mainVersion = parts[0];
+  }
+  else if (version.contains("N")) {
+    parts = version.split("N");
+    result = parts[1].toInt(); // nightly build up to 899
+    mainVersion = parts[0];
+  }
+  parts = mainVersion.split('.');
   if (parts.size() > 2)
     result += 1000 * parts[2].toInt();
   if (parts.size() > 1)
@@ -882,8 +722,10 @@ int version2index(const QString & version)
   return result;
 }
 
-QString index2version(int index)
+const QString index2version(int index)
 {
+  QString result;
+  QString templt("%1.%2.%3");
   if (index >= 19900000) {
     int nightly = index % 1000;
     index /= 1000;
@@ -891,22 +733,22 @@ QString index2version(int index)
     index /= 100;
     int minor = index % 100;
     int major = index / 100;
-    QString result = QString("%1.%2.%3").arg(major).arg(minor).arg(revision);
-    if (nightly > 0 && nightly < 999) {
-      result += QString("N%1").arg(nightly);
+    result = templt.arg(major).arg(minor).arg(revision);
+    if (nightly > 0 && nightly < 900) {
+      result += "N" + QString::number(nightly);
+    }
+    else if (nightly >= 900 && nightly < 1000) {
+      result += "RC" + QString::number(nightly-900);
     }
-    return result;
   }
   else if (index >= 19900) {
     int revision = index % 100;
     index /= 100;
     int minor = index % 100;
     int major = index / 100;
-    return QString("%1.%2.%3").arg(major).arg(minor).arg(revision);
-  }
-  else {
-    return QString();
+    result = templt.arg(major).arg(minor).arg(revision);
   }
+  return result;
 }
 
 bool qunlink(const QString & fileName)

companion/src/helpers.h

@@ -22,7 +22,6 @@
 #define _HELPERS_H_
 
 #include "eeprominterface.h"
-#include "modeledit/modeledit.h"
 #include <QCheckBox>
 #include <QSpinBox>
 #include <QTableWidget>
@@ -30,6 +29,7 @@
 #include <QDebug>
 #include <QTime>
 #include <QElapsedTimer>
+#include <QStandardItemModel>
 
 extern const QColor colors[CPN_MAX_CURVES];
 
@@ -52,11 +52,6 @@ extern const QColor colors[CPN_MAX_CURVES];
 
 #define TRIM_MODE_NONE  0x1F  // 0b11111
 
-void populateGvSourceCB(QComboBox *b, int value);
-void populateFileComboBox(QComboBox * b, const QSet<QString> & set, const QString & current);
-void getFileComboBoxValue(QComboBox * b, char * dest, int length);
-void populateRotEncCB(QComboBox *b, int value, int renumber);
-
 QString getTheme();
 
 class CompanionIcon: public QIcon {
@@ -69,7 +64,10 @@ class GVarGroup: public QObject {
   Q_OBJECT
 
   public:
-    GVarGroup(QCheckBox * weightGV, QAbstractSpinBox * weightSB, QComboBox * weightCB, int & weight, const ModelData & model, const int deflt, const int mini, const int maxi, const double step=1.0, bool allowGVars=true, ModelPanel * panel=NULL);
+    GVarGroup(QCheckBox * weightGV, QAbstractSpinBox * weightSB, QComboBox * weightCB, int & weight, const ModelData & model, const int deflt, const int mini, const int maxi, const double step=1.0, bool allowGVars=true);
+
+  signals:
+    void valueChanged();
 
   protected slots:
     void gvarCBChanged(int);
@@ -84,7 +82,6 @@ class GVarGroup: public QObject {
     int & weight;
     double step;
     bool lock;
-    ModelPanel * panel;
 };
 
 #define HIDE_DIFF             0x01
@@ -116,19 +113,6 @@ class CurveGroup : public QObject {
     int lastType;
 };
 
-enum SwitchContext
-{
-  LogicalSwitchesContext,
-  SpecialFunctionsContext,
-  GlobalFunctionsContext,
-  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);
 
 #define POPULATE_NONE           (1<<0)
 #define POPULATE_SOURCES        (1<<1)
@@ -143,8 +127,22 @@ void populateGvarUseCB(QComboBox *b, unsigned int phase);
 #define GVARS_VARIANT           0x0001
 #define FRSKY_VARIANT           0x0002
 
-void populateGVCB(QComboBox & b, int value, const ModelData & model);
-void populateSourceCB(QComboBox *b, const RawSource &source, const GeneralSettings generalSettings, const ModelData * model, unsigned int flags);
+namespace Helpers
+{
+  void addRawSourceItems(QStandardItemModel * itemModel, const RawSourceType & type, int count, const GeneralSettings * const generalSettings = NULL,
+                         const ModelData * const model = NULL, const int start = 0, const QList<int> exclude = QList<int>());
+  QStandardItemModel * getRawSourceItemModel(const GeneralSettings * const generalSettings = NULL, const ModelData * const model = NULL, unsigned int flags = 0);
+
+  void populateGvarUseCB(QComboBox *b, unsigned int phase);
+  void populateGVCB(QComboBox & b, int value, const ModelData & model);
+  QString getAdjustmentString(int16_t val, const ModelData * model = NULL, bool sign = false);
+
+  void populateFileComboBox(QComboBox * b, const QSet<QString> & set, const QString & current);
+  void getFileComboBoxValue(QComboBox * b, char * dest, int length);
+}  // namespace Helpers
+
+// TODO : move to Helpers namespace
+
 QString image2qstring(QImage image);
 int findmult(float value, float base);
 
@@ -157,38 +155,18 @@ QString getFrSkySrc(int index);
 
 void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx);
 
-template <class T>
-QVector<T> findWidgets(QObject * object, const QString & name)
-{
-  QVector<T> result;
-  QRegExp rx(name.arg("([0-9]+)"));
-  QList<T> children = object->findChildren<T>();
-  foreach(T child, children) {
-    int pos = rx.indexIn(child->objectName());
-    if (pos >= 0) {
-      QStringList list = rx.capturedTexts();
-      int index = list[1].toInt();
-      if (result.size() <= index) {
-        result.resize(index+1);
-      }
-      result[index] = child;
-    }
-  }
-  return result;
-}
-
 // Format a pixmap to fit on the current firmware
 QPixmap makePixMap(const QImage & image);
 
 int version2index(const QString & version);
-QString index2version(int index);
+const 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(); };
+    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(); }
 };
 
 bool qunlink(const QString & fileName);
@@ -205,7 +183,7 @@ bool caseInsensitiveLessThan(const QString &s1, const QString &s2);
 class GpsCoord
 {
 public:
-  GpsCoord(): latitude(0), longitude(0) {};
+  GpsCoord(): latitude(0), longitude(0) {}
   double latitude;    // Precede South latitudes and West longitudes with a minus sign. Latitudes range from -90 to 90.
   double longitude;   // Longitudes range from -180 to 180.
 };
@@ -213,7 +191,7 @@ public:
 class GpsGlitchFilter
 {
 public:
-  GpsGlitchFilter() : lastValid(false), glitchCount(0) {};
+  GpsGlitchFilter() : lastValid(false), glitchCount(0) {}
   bool isGlitch(GpsCoord coord);
 
 private:
@@ -226,7 +204,7 @@ private:
 class GpsLatLonFilter
 {
 public:
-  GpsLatLonFilter() {};
+  GpsLatLonFilter() {}
   bool isValid(GpsCoord coord);
 
 private:
@@ -249,13 +227,13 @@ public:
 
   void resizeColumnsToContents();
   void setColumnWidth(int col, int width);
-  void pushRowsUp(int row); 
+  void pushRowsUp(int row);
 
 private:
 #if defined(TABLE_LAYOUT)
-  QTableWidget * tableWidget; 
+  QTableWidget * tableWidget;
 #else
-  QGridLayout * gridWidget; 
+  QGridLayout * gridWidget;
 #endif
 };
 
@@ -267,7 +245,7 @@ public:
     name(name), total(0) {
     timer.start();
   };
-  ~Stopwatch() {};
+  ~Stopwatch() {}
 
   void restart() {
     total = 0;

companion/src/icon.rc

@@ -1 +1 @@
-IDI_ICON1               ICON    DISCARDABLE     "icon.ico"
+IDI_ICON1               ICON    DISCARDABLE     "icon.ico"