Revert sync at 1000Hz, it is too CPU taxing: #474

* added gitpod/docker

.circleci/config.yml

@@ -0,0 +1,88 @@
+# Use the latest 2.1 version of CircleCI pipeline process engine.
+# See: https://circleci.com/docs/2.0/configuration-reference
+version: 2.1
+
+jobs:
+  build-std:
+    docker:
+      - image: ajjjjjjjj/opentx-docker-i6x:1.4.0
+    steps:
+      - checkout
+      - run: |
+          python3 ./tools/build-flysky.py -bI6X -tALL $PWD/
+      - store_artifacts:
+          path: output
+
+  build-std-dfplayer:
+    docker:
+      - image: ajjjjjjjj/opentx-docker-i6x:1.4.0
+    steps:
+      - checkout
+      - run: |
+          python3 ./tools/build-flysky.py -bI6X_DFPLAYER -tALL $PWD/
+      - store_artifacts:
+          path: output
+
+  build-heli:
+    docker:
+      - image: ajjjjjjjj/opentx-docker-i6x:1.4.0
+    steps:
+      - checkout
+      - run: |
+          python3 ./tools/build-flysky.py -bI6X_HELI -tALL $PWD/
+      - store_artifacts:
+          path: output
+
+  build-heli-dfplayer:
+    docker:
+      - image: ajjjjjjjj/opentx-docker-i6x:1.4.0
+    steps:
+      - checkout
+      - run: |
+          python3 ./tools/build-flysky.py -bI6X_HELI_DFPLAYER -tALL $PWD/
+      - store_artifacts:
+          path: output
+
+  build-en:
+    docker:
+      - image: ajjjjjjjj/opentx-docker-i6x:1.4.0
+    steps:
+      - checkout
+      - run: |
+          python3 ./tools/build-flysky.py -bI6X_DFPLAYER -bI6X_HELI -bI6X -tEN $PWD/
+      - store_artifacts:
+          path: output
+
+workflows:
+  openi6x-release-workflow:
+    jobs:
+      - build-en:
+          filters:
+            branches:
+              ignore:
+                - master
+                - /.*-maintenance/
+      - build-std:
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/
+      - build-std-dfplayer:
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/
+      - build-heli:
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/
+      - build-heli-dfplayer:
+          filters:
+            branches:
+              only:
+                - master
+                - /.*-maintenance/

.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

.github/ISSUE_TEMPLATE/bug.md

@@ -0,0 +1,30 @@
+---
+name: Bug report
+about: Create a report to help the OpenTX team to improve OpenTX
+
+---
+*Before submitting,  search the open issue if there is already a report of the bug*
+
+Also often minor bugs are already fixed in nightly builds, often it is
+a good idea to test (in a controlled environment like a bench setup)
+with a nightly firmware to see if the bug still exists.
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**General information**
+ - OpenI6X version (e.g. 1.8.0)
+ - Hardware (e.g. external module model)

.github/ISSUE_TEMPLATE/help.md

@@ -0,0 +1,16 @@
+---
+name: Help
+about: Problems or question of using OpenTX
+
+--- 
+
+The issue tracker here is for devlopment of OpenTX. This is not a
+support site, only a bug tracking system. Please use support groups
+like [rcgroups](https://rcgroups.com/) or
+[openrcforum](https://www.openrcforums.com/forum/). See also our
+[manual](https://opentx.gitbooks.io/manual-for-opentx-2-2/).
+
+For quick questions you can also join our general chat.
+
+Issues that fall into the category of asking for help, will be
+generally closed as invalid without an answer.

.github/ISSUE_TEMPLATE/newfeature.md

@@ -0,0 +1,18 @@
+---
+name: Feature request
+about: Suggest an idea for this project to make OpenTX even better
+
+---
+*Before suggesting a new feature here, please search the open issue if there is already a request for the feature*
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -2,7 +2,22 @@
 /.*project
 /.settings
 /.autotools
-/doc/
+/*.user
+/*.user.*
 build*/
 cmake-build-*/
 /debian/
+/CMakeFiles/*
+radio/src/CmakeFiles/*
+/.vscode/
+*.cmake
+*.make
+*.marks
+/nbproject/
+*.bin
+/radio/src/CMakeFiles/firmware.dir/link.txt
+.push.settings.jsonc
+build.sh
+firm.sh
+flash.sh
+*.patch

.gitpod.yml

@@ -0,0 +1,7 @@
+# .gitpod.yml
+image:
+  file: Dockerfile
+
+tasks:
+  - init: echo 'Welcome!'
+  - command: mkdir build && cd build

.travis.yml

@@ -1,23 +1,17 @@
 sudo: required
 dist: trusty
-language: python
+language: cpp
 compiler: gcc
 
-virtualenv:
-  system_site_packages: true
-
-python:
-  - 3.4
-
 env:
   global:
-    - QT_BASE=53
+    # - QT_BASE=53
     # - QT_BASE=54
     # - QT_BASE=55
     # - QT_BASE=56
-    # - QT_BASE=57
-    #- GCC_ARM=/opt/gcc-arm-none-eabi/bin
-    - AVR_FLAVORS="AVR9X 9X GRUVIN9X MEGA2560"
+    - QT_BASE=57
+    # - GCC_ARM=/opt/gcc-arm-none-eabi/bin
+    - PYTHONPATH=${PYTHONPATH}:/usr/lib/python3/dist-packages
   matrix:
     #
     # ALL will build every individual board & DEFAULT, sequentially.
@@ -25,15 +19,12 @@ env:
     #
     # - FLAVOR=ALL
     - FLAVOR=DEFAULT
-    - FLAVOR=AVR9X
-    # - FLAVOR=9X
-    # - FLAVOR=GRUVIN9X
-    # - FLAVOR=MEGA2560
     - FLAVOR=ARM9X
     # - FLAVOR=AR9X
     # - FLAVOR=SKY9X
     # - FLAVOR=9XRPRO
     - FLAVOR=X7
+    - FLAVOR=XLITE
     - FLAVOR=X9
     # - FLAVOR=X9D
     # - FLAVOR=X9D+
@@ -53,23 +44,16 @@ before_install:
   - if [ "$QT_BASE" = "56" ]; then sudo add-apt-repository ppa:beineri/opt-qt562-trusty -y; fi
   - if [ "$QT_BASE" = "57" ]; then sudo add-apt-repository ppa:beineri/opt-qt571-trusty -y; fi
   - sudo apt-get update -qq
+  - pyenv uninstall -f 2.7.6 && pyenv install 3.5.4 && pyenv global 3.5.4
+  - pip install pillow
 
 install:
-  - sudo apt-get --yes --force-yes install python3-pyqt5 curl libmpfr4 libmpc3 libfox-1.6-dev libgtest-dev
-  - |
-    if [[ " ${AVR_FLAVORS} " =~ " ${FLAVOR} " || ${FLAVOR} == "ALL" ]]; then
-      wget --quiet https://launchpad.net/ubuntu/+source/gcc-avr/1:4.9.2+Atmel3.5.0-1/+build/8403710/+files/gcc-avr_4.9.2+Atmel3.5.0-1_amd64.deb
-      wget --quiet https://launchpad.net/ubuntu/+source/avr-libc/1:1.8.0+Atmel3.5.0-1/+build/8435473/+files/avr-libc_1.8.0+Atmel3.5.0-1_all.deb
-      wget --quiet https://launchpad.net/ubuntu/+source/binutils-avr/2.25+Atmel3.5.0-2/+build/8435474/+files/binutils-avr_2.25+Atmel3.5.0-2_amd64.deb
-      sudo dpkg --install gcc-avr_4.9.2+Atmel3.5.0-1_amd64.deb avr-libc_1.8.0+Atmel3.5.0-1_all.deb binutils-avr_2.25+Atmel3.5.0-2_amd64.deb
-    fi
-    if [[ ! " ${AVR_FLAVORS} " =~ " ${FLAVOR} " || ${FLAVOR} == "ALL" ]]; then
-      sudo apt-get --yes --force-yes install gcc-arm-none-eabi
-      # Trying to build with gcc-arm 4.7 isn't working because it can't find the compiler, despite adding to PATH (in commit-tests.sh) by defining GCC_ARM above 
+  - sudo apt-get --yes --force-yes install curl libmpfr4 libmpc3 libfox-1.6-dev libgtest-dev
+  - sudo apt-get --yes --force-yes install gcc-arm-none-eabi
+      # Trying to build with gcc-arm 4.7 isn't working because it can't find the compiler, despite adding to PATH (in commit-tests.sh) by defining GCC_ARM above
       # - wget --quiet https://launchpad.net/gcc-arm-embedded/4.7/4.7-2013-q3-update/+download/gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2
       # - 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 --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
 
 script:

CMakeLists.txt

@@ -1,15 +1,15 @@
 project(OpenTX)
 
 set(VERSION_MAJOR "2")
-set(VERSION_MINOR "2")
+set(VERSION_MINOR "1")
 set(VERSION_REVISION "0")
 set(VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
 set(VERSION_FAMILY ${VERSION_MAJOR}.${VERSION_MINOR})
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}${VERSION_SUFFIX})
-set(SDCARD_REVISION "0008")
+set(SDCARD_REVISION "0018")
 set(SDCARD_VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
 
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.13)
 cmake_policy(SET CMP0020 NEW)
 cmake_policy(SET CMP0023 OLD)
 if(POLICY CMP0042)
@@ -21,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)
 
@@ -40,7 +43,7 @@ today(DATE)
 now(TIME)
 git_id(GIT_STR)
 
-message(STATUS "OpenTX ${VERSION} @${GIT_STR}")
+message(STATUS "OpenI6X ${VERSION} @${GIT_STR}")
 
 # options shared by all targets
 
@@ -59,6 +62,24 @@ if(WIN32)
   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()
+
+if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")  # regular Clang or AppleClang
+  set(CLANG TRUE)
+endif()
+
+option(DISABLE_COMPANION "Disable building companion and simulators" OFF)
+
+if(NOT DISABLE_COMPANION)  # FIXME cosmetics/style
+find_package(Qt5Core)
 find_package(Qt5Widgets)
 find_package(Qt5Xml)
 find_package(Qt5LinguistTools)
@@ -66,11 +87,40 @@ find_package(Qt5PrintSupport)
 find_package(Qt5Multimedia)
 find_package(Qt5Svg)
 
-if(Qt5Widgets_FOUND)
-  message(STATUS "Qt Version: ${Qt5Widgets_VERSION}")
+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(MSVC)
+    list(APPEND APP_COMMON_DEFINES -D__STDC_LIMIT_MACROS)
+  endif()
   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)
@@ -84,6 +134,7 @@ if(Qt5Widgets_FOUND)
   else()
     list(APPEND APP_COMMON_DEFINES -DAPP_DBG_HANDLER_ENABLE=0)
   endif()
+
 else()
   message(WARNING "Qt not found! Companion and Simulator builds disabled.")
 endif()
@@ -97,15 +148,19 @@ 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! Simulator audio, and joystick inputs, will not work.")
   endif()
 endif()
+endif(NOT DISABLE_COMPANION)
 
 # Check for a file that is typically left from a OpenTX 2.1 build and abort if found
 if (EXISTS ${RADIO_SRC_DIRECTORY}/stamp.h OR EXISTS ${RADIO_SRC_DIRECTORY}/translations/en.h)
@@ -136,6 +191,6 @@ endif()
 
 add_subdirectory(${RADIO_SRC_DIRECTORY})
 
-if(Qt5Widgets_FOUND)
+if(Qt5Core_FOUND AND NOT DISABLE_COMPANION)
   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

Dockerfile

@@ -0,0 +1,46 @@
+# Dockerfile
+FROM archlinux:base
+RUN pacman -Syu --noconfirm
+
+# Install misc packages
+RUN pacman -S --noconfirm \
+    7zip \
+	arm-none-eabi-gcc \
+	arm-none-eabi-newlib \
+	base-devel \
+	bc \
+	cmake \
+	cpio \
+	curl \
+	dos2unix \
+	erofs-utils \
+	git \
+	less \
+	nano \
+	python \
+	python-pip \
+	python-pilkit \
+	screen \
+	tree \
+	unzip \
+	vim \
+	wget \
+	zip
+
+# HACK: Allow base-devel to run with root user
+RUN sed -i '/E_ROOT/d' /usr/bin/makepkg
+
+# Install yay
+RUN git clone https://aur.archlinux.org/yay-bin.git /tmp/yay-bin && \
+    cd /tmp/yay-bin && \
+	makepkg -si --noconfirm && \
+	cd && rm -rf /tmp/yay-bin
+
+#RUN git clone --recursive https://github.com/STMicroelectronics/STM32CubeG0.git /workspace/STM32CubeG0
+#RUN git clone --recursive https://github.com/STMicroelectronics/STM32CubeG4.git /workspace/STM32CubeG4
+
+# Personal dir dotfiles
+#ADD home /home/
+
+# Personal uploader scripts
+#ADD root/bin /usr/local/bin/

README.md

@@ -1,10 +1,59 @@
-##OpenTX 2.2 Branch
+[![Release](https://img.shields.io/github/v/release/OpenI6X/opentx?include_prereleases)](https://github.com/OpenI6X/opentx/releases/latest)
+[![GitHub all releases](https://img.shields.io/github/downloads/OpenI6X/opentx/total)](https://github.com/OpenI6X/opentx/releases)
+[![GitHub license](https://img.shields.io/github/license/OpenI6X/opentx)](https://github.com/openi6x/opentx/blob/master/LICENSE)
+![OpenI6X](https://circleci.com/gh/OpenI6X/opentx.svg?style=shield)
+[![Gitpod ready-to-code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/openi6x/opentx/tree/master)
+[![Discord](https://img.shields.io/discord/973289741862727741.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/3vKfYNTVa2)
 
-[![Build Status](https://travis-ci.org/opentx/opentx.svg?branch=next)](https://travis-ci.org/opentx/opentx)
-[![Coverity Scan Build Status](https://scan.coverity.com/projects/11787/badge.svg)](https://scan.coverity.com/projects/opentx-opentx)
-[![Join the chat at https://opentx.rocket.chat](https://camo.githubusercontent.com/3d659054abd6ce21c0e47cf3b83a51bda69ca282/68747470733a2f2f64656d6f2e726f636b65742e636861742f696d616765732f6a6f696e2d636861742e737667)](https://opentx.rocket.chat)
-[![Donate using Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DJ9MASSKVW8WN)
+![Banner](https://github.com/OpenI6X/opentx/blob/master/doc/flysky/banner.png?raw=true)
 
-The ongoing development on 2.2.x is done in this branch.
+# Custom OpenTX / EdgeTX for Flysky FS-i6X
 
-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.
+Join our [Discord](https://discord.gg/3vKfYNTVa2), [RCGroups](https://www.rcgroups.com/forums/showthread.php?3916435-FlySky-I6X-port-of-OpenTX) or [Telegram](https://t.me/otx_flysky_i6x) to contribute, discuss or get help.<br> 
+
+## Instructions
+
+- [FlySky i6X user interface](https://github.com/OpenI6X/opentx/wiki/Manual) and other differences to official EdgeTX/OpenTX devices.<br>
+- [EdgeTX manual](https://manual.edgetx.org/bw-radios)
+- [How to install, upgrade or restore firmware](https://github.com/OpenI6X/opentx/wiki/Flashing-&-Upgrading)<br>
+- [Developers guide, how to build](https://github.com/OpenI6X/opentx/wiki/Development)<br>
+- [Modifications](https://github.com/OpenI6X/opentx/wiki/Modifications)<br>
+
+## Comparison
+
+| Feature                   | FlySky i6X | OpenI6X                      |
+|---------------------------|------------|------------------------------|
+| Channels                  | 6/10       | 16                           |
+| Mixers                    | 3          | 32                           |
+| Models                    | 20         | 20 / unlimited<sup>[1]</sup> |
+| Protocols                 | AFHDS, AFHDS2A, PPM | AFHDS2A + 16Ch modes, PPM, CRSF |
+| Trainer                   | PPM        | PPM, SBUS                    |
+| Timers                    | _          | ✓                            |
+| Voice annoucements        | _          | ✓<sup>[2]</sup>              |
+| Variometer                | _          | ✓                            |
+| ExpressLRS ready          | _          | ✓ Configurator built-in (no need for LUA) |
+| Adjustable screen brightness | _       | ✓<sup>[3]</sup>              |
+| USB Modes                 | Joystick   | Joystick, Storage, Serial (Telemetry mirror, Debug) |
+| AUX Serial port           | _          | ✓ SBUS Trainer, Telemetry mirror, Debug |
+| FlySky FS-HZCZ03-ADJ Gimbal support | _   | ✓<sup>[4]</sup>    |
+| Languages                 | EN, CN      | PL, EN, CZ, DE, ES, FI, FR, IT, NL, PT, SE |
+
+<sub>[1] Unlimited by using USB mass storage mode eeprom backup/restore.</sub><br>
+<sub>[2] By adding DFPlayer, see [instructions](https://github.com/OpenI6X/opentx/wiki/Modifications#dfplayer) in wiki.</sub><br>
+<sub>[3] By wiring 2 pads, see [instructions](https://github.com/OpenI6X/opentx/wiki/Modifications#adjustable-backlight-level) in wiki.</sub><br>
+<sub>[4] See [instructions](https://github.com/OpenI6X/opentx/wiki/Modifications#flysky-fs-hzcz03-adj-gimbal) in wiki.</sub>
+  
+## Credits
+
+* Janek ([ajjjjjjjj](https://github.com/ajjjjjjjj)), continues Kuba's and Mariano's work, added sound, USB, ExpressLRS V2/V3 configuration, telemetry mirror, SBUS trainer, new/fixed drivers, ports, bugfixes.
+* Mariano ([marianomd](https://github.com/marianomd)), continued Kuba's work and made it up to useable condition! Added gimbals, buttons, AFHDS2A, PPM, CRSF.
+* Kuba ([qba667](https://github.com/qba667)), started this work and made this project possible, it is forked from his repo.
+* Wilhelm ([wimalopaan](https://github.com/wimalopaan)) added 16 channels SBUS16 / IBUS16 modes.
+* Rafael ([rafolg](https://github.com/rafolg)), ported FlySky Hall Gimbal support from EdgeTX.
+* Tom ([tmcadam](https://github.com/tmcadam)) fixed AFHDS2A PWM mode selection.
+* The internal RF code was taken from the great KotelloRC's [erfly6: Er9X for i6 and i6x](https://bitbucket.org/KotelloRC/erfly6/src/master/).
+* Some of the internal RF fixes are a result of analysing [pascallanger's](https://github.com/pascallanger) [DIY-Multiprotocol-TX-Module](https://github.com/pascallanger/DIY-Multiprotocol-TX-Module).
+* ExpressLRS configurator is based on elrsV2/V3.lua from [ExpressLRS](https://github.com/ExpressLRS/ExpressLRS).
+* Some of the ports are from [EdgeTX](https://github.com/EdgeTX/edgetx/).
+* ADC code taken from [OpenGround](https://github.com/fishpepper/OpenGround).
+* All the contributors of [OpenTX](https://github.com/opentx/opentx/). 

cmake/Bitmaps.cmake

@@ -14,10 +14,10 @@ macro(add_bitmaps_target targetname filter width format)
   add_custom_target(${targetname} DEPENDS ${bitmaps_files})
 endmacro(add_bitmaps_target)
 
-macro(add_truetype_font_target radio name font size bold)
+macro(add_truetype_font_target radio name font size offset)
   set(target ${RADIO_SRC_DIRECTORY}/fonts/${radio}/font_${name})
   add_custom_target(ttf_${radio}_${name}
-    COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${bold} ${target}
+    COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${offset} ${target}
     WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
   )
   set(ttf_${radio}_fonts_targets ${ttf_${radio}_fonts_targets} ttf_${radio}_${name})

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

@@ -49,8 +49,8 @@ macro(use_cxx11)
 endmacro(use_cxx11)
 
 macro(PrintTargetReport targetName)
-  if(CMAKE_CXX_COMPILER MATCHES "/cl\\.exe$")
-    set(cpp_version ${MSVC_VERSION})
+  if(CMAKE_CXX_COMPILER MATCHES "/(clang-)?cl\\.exe$")
+    set(cpp_version ${CMAKE_CXX_COMPILER_VERSION})
   else()
     execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE cpp_version)
   endif()

companion/releasenotes.txt

@@ -1,5 +1,78 @@
+<h2>Version 2.2.1 / 2017-12-17</h2>
+
+Please see <a href=http://www.open-tx.org/2017/12/16/opentx-2.2.1>this page</a> for details.
+
+<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>
@@ -22,10 +95,10 @@ Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrS
 <li>Fixed a problem with updates path on Windows (<a href=https://github.com/opentx/opentx/issues/2876>#2876</a>)</li>
 <li>Edge representation unified (changed from "no release" to "instant") (<a href=https://github.com/opentx/opentx/issues/2837>#2837</a>)</li>
 <li>Added channel names on failsafe sliders (<a href=https://github.com/opentx/opentx/issues/3021>#3021</a>)</li>
-<li>Corrected failsafe mapping when using Custom failsafe mode, D16 protocol and channel range different from from 1-8. 
+<li>Corrected failsafe mapping when using Custom failsafe mode, D16 protocol and channel range different from from 1-8.
   Users with such setups are advised to re-check their failsafe settings (<a href=https://github.com/opentx/opentx/issues/2975>#2975</a>)</li>
 <li>Various texts and translations corrections</li>
-<li>Various small bug-fixes: <a href=https://github.com/opentx/opentx/issues/2994>#2994</a>, 
+<li>Various small bug-fixes: <a href=https://github.com/opentx/opentx/issues/2994>#2994</a>,
                              <a href=https://github.com/opentx/opentx/issues/3016>#3016</a>,
                              <a href=https://github.com/opentx/opentx/issues/3012>#3012</a>
 </li>
@@ -43,8 +116,8 @@ Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrS
 
 <ul>
 <li>Fixed: Lua model scripts outputs not working in a simulator (<a href=https://github.com/opentx/opentx/issues/2684>#2684</a>)</li>
-<li>Fixed a problem of Companion 2.1 trying to install into 2.0 path. 
-    The effect will only be visible for the users that did not install any of the previous 2.1.x versions. 
+<li>Fixed a problem of Companion 2.1 trying to install into 2.0 path.
+    The effect will only be visible for the users that did not install any of the previous 2.1.x versions.
     (<a href=https://github.com/opentx/opentx/issues/2645>#2645</a>)</li>
 <li>Added missing SDL libraries to MAC package  (<a href=https://github.com/opentx/opentx/issues/2678>#2678</a>)</li>
 <li>Added used channels check/warning in Wizard (<a href=https://github.com/opentx/opentx/issues/2091>#2091</a>)</li>
@@ -125,7 +198,7 @@ Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrS
 <li>Added Battery meter range setting (<a href=https://github.com/opentx/opentx/issues/2195>#2195</a>)</li>
 <li>Improvements in Print and Compare dialogs (<a href=https://github.com/opentx/opentx/issues/2219>#2219</a>)</li>
 <li>Reset pots to the middle by right double clicking them in Simulator (<a href=https://github.com/opentx/opentx/issues/1939>#1939</a>)</li>
-<li>Minor fixes: <a href=https://github.com/opentx/opentx/issues/2153>#2153</a>, 
+<li>Minor fixes: <a href=https://github.com/opentx/opentx/issues/2153>#2153</a>,
                  <a href=https://github.com/opentx/opentx/issues/2138>#2138</a>,
                  <a href=https://github.com/opentx/opentx/issues/2090>#2090</a>,
                  <a href=https://github.com/opentx/opentx/issues/2122>#2122</a>
@@ -228,13 +301,13 @@ Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrS
 <ul>
 <li>Sound should be ok on all platforms</li>
 <li>Min/Max reviewed in Logical switches (for the whole telemetry)</li>
-<li>Various bug fixes</li> 
+<li>Various bug fixes</li>
 </ul>
 
 <h2>Version 2.0.3</h2>
 <ul>
 <li>EEPROM import bug on AdjustGVAR function</li>
-<li>Timers correctly displayed in logical switches tab</li> 
+<li>Timers correctly displayed in logical switches tab</li>
 </ul>
 
 <h2>Version 2.0.2</h2>

companion/src/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(SIMULATOR_INSTALL_PREFIX "" CACHE STRING "Alternative simulator library search path")
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+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}")
@@ -11,10 +11,10 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   endif()
   message(STATUS "Simulators library search path: " ${SIMULATOR_LIB_PATH})
   set(SIMULATOR_LIB_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
-else(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+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
@@ -25,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)
@@ -80,11 +81,14 @@ if(WIN32)
     set(WIN_EXECUTABLE_TYPE WIN32)  # GUI (WinMain) app
   endif()
   if(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /LD /MP")
+    if(NOT CLANG)
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /LD /MP")
+    endif()
     if(NOT WIN_USE_CONSOLE)
       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,5.01")  # is this even needed?
     endif()
   elseif(MINGW)
+    get_filename_component(MINGW_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
     # struct packing breaks on MinGW w/out -mno-ms-bitfields: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991 & http://stackoverflow.com/questions/24015852/struct-packing-and-alignment-with-mingw
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
   endif()
@@ -100,53 +104,119 @@ 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
+  customdebug.cpp
+  helpers.cpp
+  translations.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_library(common ${common_SRCS} ${common_RCC})
+
+target_link_libraries(common
+  firmwares
+  storage
+  simulation
+  maxLibQtWidgets
+  Qt5::Core
+  Qt5::Xml
+  Qt5::Widgets
+  ${PTHREAD_LIBRARY}
+  ${SDL_LIBRARY}
+  ${WIN_LINK_LIBRARIES}
+  )
+
+set(CPN_COMMON_LIB common)
+
 ############# Supporting libraries ###############
 
+add_subdirectory(datamodels)
+add_subdirectory(firmwares)
 add_subdirectory(shared)
 add_subdirectory(modeledit)
 add_subdirectory(generaledit)
 add_subdirectory(simulation)
 add_subdirectory(storage)
 add_subdirectory(thirdparty/qcustomplot)
-add_subdirectory(thirdparty/qxtcommandoptions)
-
-############# Common lib ###############
-
-set(common_SRCS
-  appdebugmessagehandler.cpp
-  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
-  )
-
-set(common_MOC_HDRS
-  appdebugmessagehandler.h
-  )
-
-qt5_wrap_cpp(common_SRCS ${common_MOC_HDRS})
-
-add_library(common ${common_SRCS})
-qt5_use_modules(common Core Xml Widgets)
+add_subdirectory(thirdparty/maxlibqt/src/widgets)
 
 ############# Companion ###############
 
 set(companion_SRCS
-  helpers.cpp
   helpers_html.cpp
   mdichild.cpp
   modelslist.cpp
@@ -155,7 +225,7 @@ set(companion_SRCS
   burnconfigdialog.cpp
   multimodelprinter.cpp
   comparedialog.cpp
-  contributorsdialog.cpp
+  creditsdialog.cpp
   releasenotesdialog.cpp
   releasenotesfirmwaredialog.cpp
   customizesplashdialog.cpp
@@ -178,7 +248,8 @@ set(companion_SRCS
   radionotfound.cpp
   wizarddata.cpp
   wizarddialog.cpp
-  multiprotocols.cpp
+  styleeditdialog.cpp
+  dialogs/filesyncdialog.cpp         # TODO move to own lib with other dialogs
   )
 
 set(companion_MOC_HDRS
@@ -189,7 +260,7 @@ set(companion_MOC_HDRS
   printdialog.h
   fusesdialog.h
   logsdialog.h
-  contributorsdialog.h
+  creditsdialog.h
   releasenotesdialog.h
   releasenotesfirmwaredialog.h
   customizesplashdialog.h
@@ -206,11 +277,13 @@ set(companion_MOC_HDRS
   mdichild.h
   mainwindow.h
   radionotfound.h
-  helpers.h
   wizarddialog.h
   modelprinter.h
   multimodelprinter.h
   modelslist.h
+  styleeditdialog.h
+  helpers_html.h
+  dialogs/filesyncdialog.h
   )
 
 set(companion_UIS
@@ -231,82 +304,27 @@ set(companion_UIS
   flashfirmwaredialog.ui
   flasheepromdialog.ui
   radionotfound.ui
+  styleeditdialog.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 images/winicons/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_executable(${COMPANION_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${companion_SRCS} ${companion_RCC} ${companion_QM})
-
-add_dependencies(${COMPANION_NAME} gen_qrc)
-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})
+add_executable(${COMPANION_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${companion_SRCS} ${icon_RC})
+target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit qcustomplot shared ${CPN_COMMON_LIB})
 
 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)
-
-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 ${CPN_COMMON_LIB})
 
 ############# Install ####################
 
@@ -318,8 +336,10 @@ string(TOLOWER ${PCB} FLAVOUR)
 if(POLICY CMP0026)
   cmake_policy(SET CMP0026 OLD)  # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
 endif()
-get_property(current_plugin TARGET opentx-${FLAVOUR}-simulator PROPERTY LOCATION)
-list(APPEND simulator_plugins "${current_plugin}")
+if(SIMU_TARGET)
+  get_property(current_plugin TARGET opentx-${FLAVOUR}-simulator PROPERTY LOCATION)
+  list(APPEND simulator_plugins "${current_plugin}")
+endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
@@ -343,19 +363,12 @@ 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 Qt5Svg)
-  set(INSTALL_TEMP_ICUDLL_FILES icudt54.dll icuin54.dll icuuc54.dll)
-  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(INSTALL_TEMP_QTDLL_SFX "d")
-  endif()
-
   if(NOT WIN_DO_FULL_INSTALL)
     # Just copy supporting DLLs to build folder
     set(INSTALL_DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
@@ -369,89 +382,90 @@ elseif(WIN32)
     install(TARGETS ${SIMULATOR_NAME} DESTINATION ${INSTALL_DESTINATION})
     install(FILES ${simulator_plugins} DESTINATION "${INSTALL_DESTINATION}")
     # supporting utilities
-    set(INSTALL_TEMP_FILES avrdude.exe avrdude.conf dfu-util.exe libusb0.dll libusb-1.0.dll)
+    set(INSTALL_TEMP_FILES avrdude.exe avrdude.conf dfu-util.exe libusb0.dll libusb-1.0.dll license.txt)
     foreach(tmpfile ${INSTALL_TEMP_FILES})
       install(FILES "${COMPANION_SRC_DIRECTORY}/../targets/windows/${tmpfile}" DESTINATION ${INSTALL_DESTINATION})
     endforeach()
   endif()  # WIN_DO_FULL_INSTALL
 
-  # Qt dlls
-  foreach(tmpfile ${INSTALL_TEMP_QTDLL_FILES})
-    install(FILES ${QT_DLL_DIR}/${tmpfile}${INSTALL_TEMP_QTDLL_SFX}.dll DESTINATION ${INSTALL_DESTINATION})
-  endforeach()
-  install(FILES ${QT_DLL_DIR}/../plugins/platforms/qwindows${INSTALL_TEMP_QTDLL_SFX}.dll DESTINATION ${INSTALL_DESTINATION}/platforms)
-  # ICU dlls
-  foreach(tmpfile ${INSTALL_TEMP_ICUDLL_FILES})
-    # Qt5.7+ doesn't use icu dlls anymore, hence optional
-    install(FILES ${QT_DLL_DIR}/${tmpfile}.dll DESTINATION ${INSTALL_DESTINATION} OPTIONAL)
-  endforeach()
+  # Qt dlls (using windeployqt)
+  ## Qt translations are already packaged into our custom qrc. Also don't need software rendering engines.
+  set(wdqtopts --no-translations --no-opengl-sw --no-system-d3d-compiler --no-angle)
+  if(CMAKE_BUILD_TYPE STREQUAL "Release")
+    set(wdqtopts ${wdqtopts} --release)  # release builds aren't always properly detected with mingw
+  endif()
+  if(MSVC)
+    set(wdqtopts ${wdqtopts} --no-compiler-runtime)  # --compiler-runtime includes vcredist_x86, but we just copy the required DLLs manually
+  endif()
+  set(wdqtopts ${wdqtopts} -dir "${INSTALL_DESTINATION}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${COMPANION_NAME}.exe" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${SIMULATOR_NAME}.exe")
+  # Add installer command to execute windeployqt
+  install(CODE "execute_process(COMMAND \"${QT_BIN_DIR}/windeployqt.exe\" ${wdqtopts})")
+
   # SDL dll
-  if(SDL_FOUND AND SDL_LIBRARY_PATH AND EXISTS "${SDL_LIBRARY_PATH}/SDL.dll")
+  if(SDL_FOUND AND EXISTS "${SDL_LIBRARY_PATH}/SDL.dll")
     set(SDL_DIR ${SDL_LIBRARY_PATH})  # this is also used by NSIS installer script
     install(FILES ${SDL_DIR}/SDL.dll DESTINATION ${INSTALL_DESTINATION})
   elseif(SDL_FOUND)
-    message(WARNING "Installer: SDL.dll not found!")
+    message(WARNING "Installer: SDL.dll not found, set SDL_LIBRARY_PATH manually.")
   endif()
+
+  # libeay (SSL) dlls  (used by QtNetwork) -- not strictly required but avoids possible issues with downloads and Qt warnings.
+  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" WIN_PROGRAM_FILES)
+  find_path(EAY_LIB_DIR libeay32.dll HINTS
+    "${WIN_PROGRAM_FILES}/OpenSSL" "${WIN_PROGRAM_FILES}/OpenSSL-Win32"
+    "C:/OpenSSL/" "C:/OpenSSL-Win32/"
+    "${WIN_EXTRA_LIBS_PATH}" "${WIN_EXTRA_LIBS_PATH}/OpenSSL" "${WIN_EXTRA_LIBS_PATH}/OpenSSL-Win32"
+    "${MINGW_DIR}/../opt/bin"
+    "${PYTHON_DIRECTORY}/lib/site-packages/PyQt4"
+    PATH_SUFFIXES bin
+    DOC "Path to libeay32.dll and ssleay32.dll (OpenSSL)"
+  )
+  if (EAY_LIB_DIR)
+    install(FILES "${EAY_LIB_DIR}/libeay32.dll" "${EAY_LIB_DIR}/ssleay32.dll" DESTINATION ${INSTALL_DESTINATION} OPTIONAL)
+  else()
+    message(WARNING "Installer: SSL libs not found, set EAY_LIB_DIR manually.")
+  endif()
+
   # C++/system dlls, depends on compiler
   if(MSVC)
-    string(REPLACE "\\" "/" WIN_SYSDIR "$ENV{windir}")
-    set(WIN_SYSDIR "${WIN_SYSDIR}/SysWOW64")  # This would be "system32" for a 64-bit build or on x86... but how to tell?
-    if(IS_DIRECTORY "${WIN_SYSDIR}")
-      install(FILES "${WIN_SYSDIR}/msvcp140.dll" "${WIN_SYSDIR}/vcruntime140.dll" DESTINATION ${INSTALL_DESTINATION} OPTIONAL)
+    file(TO_CMAKE_PATH "$ENV{windir}/SysWOW64" WIN_SYSDIR)    # This would be "system32" for a 64-bit build or on x86... but how to tell?
+    if (NOT EXISTS "${WIN_SYSDIR}")
+      file(TO_CMAKE_PATH "$ENV{windir}/system32" WIN_SYSDIR)  # Must be 32-bit Windows.
     endif()
+    install(FILES "${WIN_SYSDIR}/msvcp140.dll" "${WIN_SYSDIR}/vcruntime140.dll" DESTINATION ${INSTALL_DESTINATION} OPTIONAL)
     if(WIN_PTHREAD_DLL)
       install(FILES "${WIN_PTHREAD_DLL}" DESTINATION ${INSTALL_DESTINATION})
     endif()
-  elseif(MINGW)
-    get_filename_component(MINGW_DIR ${CMAKE_CXX_COMPILER} PATH)
-    if(IS_DIRECTORY ${MINGW_DIR})
-      install(FILES "${MINGW_DIR}/libgcc_s_dw2-1.dll" "${MINGW_DIR}/libstdc++-6.dll" "${MINGW_DIR}/libwinpthread-1.dll" DESTINATION ${INSTALL_DESTINATION})
-      set(MINGW_DIR "${MINGW_DIR}/../opt/bin")
-      # SSL support
-      install(FILES "${MINGW_DIR}/libeay32.dll" "${MINGW_DIR}/ssleay32.dll" DESTINATION ${INSTALL_DESTINATION} OPTIONAL)
-    endif()
   endif()
 
 endif() # WIN32 install
 
 ############# Packaging ####################
 
-# Create Windows installer with NSIS (only works for MSVC for now)
+# Create Windows installer with NSIS
 if(WIN32)
-  if(MSVC)
-    set(COMPANION_NSI_IN_FILE companion-vs.nsi.in)
-    set(SIMULATOR_NSI_IN_FILE simulator-vs.nsi.in)
-  else()
-    set(COMPANION_NSI_IN_FILE companion-msys.nsi.in)
-    set(SIMULATOR_NSI_IN_FILE simulator-msys.nsi.in)
-  endif()
-
-  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)
 
   find_program(NSIS_EXE makensis.exe PATHS
     "C:/Program Files/NSIS"
     "C:/Program Files (x86)/NSIS"
     "C:/Programs/NSIS"
+    "${WIN_EXTRA_LIBS_PATH}/NSIS"
+  )
+
+  if (NSIS_EXE)
+    file(TO_NATIVE_PATH "${INSTALL_DESTINATION}" NSIS_DISTRO)  # all files in here will be included in installer
+    set(NSI_FILE "${PROJECT_BINARY_DIR}/companion/companion.nsi")
+    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/companion.nsi.in" "${NSI_FILE}" @ONLY)
+
+    add_custom_target(installer
+      # The 'install' target prepares all the distro files, make sure it has been executed first.
+      COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target install
+      COMMAND "${NSIS_EXE}" "${NSI_FILE}"
+      DEPENDS "${NSI_FILE}"
+      COMMENT "Building Windows NSIS installer..."
     )
+  endif()
 
-  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/companion/companion-windows.exe
-    COMMAND "${NSIS_EXE}" ARGS ${PROJECT_BINARY_DIR}/companion/companion.nsi
-    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_target(installer
-    DEPENDS ${PROJECT_BINARY_DIR}/companion/companion-windows.exe
-    DEPENDS ${PROJECT_BINARY_DIR}/companion/simulator-windows.exe
-    SOURCES ${PROJECT_BINARY_DIR}/companion/companion.nsi
-    SOURCES ${PROJECT_BINARY_DIR}/companion/simulator.nsi
-    )
 endif()
 
 set(CPACK_PACKAGE_NAME "companion${C9X_NAME_SUFFIX}")
@@ -517,13 +531,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
@@ -532,7 +545,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()
@@ -552,6 +565,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

@@ -20,6 +20,8 @@
 
 #include "appdebugmessagehandler.h"
 
+#include <QFileDevice>
+
 AppDebugMessageHandler::AppDebugMessageHandler(QObject * parent) :
   QObject(parent),
   m_appDebugOutputLevel(APP_DBG_HANDLER_DEFAULT_LEVEL),
@@ -55,6 +57,25 @@ void AppDebugMessageHandler::setShowFunctionDeclarations(bool showFunctionDeclar
   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);
@@ -98,7 +119,7 @@ void AppDebugMessageHandler::messageHandler(QtMsgType type, const QMessageLogCon
 
   qSetMessagePattern(msgPattern);
 
-  if (!m_defaultHandler || receivers(SIGNAL(messageOutput(quint8, const QString &, const QMessageLogContext &)))) {
+  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
@@ -111,7 +132,15 @@ void AppDebugMessageHandler::messageHandler(QtMsgType type, const QMessageLogCon
     }
 #endif
 
-    emit messageOutput(lvl, msgPattern, context);
+    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

companion/src/appdebugmessagehandler.h

@@ -26,6 +26,7 @@
 
 #include <QApplication>
 #include <QDebug>
+#include <QIODevice>
 #include <QMessageLogContext>
 #include <QObject>
 #include <QRegularExpression>
@@ -94,7 +95,7 @@
   #else
     #define qInfo      qDebug
   #endif
-  #define QtInfoMsg    4
+  #define QtInfoMsg    QtMsgType(4)
 #endif
 
 class AppDebugMessageHandler : public QObject
@@ -110,6 +111,8 @@ class AppDebugMessageHandler : public QObject
     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);
@@ -123,11 +126,12 @@ class AppDebugMessageHandler : public QObject
     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, const QMessageLogContext & context);
+    void messageOutput(quint8 level, const QString & msg);
 };
 
 // Message handler which is installed using qInstallMessageHandler. This needs to be global.

companion/src/apppreferencesdialog.cpp

@@ -23,25 +23,25 @@
 #include "mainwindow.h"
 #include "appdata.h"
 #include "helpers.h"
-#include "firmwareinterface.h"
-#ifdef JOYSTICKS
+#include "storage.h"
+#if defined(JOYSTICKS)
 #include "joystick.h"
 #include "joystickdialog.h"
 #endif
-#include <QDesktopServices>
-#include <QtGui>
 
 AppPreferencesDialog::AppPreferencesDialog(QWidget * parent) :
   QDialog(parent),
-  ui(new Ui::AppPreferencesDialog)
+  ui(new Ui::AppPreferencesDialog),
+  updateLock(false),
+  mainWinHasDirtyChild(false)
 {
   ui->setupUi(this);
-  updateLock=false;
   setWindowIcon(CompanionIcon("apppreferences.png"));
 
   initSettings();
-  connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
-  connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
+  connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(onBaseFirmwareChanged()));
+  connect(ui->opt_appDebugLog, &QCheckBox::toggled, this, &AppPreferencesDialog::toggleAppLogSettings);
+  connect(ui->opt_fwTraceLog, &QCheckBox::toggled, this, &AppPreferencesDialog::toggleAppLogSettings);
 
 #if !defined(JOYSTICKS)
   ui->joystickCB->hide();
@@ -59,54 +59,93 @@ AppPreferencesDialog::~AppPreferencesDialog()
   delete ui;
 }
 
-void AppPreferencesDialog::writeValues()
+void AppPreferencesDialog::setMainWinHasDirtyChild(bool value)
 {
-  g.useCompanionNightlyBuilds(ui->useCompanionNightlyBuilds->isChecked());
+  mainWinHasDirtyChild = value;
+}
+
+void AppPreferencesDialog::accept()
+{
+  Profile & profile = g.currentProfile();
+
   g.autoCheckApp(ui->autoCheckCompanion->isChecked());
-  g.useFirmwareNightlyBuilds(ui->useFirmwareNightlyBuilds->isChecked());
+  g.OpenTxBranch(AppData::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() ? AppData::MODEL_ACT_WIZARD : ui->opt_newMdl_useEditor->isChecked() ? AppData::MODEL_ACT_EDITOR : AppData::MODEL_ACT_NONE);
   g.historySize(ui->historySize->value());
   g.backLight(ui->backLightColor->currentIndex());
-  g.profile[g.id()].volumeGain(round(ui->volumeGain->value() * 10.0));
+  profile.volumeGain(round(ui->volumeGain->value() * 10.0));
   g.libDir(ui->libraryPath->text());
   g.gePath(ui->ge_lineedit->text());
   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 {
     g.jsSupport(false);
     g.jsCtrl(0);
   }
-  g.profile[g.id()].channelOrder(ui->channelorderCB->currentIndex());
-  g.profile[g.id()].defaultMode(ui->stickmodeCB->currentIndex());
-  g.profile[g.id()].renameFwFiles(ui->renameFirmware->isChecked());
-  g.profile[g.id()].burnFirmware(ui->burnFirmware->isChecked());
-  g.profile[g.id()].sdPath(ui->sdPath->text());
-  g.profile[g.id()].pBackupDir(ui->profilebackupPath->text());
-  g.profile[g.id()].penableBackup(ui->pbackupEnable->isChecked());
-  g.profile[g.id()].splashFile(ui->SplashFileName->text());
+  profile.channelOrder(ui->channelorderCB->currentIndex());
+  profile.defaultMode(ui->stickmodeCB->currentIndex());
+  profile.renameFwFiles(ui->renameFirmware->isChecked());
+  profile.burnFirmware(ui->burnFirmware->isChecked());
+  profile.sdPath(ui->sdPath->text());
+  profile.pBackupDir(ui->profilebackupPath->text());
+  profile.penableBackup(ui->pbackupEnable->isChecked());
+  profile.splashFile(ui->SplashFileName->text());
 
   // The profile name may NEVER be empty
   if (ui->profileNameLE->text().isEmpty())
-    g.profile[g.id()].name(tr("My Radio"));
+    profile.name(tr("My Radio"));
   else
-    g.profile[g.id()].name(ui->profileNameLE->text());
+    profile.name(ui->profileNameLE->text());
 
+  bool fwchange = false;
+  Firmware * newFw = getFirmwareVariant();  // always !null
   // If a new fw type has been choosen, several things need to reset
-  current_firmware_variant = getFirmwareVariant();
-  QString id = current_firmware_variant->getId();
-  if (g.profile[g.id()].fwType() != id) {
-    g.profile[g.id()].fwName("");
-    g.profile[g.id()].initFwVariables();
-    g.profile[g.id()].fwType(id);
+  if (Firmware::getCurrentVariant()->getId() != newFw->getId()) {
+    // check if we're going to be converting to a new radio type and there are unsaved files in the main window
+    if (mainWinHasDirtyChild && !Boards::isBoardCompatible(Firmware::getCurrentVariant()->getBoard(), newFw->getBoard())) {
+      QString q = tr("<p><b>You cannot switch Radio Type or change Build Options while there are unsaved file changes. What do you wish to do?</b></p> <ul>" \
+                     "<li><i>Save All</i> - Save any open file(s) before saving Settings.<li>" \
+                     "<li><i>Reset</i> - Revert to the previous Radio Type and Build Options before saving Settings.</li>" \
+                     "<li><i>Cancel</i> - Return to the Settings editor dialog.</li></ul>");
+      int resp = QMessageBox::question(this, windowTitle(), q, (QMessageBox::SaveAll | QMessageBox::Reset | QMessageBox::Cancel), QMessageBox::Cancel);
+      if (resp == QMessageBox::SaveAll) {
+        // signal main window to save files, need to do this before the fw actually changes
+        emit firmwareProfileAboutToChange();
+      }
+      else if (resp == QMessageBox::Reset) {
+        // bail out early before saving the radio type & firmware options
+        QDialog::accept();
+        return;
+      }
+      else {
+        // we do not accept the dialog close
+        return;
+      }
+    }
+    Firmware::setCurrentVariant(newFw);
+    profile.fwName("");
+    profile.resetFwVariables();
+    profile.fwType(newFw->getId());
+    fwchange = true;
   }
+
+  QDialog::accept();
+
+  if (fwchange)
+    emit firmwareProfileChanged();  // important to do this after the accepted() signal
 }
 
 void AppPreferencesDialog::on_snapshotPathButton_clicked()
@@ -121,34 +160,43 @@ void AppPreferencesDialog::on_snapshotPathButton_clicked()
 
 void AppPreferencesDialog::initSettings()
 {
+  const Profile & profile = g.currentProfile();
+
   ui->snapshotClipboardCKB->setChecked(g.snapToClpbrd());
-  ui->burnFirmware->setChecked(g.profile[g.id()].burnFirmware());
+  ui->burnFirmware->setChecked(profile.burnFirmware());
   ui->snapshotPath->setText(g.snapshotDir());
   ui->snapshotPath->setReadOnly(true);
   if (ui->snapshotClipboardCKB->isChecked()) {
     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)
+  // remove nightly version option entirely unless it's the current one (because user might have nightly version also installed)
+  if (g.OpenTxBranch() != AppData::BRANCH_NIGHTLY_UNSTABLE)
+    ui->OpenTxBranch->removeItem(2);
+  // if it's already selected, add a warning message
+  else
+    ui->updatesLayout->addWidget(new QLabel("<font color='red'>" % tr("Note: Nightly builds are not available in this version, Release/RC update channel will be used.") % "</font>", this));
 #endif
+  ui->OpenTxBranch->setCurrentIndex(g.OpenTxBranch());
+
   ui->autoCheckCompanion->setChecked(g.autoCheckApp());
   ui->autoCheckFirmware->setChecked(g.autoCheckFw());
   ui->showSplash->setChecked(g.showSplash());
   ui->historySize->setValue(g.historySize());
   ui->backLightColor->setCurrentIndex(g.backLight());
-  ui->volumeGain->setValue(g.profile[g.id()].volumeGain() / 10.0);
+  ui->volumeGain->setValue(profile.volumeGain() / 10.0);
 
   if (IS_TARANIS(getCurrentBoard())) {
     ui->backLightColor->setEnabled(false);
   }
 
   ui->simuSW->setChecked(g.simuSW());
-  ui->modelWizard_CB->setChecked(g.useWizard());
+  ui->opt_removeBlankSlots->setChecked(g.removeModelSlots());
+  ui->opt_newMdl_useNone->setChecked(g.newModelAction() == AppData::MODEL_ACT_NONE);
+  ui->opt_newMdl_useWizard->setChecked(g.newModelAction() == AppData::MODEL_ACT_WIZARD);
+  ui->opt_newMdl_useEditor->setChecked(g.newModelAction() == AppData::MODEL_ACT_EDITOR);
   ui->libraryPath->setText(g.libDir());
   ui->ge_lineedit->setText(g.gePath());
 
@@ -163,10 +211,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,17 +246,17 @@ 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());
-  ui->renameFirmware->setChecked(g.profile[g.id()].renameFwFiles());
-  ui->sdPath->setText(g.profile[g.id()].sdPath());
-  if (!g.profile[g.id()].pBackupDir().isEmpty()) {
-    if (QDir(g.profile[g.id()].pBackupDir()).exists()) {
-      ui->profilebackupPath->setText(g.profile[g.id()].pBackupDir());
+  ui->channelorderCB->setCurrentIndex(profile.channelOrder());
+  ui->stickmodeCB->setCurrentIndex(profile.defaultMode());
+  ui->renameFirmware->setChecked(profile.renameFwFiles());
+  ui->sdPath->setText(profile.sdPath());
+  if (!profile.pBackupDir().isEmpty()) {
+    if (QDir(profile.pBackupDir()).exists()) {
+      ui->profilebackupPath->setText(profile.pBackupDir());
       ui->pbackupEnable->setEnabled(true);
-      ui->pbackupEnable->setChecked(g.profile[g.id()].penableBackup());
+      ui->pbackupEnable->setChecked(profile.penableBackup());
     } else {
       ui->pbackupEnable->setDisabled(true);
     }
@@ -212,15 +265,14 @@ void AppPreferencesDialog::initSettings()
       ui->pbackupEnable->setDisabled(true);
   }
 
-  ui->profileNameLE->setText(g.profile[g.id()].name());
-  ui->SplashFileName->setText(g.profile[g.id()].splashFile());
+  ui->profileNameLE->setText(profile.name());
 
   QString hwSettings;
-  if (g.profile[g.id()].stickPotCalib() == "" ) {
+  if (profile.stickPotCalib() == "" ) {
     hwSettings = tr("EMPTY: No radio settings stored in profile");
   }
   else  {
-    QString str = g.profile[g.id()].timeStamp();
+    QString str = profile.timeStamp();
     if (str.isEmpty())
       hwSettings = tr("AVAILABLE: Radio settings of unknown age");
     else
@@ -228,32 +280,15 @@ void AppPreferencesDialog::initSettings()
   }
   ui->lblGeneralSettings->setText(hwSettings);
 
-  Firmware * current_firmware = getCurrentFirmware();
-  
-  if (!IS_HORUS(current_firmware->getBoard())) {
-    displayImage(g.profile[g.id()].splashFile());
-  }
-  // TODO: Remove once splash replacement supported on Horus
-  // NOTE: 480x272 image causes issues on screens <800px high, needs a solution like scrolling once reinstated
-  else {
-    ui->imageLabel->hide();
-    ui->splashLabel->hide();
-    ui->SplashFileName->hide();
-    ui->SplashSelect->hide();
-    ui->SplashSelect->setEnabled(false);
-    ui->clearImageButton->hide();
-    ui->clearImageButton->setEnabled(false);
-    ui->splashSeparator->hide();
-  }
-
-  foreach(Firmware * firmware, firmwares) {
+  QString currType = QStringList(profile.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();
+
+  onBaseFirmwareChanged();
 }
 
 void AppPreferencesDialog::on_libraryPathButton_clicked()
@@ -299,6 +334,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());
@@ -306,7 +350,7 @@ void AppPreferencesDialog::on_ge_pathButton_clicked()
     ui->ge_lineedit->setText(fileName);
   }
 }
- 
+
 #if defined(JOYSTICKS)
 void AppPreferencesDialog::on_joystickChkB_clicked() {
   if (ui->joystickChkB->isChecked()) {
@@ -344,33 +388,24 @@ void AppPreferencesDialog::on_joystickcalButton_clicked() {
 
 void AppPreferencesDialog::on_sdPathButton_clicked()
 {
-  QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), g.profile[g.id()].sdPath());
+  QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), g.currentProfile().sdPath());
   if (!fileName.isEmpty()) {
     ui->sdPath->setText(fileName);
   }
 }
 
-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;
@@ -388,7 +423,7 @@ void AppPreferencesDialog::on_SplashSelect_clicked()
 
   if (!fileName.isEmpty()){
     g.imagesDir(QFileInfo(fileName).dir().absolutePath());
-   
+
     displayImage(fileName);
     ui->SplashFileName->setText(fileName);
   }
@@ -400,154 +435,126 @@ void AppPreferencesDialog::on_clearImageButton_clicked()
   ui->SplashFileName->clear();
 }
 
-
-void AppPreferencesDialog::showVoice(bool show)
+void AppPreferencesDialog::onBaseFirmwareChanged()
 {
-  ui->voiceLabel->setVisible(show);
-  ui->voiceCombo->setVisible(show);
-  QTimer::singleShot(0, this, SLOT(shrink()));
+  populateFirmwareOptions(getBaseFirmware());
 }
 
-void AppPreferencesDialog::baseFirmwareChanged()
+Firmware *AppPreferencesDialog::getBaseFirmware() const
 {
-  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-
-  foreach(Firmware * firmware, firmwares) {
-    if (firmware->getId() == selected_firmware) {
-      populateFirmwareOptions(firmware);
-      break;
-    }
-  }
+  return Firmware::getFirmwareForId(ui->downloadVerCB->currentData().toString());
 }
 
-Firmware * AppPreferencesDialog::getFirmwareVariant()
+Firmware * AppPreferencesDialog::getFirmwareVariant() const
 {
-  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
+  QString id = ui->downloadVerCB->currentData().toString();
 
-  foreach(Firmware * firmware, firmwares) {
-    QString id = firmware->getId();
-    if (id == selected_firmware) {
-      foreach(QCheckBox *cb, optionsCheckBoxes) {
-        if (cb->isChecked()) {
-          id += QString("-") + cb->text();
-        }
-      }
-
-      if (voice && voice->isChecked()) {
-        id += QString("-tts") + ui->voiceCombo->currentText();
-      }
-
-      if (ui->langCombo->count()) {
-        id += QString("-") + ui->langCombo->currentText();
-      }
-
-      return getFirmware(id);
-    }
+  foreach(QCheckBox *cb, optionsCheckBoxes.values()) {
+    if (cb->isChecked())
+      id += "-" + cb->text();
   }
 
-  // Should never occur...
-  return default_firmware_variant;
+  if (ui->langCombo->count())
+    id += "-" + ui->langCombo->currentText();
+
+  return Firmware::getFirmwareForId(id);
 }
 
-void AppPreferencesDialog::firmwareOptionChanged(bool state)
+void AppPreferencesDialog::onFirmwareOptionChanged(bool state)
 {
   QCheckBox *cb = qobject_cast<QCheckBox*>(sender());
-  if (cb == voice) {
-    showVoice(voice->isChecked());
-  }
-  Firmware * firmware=NULL;
-  if (cb && state) {
-    QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
-    foreach(firmware, firmwares) {
-      if (firmware->getId() == selected_firmware) {
-        foreach(QList<Option> opts, firmware->opts) {
-          foreach(Option opt, opts) {
-            if (cb->text() == opt.name) {
-              foreach(Option other, opts) {
-                if (other.name != opt.name) {
-                  foreach(QCheckBox *ocb, optionsCheckBoxes) {
-                    if (ocb->text() == other.name) {
-                      ocb->setChecked(false);
-                    }
-                  }
-                }
-              }
-              return;
-            }
-          }
-        }
+  if (!(cb && state))
+    return;
+
+  // This de-selects any mutually exlusive options (that is, members of the same QList<Option> list).
+  const Firmware::OptionsList & fwOpts = getBaseFirmware()->optionGroups();
+  for (const Firmware::OptionsGroup & optGrp : fwOpts) {
+    for (const Firmware::Option & opt : optGrp) {
+      if (cb->text() == opt.name) {
+        QCheckBox *ocb = nullptr;
+        foreach(const Firmware::Option & other, optGrp)
+          if (other.name != opt.name && (ocb = optionsCheckBoxes.value(other.name, nullptr)))
+            ocb->setChecked(false);
+        return;
       }
     }
-  } 
+  }
+}
+
+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)
 {
-  const Firmware * parent = firmware->getFirmwareBase();
+  const Firmware * baseFw = firmware->getFirmwareBase();
+  QStringList currVariant = Firmware::getCurrentVariant()->getId().split('-');
+  const QString currLang = ui->langCombo->count() ? ui->langCombo->currentText() : currVariant.last();
 
   updateLock = true;
 
-  QString id = current_firmware_variant->getId();
   ui->langCombo->clear();
-  foreach(const char *lang, parent->languages) {
+  for (const char *lang : baseFw->languageList()) {
     ui->langCombo->addItem(lang);
-    if (id.endsWith(lang)) {
+    if (currLang == lang) {
       ui->langCombo->setCurrentIndex(ui->langCombo->count() - 1);
     }
   }
 
-  voice = NULL; // we will search for a voice checkbox
+  if (optionsCheckBoxes.size()) {
+    currVariant.clear();
+    QMutableMapIterator<QString, QCheckBox *> it(optionsCheckBoxes);
+    while (it.hasNext()) {
+      it.next();
+      QCheckBox * cb = it.value();
+      if (cb->isChecked())
+        currVariant.append(it.key());    // keep previous selections
+      ui->optionsLayout->removeWidget(cb);
+      cb->deleteLater();
+      it.remove();
+    }
+  }
 
   int index = 0;
-  QWidget * prevFocus = ui->voiceCombo;
-  foreach(QList<Option> opts, parent->opts) {
-    foreach(Option opt, opts) {
-      if (index >= optionsCheckBoxes.size()) {
-        QCheckBox * checkbox = new QCheckBox(ui->profileTab);
-        ui->optionsLayout->addWidget(checkbox, optionsCheckBoxes.count()/4, optionsCheckBoxes.count()%4, 1, 1);
-        optionsCheckBoxes.push_back(checkbox);
-        connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
-        if (prevFocus) {
-          QWidget::setTabOrder(prevFocus, checkbox);
-        }
-      }
-
-      QCheckBox *cb = optionsCheckBoxes.at(index++);
-      if (cb) {
-        cb->show();
-        cb->setText(opt.name);
-        cb->setToolTip(opt.tooltip);
-        cb->setCheckState(id.contains(opt.name) ? Qt::Checked : Qt::Unchecked);
-        if (opt.name == QString("voice")) {
-          voice = cb;
-        }
-        prevFocus = cb;
-      }
+  QWidget * prevFocus = ui->langCombo;
+  for (const Firmware::OptionsGroup &optGrp : baseFw->optionGroups()) {
+    for (const Firmware::Option &opt : optGrp) {
+      QCheckBox * cb = new QCheckBox(ui->profileTab);
+      cb->setText(opt.name);
+      cb->setToolTip(opt.tooltip);
+      cb->setChecked(currVariant.contains(opt.name));
+      ui->optionsLayout->addWidget(cb, index / 4, index % 4);
+      QWidget::setTabOrder(prevFocus, cb);
+      // connect to duplicates check handler if this option is part of a group
+      if (optGrp.size() > 1)
+        connect(cb, &QCheckBox::toggled, this, &AppPreferencesDialog::onFirmwareOptionChanged);
+      optionsCheckBoxes.insert(opt.name, cb);
+      prevFocus = cb;
+      ++index;
     }
   }
 
-  for (; index<optionsCheckBoxes.size(); index++) {
-    QCheckBox *cb = optionsCheckBoxes.at(index);
-    cb->hide();
-    cb->setCheckState(Qt::Unchecked);
+  // 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(baseFw->getBoard())) {
+    ui->widget_splashImage->hide();
+    ui->SplashFileName->setText("");
   }
-
-  ui->voiceCombo->clear();
-  foreach(const char *lang, parent->ttslanguages) {
-    ui->voiceCombo->addItem(lang);
-    if (id.contains(QString("-tts%1").arg(lang))) {
-      ui->voiceCombo->setCurrentIndex(ui->voiceCombo->count() - 1);
-    }
+  else {
+    ui->widget_splashImage->show();
+    ui->SplashFileName->setText(g.currentProfile().splashFile());
+    displayImage(g.currentProfile().splashFile());
   }
 
-  showVoice(voice && voice->isChecked());
-
   updateLock = false;
-  QTimer::singleShot(0, this, SLOT(shrink()));
+  QTimer::singleShot(50, this, &AppPreferencesDialog::shrink);
 }
 
 void AppPreferencesDialog::shrink()
 {
-  resize(0,0);
+  adjustSize();
 }
-

companion/src/apppreferencesdialog.h

@@ -38,29 +38,23 @@ class AppPreferencesDialog : public QDialog
   public:
     explicit AppPreferencesDialog(QWidget * parent = 0);
     ~AppPreferencesDialog();
+
     Joystick * joystick;
 
-  private:
-    QList<QCheckBox *> optionsCheckBoxes;
-    bool updateLock;
-    void showVoice(bool);
-    void showVoice();
-    void hideVoice();
-    void populateLocale();
-    void populateFirmwareOptions(const Firmware *);
-    Firmware * getFirmwareVariant();
-    QCheckBox * voice;
+  public slots:
+    void accept() Q_DECL_OVERRIDE;
+    void setMainWinHasDirtyChild(bool value);
 
-    Ui::AppPreferencesDialog *ui;
-    void initSettings();
-    bool displayImage(const QString & fileName);
+  signals:
+    void firmwareProfileChanged();
+    void firmwareProfileAboutToChange(bool saveFiles = true);
 
   protected slots:
     void shrink();
-    void baseFirmwareChanged();
-    void firmwareOptionChanged(bool state);
+    void onBaseFirmwareChanged();
+    void onFirmwareOptionChanged(bool state);
+    void toggleAppLogSettings();
 
-    void writeValues();
     void on_libraryPathButton_clicked();
     void on_snapshotPathButton_clicked();
     void on_snapshotClipboardCKB_clicked();
@@ -69,14 +63,26 @@ 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();
     void on_joystickcalButton_clicked();
 #endif
+
+  private:
+    void initSettings();
+    void populateFirmwareOptions(const Firmware *);
+    Firmware * getBaseFirmware() const;
+    Firmware * getFirmwareVariant() const;
+    bool displayImage(const QString & fileName);
+
+    Ui::AppPreferencesDialog *ui;
+    QMap<QString, QCheckBox *> optionsCheckBoxes;
+    bool updateLock;
+    bool mainWinHasDirtyChild;
 };
 
 #endif // _APPPREFERENCESDIALOG_H_

companion/src/boards.cpp

@@ -1,160 +0,0 @@
-/*
- * 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 "boards.h"
-#include "macros.h"
-
-using namespace Board;
-
-int getEEpromSize(Board::Type board)
-{
-  switch (board) {
-    case Board::BOARD_STOCK:
-      return EESIZE_STOCK;
-    case Board::BOARD_M128:
-      return EESIZE_M128;
-    case Board::BOARD_MEGA2560:
-    case Board::BOARD_GRUVIN9X:
-      return EESIZE_GRUVIN9X;
-    case Board::BOARD_SKY9X:
-      return EESIZE_SKY9X;
-    case Board::BOARD_9XRPRO:
-    case Board::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:
-      return EESIZE_TARANIS;
-    default:
-      return 0; // unlimited
-  }
-}
-
-Board::SwitchInfo 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"}
-    };
-    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"}
-    };
-    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"}
-    };
-    if (index < DIM(switches))
-      return switches[index];
-  }
-
-  return {Board::SWITCH_NOT_AVAILABLE, "???"};
-}
-
-int getBoardCapability(Board::Type board, Board::Capability capability)
-{
-  switch (capability) {
-    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 MouseAnalogs:
-      if (IS_HORUS(board))
-        return 2;
-      else
-        return 0;
-    case FactoryInstalledSwitches:
-      if (IS_TARANIS_X9E(board))
-        return 8;
-      // no break
-    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 NumTrims:
-      if (IS_HORUS(board))
-        return 6;
-      else
-        return 4;
-    case NumTrimSwitches:
-      return getBoardCapability(board, NumTrims) * 2;
-  }
-
-  return 0;
-}

companion/src/burnconfigdialog.cpp

@@ -57,7 +57,7 @@ burnConfigDialog::burnConfigDialog(QWidget *parent) :
       ui->label_sb1->hide();
       ui->label_sb3->hide();
       ui->samba_location->hide();
-      ui->samba_port->hide();      
+      ui->samba_port->hide();
       ui->sb_browse->hide();
     }
     else if (IS_SKY9X(board)) {
@@ -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";
@@ -164,7 +181,7 @@ void burnConfigDialog::getSettings()
       ui->pushButton_3->setEnabled(true);
     } else {
       ui->pushButton_3->setDisabled(true);
-    }    
+    }
 }
 
 void burnConfigDialog::putSettings()
@@ -341,7 +358,7 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
     else {
       ui->label_av3->show();
       ui->avrdude_mcu->show();
-      QMessageBox::warning(this, tr("Companion"),
+      QMessageBox::warning(this, CPN_STR_APP_NAME,
         tr("<b><u>WARNING!</u></b><br>Normally CPU type is automatically selected according to the chosen firmware.<br>If you change the CPU type the resulting eeprom could be inconsistent."),
         QMessageBox::Ok);
     }

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,8 +19,10 @@
  */
 
 #include <QApplication>
-#include <QTranslator>
+#include <QDateTime>
 #include <QDir>
+#include <QFile>
+#include <QMessageBox>
 #include <QSplashScreen>
 #if defined(JOYSTICKS) || defined(SIMU_AUDIO)
   #include <SDL.h>
@@ -28,10 +30,14 @@
 #endif
 
 #include "appdebugmessagehandler.h"
+#include "customdebug.h"
 #include "mainwindow.h"
 #include "version.h"
 #include "appdata.h"
+#include "simulatorinterface.h"
 #include "storage.h"
+#include "translations.h"
+#include "helpers.h"
 
 #ifdef __APPLE__
 #include <QProxyStyle>
@@ -48,11 +54,88 @@ class MyProxyStyle : public QProxyStyle
  };
 #endif
 
+void importError()
+{
+  QMessageBox::critical(nullptr, CPN_STR_APP_NAME, QCoreApplication::translate("Companion", "The saved settings could not be imported, please try again or continue with current settings."), QMessageBox::Ok, 0);
+}
+
+void checkSettingsImport(bool force = false)
+{
+  QString previousVersion;
+  bool found;
+  if (!(found = g.findPreviousVersionSettings(&previousVersion))) {
+    found = QDir(CPN_SETTINGS_BACKUP_DIR).entryList(QStringList({"*.ini"}), QDir::Files).size() > 0;
+  }
+  if (!found && !force)
+    return;
+
+  const QString impFileBtn = QCoreApplication::translate("Companion", "Import from File");
+  const QString impPrevBtn = QCoreApplication::translate("Companion", "Import from v%1").arg(previousVersion);
+  const QString impNoneBtn = QCoreApplication::translate("Companion", "Do not import");
+
+  QString msg;
+  if (previousVersion.isEmpty()) {
+    if (found)
+      msg = QCoreApplication::translate("Companion", "We have found possible Companion settings backup file(s).\nDo you want to import settings from a file?");
+    else
+      msg = QCoreApplication::translate("Companion", "Import settings from a file, or start with current values.");
+  }
+  else {
+    msg = QCoreApplication::translate("Companion", "We have found existing settings for Companion version: %1.\nDo you want to import them?\n\n" \
+                                                   "If you have a settings backup file, you may import that instead.").arg(previousVersion);
+  }
+
+  const int ret = QMessageBox::question(nullptr, CPN_STR_APP_NAME, msg, impNoneBtn, impFileBtn, (previousVersion.isEmpty() ? QString() : impPrevBtn), 0, 0);
+  if (!ret)
+    return;
+
+  // Import from previous version
+  if (ret == 2) {
+    if (!g.importSettings(previousVersion)) {
+      // very unlikely, but just in case of unexpected error, restart the import
+      importError();
+      checkSettingsImport();
+    }
+    return;
+  }
+
+  // Import from file
+  bool err = false;
+  QString impFile = CPN_SETTINGS_BACKUP_DIR;
+  impFile = QFileDialog::getOpenFileName(nullptr, QCoreApplication::translate("Companion", "Select %1:").arg(CPN_STR_APP_SETTINGS_FILES), impFile, CPN_STR_APP_SETTINGS_FILTER);
+
+  if (!impFile.isEmpty() && QFileInfo(impFile).isReadable()) {
+    QSettings fromSettings(impFile, QSettings::IniFormat);
+    if (g.importSettings(&fromSettings)) {
+      return;
+    }
+    else {
+      importError();
+      err = true;
+    }
+  }
+  // Restart the import prompt if user cancelled the file select dialog but we do have previous settings, or if we had a file import error.
+  if (err || !previousVersion.isEmpty())
+    checkSettingsImport();
+}
+
+void printHelpText()
+{
+  printf(qPrintable(QString(APP_COMPANION % " v%s\n\n")), VERSION);
+  const char tmpl[] = "  %s \t %s\n";
+  printf(tmpl, "--export",   QCoreApplication::translate("Companion", "Save application settings to file...").toUtf8().constData());
+  printf(tmpl, "--import",   QCoreApplication::translate("Companion", "Load application settings from file or previous version...").toUtf8().constData());
+  printf(tmpl, "--defaults", QCoreApplication::translate("Companion", "Reset ALL application settings to default and remove radio profiles...").toUtf8().constData());
+  printf(tmpl, "--quit  ",   QCoreApplication::translate("Companion", "Exit before settings initialization and application startup.").toUtf8().constData());
+  printf(tmpl, "--version",  QCoreApplication::translate("Companion", "Print version number and exit.").toUtf8().constData());
+  printf(tmpl, "--help|-h",  QCoreApplication::translate("Companion", "Print this help text.").toUtf8().constData());
+  fflush(stdout);
+}
+
 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
 
@@ -62,30 +145,80 @@ int main(int argc, char *argv[])
   app.setOrganizationDomain(COMPANY_DOMAIN);
   app.setAttribute(Qt::AA_DontShowIconsInMenus, false);
 
-  if (AppDebugMessageHandler::instance())
-    AppDebugMessageHandler::instance()->installAppMessageHandler();
+  const QStringList args(QApplication::arguments());
 
-  g.init();
+  if (args.contains("--help") || args.contains("-h") || args.contains("/?")) {
+    printHelpText();
+    exit(0);
+  }
 
-  QStringList strl = QApplication::arguments();
-  if (strl.contains("--version")) {
+  if (args.contains("--version")) {
     printf("%s\n", VERSION);
     fflush(stdout);
     exit(0);
   }
 
+  Q_INIT_RESOURCE(companion);
+
+  if (AppDebugMessageHandler::instance())
+    AppDebugMessageHandler::instance()->installAppMessageHandler();
+
+  CustomDebug::setFilterRules();
+
+  // handle settings export/import/reset via CLI
+
+  bool doExport = args.contains("--export");
+  bool doImport = args.contains("--import");
+  bool doReset = args.contains("--defaults");
+
+  if (doExport)
+    Helpers::exportAppSettings();
+
+  if (doReset) {
+    char ok;
+    printf("%s [Y/N] ", QCoreApplication::translate("Companion", "Reset ALL application settings to default values and remove radio profiles, are you sure?").toUtf8().constData());
+    std::cin >> ok;
+    if (ok != 'Y' && ok != 'y')
+      exit(0);
+    if (!doExport) {
+      printf("%s [Y/N] ", QCoreApplication::translate("Companion", "Would you like to perform a backup first?").toUtf8().constData());
+      std::cin >> ok;
+      if (ok == 'Y' || ok == 'y')
+        Helpers::exportAppSettings();
+    }
+    g.resetAllSettings();
+    g.storeAllSettings();
+    std::cout << QCoreApplication::translate("Companion", "Application settings were reset and saved.").toUtf8().constData() << std::endl;
+  }
+
+  if (doImport)
+    checkSettingsImport(true);
+
+  // give option to quit before settings init
+  if (args.contains("--quit"))
+    exit(0);
+
+  // end CLI handling
+
+  if (!doImport && g.isFirstUse())
+    checkSettingsImport(false);
+
+  g.init();
+
+  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;
@@ -102,11 +235,12 @@ int main(int argc, char *argv[])
 
   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()].fwName("");
+  Profile & profile = g.currentProfile();
+  if (profile.fwType().isEmpty()){
+    profile.fwType(Firmware::getDefaultVariant()->getId());
+    profile.fwName("");
   }
 
   QString splashScreen;
@@ -115,7 +249,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()) {
@@ -132,14 +266,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

@@ -1,9 +1,8 @@
 <!DOCTYPE RCC><RCC version="1.0">
   <qresource prefix="/">
     <file>images/customize.png</file>
-    <file>icon.png</file>
+    <file alias="icon.png">images/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,41 +11,68 @@
     <file>images/track.png</file>
     <file>images/track0.png</file>
     <file>images/taranison.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-active.svg</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/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>
@@ -110,6 +136,18 @@
     <file>images/simulator/X9E/right.png</file>
     <file>images/simulator/X9E/right_enter.png</file>
     <file>images/simulator/X9E/top.png</file>
+    <file>images/simulator/XLITE/bottom.png</file>
+    <file>images/simulator/XLITE/left.png</file>
+    <file>images/simulator/XLITE/left_scrnshot.png</file>
+    <file>images/simulator/XLITE/right.png</file>
+    <file>images/simulator/XLITE/right_ent.png</file>
+    <file>images/simulator/XLITE/top.png</file>
+    <file>images/simulator/XLITE/right_exit.png</file>
+    <file>images/simulator/XLITE/right_shift.png</file>
+    <file>images/simulator/XLITE/right_right.png</file>
+    <file>images/simulator/XLITE/right_left.png</file>
+    <file>images/simulator/XLITE/right_up.png</file>
+    <file>images/simulator/XLITE/right_down.png</file>
     <file>images/wizard/ailerons.png</file>
     <file>images/wizard/airbrakes.png</file>
     <file>images/wizard/elevons.png</file> 
@@ -209,6 +247,7 @@
     <file>images/library/10802.png</file>
     <file>themes/default/style.css</file>
     <file>themes/default/style-osx.css</file>
+    <file>themes/default/modelprt.css</file>
     <file>themes/monochrome/16/paintbrush.png</file>
     <file>themes/monochrome/16/open.png</file>
     <file>themes/monochrome/16/edit.png</file>
@@ -604,6 +643,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>
@@ -647,6 +687,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>
@@ -690,6 +731,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>
@@ -733,6 +775,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>
@@ -776,6 +819,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>
@@ -819,6 +863,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>
@@ -862,6 +907,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>
@@ -905,6 +951,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,47 @@
 
 #include "comparedialog.h"
 #include "ui_comparedialog.h"
+#include "appdata.h"
 #include "helpers.h"
+#include "modelslist.h"
+#include "styleeditdialog.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 +70,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 +83,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()
@@ -156,3 +190,10 @@ void CompareDialog::on_printFileButton_clicked()
     ui->textEdit->print(&printer);
   }
 }
+
+void CompareDialog::on_styleButton_clicked()
+{
+  StyleEditDialog *g = new StyleEditDialog(this, MODEL_PRINT_CSS);
+  if (g->exec() == QDialog::Accepted)
+    compare();
+}

companion/src/comparedialog.h

@@ -35,27 +35,33 @@ 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();
-    
+    void on_styleButton_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,25 @@
    <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>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
@@ -106,6 +68,13 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="styleButton">
+       <property name="text">
+        <string>Style</string>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QPushButton" name="printButton">
        <property name="text">
@@ -122,11 +91,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,52 @@
 #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_APP_NAME               QCoreApplication::translate("Companion", "OpenTX Companion")
+#define CPN_STR_TTL_INFO               QCoreApplication::translate("Companion", "Information")        // shared Title Case words, eg. for a window title or section heading
+#define CPN_STR_TTL_WARNING            QCoreApplication::translate("Companion", "Warning")
+#define CPN_STR_TTL_ERROR              QCoreApplication::translate("Companion", "Error")
+#define CPN_STR_TTL_CONFIRM            QCoreApplication::translate("Companion", "Please Confirm")
 
-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_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"
+
+#define CPN_STR_APP_SETTINGS           QCoreApplication::translate("Companion", "Application Settings")
+#define CPN_STR_APP_SETTINGS_FILES     CPN_STR_APP_SETTINGS % " " % CPN_STR_FILES
+#define CPN_STR_APP_SETTINGS_FILTER    CPN_STR_APP_SETTINGS_FILES % " (*.ini)"
+
+#define CPN_STR_UNKNOWN_ITEM           "???"
+
+#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.
 
 #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

@@ -18,16 +18,23 @@
  * GNU General Public License for more details.
  */
 
-#ifndef _I2C_DRIVER_H_
-#define _I2C_DRIVER_H_
+#include "customdebug.h"
 
-#include "stdint.h"
+Q_LOGGING_CATEGORY(eepromImport, "eeprom.import")
 
-uint32_t fromBCD(uint8_t bcd_value);
-uint8_t toBCD(uint32_t value);
-
-bool i2cInit();
-uint32_t i2cReadBuffer(uint8_t chip, uint8_t *addr, uint8_t addr_len, uint8_t *buffer, uint32_t length);
-uint32_t i2cWriteBuffer(uint8_t chip, uint8_t *addr, uint8_t addr_len, uint8_t *buffer, uint32_t length);
+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

@@ -74,7 +74,7 @@ bool Side::displayImage(QString fileName, Source pictSource)
     if (pictSource== PICT)
       *format = image.width()>WIDTH_9X ? LCDTARANIS : LCD9X;
     else if (pictSource == PROFILE)
-      *format = (g.profile[g.id()].fwType().contains("x9")) ? LCDTARANIS : LCD9X; 
+      *format = (g.profile[g.id()].fwType().contains("x9")) ? LCDTARANIS : LCD9X;
   }
 
   if (image.isNull()) {
@@ -88,17 +88,17 @@ bool Side::displayImage(QString fileName, Source pictSource)
 
   switch (pictSource) {
     case FW:
-      fileNameEdit->setText(QObject::tr("FW: %1").arg(fileName));
+      fileNameEdit->setText(CustomizeSplashDialog::tr("FW: %1").arg(fileName));
       *saveToFileName = fileName;
       *source = FW;
       break;
     case PICT:
-      fileNameEdit->setText(QObject::tr("Pict: %1").arg(fileName));
+      fileNameEdit->setText(CustomizeSplashDialog::tr("Pict: %1").arg(fileName));
       *saveToFileName = fileName;
       *source = PICT;
       break;
     case PROFILE:
-      fileNameEdit->setText(QObject::tr("Profile image"));
+      fileNameEdit->setText(CustomizeSplashDialog::tr("Profile image"));
       *saveToFileName = fileName;
       *source = PROFILE;
       break;
@@ -150,17 +150,15 @@ 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"));
   ui->leftLibraryButton->setIcon(CompanionIcon("library.png"));
   ui->rightLibraryButton->setIcon(CompanionIcon("library.png"));
-  
+
   left.imageLabel =  ui->leftImageLabel;
   right.imageLabel = ui->rightImageLabel;
   left.fileNameEdit =  ui->leftFileNameEdit;
@@ -171,7 +169,7 @@ customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
   right.libraryButton = ui->rightLibraryButton;
   left.invertButton = ui->leftInvertButton;
   right.invertButton = ui->rightInvertButton;
-  
+
   left.loadFwButton =  ui->leftLoadFwButton;
   right.loadFwButton =  ui->rightLoadFwButton;
   left.loadPictButton =  ui->leftLoadPictButton;
@@ -185,36 +183,36 @@ 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()) {
     if (!side.displayImage( fileName, FW ))
-      QMessageBox::critical(this, tr("Error"), tr("Can not load embedded image from firmware file %1.").arg(fileName));
+      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("Can not load embedded image from firmware file %1.").arg(fileName));
     else
     g.flashDir( QFileInfo(fileName).dir().absolutePath() );
   }
   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++) {
@@ -225,42 +223,42 @@ void customizeSplashDialog::loadPicture(Side side)
 
   if (!fileName.isEmpty()) {
     if (!side.displayImage( fileName, PICT ))
-      QMessageBox::critical(this, tr("Error"), tr("Cannot load the image file %1.").arg(fileName));
+      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("Cannot load the image file %1.").arg(fileName));
     else
       g.imagesDir( QFileInfo(fileName).dir().absolutePath() );
   }
   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();
 
   if (!fileName.isEmpty()) {
     if (!side.displayImage( fileName, PROFILE ))
-      QMessageBox::critical(this, tr("Error"), tr("Cannot load profile image %1.").arg(fileName));
+      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("Cannot load profile image %1.").arg(fileName));
   }
   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);
   ld->exec();
   if (!fileName.isEmpty()) {
     if (!side.displayImage( fileName, UNDEFINED ))
-      QMessageBox::critical(this, tr("Error"), tr("Cannot load the library image %1.").arg(fileName));
+      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("Cannot load the library image %1.").arg(fileName));
   }
 }
 
-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/datamodels/CMakeLists.txt

@@ -0,0 +1,24 @@
+
+set(datamodels_SRCS
+  rawitemdatamodels.cpp
+  rawitemfilteredmodel.cpp
+)
+
+set(datamodels_HDRS
+  rawitemdatamodels.h
+  rawitemfilteredmodel.h
+)
+
+qt5_wrap_cpp(datamodels_SRCS ${datamodels_HDRS})
+
+add_library(datamodels ${datamodels_SRCS} ${datamodels_HDRS})
+target_link_libraries(datamodels PRIVATE ${CPN_COMMON_LIB})
+
+target_include_directories(datamodels
+  PRIVATE
+    "${CMAKE_SOURCE_DIR}"
+    "${CMAKE_CURRENT_BINARY_DIR}"
+    "${COMPANION_SRC_DIRECTORY}"
+  PUBLIC
+    "${CMAKE_CURRENT_LIST_DIR}"
+)

companion/src/datamodels/rawitemdatamodels.cpp

@@ -0,0 +1,172 @@
+/*
+ * 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 "rawitemdatamodels.h"
+#include "generalsettings.h"
+#include "eeprominterface.h"
+#include "modeldata.h"
+
+RawSourceItemModel::RawSourceItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, QObject * parent) :
+  AbstractRawItemDataModel(generalSettings, modelData, parent)
+{
+  const Boards board = Boards(getCurrentBoard());
+  Firmware * fw = getCurrentFirmware();
+  const int anasCount = CPN_MAX_STICKS + board.getCapability(Board::Pots) + board.getCapability(Board::Sliders) +  board.getCapability(Board::MouseAnalogs);
+
+  addItems(SOURCE_TYPE_NONE,           RawSource::NoneGroup,     1);
+  for (int i=0; i < fw->getCapability(LuaScripts); i++)
+    addItems(SOURCE_TYPE_LUA_OUTPUT,   RawSource::ScriptsGroup,  fw->getCapability(LuaOutputsPerScript), i * 16);
+  addItems(SOURCE_TYPE_VIRTUAL_INPUT,  RawSource::InputsGroup,   fw->getCapability(VirtualInputs));
+  addItems(SOURCE_TYPE_STICK,          RawSource::SourcesGroup,  anasCount);
+  addItems(SOURCE_TYPE_ROTARY_ENCODER, RawSource::SourcesGroup,  fw->getCapability(RotaryEncoders));
+  addItems(SOURCE_TYPE_TRIM,           RawSource::TrimsGroup,    board.getCapability(Board::NumTrims));
+  addItems(SOURCE_TYPE_MAX,            RawSource::SourcesGroup,  1);
+  addItems(SOURCE_TYPE_SWITCH,         RawSource::SwitchesGroup, board.getCapability(Board::Switches));
+  addItems(SOURCE_TYPE_CUSTOM_SWITCH,  RawSource::SwitchesGroup, fw->getCapability(LogicalSwitches));
+  addItems(SOURCE_TYPE_CYC,            RawSource::SourcesGroup,  CPN_MAX_CYC);
+  addItems(SOURCE_TYPE_PPM,            RawSource::SourcesGroup,  fw->getCapability(TrainerInputs));
+  addItems(SOURCE_TYPE_CH,             RawSource::SourcesGroup,  fw->getCapability(Outputs));
+  addItems(SOURCE_TYPE_SPECIAL,        RawSource::TelemGroup,    5);
+  addItems(SOURCE_TYPE_TELEMETRY,      RawSource::TelemGroup,    CPN_MAX_SENSORS * 3);
+  addItems(SOURCE_TYPE_GVAR,           RawSource::GVarsGroup,    fw->getCapability(Gvars));
+}
+
+void RawSourceItemModel::setDynamicItemData(QStandardItem * item, const RawSource & src) const
+{
+  Board::Type board = getCurrentBoard();
+  item->setText(src.toString(modelData, generalSettings, board));
+  item->setData(src.isAvailable(modelData, generalSettings, board), IsAvailableRole);
+}
+
+void RawSourceItemModel::addItems(const RawSourceType & type, const int group, const int count, const int start)
+{
+  for (int i = start; i < start + count; i++) {
+    const RawSource src = RawSource(type, i);
+    QStandardItem * modelItem = new QStandardItem();
+    modelItem->setData(src.toValue(), ItemIdRole);
+    modelItem->setData(type, ItemTypeRole);
+    modelItem->setData(group, ItemFlagsRole);
+    setDynamicItemData(modelItem, src);
+    appendRow(modelItem);
+  }
+}
+
+void RawSourceItemModel::update() const
+{
+  for (int i=0; i < rowCount(); ++i)
+    setDynamicItemData(item(i), RawSource(item(i)->data(ItemIdRole).toInt()));
+}
+
+
+//
+// RawSwitchItemModel
+//
+
+RawSwitchItemModel::RawSwitchItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, QObject * parent) :
+  AbstractRawItemDataModel(generalSettings, modelData, parent)
+{
+  Boards board = Boards(getCurrentBoard());
+  Firmware * fw = getCurrentFirmware();
+
+  // Descending switch direction: NOT (!) switches
+  addItems(SWITCH_TYPE_SENSOR,         -CPN_MAX_SENSORS);
+  addItems(SWITCH_TYPE_TELEMETRY,      -1);
+  addItems(SWITCH_TYPE_FLIGHT_MODE,    -fw->getCapability(FlightModes));
+  addItems(SWITCH_TYPE_VIRTUAL,        -fw->getCapability(LogicalSwitches));
+  addItems(SWITCH_TYPE_ROTARY_ENCODER, -fw->getCapability(RotaryEncoders));
+  addItems(SWITCH_TYPE_TRIM,           -board.getCapability(Board::NumTrimSwitches));
+  addItems(SWITCH_TYPE_MULTIPOS_POT,   -(board.getCapability(Board::MultiposPots) * board.getCapability(Board::MultiposPotsPositions)));
+  addItems(SWITCH_TYPE_SWITCH,         -board.getCapability(Board::SwitchPositions));
+
+  // Ascending switch direction (including zero)
+  addItems(SWITCH_TYPE_TIMER_MODE, 5);
+  addItems(SWITCH_TYPE_NONE, 1);
+  addItems(SWITCH_TYPE_SWITCH,         board.getCapability(Board::SwitchPositions));
+  addItems(SWITCH_TYPE_MULTIPOS_POT,   board.getCapability(Board::MultiposPots) * board.getCapability(Board::MultiposPotsPositions));
+  addItems(SWITCH_TYPE_TRIM,           board.getCapability(Board::NumTrimSwitches));
+  addItems(SWITCH_TYPE_ROTARY_ENCODER, fw->getCapability(RotaryEncoders));
+  addItems(SWITCH_TYPE_VIRTUAL,        fw->getCapability(LogicalSwitches));
+  addItems(SWITCH_TYPE_FLIGHT_MODE,    fw->getCapability(FlightModes));
+  addItems(SWITCH_TYPE_TELEMETRY,      1);
+  addItems(SWITCH_TYPE_SENSOR,         CPN_MAX_SENSORS);
+  addItems(SWITCH_TYPE_ON,             1);
+  addItems(SWITCH_TYPE_ONE,            1);
+}
+
+void RawSwitchItemModel::setDynamicItemData(QStandardItem * item, const RawSwitch & rsw) const
+{
+  const Board::Type board = getCurrentBoard();
+  item->setText(rsw.toString(board, generalSettings, modelData));
+  item->setData(rsw.isAvailable(modelData, generalSettings, board), IsAvailableRole);
+}
+
+void RawSwitchItemModel::addItems(const RawSwitchType & type, int count)
+{
+  // Most RawSwitch() indices are one-based (vs. typical zero); these are exceptions to the rule:
+  const static QVector<int> rawSwitchIndexBaseZeroTypes = QVector<int>() << SWITCH_TYPE_NONE << SWITCH_TYPE_ON << SWITCH_TYPE_OFF << SWITCH_TYPE_TIMER_MODE;
+  // handle exceptions in RawSwitch() index values
+  const short rawIdxAdj = rawSwitchIndexBaseZeroTypes.contains(type) ? -1 : 0;
+
+  // determine cotext flags
+  int context = RawSwitch::AllSwitchContexts;
+  switch (type) {
+    case SWITCH_TYPE_FLIGHT_MODE:
+      context &= ~RawSwitch::MixesContext;
+    // fallthrough
+    case SWITCH_TYPE_VIRTUAL:
+    case SWITCH_TYPE_SENSOR:
+      context &= ~RawSwitch::GlobalFunctionsContext;
+      break;
+
+    case SWITCH_TYPE_TIMER_MODE:
+      context = RawSwitch::TimersContext;
+      break;
+
+    case SWITCH_TYPE_NONE:
+      context &= ~RawSwitch::TimersContext;
+      break;
+
+    case SWITCH_TYPE_ON:
+    case SWITCH_TYPE_ONE:
+      context = RawSwitch::SpecialFunctionsContext | RawSwitch::GlobalFunctionsContext;
+      break;
+
+    default:
+      break;
+  }
+
+  int i = (count < 0 ? count : 1);
+  count = (i < 0 ? 0 : count + i);
+  for ( ; i < count; ++i) {
+    RawSwitch rs(type, i + rawIdxAdj);
+    QStandardItem * modelItem = new QStandardItem();
+    modelItem->setData(rs.toValue(), ItemIdRole);
+    modelItem->setData(type, ItemTypeRole);
+    modelItem->setData(context, ItemFlagsRole);
+    setDynamicItemData(modelItem, rs);
+    appendRow(modelItem);
+  }
+}
+
+void RawSwitchItemModel::update() const
+{
+  for (int i=0; i < rowCount(); ++i)
+    setDynamicItemData(item(i), RawSwitch(item(i)->data(ItemIdRole).toInt()));
+}

companion/src/datamodels/rawitemdatamodels.h

@@ -0,0 +1,84 @@
+/*
+ * 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 RAWITEMDATAMODELS_H
+#define RAWITEMDATAMODELS_H
+
+#include "rawsource.h"
+#include "rawswitch.h"
+
+#include <QStandardItemModel>
+
+class GeneralSettings;
+class ModelData;
+
+class AbstractRawItemDataModel: public QStandardItemModel
+{
+    Q_OBJECT
+  public:
+    enum DataRoles { ItemIdRole = Qt::UserRole, ItemTypeRole, ItemFlagsRole, IsAvailableRole };
+    Q_ENUM(DataRoles)
+
+    explicit AbstractRawItemDataModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, QObject * parent = nullptr)  :
+      QStandardItemModel(parent),
+      generalSettings(generalSettings),
+      modelData(modelData)
+    {}
+
+  public slots:
+    virtual void update() const = 0;
+
+  protected:
+    const GeneralSettings * generalSettings;
+    const ModelData * modelData;
+};
+
+
+class RawSourceItemModel: public AbstractRawItemDataModel
+{
+    Q_OBJECT
+  public:
+    explicit RawSourceItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, QObject * parent = nullptr);
+
+  public slots:
+    void update() const override;
+
+  protected:
+    void setDynamicItemData(QStandardItem * item, const RawSource & src) const;
+    void addItems(const RawSourceType & type, const int group, const int count, const int start = 0);
+};
+
+
+class RawSwitchItemModel: public AbstractRawItemDataModel
+{
+    Q_OBJECT
+  public:
+    explicit RawSwitchItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, QObject * parent = nullptr);
+
+  public slots:
+    void update() const override;
+
+  protected:
+    void setDynamicItemData(QStandardItem * item, const RawSwitch & rsw) const;
+    void addItems(const RawSwitchType & type, int count);
+};
+
+
+#endif // RAWITEMDATAMODELS_H

companion/src/datamodels/rawitemfilteredmodel.cpp

@@ -0,0 +1,74 @@
+/*
+ * 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 "rawitemfilteredmodel.h"
+#include "rawitemdatamodels.h"
+
+RawItemFilteredModel::RawItemFilteredModel(QAbstractItemModel * sourceModel, int flags, QObject * parent) :
+  QSortFilterProxyModel(parent),
+  filterFlags(0)
+{
+  setFilterRole(AbstractRawItemDataModel::IsAvailableRole);
+  setFilterKeyColumn(0);
+  setFilterFlags(flags);
+  setDynamicSortFilter(true);
+  setSourceModel(sourceModel);
+}
+
+void RawItemFilteredModel::setFilterFlags(int flags)
+{
+  if (filterFlags != flags) {
+    filterFlags = flags;
+    invalidateFilter();
+  }
+}
+
+bool RawItemFilteredModel::filterAcceptsRow(int sourceRow, const QModelIndex & sourceParent) const
+{
+  const QModelIndex & srcIdx = sourceModel()->index(sourceRow, 0, sourceParent);
+  if (!srcIdx.isValid() || !sourceModel()->data(srcIdx, filterRole()).toBool())
+    return false;
+
+  if (!filterFlags)
+    return true;
+
+  bool ok;
+  const int flags = sourceModel()->data(srcIdx, AbstractRawItemDataModel::ItemFlagsRole).toInt(&ok);
+  return (ok && (!flags || (filterFlags & flags)));
+}
+
+void RawItemFilteredModel::update() const
+{
+  AbstractRawItemDataModel * model = qobject_cast<AbstractRawItemDataModel *>(sourceModel());
+  if (model)
+    model->update();
+}
+
+
+RawSourceFilterItemModel::RawSourceFilterItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, int flags, QObject * parent) :
+  RawItemFilteredModel(new RawSourceItemModel(generalSettings, modelData, parent), flags, parent)
+{
+}
+
+
+RawSwitchFilterItemModel::RawSwitchFilterItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, int context, QObject * parent) :
+  RawItemFilteredModel(new RawSwitchItemModel(generalSettings, modelData, parent), context, parent)
+{
+}

companion/src/datamodels/rawitemfilteredmodel.h

@@ -0,0 +1,74 @@
+/*
+ * 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 RAWITEMFILTEREDMODEL_H
+#define RAWITEMFILTEREDMODEL_H
+
+#include <QSortFilterProxyModel>
+
+class GeneralSettings;
+class ModelData;
+class RawSourceItemModel;
+class RawSwitchItemModel;
+
+class RawItemFilteredModel: public QSortFilterProxyModel
+{
+    Q_OBJECT
+  public:
+    explicit RawItemFilteredModel(QAbstractItemModel * sourceModel, int flags, QObject * parent = nullptr);
+    explicit RawItemFilteredModel(QAbstractItemModel * sourceModel, QObject * parent = nullptr) : RawItemFilteredModel(sourceModel, 0, parent) {}
+
+  public slots:
+    void setFilterFlags(int flags);
+    void update() const;
+
+  protected:
+    bool filterAcceptsRow(int sourceRow, const QModelIndex & sourceParent) const override;
+
+    int filterFlags;
+};
+
+
+// The specialized "convenience" types below can go away once centralalized RawSource/RawSwitch item models are established.
+// These proxy classes will automatically create a source model of the corresponding type.
+
+class RawSwitchFilterItemModel: public RawItemFilteredModel
+{
+    Q_OBJECT
+  public:
+    using RawItemFilteredModel::RawItemFilteredModel;
+
+    explicit RawSwitchFilterItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, int context, QObject * parent = nullptr);
+};
+
+
+class RawSourceFilterItemModel: public RawItemFilteredModel
+{
+    Q_OBJECT
+  public:
+    using RawItemFilteredModel::RawItemFilteredModel;
+
+    explicit RawSourceFilterItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, int flags, QObject * parent = nullptr);
+
+    explicit RawSourceFilterItemModel(const GeneralSettings * const generalSettings, const ModelData * const modelData, QObject * parent = nullptr) :
+      RawSourceFilterItemModel(generalSettings, modelData, 0, parent) {}
+};
+
+#endif // RAWITEMFILTEREDMODEL_H

companion/src/dialogs/filesyncdialog.cpp

@@ -0,0 +1,502 @@
+/*
+ * 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 "filesyncdialog.h"
+
+#include "autobitsetcheckbox.h"
+#include "autocheckbox.h"
+#include "autocombobox.h"
+#include "autolineedit.h"
+#include "constants.h"
+#include "helpers.h"
+#include "progresswidget.h"
+
+#include <QApplication>
+#include <QComboBox>
+#include <QCompleter>
+#include <QCheckBox>
+#include <QDir>
+#include <QFileDialog>
+#include <QFileSystemModel>
+#include <QLayout>
+#include <QLineEdit>
+#include <QMenu>
+#include <QSpinBox>
+
+FileSyncDialog::FileSyncDialog(QWidget * parent, const SyncProcess::SyncOptions & syncOptions) :
+  QDialog(parent),
+  m_syncOptions(syncOptions),
+  m_running(false)
+{
+  setWindowTitle(tr("Synchronize Files"));
+  setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
+  setSizeGripEnabled(true);
+
+  setupUi();
+  toggleExtraOptions(false);
+  validate();
+  updateRunningState();
+}
+
+void FileSyncDialog::reject()
+{
+  // override close event via window system close or esc. key
+  if (m_running) {
+    if (QMessageBox::question(this, CPN_STR_APP_NAME, tr("Are you sure you wish to abort the sync?")) == QMessageBox::No)
+      return;
+    emit stopSync();
+    // Force termination if the sync hasn't finished within 5s
+    QElapsedTimer tim;
+    tim.start();
+    while (!tim.hasExpired(5000) && m_running)
+      QApplication::processEvents(QEventLoop::ExcludeUserInputEvents, 10);
+    if (m_running)
+      qWarning() << "Terminating thread while Sync process was still running.";
+  }
+  QDialog::reject();
+}
+
+// Create a widget with a line edit and folder select button and handles all interactions. Features autosuggest
+//   path hints while typing, invalid paths shown in red.
+// This should probably be moved some place more reusable, esp. the QFileSystemModel.
+static QWidget * folderSelectorWidget(QLineEdit * le, QWidget * parent)
+{
+  static QFileSystemModel fileModel;
+  static bool init = false;
+  if (!init) {
+    init = true;
+    fileModel.setFilter(QDir::Dirs);
+    fileModel.setRootPath("/");
+  }
+
+  QWidget * fsw = new QWidget(parent);
+  //le = new QLineEdit(parent);
+  QCompleter * fsc = new QCompleter(fsw);
+  fsc->setModel(&fileModel);
+  //fsc->setCompletionMode(QCompleter::InlineCompletion);
+  le->setCompleter(fsc);
+
+  QToolButton * btn = new QToolButton(fsw);
+  btn->setIcon(CompanionIcon("open.png"));
+  QHBoxLayout * l = new QHBoxLayout(fsw);
+  l->setContentsMargins(0,0,0,0);
+  l->setSpacing(3);
+  l->addWidget(le);
+  l->addWidget(btn);
+
+  QObject::connect(btn, &QToolButton::clicked, [=]() {
+    QString dir = QFileDialog::getExistingDirectory(parent, fsw->property("fileDialogTitle").toString(), le->text(), 0);
+    if (!dir.isEmpty()) {
+      le->setText(QDir::toNativeSeparators(dir));
+      le->setFocus();
+    }
+  });
+
+  QObject::connect(le, &QLineEdit::textChanged, [=](const QString & text) {
+    if (QFile::exists(text))
+      le->setStyleSheet("");
+    else
+      le->setStyleSheet("QLineEdit {color: red;}");
+  });
+
+  return fsw;
+}
+
+void FileSyncDialog::setupUi()
+{
+  const QString srcArw = CPN_STR_SW_INDICATOR_UP % " ";
+  const QString dstArw = CPN_STR_SW_INDICATOR_DN % " ";
+  int row = 0;
+
+  CompanionIcon playIcon("play.png");
+  playIcon.addImage("stop.png", QIcon::Normal, QIcon::On);
+
+  QLabel * lblSrc = new QLabel(tr("Source Folder:"), this);
+  AutoLineEdit * leSrc =  new AutoLineEdit(this, true);
+  leSrc->setField(m_syncOptions.folderA);
+  leSrc->setText(QDir::toNativeSeparators(m_syncOptions.folderA));
+  QWidget * wdgSrc = folderSelectorWidget(leSrc, this);
+
+  QLabel * lblDst = new QLabel(tr("Destination Folder:"), this);
+  AutoLineEdit * leDst =  new AutoLineEdit(this, true);
+  leDst->setField(m_syncOptions.folderB);
+  leDst->setText(QDir::toNativeSeparators(m_syncOptions.folderB));
+  QWidget * wdgDst = folderSelectorWidget(leDst, this);
+
+  AutoComboBox * syncDir = new AutoComboBox(this);
+  syncDir->addItem(tr("%1%2 Both directions, to destination folder first").arg(dstArw, srcArw), SyncProcess::SYNC_A2B_B2A);
+  syncDir->addItem(tr("%1%2 Both directions, to source folder first").arg(srcArw, dstArw), SyncProcess::SYNC_B2A_A2B);
+  syncDir->addItem(tr(" %1  Only from source folder to destination folder").arg(dstArw), SyncProcess::SYNC_A2B);
+  syncDir->addItem(tr(" %1  Only from destination folder to source folder").arg(srcArw), SyncProcess::SYNC_B2A);
+  syncDir->setCurrentIndex(-1);  // we set the default option later
+
+  AutoComboBox * copyMode = new AutoComboBox(this);
+  copyMode->setToolTip(tr("How to handle overwriting files which already exist in the destination folder."));
+  copyMode->addItem(tr("Copy only if newer and different (compare contents)"), SyncProcess::OVERWR_NEWER_IF_DIFF);
+  copyMode->addItem(tr("Copy only if newer (do not compare contents)"), SyncProcess::OVERWR_NEWER_ALWAYS);
+  copyMode->addItem(tr("Copy only if different (ignore file time stamps)"), SyncProcess::OVERWR_IF_DIFF);
+  copyMode->addItem(tr("Always copy (force overwite existing files)"), SyncProcess::OVERWR_ALWAYS);
+  copyMode->setField(m_syncOptions.compareType);
+
+  QSpinBox * maxSize = new QSpinBox(this);
+  maxSize->setRange(0, 100 * 1024);
+  maxSize->setAccelerated(true);
+  maxSize->setSpecialValueText(tr("Any size"));
+  maxSize->setToolTip(tr("Skip files larger than this size. Enter zero for unlimited."));
+  maxSize->setGroupSeparatorShown(true);
+  maxSize->setValue(0);  // we set the real default value later
+
+  AutoComboBox * logLevel = new AutoComboBox(this);
+  logLevel->setToolTip(tr("Minimum reporting level. Events of this type and of higher importance are shown.\n" \
+                          "WARNING: High log rates may make the user interface temporarily unresponsive."));
+  logLevel->addItem(tr("Skipped"), QtDebugMsg);
+  logLevel->addItem(tr("Created"), QtInfoMsg);
+  logLevel->addItem(tr("Updated"), QtWarningMsg);
+  //logLevel->addItem(tr("Item Deleted"), QtCriticalMsg);  // unused
+  logLevel->addItem(tr("Errors Only"), QtFatalMsg);
+  logLevel->setField(m_syncOptions.logLevel);
+
+  AutoBitsetCheckBox * testRun = new AutoBitsetCheckBox(m_syncOptions.flags, SyncProcess::OPT_DRY_RUN, tr("Test-run only"), this);
+  testRun->setToolTip(tr("Run as normal but do not actually copy anything. Useful for verifying results before real sync."));
+
+  // layout to hold size spinbox and checkbox option(s)
+  QHBoxLayout * hlay1 = new QHBoxLayout();
+  hlay1->addWidget(maxSize, 1);
+  hlay1->addWidget(testRun);
+  hlay1->addWidget(new QLabel(tr("Log Level:"), this));
+  hlay1->addWidget(logLevel);
+
+  // "extra" options
+
+  QLabel * lbFilter = new QLabel(tr("Filters:"), this);
+  lbFilter->setToolTip(tr("The \"Include\" filter will only copy files which match the pattern(s).\n" \
+                          "The \"Exclude\" filter will skip files matching the filter pattern(s).\n" \
+                          "The Include filter is evaluated first."));
+
+  AutoLineEdit * leFiltExc = new AutoLineEdit(this, true);
+  leFiltExc->setField(m_syncOptions.excludeFilter);
+  leFiltExc->setToolTip(tr("One or more file pattern(s) to exclude, separated by commas.\n" "Blank means exclude none. ?, *, and [...] wildcards accepted."));
+
+  AutoLineEdit * leFiltInc = new AutoLineEdit(this, true);
+  leFiltInc->setField(m_syncOptions.includeFilter);
+  leFiltInc->setToolTip(tr("One or more file pattern(s) to include, separated by commas.\n" "Blank means include all. ?, *, and [...] wildcards accepted."));
+
+  // layout to hold filter options
+  QHBoxLayout * filtLo = new QHBoxLayout();
+  filtLo->addWidget(new QLabel(tr("Include:"), this));
+  filtLo->addWidget(leFiltInc, 1);
+  filtLo->addWidget(new QLabel(tr("Exclude:"), this));
+  filtLo->addWidget(leFiltExc, 1);
+
+  // file options
+  QHBoxLayout * filOptsLo = new QHBoxLayout();
+  filOptsLo->addWidget(new AutoBitsetCheckBox(m_syncOptions.dirFilterFlags, QDir::CaseSensitive, tr("Case sensitive"), this));
+  filOptsLo->addWidget(new AutoBitsetCheckBox(m_syncOptions.dirFilterFlags, QDir::NoSymLinks, true, tr("Follow links"), this));
+  filOptsLo->addWidget(new AutoBitsetCheckBox(m_syncOptions.dirFilterFlags, QDir::Hidden, tr("Include hidden"), this));
+
+  // folder options
+  QHBoxLayout * dirOptsLo = new QHBoxLayout();
+  dirOptsLo->addWidget(new AutoBitsetCheckBox(m_syncOptions.flags, SyncProcess::OPT_RECURSIVE, tr("Recursive"), this));
+  dirOptsLo->addWidget(new AutoBitsetCheckBox(m_syncOptions.flags, SyncProcess::OPT_SKIP_DIR_LINKS, true, tr("Follow links"), this));
+  dirOptsLo->addWidget(new AutoBitsetCheckBox(m_syncOptions.dirFilterFlags, QDir::Dirs, true, tr("Skip empty"), this));
+  dirOptsLo->addWidget(new AutoBitsetCheckBox(m_syncOptions.dirFilterFlags, QDir::AllDirs, true, tr("Apply filters"), this));
+
+  // extra options container widget and layout
+  ui_extraOptions = new QWidget(this);
+  ui_extraOptions->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
+
+  QGridLayout * xOptsLay = new QGridLayout(ui_extraOptions);
+  xOptsLay->setContentsMargins(0, 0, 0, 0);
+  xOptsLay->addWidget(lbFilter, row, 0);
+  xOptsLay->addLayout(filtLo, row++, 1);
+  xOptsLay->addWidget(new QLabel(tr("Filter Options:"), this), row, 0);
+  xOptsLay->addLayout(filOptsLo, row++, 1);
+  xOptsLay->addWidget(new QLabel(tr("Folder Options:"), this), row, 0);
+  xOptsLay->addLayout(dirOptsLo, row++, 1);
+
+  // status label
+  ui_statusLabel = new QLabel(this);
+  // progress widget
+  ui_progress = new ProgressWidget(this);
+  ui_progress->setMinimumWidth(0);
+  ui_progress->setVisible(false);
+
+  // dialog buttons & menu
+
+  QMenu * optionsMenu = new QMenu(tr("Options"));
+  QAction * xtrasAct = optionsMenu->addAction(CompanionIcon("fuses.png"), tr("Show extra options"), this, &FileSyncDialog::toggleExtraOptions);
+  xtrasAct->setCheckable(true);
+  connect(this, &FileSyncDialog::extraOptionsToggled, xtrasAct, &QAction::setChecked);
+  optionsMenu->addAction(CompanionIcon("paintbrush.png"), tr("Reset to defaults"), this, &FileSyncDialog::resetOptions);
+
+  QToolButton * btnOpts = new QToolButton(this);
+  btnOpts->setDefaultAction(xtrasAct);
+  btnOpts->setMenu(optionsMenu);
+  btnOpts->setToolButtonStyle(Qt::ToolButtonIconOnly);
+  btnOpts->setPopupMode(QToolButton::MenuButtonPopup);
+  btnOpts->setToolTip(xtrasAct->text());
+
+  ui_btnStartStop = new QToolButton(this);
+  ui_btnStartStop->setCheckable(true);
+  ui_btnStartStop->setIcon(playIcon);
+  ui_btnStartStop->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+
+  ui_btnClose = new QToolButton(this);
+  ui_btnClose->setText(tr("Close"));
+  ui_btnClose->setToolButtonStyle(Qt::ToolButtonTextOnly);
+  ui_btnClose->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding);
+
+  ui_buttonBox = new QDialogButtonBox(this);
+  ui_buttonBox->addButton(btnOpts, QDialogButtonBox::ActionRole);
+  ui_buttonBox->addButton(ui_btnStartStop, QDialogButtonBox::ActionRole);
+  ui_buttonBox->addButton(ui_btnClose, QDialogButtonBox::RejectRole);
+
+  // The options group box.
+  ui_optionsPanel = new QGroupBox(tr("Options"), this);
+  QGridLayout * optsLay = new QGridLayout(ui_optionsPanel);
+  row = 0;
+  optsLay->addWidget(lblSrc, row, 0);
+  optsLay->addWidget(wdgSrc, row++, 1);
+  optsLay->addWidget(lblDst, row, 0);
+  optsLay->addWidget(wdgDst, row++, 1);
+  optsLay->addWidget(new QLabel(tr("Sync. Direction:"), this), row, 0);
+  optsLay->addWidget(syncDir, row++, 1);
+  optsLay->addWidget(new QLabel(tr("Existing Files:"), this), row, 0);
+  optsLay->addWidget(copyMode, row++, 1);
+  optsLay->addWidget(new QLabel(tr("Max. File Size:"), this), row, 0);
+  optsLay->addLayout(hlay1, row++, 1);
+  optsLay->addWidget(ui_extraOptions, row, 0, 1, 2);
+
+  // layout to hold warning label and button box
+  QHBoxLayout * hlay2 = new QHBoxLayout();
+  hlay2->addWidget(ui_statusLabel, 1);
+  hlay2->addWidget(ui_buttonBox);
+
+  // Create main layout and add options, progress, buttons.
+  QVBoxLayout * dlgL = new QVBoxLayout(this);
+  dlgL->addWidget(ui_optionsPanel, 0, Qt::AlignTop);
+  dlgL->addLayout(hlay2);
+  dlgL->addWidget(ui_progress, 1);
+
+  // Connect all signal handlers
+
+  // source path
+  connect(leSrc, &AutoLineEdit::textChanged, this, &FileSyncDialog::validate);
+  // destination path
+  connect(leDst, &AutoLineEdit::textChanged, this, &FileSyncDialog::validate);
+
+  // function to dis/enable the OVERWR_ALWAYS option depending on sync direction
+  connect(syncDir, &AutoComboBox::currentDataChanged, [=](int dir) {
+    int idx = copyMode->findData(SyncProcess::OVERWR_ALWAYS);
+    int flg = (dir == SyncProcess::SYNC_A2B || dir == SyncProcess::SYNC_B2A) ? 33 : 0;
+    if (!flg && idx == copyMode->currentIndex())
+      copyMode->setCurrentIndex(copyMode->findData(SyncProcess::OVERWR_NEWER_IF_DIFF));
+    copyMode->setItemData(idx, flg, Qt::UserRole - 1);
+  });
+
+  // function to set magnitude of file size spinbox, KB or MB
+  connect(maxSize, static_cast<void(QSpinBox::*)(int)>(&QSpinBox::valueChanged), [=](int value) {
+    const QSignalBlocker blocker(maxSize);
+    int multi = maxSize->property("multi").isValid() ? maxSize->property("multi").toInt() : 0;
+    if (value >= 10 * 1024 && multi != 1024 * 1024) {
+      // KB -> MB
+      multi = 1024 * 1024;
+      maxSize->setValue(value / 1024);
+      maxSize->setMaximum(100);
+      maxSize->setSingleStep(1);
+      maxSize->setSuffix(tr(" MB"));
+    }
+    else if ((value < 10 && multi != 1024) || !multi) {
+      // MB -> KB
+      if (multi)
+        value *= 1024;
+      multi = 1024;
+      if (value == 9 * 1024)
+        value += 1024 - 32;  // avoid large jump when stepping from 10MB to 10,208KB
+      maxSize->setMaximum(100 * 1024);
+      maxSize->setValue(value);
+      maxSize->setSingleStep(32);
+      maxSize->setSuffix(tr(" KB"));
+    }
+    maxSize->setProperty("multi", multi);
+    m_syncOptions.maxFileSize = value * multi;
+  });
+
+  // we set these after connections are made because we want the signal processors to run
+  syncDir->setField(m_syncOptions.direction);
+  maxSize->setValue(m_syncOptions.maxFileSize / 1024);
+
+  // connect Reset action to all fields
+  for (AutoLineEdit * a : ui_optionsPanel->findChildren<AutoLineEdit *>())
+    connect(this, &FileSyncDialog::optionsWereReset, a, &AutoLineEdit::updateValue);
+  for (AutoComboBox * a : ui_optionsPanel->findChildren<AutoComboBox *>())
+    connect(this, &FileSyncDialog::optionsWereReset, a, &AutoComboBox::updateValue);
+  for (AutoBitsetCheckBox * a : ui_optionsPanel->findChildren<AutoBitsetCheckBox *>())
+    connect(this, &FileSyncDialog::optionsWereReset, a, &AutoBitsetCheckBox::updateValue);
+  connect(this, &FileSyncDialog::optionsWereReset, [=]() { maxSize->setValue(m_syncOptions.maxFileSize / 1024); });
+
+  // React to name changes for source and destination path labels
+  connect(this, &FileSyncDialog::folderNameAChanged, [=](const QString &text) {
+    lblSrc->setText(text % ":");
+    wdgSrc->setProperty("fileDialogTitle", text);
+  });
+  connect(this, &FileSyncDialog::folderNameBChanged, [=](const QString &text) {
+    lblDst->setText(text % ":");
+    wdgDst->setProperty("fileDialogTitle", text);
+  });
+
+  // button actions
+  connect(ui_btnStartStop, &QPushButton::clicked,           this, &FileSyncDialog::toggleSync);
+  connect(ui_buttonBox,    &QDialogButtonBox::rejected,     this, &QDialog::reject);
+  connect(ui_buttonBox,    &QDialogButtonBox::accepted,     this, &QDialog::accept);
+  connect(ui_progress,     &ProgressWidget::detailsToggled, this, &FileSyncDialog::adjustSizeDelayed);
+}
+
+void FileSyncDialog::toggleSync(bool)
+{
+  if (m_running) {
+    setCursor(Qt::WaitCursor);
+    emit stopSync();
+    return;
+  }
+
+  ui_progress->clearDetails();
+  ui_progress->setInfo("");
+  SyncProcess * syncProcess = new SyncProcess(m_syncOptions);
+
+  // move sync process to separate thread, we only use signals/slots from here on...
+  QThread * syncThread = new QThread(this);
+  syncProcess->moveToThread(syncThread);
+
+  // ...and quite a few of them!
+  connect(this,        &FileSyncDialog::startSync,     syncProcess, &SyncProcess::run);
+  connect(this,        &FileSyncDialog::stopSync,      syncProcess, &SyncProcess::stop);
+  connect(syncProcess, &SyncProcess::started,          this,        &FileSyncDialog::onSyncStarted);
+  connect(syncProcess, &SyncProcess::finished,         this,        &FileSyncDialog::onSyncFinished);
+  connect(syncProcess, &SyncProcess::statusMessage,    this,        &FileSyncDialog::setStatusText);
+  connect(syncProcess, &SyncProcess::statusUpdate,     this,        &FileSyncDialog::onStatusUpdate);
+  connect(syncProcess, &SyncProcess::fileCountChanged, ui_progress, &ProgressWidget::setMaximum);
+  connect(syncProcess, &SyncProcess::progressMessage,  ui_progress, &ProgressWidget::addMessage);
+  connect(syncProcess, &SyncProcess::finished,         syncThread,  &QThread::quit);
+  connect(syncThread,  &QThread::finished,             syncThread,  &QThread::deleteLater);
+  connect(syncThread,  &QThread::destroyed,            syncProcess, &SyncProcess::deleteLater);
+
+  // go
+  syncThread->start(QThread::LowPriority);
+  emit startSync();
+}
+
+void FileSyncDialog::onSyncStarted()
+{
+  m_running = true;
+  updateRunningState();
+}
+
+void FileSyncDialog::onSyncFinished()
+{
+  m_running = false;
+  updateRunningState();
+  if (parentWidget())
+    QApplication::alert(parentWidget());
+}
+
+void FileSyncDialog::updateRunningState()
+{
+  ui_btnStartStop->setChecked(m_running);
+  ui_optionsPanel->setEnabled(!m_running);
+  ui_btnClose->setEnabled(!m_running);
+  ui_btnStartStop->setText(m_running ? tr("Abort") : tr("Start"));
+  if (m_running) {
+    ui_progress->setVisible(true);  // don't hide after run
+  }
+  else {
+    setCursor(Qt::ArrowCursor);     // in case we set a wait cursor upon abort request
+  }
+}
+
+void FileSyncDialog::onStatusUpdate(const SyncProcess::SyncStatus & stat)
+{
+  static const QString reportTemplate = tr("Total: <b>%1</b>; Created: <b>%2</b>; Updated: <b>%3</b>; Skipped: <b>%4</b>; Errors: <font color=%6><b>%5</b></font>;");
+  ui_progress->setInfo((stat.index < stat.count ? tr("Current: <b>%1</b> of ").arg(stat.index) : "") % reportTemplate.arg(stat.count).arg(stat.created).arg(stat.updated).arg(stat.skipped).arg(stat.errored).arg(stat.errored ? "red" : "black"));
+  ui_progress->setValue(stat.index);
+}
+
+void FileSyncDialog::setSyncOptions(const SyncProcess::SyncOptions & syncOptions)
+{
+  m_syncOptions = syncOptions;
+  emit optionsWereReset();
+}
+
+void FileSyncDialog::resetOptions()
+{
+  m_syncOptions.reset();
+  emit optionsWereReset();
+}
+
+void FileSyncDialog::toggleExtraOptions(bool show)
+{
+  ui_extraOptions->setVisible(show);
+  if (!ui_progress->detailsVisible())
+    adjustSizeDelayed();
+  m_extraOptionsVisible = show;
+  emit extraOptionsToggled(show);
+}
+
+void FileSyncDialog::setFolderNameA(const QString & name)
+{
+  if (m_folderNameA != name) {
+    m_folderNameA = name;
+    emit folderNameAChanged(name);
+  }
+}
+
+void FileSyncDialog::setFolderNameB(const QString & name)
+{
+  if (m_folderNameB != name) {
+    m_folderNameB = name;
+    emit folderNameBChanged(name);
+  }
+}
+
+void FileSyncDialog::setStatusText(const QString & text, int type)
+{
+  ui_statusLabel->setText(text);
+  ui_statusLabel->setStyleSheet(type != QtInfoMsg && type >= QtWarningMsg ?  "QLabel { color: red; }:" : "");
+}
+
+bool FileSyncDialog::validate()
+{
+  QString msg;
+  if (m_syncOptions.folderA.isEmpty() || !QFileInfo(m_syncOptions.folderA).exists())
+    msg = tr("Source folder not found.");
+  else if (m_syncOptions.folderB.isEmpty() || !QFileInfo(m_syncOptions.folderB).exists())
+    msg = tr("Destination folder not found.");
+  else if (QFileInfo(m_syncOptions.folderA).canonicalFilePath() == QFileInfo(m_syncOptions.folderB).canonicalFilePath())
+    msg = tr("Source and destination folders are the same.");
+
+  setStatusText(msg, QtCriticalMsg);
+  ui_btnStartStop->setEnabled(msg.isEmpty());
+  return msg.isEmpty();
+}
+
+void FileSyncDialog::adjustSizeDelayed()
+{
+  QTimer::singleShot(0, [=]() { adjustSize(); });
+}

companion/src/dialogs/filesyncdialog.h

@@ -0,0 +1,96 @@
+/*
+ * 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 FILESYNCDIALOG_H
+#define FILESYNCDIALOG_H
+
+#include "process_sync.h"
+
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QGroupBox>
+#include <QLabel>
+#include <QToolButton>
+
+class ProgressWidget;
+
+class FileSyncDialog : public QDialog
+{
+    Q_OBJECT
+    Q_PROPERTY(SyncProcess::SyncOptions syncOptions READ syncOptions WRITE setSyncOptions RESET resetOptions NOTIFY optionsWereReset)
+    Q_PROPERTY(bool extraOptionsVisible READ extraOptionsVisible WRITE toggleExtraOptions NOTIFY extraOptionsToggled)
+    Q_PROPERTY(QString folderNameA READ folderNameA WRITE setFolderNameA NOTIFY folderNameAChanged)
+    Q_PROPERTY(QString folderNameB READ folderNameB WRITE setFolderNameB NOTIFY folderNameBChanged)
+
+  public:
+    FileSyncDialog(QWidget * parent = nullptr, const SyncProcess::SyncOptions & syncOptions = SyncProcess::SyncOptions());
+
+    inline SyncProcess::SyncOptions syncOptions() const { return m_syncOptions; }
+    void setSyncOptions(const SyncProcess::SyncOptions & syncOptions);
+    void resetOptions();
+
+    inline bool extraOptionsVisible() const { return m_extraOptionsVisible; }
+    void toggleExtraOptions(bool show);
+
+    inline QString folderNameA() const { return m_folderNameA; }
+    void setFolderNameA(const QString & name);
+
+    inline QString folderNameB() const { return m_folderNameB; }
+    void setFolderNameB(const QString & name);
+
+  public slots:
+    virtual void reject() override;
+    void setStatusText(const QString & text, int type = QtWarningMsg);
+    bool validate();
+
+  signals:
+    void startSync();
+    void stopSync();
+    void folderNameAChanged(const QString & name);
+    void folderNameBChanged(const QString & name);
+    void extraOptionsToggled(bool show);
+    void optionsWereReset();
+
+  private slots:
+    void setupUi();
+    void toggleSync(bool);
+    void onSyncStarted();
+    void onSyncFinished();
+    void updateRunningState();
+    void onStatusUpdate(const SyncProcess::SyncStatus & stat);
+    void adjustSizeDelayed();
+
+  private:
+    SyncProcess::SyncOptions m_syncOptions;
+    QString m_folderNameA;
+    QString m_folderNameB;
+    bool m_running;
+    bool m_extraOptionsVisible;
+
+    QGroupBox * ui_optionsPanel;
+    QWidget * ui_extraOptions;
+    ProgressWidget * ui_progress;
+    QDialogButtonBox * ui_buttonBox;
+    QToolButton * ui_btnStartStop;
+    QToolButton * ui_btnClose;
+    QLabel * ui_statusLabel;
+};
+
+#endif // FILESYNCDIALOG_H

companion/src/downloaddialog.cpp

@@ -20,13 +20,17 @@
 
 #include "downloaddialog.h"
 #include "ui_downloaddialog.h"
-#include <QTime>
+#include "constants.h"
 #include "helpers.h"
 
+#include <QTime>
+
 downloadDialog::downloadDialog(QWidget *parent, QString src, QString tgt):
   QDialog(parent),
   ui(new Ui::downloadDialog),
-  file(NULL)
+  reply(nullptr),
+  file(nullptr),
+  aborted(false)
 {
     ui->setupUi(this);
     setWindowIcon(CompanionIcon("fwpreferences.png"));
@@ -41,7 +45,7 @@ downloadDialog::downloadDialog(QWidget *parent, QString src, QString tgt):
 
     file = new QFile(tgt);
     if (!file->open(QIODevice::WriteOnly)) {
-      QMessageBox::critical(this, "Companion",
+      QMessageBox::critical(this, CPN_STR_APP_NAME,
           tr("Unable to save the file %1: %2.")
           .arg(tgt).arg(file->errorString()));
       QTimer::singleShot(0, this, SLOT(fileError()));
@@ -60,29 +64,38 @@ downloadDialog::~downloadDialog()
   delete file;
 }
 
+void downloadDialog::reject()
+{
+  if (reply && reply->isRunning()) {
+    aborted = true;
+    reply->abort();  // this will call QNetworkReply::finished()
+    return;
+  }
+
+  QDialog::reject();
+}
+
 void downloadDialog::httpFinished()
 {
-    file->flush();
-    file->close();
+  file->flush();
+  file->close();
 
-    bool ok = true;
-    if (reply->error()) {
-        file->remove();
-        QMessageBox::information(this, tr("Companion"),
-                                 tr("Download failed: %1.")
-                                 .arg(reply->errorString()));
-        ok = false;
-    }
+  const bool ok = !(reply->error() || aborted);
+  if (!ok) {
+    file->remove();
+    if (!aborted)
+      QMessageBox::information(this, CPN_STR_APP_NAME, tr("Download failed: %1.").arg(reply->errorString()));
+  }
 
-    reply->deleteLater();
-    reply = 0;
-    delete file;
-    file = NULL;
+  reply->deleteLater();
+  reply = nullptr;
+  file->deleteLater();
+  file = nullptr;
 
-    if (ok)
-      accept();
-    else
-      reject();
+  if (ok)
+    accept();
+  else
+    reject();
 }
 
 void downloadDialog::httpReadyRead()
@@ -111,7 +124,7 @@ void downloadDialog::closeEvent( QCloseEvent * event)
   // Delay closing 2 seconds to avoid unpleasant flashing download dialogs
   QTime closeTime= QTime::currentTime().addSecs(2);
   while( QTime::currentTime() < closeTime )
-    QCoreApplication::processEvents(QEventLoop::AllEvents, 100);   
+    QCoreApplication::processEvents(QEventLoop::AllEvents, 100);
 
   event->accept();
 }

companion/src/downloaddialog.h

@@ -39,6 +39,9 @@ public:
     explicit downloadDialog(QWidget *parent = 0, QString src = "", QString tgt = "");
     ~downloadDialog();
 
+  public slots:
+    virtual void reject() override;
+
 private slots:
     void fileError();
     void httpFinished();
@@ -54,7 +57,7 @@ private:
     QNetworkAccessManager qnam;
     QNetworkReply *reply;
     QFile *file;
-
+    bool aborted;
 };
 
 #endif // _DOWNLOADDIALOG_H_

companion/src/firmwares/CMakeLists.txt

@@ -0,0 +1,46 @@
+
+set(firmwares_SRCS
+  boards.cpp
+  curvereference.cpp
+  customfunctiondata.cpp
+  eeprominterface.cpp
+  generalsettings.cpp
+  gvardata.cpp
+  io_data.cpp
+  logicalswitchdata.cpp
+  modeldata.cpp
+  moduledata.cpp
+  multiprotocols.cpp
+  radiodata.cpp
+  radiodataconversionstate.cpp
+  rawsource.cpp
+  rawswitch.cpp
+  sensordata.cpp
+  telem_data.cpp
+  er9x/er9xeeprom.cpp
+  er9x/er9xinterface.cpp
+  ersky9x/ersky9xeeprom.cpp
+  ersky9x/ersky9xinterface.cpp
+  opentx/opentxeeprom.cpp
+  opentx/opentxinterface.cpp
+  )
+
+string(REPLACE ".cpp" ".h" firmwares_HDRS "${firmwares_SRCS}")
+
+list(APPEND firmwares_HDRS
+  eepromimportexport.h
+  moduledata.h
+  )
+
+add_library(firmwares ${firmwares_SRCS} ${firmwares_HDRS})
+target_link_libraries(firmwares ${CPN_COMMON_LIB} Qt5::Core Qt5::Xml Qt5::Widgets)
+target_include_directories(firmwares
+  PRIVATE
+    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+  PUBLIC
+    "${CMAKE_CURRENT_LIST_DIR}"
+    "${CMAKE_CURRENT_LIST_DIR}/er9x"
+    "${CMAKE_CURRENT_LIST_DIR}/ersky9x"
+    "${CMAKE_CURRENT_LIST_DIR}/opentx"
+  )

companion/src/firmwares/boards.cpp

@@ -0,0 +1,427 @@
+/*
+ * 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 "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;
+
+void Boards::setBoardType(const Type & board)
+{
+  if (board >= BOARD_UNKNOWN && board < BOARD_ENUM_COUNT)
+    m_boardType = board;
+  else
+    m_boardType = BOARD_UNKNOWN;
+}
+
+uint32_t Boards::getFourCC(Type board)
+{
+  switch (board) {
+    case BOARD_X12S:
+      return 0x3478746F;
+    case BOARD_X10:
+      return 0x3778746F;
+    case BOARD_TARANIS_XLITE:
+      return 0x3978746F;
+    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:
+    case BOARD_9XRPRO:
+      return 0x3278746F;
+    case BOARD_MEGA2560:
+    case BOARD_GRUVIN9X:
+      return 0x3178746F;
+    default:
+      return 0;
+  }
+}
+
+const int Boards::getEEpromSize(Board::Type board)
+{
+  switch (board) {
+    case BOARD_STOCK:
+      return EESIZE_STOCK;
+    case BOARD_M128:
+      return EESIZE_M128;
+    case BOARD_MEGA2560:
+    case BOARD_GRUVIN9X:
+      return EESIZE_GRUVIN9X;
+    case BOARD_SKY9X:
+      return EESIZE_SKY9X;
+    case BOARD_9XRPRO:
+    case BOARD_AR9X:
+      return EESIZE_9XRPRO;
+    case BOARD_TARANIS_XLITE:
+    case BOARD_TARANIS_X7:
+    case BOARD_TARANIS_X9D:
+    case BOARD_TARANIS_X9DP:
+    case BOARD_TARANIS_X9E:
+      return EESIZE_TARANIS;
+    case BOARD_UNKNOWN:
+      return EESIZE_MAX;
+    default:
+      return 0; // unlimited
+  }
+}
+
+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_XLITE:
+    case BOARD_TARANIS_X7:
+    case BOARD_TARANIS_X9D:
+    case BOARD_TARANIS_X9DP:
+    case BOARD_TARANIS_X9E:
+      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, int index)
+{
+  if (index < 0)
+    return {SWITCH_NOT_AVAILABLE, CPN_STR_UNKNOWN_ITEM};
+
+  if (IS_TARANIS_XLITE(board)) {
+    const Board::SwitchInfo switches[] = {
+      {SWITCH_3POS,   "SA"},
+      {SWITCH_3POS,   "SB"},
+      {SWITCH_2POS,   "SC"},
+      {SWITCH_2POS,   "SD"}
+    };
+    if (index < DIM(switches))
+      return switches[index];
+  }
+  if (IS_TARANIS_X7(board)) {
+    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[] = {
+      {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[] = {
+      {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 {SWITCH_NOT_AVAILABLE, CPN_STR_UNKNOWN_ITEM};
+}
+
+const int Boards::getCapability(Board::Type board, Board::Capability capability)
+{
+  switch (capability) {
+    case Sticks:
+      return 4;
+
+    case Pots:
+      if (IS_TARANIS_SMALL(board))
+        return 2;
+      else if (IS_TARANIS_X9E(board))
+        return 4;
+      else
+        return 3;
+
+    case FactoryInstalledPots:
+      if (IS_TARANIS_X9(board))
+        return 2;
+      else
+        return getCapability(board, Pots);
+
+    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 MaxAnalogs:
+      return getCapability(board, Board::Sticks) + getCapability(board, Board::Pots) + getCapability(board, Board::Sliders) +  getCapability(board, Board::MouseAnalogs);
+
+    case MultiposPots:
+      return IS_HORUS_OR_TARANIS(board) ? 3 : 0;
+
+    case MultiposPotsPositions:
+      return IS_HORUS_OR_TARANIS(board) ? 6 : 0;
+
+    case Switches:
+      if (IS_TARANIS_X9E(board))
+        return 18;
+      else if (IS_TARANIS_X7(board))
+        return 6;
+      else if (IS_TARANIS_XLITE(board))
+        return 4;
+      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[] = {
+    tr("Left Horizontal"),
+    tr("Left Vertical"),
+    tr("Right Vertical"),
+    tr("Right Horizontal"),
+    tr("Aux. 1"),
+    tr("Aux. 2"),
+  };
+  if (index < (int)DIM(axes))
+    return axes[index];
+  else
+    return tr("Unknown");
+}
+
+const QString Boards::getAnalogInputName(Board::Type board, int index)
+{
+  if (index < 0)
+    return CPN_STR_UNKNOWN_ITEM;
+
+  if (index < getBoardCapability(board, Board::Sticks)) {
+    const QString sticks[] = {
+      tr("Rud"),
+      tr("Ele"),
+      tr("Thr"),
+      tr("Ail")
+    };
+    return sticks[index];
+  }
+
+  index -= getCapability(board, Board::Sticks);
+
+  if (IS_9X(board) || IS_2560(board) || IS_SKY9X(board)) {
+    const QString pots[] = {
+      "P1",
+      "P2",
+      "P3"
+    };
+    if (index < DIM(pots))
+      return pots[index];
+  }
+  else if (IS_TARANIS_X9E(board)) {
+    const QString pots[] = {
+      "F1",
+      "F2",
+      "F3",
+      "F4",
+      "S1",
+      "S2",
+      "LS",
+      "RS"
+    };
+    if (index < DIM(pots))
+      return pots[index];
+  }
+  else if (IS_TARANIS(board)) {
+    const QString pots[] = {
+      "S1",
+      "S2",
+      "S3",
+      "LS",
+      "RS"
+    };
+    if (index < DIM(pots))
+      return pots[index];
+  }
+  else if (IS_HORUS_X12S(board)) {
+    const QString pots[] = {
+      "S1",
+      "6P",
+      "S2",
+      "L1",
+      "L2",
+      "LS",
+      "RS",
+      "JSx",
+      "JSy"
+    };
+    if (index < DIM(pots))
+      return pots[index];
+  }
+  else if (IS_HORUS_X10(board)) {
+    const QString pots[] = {
+      "S1",
+      "6P",
+      "S2",
+      "LS",
+      "RS"
+    };
+    if (index < DIM(pots))
+      return pots[index];
+  }
+
+  return CPN_STR_UNKNOWN_ITEM;
+}
+
+const bool Boards::isBoardCompatible(Type board1, Type board2)
+{
+  return (getFourCC(board1) == getFourCC(board2));
+}
+
+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/X7S";
+     case BOARD_TARANIS_XLITE:
+      return "Taranis X-Lite";
+    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 X12S";
+    case BOARD_X10:
+      return "Horus X10/X10S";
+    default:
+      return tr("Unknown");
+  }
+}

companion/src/firmwares/boards.h

@@ -21,13 +21,18 @@
 #ifndef _BOARDS_H_
 #define _BOARDS_H_
 
+#include <QtCore>
+#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,
@@ -38,10 +43,10 @@ namespace Board {
     BOARD_TARANIS_X9D,
     BOARD_TARANIS_X9DP,
     BOARD_TARANIS_X9E,
-    BOARD_FLAMENCO,
     BOARD_X12S,
     BOARD_X10,
-    BOARD_UNKNOWN = -1
+    BOARD_TARANIS_XLITE,
+    BOARD_ENUM_COUNT
   };
 
   enum PotType
@@ -66,10 +71,61 @@ 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,
+    FactoryInstalledPots,
+    Sliders,
+    MouseAnalogs,
+    MaxAnalogs,
+    MultiposPots,
+    MultiposPotsPositions,
+    Switches,
+    SwitchPositions,
+    FactoryInstalledSwitches,
+    NumTrims,
+    NumTrimSwitches
+  };
+
   struct SwitchInfo
   {
     SwitchType config;
-    const char * name;
+    QString name;
   };
 
   struct SwitchPosition {
@@ -82,59 +138,69 @@ namespace Board {
       unsigned int position;
   };
 
-  enum Capability {
-    Pots,
-    Sliders,
-    MouseAnalogs,
-    Switches,
-    FactoryInstalledSwitches,
-    NumTrims,
-    NumTrimSwitches
-  };
 }
 
-// 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
+{
+  Q_DECLARE_TR_FUNCTIONS(Boards)
 
-// 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
+  public:
 
-int getEEpromSize(Board::Type board);
-Board::SwitchInfo getSwitchInfo(Board::Type board, unsigned index);
+    Boards(Board::Type board)
+    {
+      setBoardType(board);
+    }
 
-int getBoardCapability(Board::Type board, Board::Capability capability);
+    void setBoardType(const Board::Type & board);
+    Board::Type getBoardType() const { return m_boardType; }
+
+    const uint32_t getFourCC() const { return getFourCC(m_boardType); }
+    const int getEEpromSize() const { return getEEpromSize(m_boardType); }
+    const int getFlashSize() const { return getFlashSize(m_boardType); }
+    const Board::SwitchInfo getSwitchInfo(int index) const { return getSwitchInfo(m_boardType, index); }
+    const int getCapability(Board::Capability capability) const { return getCapability(m_boardType, capability); }
+    const QString getAnalogInputName(int index) const { return getAnalogInputName(m_boardType, index); }
+    const bool isBoardCompatible(Board::Type board2) const { return isBoardCompatible(m_boardType, board2); }
+
+    static uint32_t getFourCC(Board::Type board);
+    static const int getEEpromSize(Board::Type board);
+    static const int getFlashSize(Board::Type board);
+    static const Board::SwitchInfo getSwitchInfo(Board::Type board, int index);
+    static const int getCapability(Board::Type board, Board::Capability capability);
+    static const QString getAxisName(int index);
+    static const QString getAnalogInputName(Board::Type board, int index);
+    static const bool isBoardCompatible(Board::Type board1, Board::Type board2);
+    static const QString getBoardName(Board::Type board);
+
+  protected:
+
+    Board::Type m_boardType;
+};
+
+// temporary aliases for transition period, use Boards class instead.
+#define getBoardCapability(b__, c__)   Boards::getCapability(b__, c__)
 
 #define IS_9X(board)                   (board==Board::BOARD_STOCK || board==Board::BOARD_M128)
 #define IS_STOCK(board)                (board==Board::BOARD_STOCK)
+#define IS_M128(board)                 (board==Board::BOARD_M128)
 #define IS_2560(board)                 (board==Board::BOARD_GRUVIN9X || board==Board::BOARD_MEGA2560)
 #define IS_SKY9X(board)                (board==Board::BOARD_SKY9X || board==Board::BOARD_9XRPRO || board==Board::BOARD_AR9X)
 #define IS_9XRPRO(board)               (board==Board::BOARD_9XRPRO)
+#define IS_TARANIS_XLITE(board)        (board==Board::BOARD_TARANIS_XLITE)
 #define IS_TARANIS_X7(board)           (board==Board::BOARD_TARANIS_X7)
 #define IS_TARANIS_X9(board)           (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E)
 #define IS_TARANIS_X9D(board)          (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP)
 #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_TARANIS(board)              (IS_TARANIS_X9(board) || IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board))
+#define IS_TARANIS_SMALL(board)        (board==Board::BOARD_TARANIS_X7 || board==Board::BOARD_TARANIS_XLITE)
+#define IS_TARANIS_NOT_X9E(board)      (IS_TARANIS(board) && !IS_TARANIS_X9E(board))
 #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))
+#define IS_STM32(board)                (IS_TARANIS(board) || IS_HORUS(board))
 #define IS_ARM(board)                  (IS_STM32(board) || IS_SKY9X(board))
-#define HAS_LARGE_LCD(board)           (IS_HORUS(board) || (IS_TARANIS(board) && !IS_TARANIS_X7(board)))
+#define HAS_LARGE_LCD(board)           (IS_HORUS(board) || IS_TARANIS_X9(board))
 
 #endif // _BOARDS_H_

companion/src/firmwares/curvereference.cpp

@@ -0,0 +1,63 @@
+/*
+ * 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 "curvereference.h"
+
+#include "helpers.h"     // for Helpers::getAdjustmentString()
+#include "radiodata.h"  // for ModelData
+
+QString CurveReference::toString(const ModelData * model, bool verbose) const
+{
+  if (value == 0) {
+    return "----";
+  }
+
+  QString ret;
+  unsigned idx = abs(value) - 1;
+
+  switch(type) {
+    case CURVE_REF_DIFF:
+      ret = tr("Diff(%1)").arg(Helpers::getAdjustmentString(value, model));
+      break;
+
+    case CURVE_REF_EXPO:
+      ret = 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 = tr("Function(%1)").arg(ret);
+      break;
+
+    default:
+      if (model)
+        ret = model->curves[idx].nameToString(idx);
+      else
+        ret = CurveData().nameToString(idx);
+      if (verbose)
+        ret = tr("Curve(%1)").arg(ret);
+      if (value < 0)
+        ret.prepend(CPN_STR_SW_INDICATOR_REV);
+      break;
+  }
+
+  return ret;
+}

companion/src/firmwares/curvereference.h

@@ -0,0 +1,55 @@
+/*
+ * 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 CURVEREFERENCE_H
+#define CURVEREFERENCE_H
+
+#include <QtCore>
+
+class ModelData;
+
+class CurveReference {
+  Q_DECLARE_TR_FUNCTIONS(CurveReference)
+
+  public:
+    enum CurveRefType {
+      CURVE_REF_DIFF,
+      CURVE_REF_EXPO,
+      CURVE_REF_FUNC,
+      CURVE_REF_CUSTOM
+    };
+
+    CurveReference() { clear(); }
+
+    CurveReference(CurveRefType type, int value):
+      type(type),
+      value(value)
+    {
+    }
+
+    void clear() { memset(this, 0, sizeof(CurveReference)); }
+
+    CurveRefType type;
+    int value;
+
+    QString toString(const ModelData * model = NULL, bool verbose = true) const;
+};
+
+#endif // CURVEREFERENCE_H

companion/src/firmwares/customfunctiondata.cpp

@@ -0,0 +1,264 @@
+/*
+ * 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 "customfunctiondata.h"
+
+#include "eeprominterface.h"
+#include "radiodata.h"
+#include "radiodataconversionstate.h"
+
+void CustomFunctionData::clear()
+{
+  memset(reinterpret_cast<void *>(this), 0, sizeof(CustomFunctionData));
+  if (!getCurrentFirmware()->getCapability(SafetyChannelCustomFunction)) {
+    func = FuncTrainer;
+  }
+}
+
+bool CustomFunctionData::isEmpty() const
+{
+  return (swtch.type == SWITCH_TYPE_NONE);
+}
+
+QString CustomFunctionData::nameToString(int index, bool globalContext) const
+{
+  return RadioData::getElementName((globalContext ? tr("GF") : tr("SF")), index+1, 0, true);
+}
+
+QString CustomFunctionData::funcToString(const ModelData * model) const
+{
+  if (func >= FuncOverrideCH1 && func <= FuncOverrideCH32)
+    return tr("Override %1").arg(RawSource(SOURCE_TYPE_CH, func).toString(model));
+  else if (func == FuncTrainer)
+    return tr("Trainer");
+  else if (func == FuncTrainerRUD)
+    return tr("Trainer RUD");
+  else if (func == FuncTrainerELE)
+    return tr("Trainer ELE");
+  else if (func == FuncTrainerTHR)
+    return tr("Trainer THR");
+  else if (func == FuncTrainerAIL)
+    return tr("Trainer AIL");
+  else if (func == FuncInstantTrim)
+    return tr("Instant Trim");
+  else if (func == FuncPlaySound)
+    return tr("Play Sound");
+  else if (func == FuncPlayHaptic)
+    return tr("Haptic");
+  else if (func == FuncReset)
+    return tr("Reset");
+  else if (func >= FuncSetTimer1 && func <= FuncSetTimer3)
+    return tr("Set Timer %1").arg(func-FuncSetTimer1+1);
+  else if (func == FuncVario)
+    return tr("Vario");
+  else if (func == FuncPlayPrompt)
+    return tr("Play Track");
+  else if (func == FuncPlayBoth)
+    return tr("Play Both");
+  else if (func == FuncPlayValue)
+    return tr("Play Value");
+  else if (func == FuncPlayScript)
+    return tr("Play Script");
+  else if (func == FuncLogs)
+    return tr("SD Logs");
+  else if (func == FuncVolume)
+    return tr("Volume");
+  else if (func == FuncBacklight)
+    return tr("Backlight");
+  else if (func == FuncScreenshot)
+    return tr("Screenshot");
+  else if (func == FuncBackgroundMusic)
+    return tr("Background Music");
+  else if (func == FuncBackgroundMusicPause)
+    return tr("Background Music Pause");
+  else if (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast)
+    return tr("Adjust %1").arg(RawSource(SOURCE_TYPE_GVAR, func-FuncAdjustGV1).toString(model));
+  else if (func == FuncSetFailsafeInternalModule)
+    return tr("SetFailsafe Int. Module");
+  else if (func == FuncSetFailsafeExternalModule)
+    return tr("SetFailsafe Ext. Module");
+  else if (func == FuncRangeCheckInternalModule)
+    return tr("RangeCheck Int. Module");
+  else if (func == FuncRangeCheckExternalModule)
+    return tr("RangeCheck Ext. Module");
+  else if (func == FuncBindInternalModule)
+    return tr("Bind Int. Module");
+  else if (func == FuncBindExternalModule)
+    return tr("Bind Ext. Module");
+  else {
+    return QString("???"); // Highlight unknown functions with output of question marks.(BTW should not happen that we do not know what a function is)
+  }
+}
+
+void CustomFunctionData::populateResetParams(const ModelData * model, QComboBox * b, unsigned int value = 0)
+{
+  int val = 0;
+  Firmware * firmware = Firmware::getCurrentVariant();
+  Board::Type board = firmware->getBoard();
+
+  b->addItem(tr("Timer1"), val++);
+  b->addItem(tr("Timer2"), val++);
+  if (IS_ARM(board)) {
+    b->addItem( tr("Timer3"), val++);
+  }
+  b->addItem(tr("Flight"), val++);
+  b->addItem(tr("Telemetry"), val++);
+  int reCount = firmware->getCapability(RotaryEncoders);
+  if (reCount == 1) {
+    b->addItem(tr("Rotary Encoder"), val++);
+  }
+  else if (reCount == 2) {
+    b->addItem(tr("REa"), val++);
+    b->addItem(tr("REb"), val++);
+  }
+  if ((int)value < b->count()) {
+    b->setCurrentIndex(value);
+  }
+  if (model && IS_ARM(board)) {
+    for (int i=0; i<CPN_MAX_SENSORS; ++i) {
+      if (model->sensorData[i].isAvailable()) {
+        RawSource item = RawSource(SOURCE_TYPE_TELEMETRY, 3*i);
+        b->addItem(item.toString(model), val+i);
+        if ((int)value == val+i) {
+          b->setCurrentIndex(b->count()-1);
+        }
+      }
+    }
+  }
+}
+
+void CustomFunctionData::populatePlaySoundParams(QStringList & qs)
+{
+  qs <<"Beep 1" << "Beep 2" << "Beep 3" << "Warn1" << "Warn2" << "Cheep" << "Ratata" << "Tick" << "Siren" << "Ring" ;
+  qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt"  << "AlmClk"  ;
+}
+
+void CustomFunctionData::populateHapticParams(QStringList & qs)
+{
+  qs << "0" << "1" << "2" << "3";
+}
+
+QString CustomFunctionData::paramToString(const ModelData * model) const
+{
+  QStringList qs;
+  if (func <= FuncInstantTrim) {
+    return QString("%1").arg(param);
+  }
+  else if (func == FuncLogs) {
+    return QString("%1").arg(param/10.0) + tr("s");
+  }
+  else if (func == FuncPlaySound) {
+    CustomFunctionData::populatePlaySoundParams(qs);
+    if (param>=0 && param<(int)qs.count())
+      return qs.at(param);
+    else
+      return tr("<font color=red><b>Inconsistent parameter</b></font>");
+  }
+  else if (func == FuncPlayHaptic) {
+    CustomFunctionData::populateHapticParams(qs);
+    if (param>=0 && param<(int)qs.count())
+      return qs.at(param);
+    else
+      return tr("<font color=red><b>Inconsistent parameter</b></font>");
+  }
+  else if (func == FuncReset) {
+    QComboBox cb;
+    CustomFunctionData::populateResetParams(model, &cb);
+    int pos = cb.findData(param);
+    if (pos >= 0)
+      return cb.itemText(pos);
+    else
+      return tr("<font color=red><b>Inconsistent parameter</b></font>");
+  }
+  else if (func == FuncVolume || func == FuncPlayValue || func == FuncBacklight) {
+    RawSource item(param);
+    return item.toString(model);
+  }
+  else if (func == FuncPlayPrompt || func == FuncPlayBoth) {
+    if ( getCurrentFirmware()->getCapability(VoicesAsNumbers)) {
+      return QString("%1").arg(param);
+    }
+    else {
+      return paramarm;
+    }
+  }
+  else if (func >= FuncAdjustGV1 && func < FuncCount) {
+    switch (adjustMode) {
+      case FUNC_ADJUST_GVAR_CONSTANT:
+        return tr("Value ")+QString("%1").arg(param);
+      case FUNC_ADJUST_GVAR_SOURCE:
+      case FUNC_ADJUST_GVAR_GVAR:
+        return RawSource(param).toString();
+      case FUNC_ADJUST_GVAR_INCDEC:
+        float val;
+        QString unit;
+        if (IS_ARM(getCurrentBoard())) {
+          val = param * model->gvarData[func - FuncAdjustGV1].multiplierGet();
+          unit = model->gvarData[func - FuncAdjustGV1].unitToString();
+        }
+        else {
+          val = param;
+          unit = "";
+        }
+        return QString("Increment: %1%2").arg(val).arg(unit);
+    }
+  }
+  return "";
+}
+
+QString CustomFunctionData::repeatToString() const
+{
+  if (repeatParam == -1) {
+    return tr("played once, not during startup");
+  }
+  else if (repeatParam == 0) {
+    return "";
+  }
+  else {
+    unsigned int step = IS_ARM(getCurrentBoard()) ? 1 : 10;
+    return tr("repeat(%1s)").arg(step*repeatParam);
+  }
+}
+
+QString CustomFunctionData::enabledToString() const
+{
+  if ((func >= FuncOverrideCH1 && func <= FuncOverrideCH32) ||
+      (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast) ||
+      (func == FuncReset) ||
+      (func >= FuncSetTimer1 && func <= FuncSetTimer2) ||
+      (func == FuncVolume) ||
+      (func == FuncBacklight) ||
+      (func <= FuncInstantTrim)) {
+    if (!enabled) {
+      return tr("DISABLED");
+    }
+  }
+  return "";
+}
+
+void CustomFunctionData::convert(RadioDataConversionState & cstate)
+{
+  cstate.setComponent(tr("CFN"), 8);
+  cstate.setSubComp(nameToString(cstate.subCompIdx, (cstate.toModel() ? false : true)));
+  swtch.convert(cstate);
+  if (func == FuncVolume || func == FuncBacklight || func == FuncPlayValue || (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast && adjustMode == 1)) {
+    param = RawSource(param).convert(cstate.withComponentField("PARAM")).toValue();
+  }
+}

companion/src/firmwares/customfunctiondata.h

@@ -0,0 +1,112 @@
+/*
+ * 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 CUSTOMFUNCTIONDATA_H
+#define CUSTOMFUNCTIONDATA_H
+
+#include "boards.h"
+#include "constants.h"
+#include "rawswitch.h"
+
+#include <QtCore>
+#include <QComboBox>
+
+class Firmware;
+class ModelData;
+class GeneralSettings;
+class RadioDataConversionState;
+
+enum AssignFunc {
+  FuncOverrideCH1 = 0,
+  FuncOverrideCH32 = FuncOverrideCH1+CPN_MAX_CHNOUT-1,
+  FuncTrainer,
+  FuncTrainerRUD,
+  FuncTrainerELE,
+  FuncTrainerTHR,
+  FuncTrainerAIL,
+  FuncInstantTrim,
+  FuncPlaySound,
+  FuncPlayHaptic,
+  FuncReset,
+  FuncSetTimer1,
+  FuncSetTimer2,
+  FuncSetTimer3,
+  FuncVario,
+  FuncPlayPrompt,
+  FuncPlayBoth,
+  FuncPlayValue,
+  FuncPlayScript,
+  FuncLogs,
+  FuncVolume,
+  FuncBacklight,
+  FuncScreenshot,
+  FuncBackgroundMusic,
+  FuncBackgroundMusicPause,
+  FuncAdjustGV1,
+  FuncAdjustGVLast = FuncAdjustGV1+CPN_MAX_GVARS-1,
+  FuncSetFailsafeInternalModule,
+  FuncSetFailsafeExternalModule,
+  FuncRangeCheckInternalModule,
+  FuncRangeCheckExternalModule,
+  FuncBindInternalModule,
+  FuncBindExternalModule,
+  FuncCount,
+  FuncReserve = -1
+};
+
+enum GVarAdjustModes
+{
+  FUNC_ADJUST_GVAR_CONSTANT,
+  FUNC_ADJUST_GVAR_SOURCE,
+  FUNC_ADJUST_GVAR_GVAR,
+  FUNC_ADJUST_GVAR_INCDEC
+};
+
+class CustomFunctionData {
+  Q_DECLARE_TR_FUNCTIONS(CustomFunctionData)
+
+  public:
+    CustomFunctionData(AssignFunc func=FuncOverrideCH1) { clear(); this->func = func; }
+    RawSwitch    swtch;
+    AssignFunc   func;
+    int param;
+    char paramarm[10];
+    unsigned int enabled; // TODO perhaps not any more the right name
+    unsigned int adjustMode;
+    int repeatParam;
+
+    void clear();
+    bool isEmpty() const;
+    QString nameToString(int index, bool globalContext = false) const;
+    QString funcToString(const ModelData * model = NULL) const;
+    QString paramToString(const ModelData * model) const;
+    QString repeatToString() const;
+    QString enabledToString() const;
+
+    static void populateResetParams(const ModelData * model, QComboBox * b, unsigned int value);
+    static void populatePlaySoundParams(QStringList & qs);
+    static void populateHapticParams(QStringList & qs);
+
+    void convert(RadioDataConversionState & cstate);
+
+};
+
+
+#endif // CUSTOMFUNCTIONDATA_H

companion/src/firmwares/eepromimportexport.h

@@ -22,9 +22,13 @@
 #define _EEPROMIMPORTEXPORT_H_
 
 #include "customdebug.h"
+
+#include <QtCore>
 #include <QBitArray>
 
 class DataField {
+  Q_DECLARE_TR_FUNCTIONS(DataField)
+
   public:
     DataField(DataField * parent, const char * name=""):
       parent(parent),
@@ -181,7 +185,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()
@@ -238,7 +242,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()
@@ -308,7 +312,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()
@@ -369,7 +373,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()
@@ -382,8 +386,33 @@ class CharField: public DataField {
     bool truncate;
 };
 
-int8_t char2idx(char c);
-char idx2char(int8_t idx);
+static const char specialCharsTab[] = "_-.,";
+static inline int8_t char2idx(char c)
+{
+  if (c==' ') return 0;
+  if (c>='A' && c<='Z') return 1+c-'A';
+  if (c>='a' && c<='z') return -1-c+'a';
+  if (c>='0' && c<='9') return 27+c-'0';
+  for (int8_t i=0;;i++) {
+    char cc = specialCharsTab[i];
+    if (cc==0) return 0;
+    if (cc==c) return 37+i;
+  }
+}
+
+#define ZCHAR_MAX 40
+static inline char idx2char(int8_t idx)
+{
+  if (idx == 0) return ' ';
+  if (idx < 0) {
+    if (idx > -27) return 'a' - idx - 1;
+    idx = -idx;
+  }
+  if (idx < 27) return 'A' + idx - 1;
+  if (idx < 37) return '0' + idx - 27;
+  if (idx <= ZCHAR_MAX) return specialCharsTab[idx-37];
+  return ' ';
+}
 
 template<int N>
 class ZCharField: public DataField {
@@ -427,7 +456,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()
@@ -453,7 +482,7 @@ class StructField: public DataField {
     }
 
     inline void Append(DataField * field) {
-      //eepromImportDebug() << QString("StructField(%1) appending field: %2").arg(name).arg(field->getName());
+      //qCDebug(eepromImport) << QString("StructField(%1) appending field: %2").arg(name).arg(field->getName());
       fields.append(field);
     }
 
@@ -471,7 +500,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();
@@ -526,7 +555,7 @@ 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();
     }
@@ -564,7 +593,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;
@@ -579,7 +608,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;
@@ -717,7 +746,7 @@ class ConversionField: public TransformedField {
 
       if (table) {
         if (!table->exportValue(_field, _field)) {
-          setError(error.isEmpty() ? QObject::tr("Conversion error on field %1").arg(name) : error);
+          setError(error.isEmpty() ? DataField::tr("Conversion error on field %1").arg(name) : error);
         }
         return;
       }
@@ -756,7 +785,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/firmwares/eeprominterface.cpp

@@ -0,0 +1,185 @@
+/*
+ * 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 "eeprominterface.h"
+#include "firmwares/opentx/opentxeeprom.h"
+#include "firmwareinterface.h"
+
+#include <QtCore>
+#include <QMessageBox>
+#include <bitset>
+
+float ValToTim(int value)
+{
+   return ((value < -109 ? 129+value : (value < 7 ? (113+value)*5 : (53+value)*10))/10.0);
+}
+
+int TimToVal(float value)
+{
+  int temp;
+  if (value>60) {
+    temp=136+round((value-60));
+  }
+  else if (value>2) {
+    temp=20+round((value-2.0)*2.0);
+  }
+  else {
+    temp=round(value*10.0);
+  }
+  return (temp-129);
+}
+
+
+/*
+ * EEpromInterface globals
+ */
+
+// TODO: No globals
+
+QList<EEPROMInterface *> eepromInterfaces;
+
+void unregisterEEpromInterfaces()
+{
+  foreach(EEPROMInterface * intf, eepromInterfaces) {
+    // qDebug() << "UnregisterEepromInterfaces(): deleting " <<  QString::number( reinterpret_cast<uint64_t>(intf), 16 );
+    delete intf;
+  }
+  OpenTxEepromCleanup();
+}
+
+#if 0  // TODO: remove if unused, currently commented out in mdiChild.cpp
+// TODO: No GUI here, e.g. return string list instead
+void EEPROMInterface::showEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound)
+{
+  std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
+  QStringList errorsList;
+
+  errorsList << tr("Possible causes for this:");
+
+  if (errors.test(UNSUPPORTED_NEWER_VERSION)) { errorsList << tr("- Eeprom is from a newer version of OpenTX"); }
+  if (errors.test(NOT_OPENTX)) { errorsList << tr("- Eeprom is not from OpenTX"); }
+  if (errors.test(NOT_TH9X)) { errorsList << tr("- Eeprom is not from Th9X"); }
+  if (errors.test(NOT_GRUVIN9X)) { errorsList << tr("- Eeprom is not from Gruvin9X"); }
+  if (errors.test(NOT_ERSKY9X)) { errorsList << tr("- Eeprom is not from ErSky9X"); }
+  if (errors.test(NOT_ER9X)) { errorsList << tr("- Eeprom is not from Er9X"); }
+  if (errors.test(WRONG_SIZE)) { errorsList << tr("- Eeprom size is invalid"); }
+  if (errors.test(WRONG_FILE_SYSTEM)) { errorsList << tr("- Eeprom file system is invalid"); }
+  if (errors.test(UNKNOWN_BOARD)) { errorsList << tr("- Eeprom is from a unknown board"); }
+  if (errors.test(WRONG_BOARD)) { errorsList << tr("- Eeprom is from the wrong board"); }
+  if (errors.test(BACKUP_NOT_SUPPORTED)) { errorsList << tr("- Eeprom backup not supported"); }
+
+  if (errors.test(UNKNOWN_ERROR)) { errorsList << tr("- Something that couldn't be guessed, sorry"); }
+
+  if (errors.test(HAS_WARNINGS)) {
+    errorsList << tr("Warning:");
+    if (errors.test(WARNING_WRONG_FIRMWARE)) { errorsList << tr("- Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"); }
+  }
+
+  QMessageBox msgBox(parent);
+  msgBox.setWindowTitle(title);
+  msgBox.setIcon(QMessageBox::Critical);
+  msgBox.setText(mainMessage);
+  msgBox.setInformativeText(errorsList.join("\n"));
+  msgBox.setStandardButtons(QMessageBox::Ok);
+  msgBox.exec();
+}
+#endif
+
+// TODO: No GUI here, e.g. return string list instead
+void EEPROMInterface::showEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound)
+{
+  std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
+  QStringList warningsList;
+  if (errors.test(WARNING_WRONG_FIRMWARE)) { warningsList << tr("- 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 << tr("- 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);
+  msgBox.setIcon(QMessageBox::Warning);
+  msgBox.setText(tr("Warnings!"));
+  msgBox.setInformativeText(warningsList.join("\n"));
+  msgBox.setStandardButtons(QMessageBox::Ok);
+  msgBox.exec();
+}
+
+
+/*
+ * Firmware
+ */
+
+// static
+QVector<Firmware *> Firmware::registeredFirmwares;
+Firmware * Firmware::defaultVariant = NULL;
+Firmware * Firmware::currentVariant = NULL;
+
+// static
+Firmware * Firmware::getFirmwareForId(const QString & id)
+{
+  foreach(Firmware * firmware, registeredFirmwares) {
+    Firmware * result = firmware->getFirmwareVariant(id);
+    if (result) {
+      return result;
+    }
+  }
+
+  return defaultVariant;
+}
+
+unsigned int Firmware::getVariantNumber()
+{
+  unsigned int result = 0;
+  const Firmware * base = getFirmwareBase();
+  QStringList options = id.mid(base->getId().length()+1).split("-", QString::SkipEmptyParts);
+  foreach(QString option, options) {
+    foreach(OptionsGroup group, base->opts) {
+      foreach(Option opt, group) {
+        if (opt.name == option) {
+          result += opt.variant;
+        }
+      }
+    }
+  }
+  return result;
+}
+
+void Firmware::addLanguage(const char * lang)
+{
+  languages.push_back(lang);
+}
+
+//void Firmware::addTTSLanguage(const char * lang)
+//{
+//  ttslanguages.push_back(lang);
+//}
+
+void Firmware::addOption(const char * option, const QString & tooltip, unsigned variant)
+{
+  addOption(Option(option, tooltip, variant));
+}
+
+void Firmware::addOption(const Option & option)
+{
+  addOptionsGroup({option});
+}
+
+void Firmware::addOptionsGroup(const OptionsGroup & options)
+{
+  this->opts.append(options);
+}

companion/src/firmwares/eeprominterface.h

@@ -21,15 +21,18 @@
 #ifndef _EEPROMINTERFACE_H_
 #define _EEPROMINTERFACE_H_
 
+#include "boards.h"
+#include "macros.h"
 #include "radiodata.h"
 #include "../../radio/src/definitions.h"
 #include "simulatorinterface.h"
+
+#include <QtCore>
 #include <QStringList>
 #include <QList>
-#include <iostream>
 #include <QDebug>
 
-QString RotaryEncoderString(int index);
+#include <iostream>
 
 const uint8_t modn12x3[4][4]= {
   {1, 2, 3, 4},
@@ -51,7 +54,6 @@ enum Capability {
   VoicesMaxLength,
   MultiLangVoice,
   ModelImage,
-  SwitchesPositions,
   CustomFunctions,
   SafetyChannelCustomFunction,
   LogicalSwitches,
@@ -62,7 +64,8 @@ enum Capability {
   Outputs,
   ChannelsName,
   ExtraInputs,
-  ExtendedTrims,
+  TrimsRange,
+  ExtendedTrimsRange,
   NumCurves,
   NumCurvePoints,
   OffsetWeight,
@@ -70,6 +73,8 @@ enum Capability {
   SoundMod,
   SoundPitch,
   MaxVolume,
+  MaxContrast,
+  MinContrast,
   Haptic,
   HasBeeper,
   ModelTrainerEnable,
@@ -102,6 +107,8 @@ enum Capability {
   HasFailsafe,
   HasSoundMixer,
   NumModules,
+  HasModuleR9MFlex,
+  HasModuleR9MMini,
   PPMCenter,
   PPMUnitMicroseconds,
   SYMLimits,
@@ -133,8 +140,6 @@ enum Capability {
   EnhancedCurves,
   HasFasOffset,
   HasMahPersistent,
-  MultiposPots,
-  MultiposPotsPositions,
   SimulatorVariant,
   MavlinkTelemetry,
   HasInputDiff,
@@ -144,9 +149,10 @@ enum Capability {
   HasModelCategories
 };
 
-class SimulatorInterface;
 class EEPROMInterface
 {
+  Q_DECLARE_TR_FUNCTIONS(EEPROMInterface)
+
   public:
 
     EEPROMInterface(Board::Type board):
@@ -168,6 +174,9 @@ class EEPROMInterface
 
     virtual int getSize(const GeneralSettings &) = 0;
 
+    //static void showEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound);
+    static void showEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound);
+
   protected:
 
     Board::Type board;
@@ -178,16 +187,20 @@ class EEPROMInterface
 
 };
 
-/* EEPROM string conversion functions */
-void setEEPROMString(char *dst, const char *src, int size);
-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);
+/* EEPROM string conversion function (used only by er9xeeprom and ersky9xeeprom) */
+inline void getEEPROMString(char *dst, const char *src, int size)
+{
+  memcpy(dst, src, size);
+  dst[size] = '\0';
+  for (int i=size-1; i>=0; i--) {
+    if (dst[i] == ' ')
+      dst[i] = '\0';
+    else
+      break;
+  }
+}
 
+// (used only by er9xeeprom and ersky9xeeprom)
 inline int applyStickMode(int stick, unsigned int mode)
 {
   if (mode == 0 || mode > 4) {
@@ -195,18 +208,15 @@ 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;
 }
 
+float ValToTim(int value);
+int TimToVal(float value);
+
 void registerEEpromInterfaces();
 void unregisterEEpromInterfaces();
 void registerOpenTxFirmwares();
@@ -234,42 +244,37 @@ enum EepromLoadErrors {
   NUM_ERRORS
 };
 
-void ShowEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound);
-void ShowEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound);
-
-
-struct Option {
-  const char * name;
-  QString tooltip;
-  uint32_t variant;
-};
-
-class Firmware {
+class Firmware
+{
+  Q_DECLARE_TR_FUNCTIONS(Firmware)
 
   public:
-    Firmware(const QString & id, const QString & name, Board::Type board):
-      id(id),
-      name(name),
-      board(board),
-      variantBase(0),
-      base(NULL),
-      eepromInterface(NULL)
-    {
-    }
+    struct Option {
+      const char * name = nullptr;
+      QString tooltip;
+      unsigned variant = 0;
 
-    Firmware(Firmware * base, const QString & id, const QString & name, Board::Type board):
+      explicit Option(const char * name, const QString & description, unsigned variant = 0) :
+        name(name), tooltip(description), variant(variant) { }
+    };
+    typedef QList<Option> OptionsGroup;
+    typedef QList<OptionsGroup> OptionsList;
+
+
+    explicit Firmware(const QString & id, const QString & name, Board::Type board) :
+      Firmware(nullptr, id, name, board)
+    { }
+
+    explicit Firmware(Firmware * base, const QString & id, const QString & name, Board::Type board) :
       id(id),
       name(name),
       board(board),
       variantBase(0),
       base(base),
-      eepromInterface(NULL)
-    {
-    }
+      eepromInterface(nullptr)
+    { }
 
-    virtual ~Firmware()
-    {
-    }
+    virtual ~Firmware() { }
 
     inline const Firmware * getFirmwareBase() const
     {
@@ -280,13 +285,15 @@ class Firmware {
 
     unsigned int getVariantNumber();
 
-    virtual void addLanguage(const char *lang);
+    virtual void addLanguage(const char * lang);
 
-    virtual void addTTSLanguage(const char *lang);
+    //virtual void addTTSLanguage(const char * lang);
 
-    virtual void addOption(const char *option, QString tooltip="", uint32_t variant=0);
+    virtual void addOption(const char * option, const QString & tooltip = QString(), unsigned variant = 0);
 
-    virtual void addOptions(Option options[]);
+    virtual void addOption(const Option & option);
+
+    virtual void addOptionsGroup(const OptionsGroup & options);
 
     virtual QString getStampUrl() = 0;
 
@@ -319,6 +326,16 @@ class Firmware {
       return id;
     }
 
+    QList<const char *> languageList() const
+    {
+      return languages;
+    }
+
+    OptionsList optionGroups() const
+    {
+      return opts;
+    }
+
     virtual int getCapability(Capability) = 0;
 
     virtual QString getAnalogInputName(unsigned int index) = 0;
@@ -329,10 +346,36 @@ class Firmware {
 
     const int getFlashSize();
 
-  public:
-    QList<const char *> languages;
-    QList<const char *> ttslanguages;
-    QList< QList<Option> > opts;
+    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;
+    }
 
   protected:
     QString id;
@@ -341,33 +384,28 @@ class Firmware {
     unsigned int variantBase;
     Firmware * base;
     EEPROMInterface * eepromInterface;
+    QList<const char *> languages;
+    //QList<const char *> ttslanguages;
+    OptionsList opts;
 
-  private:
-    Firmware();
-
+    static QVector<Firmware *> registeredFirmwares;
+    static Firmware * defaultVariant;
+    static Firmware * currentVariant;
 };
 
-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)
@@ -375,11 +413,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);
+}
 
 extern QList<EEPROMInterface *> eepromInterfaces;
 
-bool loadFile(RadioData & radioData, const QString & filename);
-
 
 #endif // _EEPROMINTERFACE_H_

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/generalsettings.cpp

@@ -0,0 +1,353 @@
+/*
+ * 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 "generalsettings.h"
+
+#include "appdata.h"
+#include "eeprominterface.h"
+#include "radiodataconversionstate.h"
+
+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,
+  3,1,2,4 , 3,1,4,2 , 3,2,1,4 , 3,2,4,1 , 3,4,1,2 , 3,4,2,1,
+  4,1,2,3 , 4,1,3,2 , 4,2,1,3 , 4,2,3,1 , 4,3,1,2 , 4,3,2,1
+};
+
+bool GeneralSettings::switchPositionAllowedTaranis(int index) const
+{
+  if (index == 0)
+    return true;
+
+  div_t qr = div(abs(index)-1, 3);
+
+  if (index < 0 && switchConfig[qr.quot] != Board::SWITCH_3POS)
+    return false;
+  else if (qr.rem == 1)
+    return switchConfig[qr.quot] == Board::SWITCH_3POS;
+  else
+    return switchConfig[qr.quot] != Board::SWITCH_NOT_AVAILABLE;
+}
+
+bool GeneralSettings::switchSourceAllowedTaranis(int index) const
+{
+  return switchConfig[index] != Board::SWITCH_NOT_AVAILABLE;
+}
+
+bool GeneralSettings::isPotAvailable(int index) const
+{
+  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>getBoardCapability(getCurrentBoard(), Board::Sliders)) return false;
+  return sliderConfig[index] != Board::SLIDER_NONE;
+}
+
+GeneralSettings::GeneralSettings()
+{
+  memset(this, 0, sizeof(GeneralSettings));
+
+  contrast  = 25;
+
+  for (int i=0; i < CPN_MAX_ANALOGS; ++i) {
+    calibMid[i]     = 0x200;
+    calibSpanNeg[i] = 0x180;
+    calibSpanPos[i] = 0x180;
+  }
+
+  Firmware * firmware = Firmware::getCurrentVariant();
+  Board::Type board = firmware->getBoard();
+
+  // 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_TARANIS_XLITE(board) || IS_HORUS_X10(board)) {
+    // Lipo 2S
+    vBatWarn = 66;
+    vBatMin = -23;  // 6.7V
+    vBatMax = -37;  // 8.3V 
+  }
+  else if (IS_TARANIS(board)) {
+    // NI-MH 7.2V, X9D, X9D+ and X7
+    vBatWarn = 65;
+    vBatMin = -30; //6V
+    vBatMax = -40; //8V
+  }
+
+  setDefaultControlTypes(board);
+
+  backlightMode = 3; // keys and sticks
+  // backlightBright = 0; // 0 = 100%
+
+  if (IS_HORUS(board)) {
+    backlightOffBright = 20;
+  }
+
+  if (IS_ARM(board)) {
+    speakerVolume = 12;
+  }
+
+  if (IS_HORUS(board)) {
+    strcpy(bluetoothName, "Horus");
+  }
+  else if (IS_TARANIS_X9E(board) || IS_TARANIS_SMALL(board)) {
+    strcpy(bluetoothName, "Taranis");
+  }
+
+  templateSetup = g.profile[g.sessionId()].channelOrder();
+  stickMode = g.profile[g.sessionId()].defaultMode();
+
+  QString t_calib = g.profile[g.sessionId()].stickPotCalib();
+  int potsnum = getBoardCapability(getCurrentBoard(), Board::Pots);
+  if (!t_calib.isEmpty()) {
+    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;
+      int16_t byte16;
+      bool ok;
+      for (int i=0; i<(CPN_MAX_STICKS+potsnum); i++) {
+        Byte=t_calib.mid(i*12,4);
+        byte16=(int16_t)Byte.toInt(&ok,16);
+        if (ok)
+          calibMid[i]=byte16;
+        Byte=t_calib.mid(4+i*12,4);
+        byte16=(int16_t)Byte.toInt(&ok,16);
+        if (ok)
+          calibSpanNeg[i]=byte16;
+        Byte=t_calib.mid(8+i*12,4);
+        byte16=(int16_t)Byte.toInt(&ok,16);
+        if (ok)
+          calibSpanPos[i]=byte16;
+      }
+      for (int i=0; i<4; i++) {
+        Byte=t_trainercalib.mid(i*4,4);
+        byte16=(int16_t)Byte.toInt(&ok,16);
+        if (ok)
+          trainer.calib[i]=byte16;
+      }
+      txCurrentCalibration=t_txCurrentCalibration;
+      txVoltageCalibration=t_txVoltageCalibration;
+      vBatWarn=t_vBatWarn;
+      PPM_Multiplier=t_PPM_Multiplier;
+      stickMode = t_stickMode;
+    }
+    if ((t_DisplaySet.length()==6) && (t_BeeperSet.length()==4) && (t_HapticSet.length()==6) && (t_SpeakerSet.length()==6)) {
+      uint8_t byte8u;
+      int8_t byte8;
+      bool ok;
+      byte8=(int8_t)t_DisplaySet.mid(0,2).toInt(&ok,16);
+      if (ok)
+        optrexDisplay=(byte8==1 ? true : false);
+      byte8u=(uint8_t)t_DisplaySet.mid(2,2).toUInt(&ok,16);
+      if (ok)
+        contrast=byte8u;
+      byte8u=(uint8_t)t_DisplaySet.mid(4,2).toUInt(&ok,16);
+      if (ok)
+        backlightBright=byte8u;
+      byte8=(int8_t)t_BeeperSet.mid(0,2).toUInt(&ok,16);
+      if (ok)
+        beeperMode=(BeeperMode)byte8;
+      byte8=(int8_t)t_BeeperSet.mid(2,2).toInt(&ok,16);
+      if (ok)
+        beeperLength=byte8;
+      byte8=(int8_t)t_HapticSet.mid(0,2).toUInt(&ok,16);
+      if (ok)
+        hapticMode=(BeeperMode)byte8;
+      byte8=(int8_t)t_HapticSet.mid(2,2).toInt(&ok,16);
+      if (ok)
+        hapticStrength=byte8;
+      byte8=(int8_t)t_HapticSet.mid(4,2).toInt(&ok,16);
+      if (ok)
+        hapticLength=byte8;
+      byte8u=(uint8_t)t_SpeakerSet.mid(0,2).toUInt(&ok,16);
+      if (ok)
+        speakerMode=byte8u;
+      byte8u=(uint8_t)t_SpeakerSet.mid(2,2).toUInt(&ok,16);
+      if (ok)
+        speakerPitch=byte8u;
+      byte8u=(uint8_t)t_SpeakerSet.mid(4,2).toUInt(&ok,16);
+      if (ok)
+        speakerVolume=byte8u;
+      if (t_CountrySet.length()==6) {
+        byte8u=(uint8_t)t_CountrySet.mid(0,2).toUInt(&ok,16);
+        if (ok)
+          countryCode=byte8u;
+        byte8u=(uint8_t)t_CountrySet.mid(2,2).toUInt(&ok,16);
+        if (ok)
+          imperial=byte8u;
+        QString chars = t_CountrySet.mid(4, 2);
+        ttsLanguage[0] = chars[0].toLatin1();
+        ttsLanguage[1] = chars[1].toLatin1();
+      }
+    }
+  }
+
+  strcpy(themeName, "default");
+  ThemeOptionData option1 = { 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0 };
+  memcpy(&themeOptionValue[0], option1, sizeof(ThemeOptionData));
+  ThemeOptionData option2 = { 0x03, 0xe1, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0 };
+  memcpy(&themeOptionValue[1], option2, sizeof(ThemeOptionData));
+}
+
+void GeneralSettings::setDefaultControlTypes(Board::Type board)
+{
+  for (int i=0; i<getBoardCapability(board, Board::FactoryInstalledSwitches); i++) {
+    switchConfig[i] = Boards::getSwitchInfo(board, i).config;
+  }
+
+  // TODO: move to Boards, like with switches
+  if (IS_HORUS(board)) {
+    potConfig[0] = Board::POT_WITH_DETENT;
+    potConfig[1] = Board::POT_MULTIPOS_SWITCH;
+    potConfig[2] = Board::POT_WITH_DETENT;
+  }
+  else if (IS_TARANIS_XLITE(board)) {
+    potConfig[0] = Board::POT_WITHOUT_DETENT;
+    potConfig[1] = Board::POT_WITHOUT_DETENT;
+  }
+  else if (IS_TARANIS_X7(board)) {
+    potConfig[0] = Board::POT_WITHOUT_DETENT;
+    potConfig[1] = Board::POT_WITH_DETENT;
+  }
+  else if (IS_TARANIS(board)) {
+    potConfig[0] = Board::POT_WITH_DETENT;
+    potConfig[1] = Board::POT_WITH_DETENT;
+  }
+  else {
+    potConfig[0] = Board::POT_WITHOUT_DETENT;
+    potConfig[1] = Board::POT_WITHOUT_DETENT;
+    potConfig[2] = Board::POT_WITHOUT_DETENT;
+  }
+
+  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_X9(board) || IS_HORUS_X10(board)) {
+    sliderConfig[0] = Board::SLIDER_WITH_DETENT;
+    sliderConfig[1] = Board::SLIDER_WITH_DETENT;
+  }
+}
+
+int GeneralSettings::getDefaultStick(unsigned int channel) const
+{
+  if (channel >= CPN_MAX_STICKS)
+    return -1;
+  else
+    return chout_ar[4*templateSetup + channel] - 1;
+}
+
+RawSource GeneralSettings::getDefaultSource(unsigned int channel) const
+{
+  int stick = getDefaultStick(channel);
+  if (stick >= 0)
+    return RawSource(SOURCE_TYPE_STICK, stick);
+  else
+    return RawSource(SOURCE_TYPE_NONE);
+}
+
+int GeneralSettings::getDefaultChannel(unsigned int stick) const
+{
+  for (int i=0; i<4; i++){
+    if (getDefaultStick(i) == (int)stick)
+      return i;
+  }
+  return -1;
+}
+
+void GeneralSettings::convert(RadioDataConversionState & cstate)
+{
+  // Here we can add explicit conversions when moving from one board to another
+
+  cstate.setOrigin(tr("Radio Settings"));
+
+  setDefaultControlTypes(cstate.toType);  // start with default switches/pots/sliders
+
+  // Try to intelligently copy any custom control names
+
+  // SE and SG are skipped on X7 board
+  if (IS_TARANIS_X7(cstate.toType)) {
+    if (IS_TARANIS_X9(cstate.fromType) || IS_HORUS(cstate.fromType)) {
+      strncpy(switchName[4], switchName[5], sizeof(switchName[4]));
+      strncpy(switchName[5], switchName[7], sizeof(switchName[5]));
+    }
+  }
+  else if (IS_TARANIS_X7(cstate.fromType)) {
+    if (IS_TARANIS_X9(cstate.toType) || IS_HORUS(cstate.toType)) {
+      strncpy(switchName[5], switchName[4], sizeof(switchName[5]));
+      strncpy(switchName[7], switchName[5], sizeof(switchName[7]));
+    }
+  }
+
+  // LS and RS sliders are after 2 aux sliders on X12 and X9E
+  if ((IS_HORUS_X12S(cstate.toType) || IS_TARANIS_X9E(cstate.toType)) && !IS_HORUS_X12S(cstate.fromType) && !IS_TARANIS_X9E(cstate.fromType)) {
+    strncpy(sliderName[0], sliderName[2], sizeof(sliderName[0]));
+    strncpy(sliderName[1], sliderName[3], sizeof(sliderName[1]));
+  }
+  else if (!IS_TARANIS_X9E(cstate.toType) && !IS_HORUS_X12S(cstate.toType) && (IS_HORUS_X12S(cstate.fromType) || IS_TARANIS_X9E(cstate.fromType))) {
+    strncpy(sliderName[2], sliderName[0], sizeof(sliderName[2]));
+    strncpy(sliderName[3], sliderName[1], sizeof(sliderName[3]));
+  }
+
+  if (IS_HORUS(cstate.toType)) {
+    // 6P switch is only on Horus (by default)
+    if (cstate.fromBoard.getCapability(Board::FactoryInstalledPots) == 2) {
+      strncpy(potName[2], potName[1], sizeof(potName[2]));
+      potName[1][0] = '\0';
+    }
+  }
+
+  if (IS_TARANIS(cstate.toType)) {
+    // No S3 pot on Taranis boards by default
+    if (cstate.fromBoard.getCapability(Board::FactoryInstalledPots) > 2)
+      strncpy(potName[1], potName[2], sizeof(potName[1]));
+
+    contrast = qBound<int>(getCurrentFirmware()->getCapability(MinContrast), contrast, getCurrentFirmware()->getCapability(MaxContrast));
+  }
+
+  // TODO: Would be nice at this point to have GUI pause and ask the user to set up any custom hardware they have on the destination radio.
+
+  // Convert all global functions (do this after HW adjustments)
+  for (int i=0; i<CPN_MAX_SPECIAL_FUNCTIONS; i++) {
+    customFn[i].convert(cstate.withComponentIndex(i));
+  }
+
+}

companion/src/firmwares/generalsettings.h

@@ -0,0 +1,177 @@
+/*
+ * 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 GENERALSETTINGS_H
+#define GENERALSETTINGS_H
+
+#include "boards.h"
+#include "constants.h"
+#include "customfunctiondata.h"
+#include "rawsource.h"
+
+#include <QtCore>
+
+class Firmware;
+class ModelData;
+class GeneralSettings;
+class RadioDataConversionState;
+
+enum UartModes {
+  UART_MODE_NONE,
+  UART_MODE_TELEMETRY_MIRROR,
+  UART_MODE_TELEMETRY,
+  UART_MODE_SBUS_TRAINER,
+  UART_MODE_DEBUG
+};
+
+class TrainerMix {
+  public:
+    TrainerMix() { clear(); }
+    unsigned int src; // 0-7 = ch1-8
+    RawSwitch swtch;
+    int weight;
+    unsigned int mode;   // off, add-mode, subst-mode
+    void clear() { memset(reinterpret_cast<void *>(this), 0, sizeof(TrainerMix)); }
+};
+
+class TrainerData {
+  public:
+    TrainerData() { clear(); }
+    int         calib[4];
+    TrainerMix  mix[4];
+    void clear() { memset(reinterpret_cast<void *>(this), 0, sizeof(TrainerData)); }
+};
+
+class GeneralSettings {
+  Q_DECLARE_TR_FUNCTIONS(GeneralSettings)
+
+  public:
+
+    enum BeeperMode {
+      BEEPER_QUIET = -2,
+      BEEPER_ALARMS_ONLY = -1,
+      BEEPER_NOKEYS = 0,
+      BEEPER_ALL = 1
+    };
+
+    GeneralSettings();
+    void convert(RadioDataConversionState & cstate);
+
+    void setDefaultControlTypes(Board::Type board);
+    int getDefaultStick(unsigned int channel) const;
+    RawSource getDefaultSource(unsigned int channel) const;
+    int getDefaultChannel(unsigned int stick) const;
+
+    unsigned int version;
+    unsigned int variant;
+    int   calibMid[CPN_MAX_ANALOGS];
+    int   calibSpanNeg[CPN_MAX_ANALOGS];
+    int   calibSpanPos[CPN_MAX_ANALOGS];
+    unsigned int  currModelIndex;
+    char currModelFilename[16+1];
+    unsigned int   contrast;
+    unsigned int   vBatWarn;
+    int    txVoltageCalibration;
+    int    txCurrentCalibration;
+    int    vBatMin;
+    int    vBatMax;
+    int   backlightMode;
+    TrainerData trainer;
+    unsigned int   view;    // main screen view // TODO enum
+    bool      disableThrottleWarning;
+    bool      fai;
+    bool      disableMemoryWarning;
+    BeeperMode beeperMode;
+    bool      disableAlarmWarning;
+    bool      disableRssiPoweroffAlarm;
+    unsigned int       usbMode;
+    BeeperMode hapticMode;
+    unsigned int   stickMode; // TODO enum
+    int       timezone;
+    bool      adjustRTC;
+    bool      optrexDisplay;
+    unsigned int    inactivityTimer;
+    bool      minuteBeep;
+    bool      preBeep;
+    bool      flashBeep;
+    unsigned int  splashMode;
+    int splashDuration;
+    unsigned int  backlightDelay;
+    unsigned int   templateSetup;  //RETA order according to chout_ar array
+    int    PPM_Multiplier;
+    int    hapticLength;
+    unsigned int   reNavigation;
+    unsigned int stickReverse;
+    unsigned int   speakerPitch;
+    int   hapticStrength;
+    unsigned int   speakerMode;
+    char      ownerName[10+1];
+    int    beeperLength;
+    unsigned int    gpsFormat;
+    int     speakerVolume;
+    unsigned int   backlightBright;
+    unsigned int   backlightOffBright;
+    int switchesDelay;
+    int    temperatureCalib;
+    int    temperatureWarn;
+    unsigned int mAhWarn;
+    unsigned int mAhUsed;
+    unsigned int globalTimer;
+    char bluetoothName[10+1];
+    unsigned int bluetoothBaudrate;
+    unsigned int bluetoothMode;
+    unsigned int sticksGain;
+    unsigned int rotarySteps;
+    unsigned int countryCode;
+    bool jitterFilter;
+    unsigned int imperial;
+    char ttsLanguage[2+1];
+    int beepVolume;
+    int wavVolume;
+    int varioVolume;
+    int varioPitch;
+    int varioRange;
+    int varioRepeat;
+    int backgroundVolume;
+    unsigned int mavbaud;
+    unsigned int switchUnlockStates;
+    unsigned int hw_uartMode;  // UartModes
+    unsigned int backlightColor;
+    CustomFunctionData customFn[CPN_MAX_SPECIAL_FUNCTIONS];
+    char switchName[CPN_MAX_SWITCHES][3+1];
+    unsigned int switchConfig[CPN_MAX_SWITCHES];
+    char stickName[CPN_MAX_STICKS][3+1];
+    char potName[CPN_MAX_KNOBS][3+1];
+    unsigned int potConfig[CPN_MAX_KNOBS];
+    char sliderName[CPN_MAX_SLIDERS][3+1];
+    unsigned int sliderConfig[CPN_MAX_SLIDERS];
+
+    char themeName[8+1];
+    typedef uint8_t ThemeOptionData[8+1];
+    ThemeOptionData themeOptionValue[5];
+
+    bool switchPositionAllowedTaranis(int index) const;
+    bool switchSourceAllowedTaranis(int index) const;
+    bool isPotAvailable(int index) const;
+    bool isSliderAvailable(int index) const;
+};
+
+
+#endif // GENERALSETTINGS_H

companion/src/firmwares/gvardata.cpp

@@ -0,0 +1,92 @@
+/*
+ * 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 "gvardata.h"
+
+#include "radiodata.h"
+
+QString GVarData::unitToString() const
+{
+  switch (unit) {
+    case GVAR_UNIT_NUMBER:
+      return tr("");
+    case GVAR_UNIT_PERCENT:
+      return tr("%");
+    default:
+      return tr("?");  //  highlight unknown value
+  }
+}
+
+QString GVarData::precToString() const
+{
+  switch (prec) {
+    case GVAR_PREC_MUL10:
+      return tr("0._");
+    case GVAR_PREC_MUL1:
+      return tr("0.0");
+    default:
+      return tr("?.?");  //  highlight unknown value
+  }
+}
+
+QString GVarData::nameToString(int index) const
+{
+  return RadioData::getElementName(tr("GV"), index + 1, name);
+}
+
+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/firmwares/gvardata.h

@@ -0,0 +1,68 @@
+/*
+ * 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 GVARDATA_H
+#define GVARDATA_H
+
+#include <QtCore>
+
+#define GVAR_NAME_LEN       3
+#define GVAR_MAX_VALUE      1024
+#define GVAR_MIN_VALUE      -GVAR_MAX_VALUE
+
+class GVarData {
+  Q_DECLARE_TR_FUNCTIONS(GVarData)
+
+  public:
+    GVarData() { clear(); }
+
+    enum {
+      GVAR_UNIT_NUMBER,
+      GVAR_UNIT_PERCENT
+    };
+
+    enum {
+      GVAR_PREC_MUL10,
+      GVAR_PREC_MUL1
+    };
+
+    char name[GVAR_NAME_LEN+1];
+    int min;
+    int max;
+    bool popup;
+    unsigned int prec;     // 0 0._  1 0.0
+    unsigned int unit;     // 0 _    1 %
+
+    void clear() {memset(this, 0, sizeof(GVarData)); }
+    QString unitToString() const;
+    QString precToString() const;
+    QString nameToString(int index) const;
+    int multiplierSet();
+    float multiplierGet() const;
+    void setMin(float val);
+    void setMax(float val);
+    int getMin() const;
+    int getMax() const;
+    float getMinPrec() const;
+    float getMaxPrec() const;
+};
+
+
+#endif // GVARDATA_H

companion/src/firmwares/io_data.cpp

@@ -0,0 +1,147 @@
+/*
+ * 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 "io_data.h"
+
+#include "radiodata.h"  // for RadioData::getElementName
+#include "radiodataconversionstate.h"
+
+/*
+ * ExpoData
+ */
+
+void ExpoData::convert(RadioDataConversionState & cstate)
+{
+  cstate.setComponent(tr("INP"), 3);
+  cstate.setSubComp(RawSource(SOURCE_TYPE_VIRTUAL_INPUT, chn).toString(cstate.fromModel(), cstate.fromGS(), cstate.fromType) % tr(" (@%1)").arg(cstate.subCompIdx));
+  srcRaw.convert(cstate);
+  swtch.convert(cstate);
+}
+
+
+/*
+ * MixData
+ */
+
+void MixData::convert(RadioDataConversionState & cstate)
+{
+  cstate.setComponent(tr("MIX"), 4);
+  cstate.setSubComp(RawSource(SOURCE_TYPE_CH, destCh-1).toString(cstate.fromModel(), cstate.fromGS(), cstate.fromType) % tr(" (@%1)").arg(cstate.subCompIdx));
+  srcRaw.convert(cstate);
+  swtch.convert(cstate);
+}
+
+
+/*
+ * LimitData
+ */
+
+QString LimitData::minToString() const
+{
+  return QString::number((qreal)min/10);
+}
+
+QString LimitData::maxToString() const
+{
+  return QString::number((qreal)max/10);
+}
+
+QString LimitData::revertToString() const
+{
+  return revert ? tr("INV") : tr("NOR");
+}
+
+QString LimitData::nameToString(int index) const
+{
+  return RadioData::getElementName(tr("CH"), index + 1, name);
+}
+
+QString LimitData::offsetToString() const
+{
+  return QString::number((qreal)offset/10, 'f', 1);
+}
+
+void LimitData::clear()
+{
+  memset(reinterpret_cast<void *>(this), 0, sizeof(LimitData));
+  min = -1000;
+  max = +1000;
+}
+
+
+/*
+ * CurveData
+ */
+
+CurveData::CurveData()
+{
+  clear(5);
+}
+
+void CurveData::clear(int count)
+{
+  memset(this, 0, sizeof(CurveData));
+  this->count = count;
+}
+
+bool CurveData::isEmpty() const
+{
+  for (int i=0; i<count; i++) {
+    if (points[i].y != 0) {
+      return false;
+    }
+  }
+  return true;
+}
+
+QString CurveData::nameToString(const int idx) const
+{
+  return RadioData::getElementName(tr("CV"), idx + 1, name);
+}
+
+
+/*
+ * FlightModeData
+ */
+
+void FlightModeData::clear(const int phase)
+{
+  memset(reinterpret_cast<void *>(this), 0, sizeof(FlightModeData));
+  if (phase != 0) {
+    for (int idx=0; idx<CPN_MAX_GVARS; idx++) {
+      gvars[idx] = 1025;
+    }
+    for (int idx=0; idx<CPN_MAX_ENCODERS; idx++) {
+      rotaryEncoders[idx] = 1025;
+    }
+  }
+}
+
+QString FlightModeData::nameToString(int index) const
+{
+  return RadioData::getElementName(tr("FM"), index, name);  // names are zero-based, FM0, FM1, etc
+}
+
+void FlightModeData::convert(RadioDataConversionState & cstate)
+{
+  cstate.setComponent("FMD", 2);
+  cstate.setSubComp(nameToString(cstate.subCompIdx));
+  swtch.convert(cstate);
+}

companion/src/firmwares/io_data.h

@@ -0,0 +1,179 @@
+/*
+ * 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 IO_DATA_H
+#define IO_DATA_H
+
+#include "constants.h"
+#include "curvereference.h"
+#include "rawsource.h"
+#include "rawswitch.h"
+
+#include <QtCore>
+
+class RadioDataConversionState;
+
+enum InputMode {
+  INPUT_MODE_NONE,
+  INPUT_MODE_POS,
+  INPUT_MODE_NEG,
+  INPUT_MODE_BOTH
+};
+
+class ExpoData {
+  Q_DECLARE_TR_FUNCTIONS(ExpoData)
+
+  public:
+    ExpoData() { clear(); }
+    RawSource srcRaw;
+    unsigned int scale;
+    unsigned int mode;   // InputMode
+    unsigned int chn;
+    RawSwitch swtch;
+    unsigned int flightModes;        // -5=!FP4, 0=normal, 5=FP4
+    int  weight;
+    int offset;
+    CurveReference curve;
+    int carryTrim;
+    char name[10+1];
+    void clear() { memset(reinterpret_cast<void *>(this), 0, sizeof(ExpoData)); }
+    void convert(RadioDataConversionState & cstate);
+};
+
+enum MltpxValue {
+  MLTPX_ADD=0,
+  MLTPX_MUL=1,
+  MLTPX_REP=2
+};
+
+#define MIXDATA_NAME_LEN  10
+
+class MixData {
+  Q_DECLARE_TR_FUNCTIONS(MixData)
+
+  public:
+    MixData() { clear(); }
+    void convert(RadioDataConversionState & cstate);
+
+    unsigned int destCh;            //        1..CPN_MAX_CHNOUT
+    RawSource srcRaw;
+    int     weight;
+    RawSwitch swtch;
+    CurveReference     curve;             //0=symmetrisch
+    unsigned int delayUp;
+    unsigned int delayDown;
+    unsigned int speedUp;           // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+    unsigned int speedDown;         // 0 nichts
+    int  carryTrim;
+    bool noExpo;
+    MltpxValue mltpx;          // multiplex method 0=+ 1=* 2=replace
+    unsigned int mixWarn;           // mixer warning
+    unsigned int flightModes;             // -5=!FP4, 0=normal, 5=FP4
+    int    sOffset;
+    char   name[MIXDATA_NAME_LEN+1];
+
+    void clear() { memset(reinterpret_cast<void *>(this), 0, sizeof(MixData)); }
+};
+
+class LimitData {
+  Q_DECLARE_TR_FUNCTIONS(LimitData)
+
+  public:
+    LimitData() { clear(); }
+    int   min;
+    int   max;
+    bool  revert;
+    int   offset;
+    int   ppmCenter;
+    bool  symetrical;
+    char  name[6+1];
+    CurveReference curve;
+    QString minToString() const;
+    QString maxToString() const;
+    QString offsetToString() const;
+    QString revertToString() const;
+    QString nameToString(int index) const;
+    void clear();
+};
+
+class CurvePoint {
+  public:
+    int8_t x;
+    int8_t y;
+};
+
+class CurveData {
+  Q_DECLARE_TR_FUNCTIONS(CurveData)
+
+  public:
+    enum CurveType {
+      CURVE_TYPE_STANDARD,
+      CURVE_TYPE_CUSTOM,
+      CURVE_TYPE_LAST = CURVE_TYPE_CUSTOM
+    };
+
+    CurveData();
+    void clear(int count);
+    bool isEmpty() const;
+    QString nameToString(const int idx) const;
+
+    CurveType type;
+    bool smooth;
+    int  count;
+    CurvePoint points[CPN_MAX_POINTS];
+    char name[6+1];
+};
+
+class FlightModeData {
+  Q_DECLARE_TR_FUNCTIONS(FlightModeData)
+
+  public:
+    FlightModeData() { clear(0); }
+    int trimMode[CPN_MAX_TRIMS];
+    int trimRef[CPN_MAX_TRIMS];
+    int trim[CPN_MAX_TRIMS];
+    RawSwitch swtch;
+    char name[10+1];
+    unsigned int fadeIn;
+    unsigned int fadeOut;
+    int rotaryEncoders[CPN_MAX_ENCODERS];
+    int gvars[CPN_MAX_GVARS];
+    void clear(const int phase);
+    QString nameToString(int index) const;
+    void convert(RadioDataConversionState & cstate);
+};
+
+class SwashRingData {
+  Q_DECLARE_TR_FUNCTIONS(SwashRingData)
+
+  public:
+    SwashRingData() { clear(); }
+    int elevatorWeight;
+    int aileronWeight;
+    int collectiveWeight;
+    unsigned int  type;
+    RawSource collectiveSource;
+    RawSource aileronSource;
+    RawSource elevatorSource;
+    unsigned int  value;
+    void clear() { memset(reinterpret_cast<void *>(this), 0, sizeof(SwashRingData)); }
+};
+
+#endif // IO_DATA_H

companion/src/firmwares/logicalswitchdata.cpp

@@ -0,0 +1,143 @@
+/*
+ * 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 "logicalswitchdata.h"
+
+#include "radiodata.h"
+#include "radiodataconversionstate.h"
+#include "rawsource.h"
+#include "rawswitch.h"
+
+bool LogicalSwitchData::isEmpty() const
+{
+  return (func == 0);
+}
+
+CSFunctionFamily LogicalSwitchData::getFunctionFamily() const
+{
+  if (func == LS_FN_EDGE)
+    return LS_FAMILY_EDGE;
+  else if (func == LS_FN_TIMER)
+    return LS_FAMILY_TIMER;
+  else if (func == LS_FN_STICKY)
+    return LS_FAMILY_STICKY;
+  else if (func < LS_FN_AND || func > LS_FN_ELESS)
+    return LS_FAMILY_VOFS;
+  else if (func < LS_FN_EQUAL)
+    return LS_FAMILY_VBOOL;
+  else
+    return LS_FAMILY_VCOMP;
+}
+
+unsigned int LogicalSwitchData::getRangeFlags() const
+{
+  int f = 0;
+
+  if (func == LS_FN_DPOS || func == LS_FN_DAPOS)
+    f |= RANGE_DELTA_FUNCTION;
+
+  if (func == LS_FN_DAPOS || func == LS_FN_APOS || func == LS_FN_ANEG)
+    f |= RANGE_ABS_FUNCTION;
+
+  return f;
+}
+
+QString LogicalSwitchData::funcToString() const
+{
+  switch (func) {
+    case LS_FN_OFF:
+      return tr("---");
+    case LS_FN_VPOS:
+      return tr("a>x");
+    case LS_FN_VNEG:
+      return tr("a<x");
+    case LS_FN_APOS:
+      return tr("|a|>x");
+    case LS_FN_ANEG:
+      return tr("|a|<x");
+    case LS_FN_AND:
+      return tr("AND");
+    case LS_FN_OR:
+      return tr("OR");
+    case LS_FN_XOR:
+      return tr("XOR");
+    case LS_FN_EQUAL:
+      return tr("a=b");
+    case LS_FN_NEQUAL:
+      return tr("a!=b");
+    case LS_FN_GREATER:
+      return tr("a>b");
+    case LS_FN_LESS:
+      return tr("a<b");
+    case LS_FN_EGREATER:
+      return tr("a>=b");
+    case LS_FN_ELESS:
+      return tr("a<=b");
+    case LS_FN_DPOS:
+      return tr("d>=x");
+    case LS_FN_DAPOS:
+      return tr("|d|>=x");
+    case LS_FN_VEQUAL:
+      return tr("a=x");
+    case LS_FN_VALMOSTEQUAL:
+      return tr("a~x");
+    case LS_FN_TIMER:
+      return tr("Timer");
+    case LS_FN_STICKY:
+      return tr("Sticky");
+    case LS_FN_EDGE:
+      return tr("Edge");
+    default:
+      return tr("Unknown");
+  }
+}
+
+QString LogicalSwitchData::nameToString(int index) const
+{
+  return RadioData::getElementName(tr("L"), index + 1, NULL, true);
+}
+
+void LogicalSwitchData::convert(RadioDataConversionState & cstate)
+{
+  cstate.setComponent(tr("LSW"), 7);
+  cstate.setSubComp(RawSwitch(SWITCH_TYPE_VIRTUAL, cstate.subCompIdx + 1).toString(cstate.fromType, cstate.fromGS(), cstate.fromModel()));
+  CSFunctionFamily family = getFunctionFamily();
+  switch(family) {
+    case LS_FAMILY_VOFS:
+      val1 = RawSource(val1).convert(cstate.withComponentField("V1")).toValue();
+      break;
+    case LS_FAMILY_STICKY:
+    case LS_FAMILY_VBOOL:
+      val1 = RawSwitch(val1).convert(cstate.withComponentField("V1")).toValue();
+      val2 = RawSwitch(val2).convert(cstate.withComponentField("V2")).toValue();
+      break;
+    case LS_FAMILY_EDGE:
+      val1 = RawSwitch(val1).convert(cstate.withComponentField("V1")).toValue();
+      break;
+    case LS_FAMILY_VCOMP:
+      val1 = RawSource(val1).convert(cstate.withComponentField("V1")).toValue();
+      val2 = RawSource(val2).convert(cstate.withComponentField("V2")).toValue();
+      break;
+    default:
+      break;
+  }
+
+  andsw = RawSwitch(andsw).convert(cstate.withComponentField("AND")).toValue();
+}

companion/src/firmwares/logicalswitchdata.h

@@ -0,0 +1,89 @@
+/*
+ * 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 LOGICALSWITCHDATA_H
+#define LOGICALSWITCHDATA_H
+
+#include <QtCore>
+
+class RadioDataConversionState;
+
+enum CSFunction {
+  LS_FN_OFF,
+  LS_FN_VPOS,
+  LS_FN_VNEG,
+  LS_FN_APOS,
+  LS_FN_ANEG,
+  LS_FN_AND,
+  LS_FN_OR,
+  LS_FN_XOR,
+  LS_FN_EQUAL,
+  LS_FN_NEQUAL,
+  LS_FN_GREATER,
+  LS_FN_LESS,
+  LS_FN_EGREATER,
+  LS_FN_ELESS,
+  LS_FN_DPOS,
+  LS_FN_DAPOS,
+  LS_FN_VEQUAL, // added at the end to avoid everything renumbered
+  LS_FN_VALMOSTEQUAL,
+  LS_FN_TIMER,
+  LS_FN_STICKY,
+  LS_FN_EDGE,
+  // later ... LS_FN_RANGE,
+    LS_FN_MAX
+};
+
+enum CSFunctionFamily {
+  LS_FAMILY_VOFS,
+  LS_FAMILY_VBOOL,
+  LS_FAMILY_VCOMP,
+  LS_FAMILY_TIMER,
+  LS_FAMILY_STICKY,
+  LS_FAMILY_EDGE,
+};
+
+class LogicalSwitchData {
+  Q_DECLARE_TR_FUNCTIONS(LogicalSwitchData)
+
+  public:
+    LogicalSwitchData(unsigned int func=0)
+    {
+      clear();
+      this->func = func;
+    }
+    unsigned int func;
+    int val1;
+    int val2;
+    int val3;
+    unsigned int delay;
+    unsigned int duration;
+    int andsw;
+
+    void clear() { memset(this, 0, sizeof(LogicalSwitchData)); }
+    bool isEmpty() const;
+    CSFunctionFamily getFunctionFamily() const;
+    unsigned int getRangeFlags() const;
+    QString funcToString() const;
+    QString nameToString(int index) const;
+    void convert(RadioDataConversionState & cstate);
+};
+
+#endif // LOGICALSWITCHDATA_H

companion/src/firmwares/modeldata.cpp

@@ -0,0 +1,444 @@
+/*
+ * 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 "modeldata.h"
+
+#include "eeprominterface.h"
+#include "generalsettings.h"
+#include "macros.h"
+#include "radiodataconversionstate.h"
+
+
+QString removeAccents(const QString & str)
+{
+  // UTF-8 ASCII Table
+  static const QHash<QString, QVariant> map = {
+    {"a", QRegularExpression("[áâãàä]")},
+    {"A", QRegularExpression("[ÁÂÃÀÄ]")},
+    {"e", QRegularExpression("[éèêě]")},
+    {"E", QRegularExpression("[ÉÈÊĚ]")},
+    {"o", QRegularExpression("[óôõö]")},
+    {"O", QRegularExpression("[ÓÔÕÖ]")},
+    {"u", QRegularExpression("[úü]")},
+    {"U", QRegularExpression("[ÚÜ]")},
+    {"i", "í"}, {"I", "Í"},
+    {"c", "ç"}, {"C", "Ç"},
+    {"y", "ý"}, {"Y", "Ý"},
+    {"s", "š"}, {"S", "Š"},
+    {"r", "ř"}, {"R", "Ř"}
+  };
+
+  QString result(str);
+  for (QHash<QString, QVariant>::const_iterator it = map.cbegin(), en = map.cend(); it != en; ++it) {
+    if (it.value().canConvert<QRegularExpression>())
+      result.replace(it.value().toRegularExpression(), it.key());
+    else
+      result.replace(it.value().toString(), it.key());
+  }
+  return result;
+}
+
+
+/*
+ * TimerData
+ */
+
+void TimerData::convert(RadioDataConversionState & cstate)
+{
+  cstate.setComponent(tr("TMR"), 1);
+  cstate.setSubComp(tr("Timer %1").arg(cstate.subCompIdx + 1));
+  mode.convert(cstate);
+}
+
+
+/*
+ * ModelData
+ */
+
+ModelData::ModelData()
+{
+  clear();
+}
+
+ModelData::ModelData(const ModelData & src)
+{
+  *this = src;
+}
+
+ModelData & ModelData::operator = (const ModelData & src)
+{
+  memcpy(reinterpret_cast<void *>(this), &src, sizeof(ModelData));
+  return *this;
+}
+
+ExpoData * ModelData::insertInput(const int idx)
+{
+  memmove(&expoData[idx+1], &expoData[idx], (CPN_MAX_EXPOS-(idx+1))*sizeof(ExpoData));
+  expoData[idx].clear();
+  return &expoData[idx];
+}
+
+bool ModelData::isInputValid(const unsigned int idx) const
+{
+  for (int i=0; i<CPN_MAX_EXPOS; i++) {
+    const ExpoData * expo = &expoData[i];
+    if (expo->mode == 0) break;
+    if (expo->chn == idx)
+      return true;
+  }
+  return false;
+}
+
+bool ModelData::hasExpos(uint8_t inputIdx) const
+{
+  for (int i=0; i<CPN_MAX_EXPOS; i++) {
+    const ExpoData & expo = expoData[i];
+    if (expo.chn==inputIdx && expo.mode!=0) {
+      return true;
+    }
+  }
+  return false;
+}
+
+bool ModelData::hasMixes(uint8_t channelIdx) const
+{
+  channelIdx += 1;
+  for (int i=0; i<CPN_MAX_MIXERS; i++) {
+    if (mixData[i].destCh == channelIdx) {
+      return true;
+    }
+  }
+  return false;
+}
+
+QVector<const ExpoData *> ModelData::expos(int input) const
+{
+  QVector<const ExpoData *> result;
+  for (int i=0; i<CPN_MAX_EXPOS; i++) {
+    const ExpoData * ed = &expoData[i];
+    if ((int)ed->chn==input && ed->mode!=0) {
+      result << ed;
+    }
+  }
+  return result;
+}
+
+QVector<const MixData *> ModelData::mixes(int channel) const
+{
+  QVector<const MixData *> result;
+  for (int i=0; i<CPN_MAX_MIXERS; i++) {
+    const MixData * md = &mixData[i];
+    if ((int)md->destCh == channel+1) {
+      result << md;
+    }
+  }
+  return result;
+}
+
+void ModelData::removeInput(const int idx, bool clearName)
+{
+  unsigned int chn = expoData[idx].chn;
+
+  memmove(&expoData[idx], &expoData[idx+1], (CPN_MAX_EXPOS-(idx+1))*sizeof(ExpoData));
+  expoData[CPN_MAX_EXPOS-1].clear();
+
+  //also remove input name if removing last line for this input
+  if (clearName && !expos(chn).size())
+    inputNames[chn][0] = 0;
+}
+
+void ModelData::clearInputs()
+{
+  for (int i=0; i<CPN_MAX_EXPOS; i++)
+    expoData[i].clear();
+
+  //clear all input names
+  if (getCurrentFirmware()->getCapability(VirtualInputs)) {
+    for (int i=0; i<CPN_MAX_INPUTS; i++) {
+      inputNames[i][0] = 0;
+    }
+  }
+}
+
+void ModelData::clearMixes()
+{
+  for (int i=0; i<CPN_MAX_MIXERS; i++)
+    mixData[i].clear();
+}
+
+void ModelData::clear()
+{
+  memset(reinterpret_cast<void *>(this), 0, sizeof(ModelData));
+  modelIndex = -1;  // an invalid index, this is managed by the TreeView data model
+  moduleData[0].protocol = PULSES_OFF;
+  moduleData[1].protocol = PULSES_OFF;
+  moduleData[0].channelsCount = 8;
+  moduleData[1].channelsStart = 0;
+  moduleData[1].channelsCount = 8;
+  moduleData[0].ppm.delay = 300;
+  moduleData[1].ppm.delay = 300;
+  moduleData[2].ppm.delay = 300; // Trainer PPM
+  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_LOGICAL_SWITCHES; i++)
+    logicalSw[i].clear();
+  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);
+  for (int i=0; i<CPN_MAX_TIMERS; i++)
+    timers[i].clear();
+  swashRingData.clear();
+  frsky.clear();
+  rssiAlarms.clear();
+  for (int i=0; i<CPN_MAX_SENSORS; i++)
+    sensorData[i].clear();
+
+  static const uint8_t blob[] = { 0x4c, 0x61, 0x79, 0x6f, 0x75, 0x74, 0x32, 0x50, 0x31, 0x00, 0x4d, 0x6f, 0x64, 0x65, 0x6c, 0x42, 0x6d, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
+  memcpy(customScreenData[0], blob, sizeof(blob));
+}
+
+bool ModelData::isEmpty() const
+{
+  return !used;
+}
+
+void ModelData::setDefaultInputs(const GeneralSettings & settings)
+{
+  Board::Type board = getCurrentBoard();
+  if (IS_ARM(board)) {
+    for (int i=0; i<CPN_MAX_STICKS; i++) {
+      ExpoData * expo = &expoData[i];
+      expo->chn = i;
+      expo->mode = INPUT_MODE_BOTH;
+      expo->srcRaw = settings.getDefaultSource(i);
+      expo->weight = 100;
+      strncpy(inputNames[i], removeAccents(expo->srcRaw.toString(this)).toLatin1().constData(), sizeof(inputNames[i])-1);
+    }
+  }
+}
+
+void ModelData::setDefaultMixes(const GeneralSettings & settings)
+{
+  Board::Type board = getCurrentBoard();
+  if (IS_ARM(board)) {
+    setDefaultInputs(settings);
+  }
+
+  for (int i=0; i<CPN_MAX_STICKS; i++) {
+    MixData * mix = &mixData[i];
+    mix->destCh = i+1;
+    mix->weight = 100;
+    if (IS_ARM(board)) {
+      mix->srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i);
+    }
+    else {
+      mix->srcRaw = RawSource(SOURCE_TYPE_STICK, i);
+    }
+  }
+}
+
+void ModelData::setDefaultValues(unsigned int id, const GeneralSettings & settings)
+{
+  clear();
+  used = true;
+  sprintf(name, "MODEL%02d", id+1);
+  for (int i=0; i<CPN_MAX_MODULES; i++) {
+    moduleData[i].modelId = id+1;
+  }
+  setDefaultMixes(settings);
+}
+
+int ModelData::getTrimValue(int phaseIdx, int trimIdx)
+{
+  int result = 0;
+  for (int i=0; i<CPN_MAX_FLIGHT_MODES; i++) {
+    FlightModeData & phase = flightModeData[phaseIdx];
+    if (phase.trimMode[trimIdx] < 0) {
+      return result;
+    }
+    else {
+      if (phase.trimRef[trimIdx] == phaseIdx || phaseIdx == 0) {
+        return result + phase.trim[trimIdx];
+      }
+      else {
+        phaseIdx = phase.trimRef[trimIdx];
+        if (phase.trimMode[trimIdx] != 0)
+          result += phase.trim[trimIdx];
+      }
+    }
+  }
+  return 0;
+}
+
+bool ModelData::isGVarLinked(int phaseIdx, int gvarIdx)
+{
+  return flightModeData[phaseIdx].gvars[gvarIdx] > 1024;
+}
+
+int ModelData::getGVarFieldValue(int phaseIdx, int gvarIdx)
+{
+  int idx = flightModeData[phaseIdx].gvars[gvarIdx];
+  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];
+  }
+  return idx;
+}
+
+void ModelData::setTrimValue(int phaseIdx, int trimIdx, int value)
+{
+  for (uint8_t i=0; i<CPN_MAX_FLIGHT_MODES; i++) {
+    FlightModeData & phase = flightModeData[phaseIdx];
+    int mode = phase.trimMode[trimIdx];
+    int p = phase.trimRef[trimIdx];
+    int & trim = phase.trim[trimIdx];
+    if (mode < 0)
+      return;
+    if (p == phaseIdx || phaseIdx == 0) {
+      trim = value;
+      break;;
+    }
+    else if (mode == 0) {
+      phaseIdx = p;
+    }
+    else {
+      trim = value - getTrimValue(p, trimIdx);
+      if (trim < -500)
+        trim = -500;
+      if (trim > 500)
+        trim = 500;
+      break;
+    }
+  }
+}
+
+void ModelData::removeGlobalVar(int & var)
+{
+  if (var >= 126 && var <= 130)
+    var = flightModeData[0].gvars[var-126];
+  else if (var <= -126 && var >= -130)
+    var = - flightModeData[0].gvars[-126-var];
+}
+
+ModelData ModelData::removeGlobalVars()
+{
+  ModelData result = *this;
+
+  for (int i=0; i<CPN_MAX_MIXERS; i++) {
+    removeGlobalVar(mixData[i].weight);
+    removeGlobalVar(mixData[i].curve.value);
+    removeGlobalVar(mixData[i].sOffset);
+  }
+
+  for (int i=0; i<CPN_MAX_EXPOS; i++) {
+    removeGlobalVar(expoData[i].weight);
+    removeGlobalVar(expoData[i].curve.value);
+  }
+
+  return result;
+}
+
+int ModelData::getChannelsMax(bool forceExtendedLimits) const
+{
+  if (forceExtendedLimits || extendedLimits)
+    return IS_HORUS_OR_TARANIS(getCurrentBoard()) ? 150 : 125;
+  else
+    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();
+}
+
+void ModelData::convert(RadioDataConversionState & cstate)
+{
+  // Here we can add explicit conversions when moving from one board to another
+
+  QString origin = QString(name);
+  if (origin.isEmpty())
+    origin = QString::number(cstate.modelIdx+1);
+  cstate.setOrigin(tr("Model: ") % origin);
+
+  cstate.setComponent("SET", 0);
+  if (thrTraceSrc && (int)thrTraceSrc < cstate.fromBoard.getCapability(Board::Pots) + cstate.fromBoard.getCapability(Board::Sliders)) {
+    cstate.setSubComp(tr("Throttle Source"));
+    thrTraceSrc = RawSource(SOURCE_TYPE_STICK, (int)thrTraceSrc + 3).convert(cstate).index - 3;
+  }
+
+  for (int i=0; i<CPN_MAX_TIMERS; i++) {
+    timers[i].convert(cstate.withComponentIndex(i));
+  }
+
+  for (int i=0; i<CPN_MAX_MIXERS; i++) {
+    mixData[i].convert(cstate.withComponentIndex(i));
+  }
+
+  for (int i=0; i<CPN_MAX_EXPOS; i++) {
+    expoData[i].convert(cstate.withComponentIndex(i));
+  }
+
+  for (int i=0; i<CPN_MAX_LOGICAL_SWITCHES; i++) {
+    logicalSw[i].convert(cstate.withComponentIndex(i));
+  }
+
+  for (int i=0; i<CPN_MAX_SPECIAL_FUNCTIONS; i++) {
+    customFn[i].convert(cstate.withComponentIndex(i));
+  }
+
+  for (int i=0; i<CPN_MAX_FLIGHT_MODES; i++) {
+    flightModeData[i].convert(cstate.withComponentIndex(i));
+  }
+
+  for (int i=0; i<CPN_MAX_MODULES; i++) {
+    moduleData[i].convert(cstate.withComponentIndex(i));
+  }
+}

companion/src/firmwares/modeldata.h

@@ -0,0 +1,232 @@
+/*
+ * 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 MODELDATA_H
+#define MODELDATA_H
+
+#include "constants.h"
+#include "customfunctiondata.h"
+#include "gvardata.h"
+#include "io_data.h"
+#include "logicalswitchdata.h"
+#include "moduledata.h"
+#include "sensordata.h"
+#include "telem_data.h"
+
+#include <QtCore>
+
+class GeneralSettings;
+class RadioDataConversionState;
+
+#define CHAR_FOR_NAMES " ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-."
+#define CHAR_FOR_NAMES_REGEX "[ A-Za-z0-9_.-,]*"
+
+class RSSIAlarmData {
+  public:
+    RSSIAlarmData() { clear(); }
+    unsigned int level[2];  // AVR Only
+    int warning;
+    int critical;
+    bool disabled;
+    void clear() {
+      this->level[0] = 2;
+      this->level[1] = 3;
+      this->warning = 45;
+      this->critical = 42;
+      this->disabled = false;
+    }
+};
+
+#define TIMER_NAME_LEN 8
+
+class TimerData {
+  Q_DECLARE_TR_FUNCTIONS(TimerData)
+
+  public:
+    enum CountDownMode {
+      COUNTDOWN_SILENT,
+      COUNTDOWN_BEEPS,
+      COUNTDOWN_VOICE,
+      COUNTDOWN_HAPTIC
+    };
+    TimerData() { clear(); }
+    RawSwitch    mode;
+    char         name[TIMER_NAME_LEN+1];
+    bool         minuteBeep;
+    unsigned int countdownBeep;
+    unsigned int val;
+    unsigned int persistent;
+    int          pvalue;
+    void clear() { memset(reinterpret_cast<void *>(this), 0, sizeof(TimerData)); mode = RawSwitch(SWITCH_TYPE_TIMER_MODE, 0); }
+    void convert(RadioDataConversionState & cstate);
+};
+
+#define CPN_MAX_SCRIPTS       9
+#define CPN_MAX_SCRIPT_INPUTS 10
+class ScriptData {
+  public:
+    ScriptData() { clear(); }
+    char    filename[10+1];
+    char    name[10+1];
+    int     inputs[CPN_MAX_SCRIPT_INPUTS];
+    void clear() { memset(reinterpret_cast<void *>(this), 0, sizeof(ScriptData)); }
+};
+
+/*
+ * TODO ...
+ */
+#if 0
+class CustomScreenOptionData {
+  public:
+
+};
+
+class CustomScreenZoneData {
+  public:
+    char widgetName[10+1];
+    WidgetOptionData widgetOptions[5];
+};
+
+class CustomScreenData {
+  public:
+    CustomScreenData();
+
+    char layoutName[10+1];
+    CustomScreenZoneData zones[];
+    CustomScreenOptionData options[];
+};
+#else
+typedef char CustomScreenData[610+1];
+typedef char TopbarData[216+1];
+#endif
+
+enum TrainerMode {
+  TRAINER_MODE_MASTER_TRAINER_JACK,
+  TRAINER_MODE_SLAVE,
+  TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE,
+  TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE,
+  TRAINER_MODE_MASTER_BATTERY_COMPARTMENT,
+};
+
+class ModelData {
+  Q_DECLARE_TR_FUNCTIONS(ModelData)
+
+  public:
+    ModelData();
+    ModelData(const ModelData & src);
+    ModelData & operator = (const ModelData & src);
+
+    void convert(RadioDataConversionState & cstate);
+
+    ExpoData * insertInput(const int idx);
+    void removeInput(const int idx, bool clearName = true);
+
+    bool isInputValid(const unsigned int idx) const;
+    bool hasExpos(uint8_t inputIdx) const;
+    bool hasMixes(uint8_t output) const;
+
+    QVector<const ExpoData *> expos(int input) const;
+    QVector<const MixData *> mixes(int channel) const;
+
+    bool      used;
+    int       category;
+    char      name[15+1];
+    char      filename[16+1];
+    int       modelIndex;      // Companion only, temporary index position managed by data model.
+
+    TimerData timers[CPN_MAX_TIMERS];
+    bool      noGlobalFunctions;
+    bool      thrTrim;            // Enable Throttle Trim
+    int       trimInc;            // Trim Increments
+    unsigned int trimsDisplay;
+    bool      disableThrottleWarning;
+
+    unsigned int beepANACenter;      // 1<<0->A1.. 1<<6->A7
+
+    bool      extendedLimits; // TODO xml
+    bool      extendedTrims;
+    bool      throttleReversed;
+    FlightModeData flightModeData[CPN_MAX_FLIGHT_MODES];
+    MixData   mixData[CPN_MAX_MIXERS];
+    LimitData limitData[CPN_MAX_CHNOUT];
+
+    char      inputNames[CPN_MAX_INPUTS][4+1];
+    ExpoData  expoData[CPN_MAX_EXPOS];
+
+    CurveData curves[CPN_MAX_CURVES];
+    LogicalSwitchData  logicalSw[CPN_MAX_LOGICAL_SWITCHES];
+    CustomFunctionData customFn[CPN_MAX_SPECIAL_FUNCTIONS];
+    SwashRingData swashRingData;
+    unsigned int thrTraceSrc;
+    uint64_t switchWarningStates;
+    unsigned int switchWarningEnable;
+    unsigned int potsWarningMode;
+    bool potsWarningEnabled[CPN_MAX_POTS];
+    int          potPosition[CPN_MAX_POTS];
+    bool         displayChecklist;
+    GVarData gvarData[CPN_MAX_GVARS];
+    MavlinkData mavlink;
+    unsigned int telemetryProtocol;
+    FrSkyData frsky;
+    RSSIAlarmData rssiAlarms;
+
+    char bitmap[10+1];
+
+    unsigned int trainerMode;  // TrainerMode
+
+    ModuleData moduleData[CPN_MAX_MODULES+1/*trainer*/];
+
+    ScriptData scriptData[CPN_MAX_SCRIPTS];
+
+    SensorData sensorData[CPN_MAX_SENSORS];
+
+    unsigned int toplcdTimer;
+
+    CustomScreenData customScreenData[5];
+
+    TopbarData topbarData;
+
+    void clear();
+    bool isEmpty() const;
+    void setDefaultInputs(const GeneralSettings & settings);
+    void setDefaultMixes(const GeneralSettings & settings);
+    void setDefaultValues(unsigned int id, const GeneralSettings & settings);
+
+    int getTrimValue(int phaseIdx, int trimIdx);
+    void setTrimValue(int phaseIdx, int trimIdx, int value);
+
+    bool isGVarLinked(int phaseIdx, int gvarIdx);
+    int getGVarFieldValue(int phaseIdx, int gvarIdx);
+    float getGVarFieldValuePrec(int phaseIdx, int gvarIdx);
+
+    ModelData removeGlobalVars();
+
+    void clearMixes();
+    void clearInputs();
+
+    int getChannelsMax(bool forceExtendedLimits=false) const;
+
+    bool isAvailable(const RawSwitch & swtch) const;
+
+  protected:
+    void removeGlobalVar(int & var);
+};
+
+#endif // MODELDATA_H

companion/src/firmwares/moduledata.cpp

@@ -0,0 +1,128 @@
+/*
+ * 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 "moduledata.h"
+#include "eeprominterface.h"
+#include "multiprotocols.h"
+#include "radiodataconversionstate.h"
+
+void ModuleData::convert(RadioDataConversionState & cstate)
+{
+  if (protocol == PULSES_PXX_R9M && (IS_TARANIS_XLITE(cstate.fromType) || IS_TARANIS_XLITE(cstate.toType))) {
+    clear();
+  }
+}
+
+QString ModuleData::rfProtocolToString() const
+{
+  switch (protocol) {
+    case PULSES_MULTIMODULE:
+      return Multiprotocols::protocolToString((int)multi.rfProtocol, multi.customProto);
+
+    default:
+      return CPN_STR_UNKNOWN_ITEM;
+  }
+}
+
+QString ModuleData::subTypeToString(int type) const
+{
+  static const char * strings[] = {
+    "FCC",
+    "EU",
+    "868MHz",
+    "915MHz"
+  };
+
+  if (type < 0)
+    type = subType;
+
+  switch (protocol) {
+    case PULSES_MULTIMODULE:
+      return Multiprotocols::subTypeToString(multi.customProto ? MM_RF_CUSTOM_SELECTED : (int)multi.rfProtocol, (unsigned)type);
+
+    case PULSES_PXX_R9M:
+      return CHECK_IN_ARRAY(strings, type);
+
+    default:
+      return CPN_STR_UNKNOWN_ITEM;
+  }
+}
+
+QString ModuleData::powerValueToString(Firmware * fw) const
+{
+  const QStringList & strRef = powerValueStrings(subType, fw);
+  // EU module with telemetry can only be < 100/200mW.
+  if (pxx.sport_out && subType == MODULE_SUBTYPE_R9M_EU && pxx.power > 1)
+    return CPN_STR_UNKNOWN_ITEM;
+
+  return strRef.value(pxx.power, CPN_STR_UNKNOWN_ITEM);
+}
+
+// static
+QString ModuleData::indexToString(int index, Firmware * fw)
+{
+  if (index < 0)
+    return tr("Trainer Port");
+
+  if (fw->getCapability(NumModules) > 1) {
+    if (IS_HORUS_OR_TARANIS(fw->getBoard()))
+      return index == 0 ? tr("Internal Radio System") : tr("External Radio Module");
+    if (index > 0)
+      return tr("Extra Radio System");
+  }
+  return tr("Radio System");
+}
+
+// static
+QString ModuleData::protocolToString(unsigned protocol)
+{
+  static const char * strings[] = {
+    "OFF",
+    "PPM",
+    "Silverlit A", "Silverlit B", "Silverlit C",
+    "CTP1009",
+    "LP45", "DSM2", "DSMX",
+    "PPM16", "PPMsim",
+    "FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
+    "Crossfire",
+    "DIY Multiprotocol Module",
+    "FrSky R9M Module",
+    "SBUS output at VBat"
+  };
+
+  return CHECK_IN_ARRAY(strings, protocol);
+}
+
+// static
+QStringList ModuleData::powerValueStrings(int subType, Firmware * fw)
+{
+  static const QStringList strings[] = {
+    { tr("10mW - 16CH"), tr("100mW - 16CH"), tr("500mW - 16CH"), tr("Auto <= 1W - 16CH") },                         // full-size FCC
+    { tr("25mW - 8CH"), tr("25mW - 16CH"), tr("200mW - 16CH (no telemetry)"), tr("500mW - 16CH (no telemetry)") },  // full-size EU
+    { tr("100mW - 16CH") },                                                                                         // mini FCC
+    { tr("25mW - 8CH"), tr("25mW - 16CH"), tr("100mW - 16CH (no telemetry)") }                                      // mini EU
+  };
+  int strIdx = 0;
+  if (subType == MODULE_SUBTYPE_R9M_EU)
+    strIdx += 1;
+  if (fw->getCapability(HasModuleR9MMini))
+    strIdx += 2;
+  return strings[strIdx];
+}

companion/src/firmwares/moduledata.h

@@ -0,0 +1,170 @@
+/*
+ * 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 MODULEDATA_H
+#define MODULEDATA_H
+
+#include "constants.h"
+
+#include <QtCore>
+
+class Firmware;
+class RadioDataConversionState;
+
+enum PulsesProtocol {
+  PULSES_OFF,
+  PULSES_PPM,
+  PULSES_SILV_A,
+  PULSES_SILV_B,
+  PULSES_SILV_C,
+  PULSES_CTP1009,
+  PULSES_LP45,
+  PULSES_DSM2,
+  PULSES_DSMX,
+  PULSES_PPM16,
+  PULSES_PPMSIM,
+  PULSES_PXX_XJT_X16,
+  PULSES_PXX_XJT_D8,
+  PULSES_PXX_XJT_LR12,
+  PULSES_PXX_DJT,
+  PULSES_CROSSFIRE,
+  PULSES_MULTIMODULE,
+  PULSES_PXX_R9M,
+  PULSES_SBUS,
+  PULSES_PROTOCOL_LAST
+};
+
+enum MultiModuleRFProtocols {
+  MM_RF_PROTO_FLYSKY=0,
+  MM_RF_PROTO_FIRST=MM_RF_PROTO_FLYSKY,
+  MM_RF_PROTO_HUBSAN,
+  MM_RF_PROTO_FRSKY,
+  MM_RF_PROTO_HISKY,
+  MM_RF_PROTO_V2X2,
+  MM_RF_PROTO_DSM2,
+  MM_RF_PROTO_DEVO,
+  MM_RF_PROTO_YD717,
+  MM_RF_PROTO_KN,
+  MM_RF_PROTO_SYMAX,
+  MM_RF_PROTO_SLT,
+  MM_RF_PROTO_CX10,
+  MM_RF_PROTO_CG023,
+  MM_RF_PROTO_BAYANG,
+  MM_RF_PROTO_ESky,
+  MM_RF_PROTO_MT99XX,
+  MM_RF_PROTO_MJXQ,
+  MM_RF_PROTO_SHENQI,
+  MM_RF_PROTO_FY326,
+  MM_RF_PROTO_SFHSS,
+  MM_RF_PROTO_J6PRO,
+  MM_RF_PROTO_FQ777,
+  MM_RF_PROTO_ASSAN,
+  MM_RF_PROTO_HONTAI,
+  MM_RF_PROTO_OLRS,
+  MM_RF_PROTO_FS_AFHDS2A,
+  MM_RF_PROTO_Q2X2,
+  MM_RF_PROTO_WK_2X01,
+  MM_RF_PROTO_Q303,
+  MM_RF_PROTO_GW008,
+  MM_RF_PROTO_DM002,
+  MM_RF_PROTO_CABELL,
+  MM_RF_PROTO_ESKY150,
+  MM_RF_PROTO_H83D,
+  MM_RF_PROTO_CORONA,
+  MM_RF_PROTO_CFLIE,
+  MM_RF_PROTO_HITEC,
+  MM_RF_PROTO_WFLY,
+  MM_RF_PROTO_BUGS,
+  MM_RF_PROTO_BUGS_MINI,
+  MM_RF_PROTO_TRAXXAS,
+  MM_RF_PROTO_NCC1701,
+  MM_RF_PROTO_E01X,
+  MM_RF_PROTO_V911S,
+  MM_RF_PROTO_GD00X,
+  MM_RF_PROTO_LAST = MM_RF_PROTO_GD00X
+};
+
+enum TrainerProtocol {
+  TRAINER_MASTER_JACK,
+  TRAINER_SLAVE_JACK,
+  TRAINER_MASTER_SBUS_MODULE,
+  TRAINER_MASTER_CPPM_MODULE,
+  TRAINER_MASTER_SBUS_BATT_COMPARTMENT
+};
+
+enum R9MSubTypes {
+  MODULE_SUBTYPE_R9M_FCC,
+  MODULE_SUBTYPE_R9M_EU,
+  MODULE_SUBTYPE_R9M_EUPLUS,
+  MODULE_SUBTYPE_R9M_AUPLUS,
+  MODULE_SUBTYPE_R9M_LAST=MODULE_SUBTYPE_R9M_AUPLUS
+};
+
+class ModuleData {
+  Q_DECLARE_TR_FUNCTIONS(ModuleData)
+
+  public:
+    ModuleData() { clear(); }
+    unsigned int modelId;
+    int          protocol;
+    unsigned int subType;
+    bool         invertedSerial;
+    unsigned int channelsStart;
+    int          channelsCount; // 0=8 channels
+    unsigned int failsafeMode;
+    int          failsafeChannels[CPN_MAX_CHNOUT];
+
+
+    struct {
+      int delay;
+      bool pulsePol;           // false = positive
+      bool outputType;         // false = open drain, true = push pull
+      int frameLength;
+    } ppm;
+
+    struct {
+      unsigned int rfProtocol;
+      bool autoBindMode;
+      bool lowPowerMode;
+      bool customProto;
+      int optionValue;
+    } multi;
+
+    struct {
+      int power;                   // 0 10 mW, 1 100 mW, 2 500 mW, 3 1W
+      bool receiver_telem_off;     // false = receiver telem enabled
+      bool receiver_channel_9_16;  // false = pwm out 1-8, true 9-16
+      bool external_antenna;       // false = internal antenna, true = external antenna
+      bool sport_out;
+    } pxx;
+
+
+    void clear() { memset(this, 0, sizeof(ModuleData)); }
+    void convert(RadioDataConversionState & cstate);
+    QString polarityToString() const { return ppm.pulsePol ? tr("Positive") : tr("Negative"); }
+    QString rfProtocolToString() const;
+    QString subTypeToString(int type = -1) const;
+    QString powerValueToString(Firmware * fw) const;
+    static QString indexToString(int index, Firmware * fw);
+    static QString protocolToString(unsigned protocol);
+    static QStringList powerValueStrings(int subType, Firmware * fw);
+};
+
+#endif // MODULEDATA_H

companion/src/firmwares/multiprotocols.cpp

@@ -0,0 +1,154 @@
+/*
+ * 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 <QObject>
+
+#include "multiprotocols.h"
+#include "radiodata.h"
+
+#define STR_MULTI_SUBTYPE                    QT_TRANSLATE_NOOP("Multiprotocols", "Subtype")
+#define STR_MULTI_VIDFREQ                    QT_TRANSLATE_NOOP("Multiprotocols", "Video TX frequency")
+#define STR_MULTI_RFTUNE                     QT_TRANSLATE_NOOP("Multiprotocols", "CC2500 frequency fine tune")
+#define STR_MULTI_TELEMETRY                  QT_TRANSLATE_NOOP("Multiprotocols", "Telemetry")
+#define STR_MULTI_RFPOWER                    QT_TRANSLATE_NOOP("Multiprotocols", "Radio output power")
+#define STR_MULTI_SERVOFREQ                  QT_TRANSLATE_NOOP("Multiprotocols", "Servo output frequency")
+#define STR_MULTI_OPTION                     QT_TRANSLATE_NOOP("Multiprotocols", "Option value")
+#define STR_MULTI_DEFAULT                    QT_TRANSLATE_NOOP("Multiprotocols", "DEFAULT")
+
+static const QStringList STR_SUBTYPE_CUSTOM  ({
+                                                STR_MULTI_SUBTYPE " 0", STR_MULTI_SUBTYPE " 1", STR_MULTI_SUBTYPE " 2", STR_MULTI_SUBTYPE " 3",
+                                                STR_MULTI_SUBTYPE " 4", STR_MULTI_SUBTYPE " 5", STR_MULTI_SUBTYPE " 6", STR_MULTI_SUBTYPE " 7"
+                                              });
+static const QStringList STR_SUBTYPE_FLYSKY  {"Standard", "V9x9", "V6x6", "V912", "CX20"};
+static const QStringList STR_SUBTYPE_HUBSAN  {"H107", "H301", "H501"};
+static const QStringList STR_SUBTYPE_FRSKY   {"D16", "D8", "D16 8ch", "V8", "D16 EU-LBT", "D16 EU-LBT 8ch"};
+static const QStringList STR_SUBTYPE_HISKY   {"Standard", "HK310"};
+static const QStringList STR_SUBTYPE_V2X2    {"Standard", "JXD506"};
+static const QStringList STR_SUBTYPE_DSM     {"DSM2 22ms", "DSM2 11ms", "DSMX 22ms", "DSMX 11ms"};
+static const QStringList STR_SUBTYPE_YD717   {"Standard", "Skywalker", "Syma X4", "XINXUN", "NIHUI"};
+static const QStringList STR_SUBTYPE_KN      {"WLtoys", "FeiLun"};
+static const QStringList STR_SUBTYPE_SYMAX   {"Standard", "Syma X5C"};
+static const QStringList STR_SUBTYPE_SLT     {"V1 (6 Channel)", "V2 (8 Channel)", "Q100", "Q200", "MR100"};
+static const QStringList STR_SUBTYPE_CX10    {"Green", "Blue", "DM007", "-", "JC3015a", "JC3015b", "MK33041"};
+static const QStringList STR_SUBTYPE_CG023   {"Standard", "YD829"};
+static const QStringList STR_SUBTYPE_BAYANG  {"Standard", "H8S3D", "X16 AH", "IRDRONE"};
+static const QStringList STR_SUBTYPE_MT99    {"MT99", "H7", "YZ", "LS", "FY805"};
+static const QStringList STR_SUBTYPE_MJXQ    {"WLH08", "X600", "X800", "H26D", "E010", "H26WH"};
+static const QStringList STR_SUBTYPE_FY326   {"Standard", "FY319"};
+static const QStringList STR_SUBTYPE_HONTAI  {"Standard", "JJRC X1", "X5C1 Clone", "FQ777_951"};
+static const QStringList STR_SUBTYPE_AFHDS2A {"PWM and IBUS", "PPM and IBUS", "PWM and SBUS", "PPM and SBUS"};
+static const QStringList STR_SUBTYPE_Q2X2    {"Q222", "Q242", "Q282"};
+static const QStringList STR_SUBTYPE_WK2x01  {"WK2801", "WK2401", "W6_5_1", "W6_6_1", "W6_HEL", "W6_HEL_I"};
+static const QStringList STR_SUBTYPE_Q303    {"Standard", "CX35", "CX10D", "CX10WD"};
+static const QStringList STR_SUBTYPE_CABELL  {"Cabell V3", "Cab V3 Telem", "-", "-", "-", "-", "Set FailSafe", "Unbind"};
+static const QStringList STR_SUBTYPE_H83D    {"H8 Mini 3D", "H20H", "H20 Mini", "H30 Mini"};
+static const QStringList STR_SUBTYPE_CORONA  {"V1", "V2", "Flydream V3"};
+static const QStringList STR_SUBTYPE_HITEC 	 {"Optima", "Optima Hub Telem", "Minima"};
+static const QStringList STR_SUBTYPE_E01X    {"E012", "E015"};
+
+static const QStringList NO_SUBTYPE          {STR_MULTI_DEFAULT};
+
+
+// Table is designed to be shared with gui_common_arm.cpp
+
+const Multiprotocols multiProtocols {
+  {MM_RF_PROTO_FLYSKY,     4, false,      STR_SUBTYPE_FLYSKY,  nullptr},
+  {MM_RF_PROTO_HUBSAN,     2, false,      STR_SUBTYPE_HUBSAN,  STR_MULTI_VIDFREQ},
+  {MM_RF_PROTO_FRSKY,      5, false,      STR_SUBTYPE_FRSKY,   STR_MULTI_RFTUNE},
+  {MM_RF_PROTO_HISKY,      1, false,      STR_SUBTYPE_HISKY,   nullptr},
+  {MM_RF_PROTO_V2X2,       1, false,      STR_SUBTYPE_V2X2,    nullptr},
+  {MM_RF_PROTO_DSM2,       3, false,      STR_SUBTYPE_DSM,     nullptr},
+  {MM_RF_PROTO_YD717,      4, false,      STR_SUBTYPE_YD717,   nullptr},
+  {MM_RF_PROTO_KN,         1, false,      STR_SUBTYPE_KN,      nullptr},
+  {MM_RF_PROTO_SYMAX,      1, false,      STR_SUBTYPE_SYMAX,   nullptr},
+  {MM_RF_PROTO_SLT,        4, false,      STR_SUBTYPE_SLT,     nullptr},
+  {MM_RF_PROTO_CX10,       6, false,      STR_SUBTYPE_CX10,    nullptr},
+  {MM_RF_PROTO_CG023,      1, false,      STR_SUBTYPE_CG023,   nullptr},
+  {MM_RF_PROTO_BAYANG,     3, false,      STR_SUBTYPE_BAYANG,  STR_MULTI_TELEMETRY},
+  {MM_RF_PROTO_MT99XX,     4, false,      STR_SUBTYPE_MT99,    nullptr},
+  {MM_RF_PROTO_MJXQ,       5, false,      STR_SUBTYPE_MJXQ,    nullptr},
+  {MM_RF_PROTO_FY326,      1, false,      STR_SUBTYPE_FY326,   nullptr},
+  {MM_RF_PROTO_SFHSS,      0, true,       NO_SUBTYPE,          STR_MULTI_RFTUNE},
+  {MM_RF_PROTO_HONTAI,     3, false,      STR_SUBTYPE_HONTAI,  nullptr},
+  {MM_RF_PROTO_OLRS,       0, false,      NO_SUBTYPE,          STR_MULTI_RFPOWER},
+  {MM_RF_PROTO_FS_AFHDS2A, 3, true,       STR_SUBTYPE_AFHDS2A, STR_MULTI_SERVOFREQ},
+  {MM_RF_PROTO_Q2X2,       2, false,      STR_SUBTYPE_Q2X2,    nullptr},
+  {MM_RF_PROTO_WK_2X01,    5, false,      STR_SUBTYPE_WK2x01,  nullptr},
+  {MM_RF_PROTO_Q303,       3, false,      STR_SUBTYPE_Q303,    nullptr},
+  {MM_RF_PROTO_CABELL,     7, false,      STR_SUBTYPE_CABELL,  STR_MULTI_OPTION},
+  {MM_RF_PROTO_H83D,       3, false,      STR_SUBTYPE_H83D,    nullptr},
+  {MM_RF_PROTO_CORONA,     2, false,      STR_SUBTYPE_CORONA,  STR_MULTI_RFTUNE},
+  {MM_RF_PROTO_HITEC,      2, false,      STR_SUBTYPE_HITEC,   STR_MULTI_RFTUNE},
+  {MM_RF_PROTO_E01X,       1, false,      STR_SUBTYPE_E01X,    nullptr},
+  {MM_RF_CUSTOM_SELECTED,  7, true,       STR_SUBTYPE_CUSTOM,  STR_MULTI_OPTION},
+
+  // Sentinel and default for protocols not listed above (MM_RF_CUSTOM is 0xff)
+  { 0xfe,                  0, false,      NO_SUBTYPE,           nullptr}
+};
+
+int Multiprotocols::MultiProtocolDefinition::getOptionMin() const {
+  if (optionsstr == STR_MULTI_RFPOWER)
+    return -1;
+  else if (optionsstr == STR_MULTI_SERVOFREQ)
+    return 0;
+  else
+    return -128;
+}
+
+int Multiprotocols::MultiProtocolDefinition::getOptionMax() const {
+  if (optionsstr == STR_MULTI_RFPOWER)
+    return 7;
+  else if (optionsstr == STR_MULTI_SERVOFREQ)
+    return 70;
+  else
+    return 127;
+}
+
+const Multiprotocols::MultiProtocolDefinition & Multiprotocols::getProtocol(int protocol) const {
+  for (const Multiprotocols::MultiProtocolDefinition & proto: protocols)
+    if (proto.protocol == protocol)
+      return proto;
+
+  // Protocol not found, return the default (last) proto
+  Q_ASSERT(protocols.rbegin()->protocol == 0xfe);
+  return *protocols.rbegin();
+}
+
+// static
+QString Multiprotocols::protocolToString(int protocol, bool custom)
+{
+  static const QStringList strings({
+    "FlySky", "Hubsan", "FrSky", "Hisky", "V2x2", "DSM", "Devo", "YD717", "KN", "SymaX", "SLT", "CX10", "CG023",
+    "Bayang", "ESky", "MT99XX", "MJXQ", "Shenqi", "FY326", "SFHSS", "J6 PRO","FQ777","Assan","Hontai","Open LRS",
+    "FlySky AFHDS2A", "Q2x2", "Walkera", "Q303", "GW008", "DM002", "Cabell", "ESky 150", "H8 3D", "Corona", "CFlie",
+	"Hitec", "Wfly", "Bugs", "Bugs Mini", "Traxxas", "NCC-1701-A", "E01X", "V911S", "GD00X"
+  });
+
+  if (protocol == MM_RF_CUSTOM_SELECTED || custom)
+    return tr("Custom - proto %1)").arg(protocol);
+  else
+    return strings.value(protocol, CPN_STR_UNKNOWN_ITEM);
+}
+
+// static
+QString Multiprotocols::subTypeToString(int protocol, unsigned subType)
+{
+  return tr(qPrintable(multiProtocols.getProtocol(protocol).subTypeStrings.value(subType, CPN_STR_UNKNOWN_ITEM)));
+}

companion/src/firmwares/multiprotocols.h

@@ -22,29 +22,31 @@
 #define OPENTX_MULTI_H
 
 #include <vector>
-#include <QString>
-#include <QVector>
-#include <QStringList>
+#include <QtCore>
 
 #define MM_RF_CUSTOM_SELECTED 0xff
 
 class Multiprotocols
 {
+    Q_DECLARE_TR_FUNCTIONS(Multiprotocols)
+
   public:
 
     struct radio_mm_definition {
       int protocol;
-      QStringList protocols;
       unsigned int maxSubtype;
+      bool hasFailsafe;
+      QStringList protocols;
       QString optionsstr;
     };
 
     struct MultiProtocolDefinition {
       const int protocol;
+      const bool hasFailsafe;
       const QStringList subTypeStrings;
       const QString optionsstr;
 
-      unsigned int numSubytes() const
+      unsigned int numSubTypes() const
       {
         return (unsigned int) subTypeStrings.length();
       }
@@ -55,6 +57,7 @@ class Multiprotocols
 
       MultiProtocolDefinition(const radio_mm_definition &rd) :
         protocol(rd.protocol),
+        hasFailsafe(rd.hasFailsafe),
         subTypeStrings(rd.protocols),
         optionsstr(rd.optionsstr)
       {
@@ -69,6 +72,8 @@ class Multiprotocols
     }
 
     const MultiProtocolDefinition &getProtocol(int protocol) const;
+    static QString protocolToString(int protocol, bool custom = false);
+    static QString subTypeToString(int protocol, unsigned subType);
 
   private:
 

companion/src/firmwares/opentx/opentxeeprom.cpp

@@ -18,6 +18,7 @@
  * GNU General Public License for more details.
  */
 
+#include "boards.h"
 #include "helpers.h"
 #include "opentxeeprom.h"
 #include "customdebug.h"
@@ -32,18 +33,18 @@ using namespace Board;
 
 #define HAS_PERSISTENT_TIMERS(board)          (IS_ARM(board) || IS_2560(board))
 #define MAX_VIEWS(board)                      (HAS_LARGE_LCD(board) ? 2 : 256)
-#define MAX_POTS(board, version)              (IS_HORUS(board) ? 3 : (IS_TARANIS_X7(board) ? 2 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : (version >= 216 ? 3 : 2)) : 3)))
-#define MAX_SLIDERS(board)                    (IS_HORUS(board) ? 4 : (IS_TARANIS_X7(board) ? 0 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 4 : 2) : 0)))
-#define MAX_MOUSE_ANALOGS(board)              (IS_HORUS(board) ? 2 : 0)
-#define MAX_SWITCHES(board, version)          (IS_HORUS(board) ? 8 : (IS_TARANIS_X7(board) ? 6 : (IS_TARANIS(board) ? (IS_TARANIS_X9E(board) ? 18 : 8) : 7)))
-#define MAX_SWITCH_SLOTS(board, version)      (IS_TARANIS_X9E(board) ? 32 : 8)
-#define MAX_SWITCHES_POSITION(board, version) (IS_TARANIS_X7(board) ? 6*3 : (IS_TARANIS_X9E(board) ? 18*3 : (IS_HORUS_OR_TARANIS(board) ? 8*3 : 9)))
+#define MAX_POTS(board, version)              (IS_TARANIS_NOT_X9E(board) && version < 216 ? 2 : Boards::getCapability(board, Board::Pots))
+#define MAX_SLIDERS(board)                    (IS_HORUS_X10(board) ? 4 : (Boards::getCapability(board, Board::Sliders))) //TODO need to be remove when x10 eeprom gets fixed
+#define MAX_MOUSE_ANALOGS(board)              (IS_HORUS_X10(board) ? 2 : (Boards::getCapability(board, Board::MouseAnalogs))) //TODO need to be remove when x10 eeprom gets fixed
+#define MAX_SWITCHES(board, version)          (Boards::getCapability(board, Board::Switches))
+#define MAX_SWITCH_SLOTS(board, version)      (IS_TARANIS_X9E(board) ? 32 : 8)  // bitsize of swconfig_t / 2 (see radio/src/datastructs.h)
+#define MAX_SWITCHES_POSITION(board, version) (Boards::getCapability(board, Board::SwitchPositions))
 #define MAX_ROTARY_ENCODERS(board)            (IS_2560(board) ? 2 : (IS_SKY9X(board) ? 1 : 0))
 #define MAX_FLIGHT_MODES(board, version)      (IS_ARM(board) ? 9 :  (IS_DBLRAM(board, version) ? 6 :  5))
 #define MAX_TIMERS(board, version)            ((IS_ARM(board) && version >= 217) ? 3 : 2)
 #define MAX_MIXERS(board, version)            (IS_ARM(board) ? 64 : 32)
 #define MAX_CHANNELS(board, version)          (IS_ARM(board) ? 32 : 16)
-#define MAX_TRIMS(board)                      (IS_HORUS(board) ? 6 : 4)
+#define MAX_TRIMS(board)                      (Boards::getCapability(board, Board::NumTrims))
 #define MAX_EXPOS(board, version)             (IS_ARM(board) ? ((IS_HORUS_OR_TARANIS(board) && version >= 216) ? 64 : 32) : (IS_DBLRAM(board, version) ? 16 : 14))
 #define MAX_LOGICAL_SWITCHES(board, version)  (IS_ARM(board) ? (version >= 218 ? 64 : 32) : ((IS_DBLEEPROM(board, version) && version<217) ? 15 : 12))
 #define MAX_CUSTOM_FUNCTIONS(board, version)  (IS_ARM(board) ? (version >= 216 ? 64 : 32) : (IS_DBLEEPROM(board, version) ? 24 : 16))
@@ -133,6 +134,7 @@ class SwitchesConversionTable: public ConversionTable {
 
       addConversion(RawSwitch(SWITCH_TYPE_OFF), -val+offset);
       addConversion(RawSwitch(SWITCH_TYPE_ON), val++);
+
       if (version >= 216) {
         addConversion(RawSwitch(SWITCH_TYPE_ONE, -1), -val+offset);
         addConversion(RawSwitch(SWITCH_TYPE_ONE, 1), val++);
@@ -144,6 +146,15 @@ class SwitchesConversionTable: public ConversionTable {
         }
       }
 
+      if (IS_ARM(board) && version >= 218) {
+        addConversion(RawSwitch(SWITCH_TYPE_TELEMETRY, -1), -val+offset);
+        addConversion(RawSwitch(SWITCH_TYPE_TELEMETRY, 1), val++);
+        for (int i=1; i<=CPN_MAX_SENSORS; i++) {
+          addConversion(RawSwitch(SWITCH_TYPE_SENSOR, -i), -val+offset);
+          addConversion(RawSwitch(SWITCH_TYPE_SENSOR, i), val++);
+        }
+      }
+
       if (version < 216) {
         // previous "moment" switches
         for (int i=1; i<=MAX_SWITCHES_POSITION(board, version); i++) {
@@ -160,6 +171,7 @@ class SwitchesConversionTable: public ConversionTable {
       }
     }
 
+
   protected:
 
     void addConversion(const RawSwitch & sw, const int b)
@@ -199,7 +211,7 @@ class SwitchesConversionTable: public ConversionTable {
     static SwitchesConversionTable * getInstance(Board::Type board, unsigned int version, unsigned long flags=0)
     {
       for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
-        Cache element = *it;
+        Cache & element = *it;
         if (element.board == board && element.version == version && element.flags == flags)
           return element.table;
       }
@@ -211,8 +223,9 @@ class SwitchesConversionTable: public ConversionTable {
     static void Cleanup()
     {
       for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
-        Cache element = *it;
-        delete element.table;
+        Cache & element = *it;
+        if (element.table)
+          delete element.table;
       }
       internalCache.clear();
     }
@@ -241,9 +254,12 @@ class SourcesConversionTable: public ConversionTable {
         for (int i=0; i<32; i++) {
           addConversion(RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i), val++);
         }
-        for (int i=0; i<MAX_SCRIPTS(board); i++) {
-          for (int j=0; j<6; j++) {
-            addConversion(RawSource(SOURCE_TYPE_LUA_OUTPUT, i*16+j), val++);
+      }
+
+      if (IS_STM32(board) && version >= 216) {
+        for (int i = 0; i < MAX_SCRIPTS(board); i++) {
+          for (int j = 0; j < 6; j++) {
+            addConversion(RawSource(SOURCE_TYPE_LUA_OUTPUT, i * 16 + j), val++);
           }
         }
       }
@@ -333,11 +349,11 @@ class SourcesConversionTable: public ConversionTable {
 
           for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
             if (version < 216) {
-              if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPEED || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
+              if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_RAS || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPEED || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
                 continue;
             }
             if (!IS_ARM(board)) {
-              if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_A3_MIN || i==TELEMETRY_SOURCE_A4_MIN)
+              if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_RAS || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_A3_MIN || i==TELEMETRY_SOURCE_A4_MIN)
                 continue;
             }
             addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
@@ -386,7 +402,7 @@ class SourcesConversionTable: public ConversionTable {
     static SourcesConversionTable * getInstance(Board::Type board, unsigned int version, unsigned int variant, unsigned long flags=0)
     {
       for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
-        Cache element = *it;
+        Cache & element = *it;
         if (element.board == board && element.version == version && element.variant == variant && element.flags == flags)
           return element.table;
       }
@@ -398,8 +414,9 @@ class SourcesConversionTable: public ConversionTable {
     static void Cleanup()
     {
       for (std::list<Cache>::iterator it=internalCache.begin(); it!=internalCache.end(); it++) {
-        Cache element = *it;
-        delete element.table;
+        Cache & element = *it;
+        if (element.table)
+          delete element.table;
       }
       internalCache.clear();
     }
@@ -417,8 +434,8 @@ template <int N>
 class SwitchField: public ConversionField< SignedField<N> > {
   public:
     SwitchField(DataField * parent, RawSwitch & sw, Board::Type board, unsigned int version, unsigned long flags=0):
-      ConversionField< SignedField<N> >(parent, _switch, SwitchesConversionTable::getInstance(board, version, flags), QObject::tr("Switch").toLatin1(),
-          QObject::tr("Switch ").toLatin1() + sw.toString(board) + QObject::tr(" cannot be exported on this board!").toLatin1()),
+      ConversionField< SignedField<N> >(parent, _switch, SwitchesConversionTable::getInstance(board, version, flags), DataField::tr("Switch").toLatin1(),
+          DataField::tr("Switch ").toLatin1() + sw.toString(board) + DataField::tr(" cannot be exported on this board!").toLatin1()),
       sw(sw),
       _switch(0),
       board(board)
@@ -439,7 +456,7 @@ class SwitchField: public ConversionField< SignedField<N> > {
     {
       ConversionField< SignedField<N> >::afterImport();
       sw = RawSwitch(_switch);
-      eepromImportDebug() << QString("imported %1: %2").arg(ConversionField< SignedField<N> >::internalField.getName()).arg(sw.toString(board));
+      qCDebug(eepromImport) << QString("imported %1: %2").arg(ConversionField< SignedField<N> >::internalField.getName()).arg(sw.toString(board));
     }
 
   protected:
@@ -470,7 +487,7 @@ class TelemetrySourcesConversionTable: public ConversionTable {
       if (IS_ARM(board) && version >= 217)
         addConversion(1+TELEMETRY_SOURCE_TIMER3, val++);
       if (IS_ARM(board) && version >= 216)
-        addConversion(1+TELEMETRY_SOURCE_SWR, val++);
+        addConversion(1+TELEMETRY_SOURCE_RAS, val++);
       addConversion(1+TELEMETRY_SOURCE_RSSI_TX, val++);
       addConversion(1+TELEMETRY_SOURCE_RSSI_RX, val++);
       if (IS_ARM(board) && version >= 216)
@@ -565,7 +582,7 @@ class TelemetrySourceField: public ConversionField< UnsignedField<N> > {
     {
       ConversionField< UnsignedField<N> >::afterImport();
       source = (_source == 0 ? RawSource(0) : RawSource(SOURCE_TYPE_TELEMETRY, _source-1));
-      eepromImportDebug() << QString("imported %1: %2").arg(ConversionField< UnsignedField<N> >::internalField.getName()).arg(source.toString());
+      qCDebug(eepromImport) << QString("imported %1: %2").arg(ConversionField< UnsignedField<N> >::internalField.getName()).arg(source.toString());
     }
 
   protected:
@@ -581,7 +598,7 @@ class SourceField: public ConversionField< UnsignedField<N> > {
   public:
     SourceField(DataField * parent, RawSource & source, Board::Type board, unsigned int version, unsigned int variant, unsigned long flags=0):
       ConversionField< UnsignedField<N> >(parent, _source, SourcesConversionTable::getInstance(board, version, variant, flags),
-            "Source", QObject::tr("Source %1 cannot be exported on this board!").arg(source.toString())),
+            DataField::tr("Source").toLatin1(), DataField::tr("Source %1 cannot be exported on this board!").arg(source.toString())),
       source(source),
       _source(0)
     {
@@ -601,7 +618,7 @@ class SourceField: public ConversionField< UnsignedField<N> > {
     {
       ConversionField< UnsignedField<N> >::afterImport();
       source = RawSource(_source);
-      eepromImportDebug() << QString("imported %1: %2").arg(ConversionField< UnsignedField<N> >::internalField.getName()).arg(source.toString());
+      qCDebug(eepromImport) << QString("imported %1: %2").arg(ConversionField< UnsignedField<N> >::internalField.getName()).arg(source.toString());
     }
 
   protected:
@@ -610,7 +627,7 @@ class SourceField: public ConversionField< UnsignedField<N> > {
 };
 
 
-int smallGvarToEEPROM(int gvar)
+int smallGvarImport(int gvar)
 {
   if (gvar < -10000) {
     gvar = 128 + gvar + 10000;
@@ -621,7 +638,7 @@ int smallGvarToEEPROM(int gvar)
   return gvar;
 }
 
-int smallGvarToC9x(int gvar)
+int smallGvarExport(int gvar)
 {
   if (gvar > 110) {
     gvar = gvar - 128 - 10000;
@@ -748,7 +765,7 @@ class CurveReferenceField: public TransformedField {
     {
       if (curve.value != 0) {
         _curve_type = (unsigned int)curve.type;
-        _curve_value = smallGvarToEEPROM(curve.value);
+        _curve_value = smallGvarImport(curve.value);
       }
       else {
         _curve_type = 0;
@@ -759,8 +776,8 @@ class CurveReferenceField: public TransformedField {
     virtual void afterImport()
     {
       curve.type = (CurveReference::CurveRefType)_curve_type;
-      curve.value = smallGvarToC9x(_curve_value);
-      eepromImportDebug() << QString("imported CurveReference(%1)").arg(curve.toString());
+      curve.value = smallGvarExport(_curve_value);
+      qCDebug(eepromImport) << QString("imported CurveReference(%1)").arg(curve.toString());
     }
 
   protected:
@@ -878,7 +895,7 @@ class FlightModeField: public TransformedField {
     virtual void beforeExport()
     {
       for (int i=0; i<CPN_MAX_STICKS+MAX_AUX_TRIMS(board); i++) {
-        if (IS_HORUS_OR_TARANIS(board) && version >= 216) {
+        if ((IS_HORUS_OR_TARANIS(board) && version >= 216) || (IS_ARM(board) && version >= 218)) {
           if (phase.trimMode[i] < 0)
             trimMode[i] = TRIM_MODE_NONE;
           else
@@ -906,7 +923,7 @@ class FlightModeField: public TransformedField {
     virtual void afterImport()
     {
       for (int i=0; i<CPN_MAX_STICKS+MAX_AUX_TRIMS(board); i++) {
-        if (IS_HORUS_OR_TARANIS(board) && version >= 216) {
+        if ((IS_HORUS_OR_TARANIS(board) && version >= 216) || (IS_ARM(board) && version >= 218)) {
           if (trimMode[i] == TRIM_MODE_NONE) {
             phase.trimMode[i] = -1;
           }
@@ -942,7 +959,7 @@ class FlightModeField: public TransformedField {
           }
         }
       }
-      eepromImportDebug() << QString("imported %1: '%2'").arg(internalField.getName()).arg(phase.name);
+      qCDebug(eepromImport) << QString("imported %1: '%2'").arg(internalField.getName()).arg(phase.name);
     }
 
   protected:
@@ -952,9 +969,9 @@ class FlightModeField: public TransformedField {
     Board::Type board;
     unsigned int version;
     int rotencCount;
-    int trimBase[CPN_MAX_STICKS+CPN_MAX_AUX_TRIMS];
-    int trimExt[CPN_MAX_STICKS+CPN_MAX_AUX_TRIMS];
-    unsigned int trimMode[CPN_MAX_STICKS+CPN_MAX_AUX_TRIMS];
+    int trimBase[CPN_MAX_TRIMS];
+    int trimExt[CPN_MAX_TRIMS];
+    unsigned int trimMode[CPN_MAX_TRIMS];
 };
 
 class MixField: public TransformedField {
@@ -990,7 +1007,7 @@ class MixField: public TransformedField {
         else
           internalField.Append(new ZCharField<6>(this, mix.name));
       }
-      else if (IS_TARANIS(board) && version >= 217) {
+      else if (IS_TARANIS(board) && version == 217) {
         internalField.Append(new UnsignedField<8>(this, _destCh));
         internalField.Append(new UnsignedField<9>(this, mix.flightModes));
         internalField.Append(new UnsignedField<2>(this, (unsigned int &)mix.mltpx));
@@ -1007,7 +1024,7 @@ class MixField: public TransformedField {
         internalField.Append(new UnsignedField<8>(this, mix.speedDown));
         internalField.Append(new ZCharField<8>(this, mix.name));
       }
-      else if (IS_ARM(board) && version >= 217) {
+      else if (IS_ARM(board) && version == 217) {
         internalField.Append(new UnsignedField<5>(this, _destCh));
         internalField.Append(new UnsignedField<3>(this, mix.mixWarn));
         internalField.Append(new UnsignedField<9>(this, mix.flightModes));
@@ -1166,7 +1183,7 @@ class MixField: public TransformedField {
         }
         else if (mix.curve.type == CurveReference::CURVE_REF_DIFF) {
           _curveMode = 0;
-          _curveParam = smallGvarToEEPROM(mix.curve.value);
+          _curveParam = smallGvarImport(mix.curve.value);
         }
       }
       else {
@@ -1201,9 +1218,9 @@ class MixField: public TransformedField {
 
       if (mix.srcRaw.type != SOURCE_TYPE_NONE) {
         mix.destCh = _destCh + 1;
-        if (!IS_STM32(board) || version < 216) {
+        if (!IS_ARM(board) || (!IS_STM32(board) && version < 218) || version < 216) {
           if (!_curveMode)
-            mix.curve = CurveReference(CurveReference::CURVE_REF_DIFF, smallGvarToC9x(_curveParam));
+            mix.curve = CurveReference(CurveReference::CURVE_REF_DIFF, smallGvarExport(_curveParam));
           else if (_curveParam > 6)
             mix.curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, _curveParam-6);
           else if (_curveParam < 0)
@@ -1231,7 +1248,7 @@ class MixField: public TransformedField {
         }
         if (mix.carryTrim < 0) mix.carryTrim = 0;
       }
-      eepromImportDebug() << QString("imported %1: ch %2, name '%3'").arg(internalField.getName()).arg(mix.destCh).arg(mix.name);
+      qCDebug(eepromImport) << QString("imported %1: ch %2, name '%3'").arg(internalField.getName()).arg(mix.destCh).arg(mix.name);
     }
 
   protected:
@@ -1363,13 +1380,13 @@ class InputField: public TransformedField {
 
     virtual void beforeExport()
     {
-      _weight = smallGvarToEEPROM(expo.weight);
+      _weight = smallGvarImport(expo.weight);
 
-      if (IS_HORUS_OR_TARANIS(board) && version >= 216) {
-        _offset = smallGvarToEEPROM(expo.offset);
+      if ((IS_HORUS_OR_TARANIS(board) && version >= 216) || (IS_ARM(board) && version >= 218)) {
+        _offset = smallGvarImport(expo.offset);
       }
 
-      if (!IS_TARANIS(board) || version < 216) {
+      if (!IS_ARM(board) || (!IS_TARANIS(board) && version < 218) || version < 216) {
         if (expo.curve.type==CurveReference::CURVE_REF_FUNC && expo.curve.value) {
           _curveMode = true;
           _curveParam = expo.curve.value;
@@ -1380,39 +1397,32 @@ class InputField: public TransformedField {
         }
         else {
           _curveMode = false;
-          _curveParam = smallGvarToEEPROM(expo.curve.value);
+          _curveParam = smallGvarImport(expo.curve.value);
         }
       }
     }
 
     virtual void afterImport()
     {
-      if (IS_STM32(board)) {
-        if (version < 216) {
-          if (expo.mode) {
-            expo.srcRaw = RawSource(SOURCE_TYPE_STICK, expo.chn);
-          }
-        }
-      }
-      else if (expo.mode) {
+      if ((IS_STM32(board) && version < 216 )|| (!IS_STM32(board) && expo.mode)) {
         expo.srcRaw = RawSource(SOURCE_TYPE_STICK, expo.chn);
       }
 
-      expo.weight = smallGvarToC9x(_weight);
+      expo.weight = smallGvarExport(_weight);
 
-      if (IS_STM32(board) && version >= 216) {
-        expo.offset = smallGvarToC9x(_offset);
+      if ((IS_STM32(board) && version >= 216) || (IS_ARM(board) && version >= 218)) {
+        expo.offset = smallGvarExport(_offset);
       }
 
-      if (!IS_STM32(board) || version < 216) {
+      if (!IS_ARM(board) || (!IS_TARANIS(board) && version < 218) || version < 216) {
         if (!_curveMode)
-          expo.curve = CurveReference(CurveReference::CURVE_REF_EXPO, smallGvarToC9x(_curveParam));
+          expo.curve = CurveReference(CurveReference::CURVE_REF_EXPO, smallGvarExport(_curveParam));
         else if (_curveParam > 6)
           expo.curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, _curveParam-6);
         else
           expo.curve = CurveReference(CurveReference::CURVE_REF_FUNC, _curveParam);
       }
-      eepromImportDebug() << QString("imported %1: ch %2 name '%3'").arg(internalField.getName()).arg(expo.chn).arg(expo.name);
+      qCDebug(eepromImport) << QString("imported %1: ch %2 name '%3'").arg(internalField.getName()).arg(expo.chn).arg(expo.name);
     }
 
   protected:
@@ -1560,14 +1570,14 @@ class CurvesField: public TransformedField {
         if (IS_STM32(board) && version >= 216) {
           offset += (curve->type == CurveData::CURVE_TYPE_CUSTOM ? curve->count * 2 - 2 : curve->count);
           if (offset > maxPoints) {
-            setError(QObject::tr("OpenTX only accepts %1 points in all curves").arg(maxPoints));
+            setError(DataField::tr("OpenTX only accepts %1 points in all curves").arg(maxPoints));
             break;
           }
         }
         else {
           offset += (curve->type == CurveData::CURVE_TYPE_CUSTOM ? curve->count * 2 - 2 : curve->count) - 5;
           if (offset > maxPoints - 5 * maxCurves) {
-            setError(QObject::tr("OpenTx only accepts %1 points in all curves").arg(maxPoints));
+            setError(DataField::tr("OpenTx only accepts %1 points in all curves").arg(maxPoints));
             break;
           }
           _curves[i] = offset;
@@ -1589,7 +1599,7 @@ class CurvesField: public TransformedField {
 
       for (int i=0; i<maxCurves; i++) {
         CurveData * curve = &curves[i];
-        if (!IS_STM32(board) || version < 216) {
+        if (!IS_ARM(board) || (!IS_STM32(board) && version < 218) || version < 216) {
           int * next = &_points[5*(i+1) + _curves[i]];
           int size = next - cur;
           if (size % 2 == 0) {
@@ -1626,7 +1636,7 @@ class CurvesField: public TransformedField {
           for (int j=0; j<curve->count; j++)
             curve->points[j].x = -100 + (200*i) / (curve->count-1);
         }
-        eepromImportDebug() << QString("imported curve: %3 points").arg(curve->count);
+        qCDebug(eepromImport) << QString("imported curve: %3 points").arg(curve->count);
       }
     }
 
@@ -1955,7 +1965,7 @@ class LogicalSwitchField: public TransformedField {
           }
         }
       }
-      eepromImportDebug() << QString("imported %1: %2").arg(internalField.getName()).arg(csw.funcToString());
+      qCDebug(eepromImport) << QString("imported %1: %2").arg(internalField.getName()).arg(csw.funcToString());
     }
 
   protected:
@@ -2115,7 +2125,7 @@ class SwitchesWarningField: public TransformedField {
       else {
         sw = _sw;
       }
-      eepromImportDebug() << QString("imported %1").arg(internalField.getName());
+      qCDebug(eepromImport) << QString("imported %1").arg(internalField.getName());
     }
 
   protected:
@@ -2145,11 +2155,11 @@ class ArmCustomFunctionField: public TransformedField {
 
       if (version >= 218) {
         internalField.Append(new SwitchField<9>(this, fn.swtch, board, version));
-        internalField.Append(new ConversionField< UnsignedField<7> >(this, _func, &functionsConversionTable, "Function", ::QObject::tr("OpenTX on this board doesn't accept this function")));
+        internalField.Append(new ConversionField< UnsignedField<7> >(this, _func, &functionsConversionTable, "Function", DataField::tr("OpenTX on this board doesn't accept this function")));
       }
       else {
         internalField.Append(new SwitchField<8>(this, fn.swtch, board, version));
-        internalField.Append(new ConversionField< UnsignedField<8> >(this, _func, &functionsConversionTable, "Function", ::QObject::tr("OpenTX on this board doesn't accept this function")));
+        internalField.Append(new ConversionField< UnsignedField<8> >(this, _func, &functionsConversionTable, "Function", DataField::tr("OpenTX on this board doesn't accept this function")));
       }
 
       if (IS_TARANIS(board) && version >= 216)
@@ -2350,7 +2360,7 @@ class ArmCustomFunctionField: public TransformedField {
       else {
         fn.param = value;
       }
-      eepromImportDebug() << QString("imported %1").arg(internalField.getName());
+      qCDebug(eepromImport) << QString("imported %1").arg(internalField.getName());
     }
 
   protected:
@@ -2385,7 +2395,7 @@ class AvrCustomFunctionField: public TransformedField {
     {
       if (version >= 217 && IS_2560(board)) {
         internalField.Append(new SwitchField<8>(this, fn.swtch, board, version));
-        internalField.Append(new ConversionField< UnsignedField<8> >(this, (unsigned int &)fn.func, &functionsConversionTable, "Function", ::QObject::tr("OpenTX on this board doesn't accept this function")));
+        internalField.Append(new ConversionField< UnsignedField<8> >(this, (unsigned int &)fn.func, &functionsConversionTable, "Function", DataField::tr("OpenTX on this board doesn't accept this function")));
         internalField.Append(new UnsignedField<2>(this, fn.adjustMode));
         internalField.Append(new UnsignedField<4>(this, _union_param));
         internalField.Append(new UnsignedField<1>(this, _active));
@@ -2393,18 +2403,18 @@ class AvrCustomFunctionField: public TransformedField {
       }
       else if (version >= 216) {
         internalField.Append(new SwitchField<6>(this, fn.swtch, board, version));
-        internalField.Append(new ConversionField< UnsignedField<4> >(this, (unsigned int &)fn.func, &functionsConversionTable, "Function", ::QObject::tr("OpenTX on this board doesn't accept this function")));
+        internalField.Append(new ConversionField< UnsignedField<4> >(this, (unsigned int &)fn.func, &functionsConversionTable, "Function", DataField::tr("OpenTX on this board doesn't accept this function")));
         internalField.Append(new UnsignedField<5>(this, _union_param));
         internalField.Append(new UnsignedField<1>(this, _active));
       }
       else if (version >= 213) {
         internalField.Append(new SwitchField<8>(this, fn.swtch, board, version));
         internalField.Append(new UnsignedField<3>(this, _union_param));
-        internalField.Append(new ConversionField< UnsignedField<5> >(this, (unsigned int &)fn.func, &functionsConversionTable, "Function", ::QObject::tr("OpenTX on this board doesn't accept this function")));
+        internalField.Append(new ConversionField< UnsignedField<5> >(this, (unsigned int &)fn.func, &functionsConversionTable, "Function", DataField::tr("OpenTX on this board doesn't accept this function")));
       }
       else {
         internalField.Append(new SwitchField<8>(this, fn.swtch, board, version));
-        internalField.Append(new ConversionField< UnsignedField<7> >(this, (unsigned int &)fn.func, &functionsConversionTable, "Function", ::QObject::tr("OpenTX on this board doesn't accept this function")));
+        internalField.Append(new ConversionField< UnsignedField<7> >(this, (unsigned int &)fn.func, &functionsConversionTable, "Function", DataField::tr("OpenTX on this board doesn't accept this function")));
         internalField.Append(new BoolField<1>(this, (bool &)fn.enabled));
       }
       internalField.Append(new UnsignedField<8>(this, _param));
@@ -2539,7 +2549,7 @@ class AvrCustomFunctionField: public TransformedField {
         else if (version >= 213)
           fn.repeatParam = _active * 10;
       }
-      eepromImportDebug() << QString("imported %1").arg(internalField.getName());
+      qCDebug(eepromImport) << QString("imported %1").arg(internalField.getName());
     }
 
   protected:
@@ -2574,13 +2584,13 @@ class FrskyScreenField: public DataField {
             bars.Append(new SourceField<16>(this, screen.body.bars[i].source, board, version, variant));
           else
             bars.Append(new SourceField<8>(this, screen.body.bars[i].source, board, version, variant));
-          bars.Append(new UnsignedField<16>(this, screen.body.bars[i].barMin));
-          bars.Append(new UnsignedField<16>(this, screen.body.bars[i].barMax));
+          bars.Append(new SignedField<16>(this, screen.body.bars[i].barMin));
+          bars.Append(new SignedField<16>(this, screen.body.bars[i].barMax));
         }
         else {
           bars.Append(new TelemetrySourceField<8>(this, screen.body.bars[i].source, board, version));
-          bars.Append(new UnsignedField<8>(this, screen.body.bars[i].barMin));
-          bars.Append(new UnsignedField<8>(this, screen.body.bars[i].barMax));
+          bars.Append(new UnsignedField<8>(this, (unsigned &)screen.body.bars[i].barMin));
+          bars.Append(new UnsignedField<8>(this, (unsigned &)screen.body.bars[i].barMax));
         }
       }
 
@@ -2634,7 +2644,7 @@ class FrskyScreenField: public DataField {
 
     virtual void ImportBits(const QBitArray & input)
     {
-      eepromImportDebug() << QString("importing %1: type: %2").arg(name).arg(screen.type);
+      qCDebug(eepromImport) << QString("importing %1: type: %2").arg(name).arg(screen.type);
 
       // NOTA: screen.type should have been imported first!
       if (IS_ARM(board) && version >= 217) {
@@ -2771,7 +2781,7 @@ class TelemetryCurrentSourceConversionTable: public ConversionTable
 
 class FrskyField: public StructField {
   public:
-    FrskyField(DataField * parent, FrSkyData & frsky, Board::Type board, unsigned int version, unsigned int variant):
+    FrskyField(DataField * parent, FrSkyData & frsky, RSSIAlarmData & rssiAlarms, Board::Type board, unsigned int version, unsigned int variant):
       StructField(parent, "FrSky"),
       telemetryVarioSourceConversionTable(board, version),
       screenTypesConversionTable(board, version),
@@ -2843,10 +2853,12 @@ class FrskyField: public StructField {
         Append(new SignedField<8>(this, frsky.varioCenterMin));
         Append(new SignedField<8>(this, frsky.varioMin));
         Append(new SignedField<8>(this, frsky.varioMax));
-        for (int i=0; i<2; i++) {
-          Append(new ConversionField< UnsignedField<2> >(this, frsky.rssiAlarms[i].level, &rssiConversionTable[i], "RSSI"));
-          Append(new ConversionField< SignedField<6> >(this, frsky.rssiAlarms[i].value, -45+i*3));
-        }
+        Append(new BoolField<1>(this, rssiAlarms.disabled));
+        Append(new SpareBitsField<1>(this));
+        Append(new ConversionField<SignedField<6> >(this, rssiAlarms.warning, -45));
+        Append(new SpareBitsField<2>(this));
+        Append(new ConversionField<SignedField<6> >(this, rssiAlarms.critical, -42));
+
         if (version == 216) {
           Append(new BoolField<1>(this, frsky.mAhPersistent));
           Append(new UnsignedField<15>(this, frsky.storedMah));
@@ -2875,8 +2887,8 @@ class FrskyField: public StructField {
         Append(new SignedField<4>(this, frsky.varioMin, "Vario Min"));
         Append(new SignedField<4>(this, frsky.varioMax));
         for (int i=0; i<2; i++) {
-          Append(new ConversionField< UnsignedField<2> >(this, frsky.rssiAlarms[i].level, &rssiConversionTable[i], "RSSI level"));
-          Append(new ConversionField< SignedField<6> >(this, frsky.rssiAlarms[i].value, -45+i*3, 0, 0, 100, "RSSI value"));
+          Append(new ConversionField< UnsignedField<2> >(this, rssiAlarms.level[i], &rssiConversionTable[i], "RSSI level"));
+          Append(new ConversionField< SignedField<6> >(this, i ==0 ? rssiAlarms.warning : rssiAlarms.critical, -45+i*3, 0, 0, 100, "RSSI value"));
         }
         for (int i=0; i<2; i++) {
           Append(new FrskyScreenField(this, frsky.screens[i], board, version, variant));
@@ -3007,7 +3019,7 @@ class SensorField: public TransformedField {
           sensor.unit++;
       }
 
-      eepromImportDebug() << QString("imported %1").arg(internalField.getName());
+      qCDebug(eepromImport) << QString("imported %1").arg(internalField.getName());
     }
 
   protected:
@@ -3041,7 +3053,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
 {
   sprintf(name, "Model %s", modelData.name);
 
-  eepromImportDebug() << QString("OpenTxModelData::OpenTxModelData(name: %1, board: %2, ver: %3, var: %4)").arg(name).arg(board).arg(version).arg(variant);
+  qCDebug(eepromImport) << QString("OpenTxModelData::OpenTxModelData(name: %1, board: %2, ver: %3, var: %4)").arg(name).arg(board).arg(version).arg(variant);
 
   if (IS_HORUS(board))
     internalField.Append(new ZCharField<15>(this, modelData.name, "Model name"));
@@ -3126,7 +3138,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
   if (IS_ARM(board))
     internalField.Append(new UnsignedField<3>(this, modelData.telemetryProtocol));
   else
-    internalField.Append(new ConversionField< UnsignedField<3> >(this, (unsigned int &)modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this telemetry protocol")));
+    internalField.Append(new ConversionField< UnsignedField<3> >(this, (unsigned int &)modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", DataField::tr("OpenTX doesn't accept this telemetry protocol")));
 
   internalField.Append(new BoolField<1>(this, modelData.thrTrim));
 
@@ -3139,7 +3151,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
     internalField.Append(new SpareBitsField<4>(this));
   }
   else {
-    internalField.Append(new ConversionField< SignedField<4> >(this, modelData.moduleData[0].channelsCount, &channelsConversionTable, "Channels number", ::QObject::tr("OpenTX doesn't allow this number of channels")));
+    internalField.Append(new ConversionField< SignedField<4> >(this, modelData.moduleData[0].channelsCount, &channelsConversionTable, "Channels number", DataField::tr("OpenTX doesn't allow this number of channels")));
   }
 
   if (version >= 216)
@@ -3215,18 +3227,19 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
   if (board != BOARD_STOCK && (board != BOARD_M128 || version < 215)) {
     for (int i=0; i<MAX_GVARS(board, version); i++) {
       if (version >= 218) {
-        internalField.Append(new ZCharField<3>(this, modelData.gvars_names[i], "GVar name"));
-        internalField.Append(new SpareBitsField<12>(this)); // TODO min
-        internalField.Append(new SpareBitsField<12>(this)); // TODO max
-        internalField.Append(new BoolField<1>(this, modelData.gvars_popups[i]));
-        internalField.Append(new SpareBitsField<1>(this));
-        internalField.Append(new SpareBitsField<2>(this));
+        internalField.Append(new ZCharField<3>(this, modelData.gvarData[i].name, "GVar name"));
+        internalField.Append(new UnsignedField<12>(this, (unsigned &)modelData.gvarData[i].min));
+        internalField.Append(new UnsignedField<12>(this, (unsigned &)modelData.gvarData[i].max));
+        internalField.Append(new BoolField<1>(this, modelData.gvarData[i].popup));
+        internalField.Append(new UnsignedField<1>(this, modelData.gvarData[i].prec));
+        internalField.Append(new UnsignedField<2>(this, modelData.gvarData[i].unit));
         internalField.Append(new SpareBitsField<4>(this));
       }
       else {
-        internalField.Append(new ZCharField<6>(this, modelData.gvars_names[i], "GVar name"));
+        internalField.Append(new ZCharField<3>(this, modelData.gvarData[i].name, "GVar name"));
+        internalField.Append(new SpareBitsField<3*8>(this));
         if (version >= 216) {
-          internalField.Append(new BoolField<1>(this, modelData.gvars_popups[i]));
+          internalField.Append(new BoolField<1>(this, modelData.gvarData[i].popup));
           internalField.Append(new SpareBitsField<7>(this));
         }
       }
@@ -3240,7 +3253,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
   }
 
   if ((board != BOARD_STOCK && (board != BOARD_M128 || version < 215)) || (variant & FRSKY_VARIANT)) {
-    internalField.Append(new FrskyField(this, modelData.frsky, board, version, variant));
+    internalField.Append(new FrskyField(this, modelData.frsky, modelData.rssiAlarms, board, version, variant));
   }
   else if ((board == BOARD_STOCK || board == BOARD_M128) && (variant & MAVLINK_VARIANT)) {
     internalField.Append(new MavlinkField(this, modelData.mavlink, board, version));
@@ -3260,7 +3273,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
       internalField.Append(new UnsignedField<2>(this, modelData.potsWarningMode));
     }
     else {
-      internalField.Append(new ConversionField< SignedField<8> >(this, modelData.moduleData[1].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this radio protocol")));
+      internalField.Append(new ConversionField< SignedField<8> >(this, modelData.moduleData[1].protocol, &protocolsConversionTable, "Protocol", DataField::tr("OpenTX doesn't accept this radio protocol")));
       internalField.Append(new UnsignedField<8>(this, modelData.trainerMode));
     }
   }
@@ -3272,14 +3285,14 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, Board::Type board, unsig
     }
     else if (version >= 216) {
       modulesCount = 3;
-      internalField.Append(new ConversionField< SignedField<8> >(this, modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this radio protocol")));
+      internalField.Append(new ConversionField< SignedField<8> >(this, modelData.moduleData[0].protocol, &protocolsConversionTable, "Protocol", DataField::tr("OpenTX doesn't accept this radio protocol")));
     }
   }
 
   if (IS_ARM(board) && version >= 215) {
     for (int module=0; module<modulesCount; module++) {
       if (version >= 217) {
-        internalField.Append(new ConversionField<SignedField<4> >(this, modelData.moduleData[module].protocol, &protocolsConversionTable, "Protocol", ::QObject::tr("OpenTX doesn't accept this radio protocol")));
+        internalField.Append(new ConversionField<SignedField<4> >(this, modelData.moduleData[module].protocol, &protocolsConversionTable, "Protocol", DataField::tr("OpenTX doesn't accept this radio protocol")));
         internalField.Append(new SignedField<4>(this, subprotocols[module]));
       }
       else {
@@ -3417,8 +3430,18 @@ void OpenTxModelData::beforeExport()
   // qDebug() << QString("before export model") << modelData.name;
 
   for (int module=0; module<3; module++) {
-    if (modelData.moduleData[module].protocol >= PULSES_PXX_XJT_X16 && modelData.moduleData[module].protocol <= PULSES_PXX_XJT_LR12) {
-      subprotocols[module] = modelData.moduleData[module].protocol - PULSES_PXX_XJT_X16;
+    if ((modelData.moduleData[module].protocol >= PULSES_PXX_XJT_X16 && modelData.moduleData[module].protocol <= PULSES_PXX_XJT_LR12) ||
+      modelData.moduleData[module].protocol == PULSES_PXX_R9M) {
+      if (! (modelData.moduleData[module].protocol == PULSES_PXX_R9M)) {
+        subprotocols[module] = modelData.moduleData[module].protocol - PULSES_PXX_XJT_X16;
+      }
+      int pxxByte = (modelData.moduleData[module].pxx.power & 0x03)
+                    | modelData.moduleData[module].pxx.receiver_telem_off << 4
+                    | modelData.moduleData[module].pxx.receiver_channel_9_16 << 5;
+      modelData.moduleData[module].ppm.delay = 300 + 50 * pxxByte;
+      modelData.moduleData[module].ppm.pulsePol = modelData.moduleData[module].pxx.external_antenna;
+      modelData.moduleData[module].ppm.outputType = modelData.moduleData[module].pxx.sport_out;
+
     }
     else if (modelData.moduleData[module].protocol >= PULSES_LP45 && modelData.moduleData[module].protocol <= PULSES_DSMX) {
       subprotocols[module] = modelData.moduleData[module].protocol - PULSES_LP45;
@@ -3452,7 +3475,7 @@ void OpenTxModelData::beforeExport()
 
 void OpenTxModelData::afterImport()
 {
-  eepromImportDebug() << QString("OpenTxModelData::afterImport()") << modelData.name;
+  qCDebug(eepromImport) << QString("OpenTxModelData::afterImport()") << modelData.name;
 
   if (IS_TARANIS(board) && version < 216) {
     for (unsigned int i=0; i<CPN_MAX_STICKS; i++) {
@@ -3493,6 +3516,17 @@ void OpenTxModelData::afterImport()
       modelData.moduleData[module].multi.lowPowerMode = modelData.moduleData[module].ppm.outputType;
       modelData.moduleData[module].multi.autoBindMode = modelData.moduleData[module].ppm.pulsePol;
     }
+
+    if ((modelData.moduleData[module].protocol >= PULSES_PXX_XJT_X16 && modelData.moduleData[module].protocol <= PULSES_PXX_XJT_LR12) ||
+        modelData.moduleData[module].protocol == PULSES_PXX_R9M) {
+      // Do the same for pxx
+      unsigned int pxxByte = (unsigned  int)((modelData.moduleData[module].ppm.delay - 300) / 50);
+      modelData.moduleData[module].pxx.power = pxxByte & 0x03;
+      modelData.moduleData[module].pxx.receiver_telem_off = static_cast<bool>(pxxByte & (1 << 4));
+      modelData.moduleData[module].pxx.receiver_channel_9_16 = static_cast<bool>(pxxByte & (1 << 5));
+      modelData.moduleData[module].pxx.sport_out = modelData.moduleData[module].ppm.outputType;
+      modelData.moduleData[module].pxx.external_antenna = modelData.moduleData[module].ppm.pulsePol;
+    }
   }
 
   if (IS_TARANIS(board) && version < 217 && modelData.moduleData[1].protocol != PULSES_OFF) {
@@ -3520,7 +3554,7 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
   version(version),
   inputsCount(CPN_MAX_STICKS+MAX_POTS(board, version)+MAX_SLIDERS(board)+MAX_MOUSE_ANALOGS(board))
 {
-  eepromImportDebug() << QString("OpenTxGeneralData::OpenTxGeneralData(board: %1, version:%2, variant:%3)").arg(board).arg(version).arg(variant);
+  qCDebug(eepromImport) << QString("OpenTxGeneralData::OpenTxGeneralData(board: %1, version:%2, variant:%3)").arg(board).arg(version).arg(variant);
 
   generalData.version = version;
   generalData.variant = variant;
@@ -3650,22 +3684,25 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
     internalField.Append(new UnsignedField<8>(this, generalData.backlightBright));
     if (version < 218) internalField.Append(new SignedField<8>(this, generalData.txCurrentCalibration));
     if (version >= 213) {
-      if (version < 218) internalField.Append(new SignedField<8>(this, generalData.temperatureWarn)); // TODO
+      if (version < 218) internalField.Append(new SignedField<8>(this, generalData.temperatureWarn));
       if (version < 218) internalField.Append(new UnsignedField<8>(this, generalData.mAhWarn));
       if (version < 218) internalField.Append(new UnsignedField<16>(this, generalData.mAhUsed));
       internalField.Append(new UnsignedField<32>(this, generalData.globalTimer));
-      if (version < 218) internalField.Append(new SignedField<8>(this, generalData.temperatureCalib)); // TODO
-      internalField.Append(new UnsignedField<8>(this, generalData.btBaudrate)); // TODO
-      if (version < 218) internalField.Append(new BoolField<8>(this, generalData.optrexDisplay)); //TODO
-      if (version < 218) internalField.Append(new UnsignedField<8>(this, generalData.sticksGain)); // TODO
+      if (version < 218) internalField.Append(new SignedField<8>(this, generalData.temperatureCalib));
+      internalField.Append(new UnsignedField<4>(this, generalData.bluetoothBaudrate));
+      internalField.Append(new UnsignedField<4>(this, generalData.bluetoothMode));
+      if (version < 218) internalField.Append(new BoolField<8>(this, generalData.optrexDisplay));
+      if (version < 218) internalField.Append(new UnsignedField<8>(this, generalData.sticksGain));
     }
     if (version >= 214) {
-      if (version < 218) internalField.Append(new UnsignedField<8>(this, generalData.rotarySteps)); // TODO
+      if (version < 218) internalField.Append(new UnsignedField<8>(this, generalData.rotarySteps));
       internalField.Append(new UnsignedField<8>(this, generalData.countryCode));
       internalField.Append(new UnsignedField<1>(this, generalData.imperial));
       if (version >= 218) {
         internalField.Append(new BoolField<1>(this, generalData.jitterFilter));
-        internalField.Append(new SpareBitsField<6>(this));
+        internalField.Append(new BoolField<1>(this, generalData.disableRssiPoweroffAlarm));
+        internalField.Append(new UnsignedField<2>(this, generalData.usbMode));
+        internalField.Append(new SpareBitsField<3>(this));
       }
       else {
         internalField.Append(new SpareBitsField<7>(this));
@@ -3735,6 +3772,16 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
         internalField.Append(new UnsignedField<8>(this, generalData.backlightColor));
       }
     }
+    else if (IS_SKY9X(board) && version >= 218) {
+      internalField.Append(new SignedField<8>(this, generalData.txCurrentCalibration));
+      internalField.Append(new SignedField<8>(this, generalData.temperatureWarn));
+      internalField.Append(new UnsignedField<8>(this, generalData.mAhWarn));
+      internalField.Append(new UnsignedField<16>(this, generalData.mAhUsed));
+      internalField.Append(new SignedField<8>(this, generalData.temperatureCalib));
+      internalField.Append(new BoolField<8>(this, generalData.optrexDisplay));
+      internalField.Append(new UnsignedField<8>(this, generalData.sticksGain));
+      internalField.Append(new UnsignedField<8>(this, generalData.rotarySteps));
+    }
 
     if (IS_TARANIS_X9E(board))
       internalField.Append(new SpareBitsField<64>(this)); // switchUnlockStates
@@ -3784,12 +3831,12 @@ OpenTxGeneralData::OpenTxGeneralData(GeneralSettings & generalData, Board::Type
     }
 
     if (IS_HORUS(board)) {
-      internalField.Append(new BoolField<1>(this, generalData.bluetoothEnable));
+      internalField.Append(new SpareBitsField<1>(this));
       internalField.Append(new UnsignedField<7>(this, generalData.backlightOffBright));
       internalField.Append(new ZCharField<10>(this, generalData.bluetoothName, "Bluetooth name"));
     }
     else if (IS_TARANIS_X9E(board) && version >= 217) {
-      internalField.Append(new BoolField<8>(this, generalData.bluetoothEnable));
+      internalField.Append(new UnsignedField<8>(this, generalData.bluetoothMode));
       internalField.Append(new ZCharField<10>(this, generalData.bluetoothName, "Bluetooth name"));
     }
 

companion/src/firmwares/opentx/opentxeeprom.h

@@ -32,6 +32,7 @@
 #define M128_VARIANT                   0x8000
 #define TARANIS_X9E_VARIANT            0x8000
 #define TARANIS_X7_VARIANT             0x4000
+#define TARANIS_XLITE_VARIANT          0x2000
 
 #define SIMU_STOCK_VARIANTS            (GVARS_VARIANT|FRSKY_VARIANT)
 #define SIMU_M128_VARIANTS             (M128_VARIANT|SIMU_STOCK_VARIANTS)
@@ -98,9 +99,11 @@ class ProtocolsConversionTable: public ConversionTable
         addConversion(PULSES_DSM2, val++);
         addConversion(PULSES_DSMX, val++);
       }
-      if (IS_HORUS_OR_TARANIS(board)) {
+      if (IS_ARM(board)) {
         addConversion(PULSES_CROSSFIRE, val++);
         addConversion(PULSES_MULTIMODULE, val++);
+        addConversion(PULSES_PXX_R9M, val++);
+        addConversion(PULSES_SBUS, val++);
       }
     }
 };

companion/src/firmwares/opentx/opentxinterface.h

@@ -23,11 +23,15 @@
 
 #include "eeprominterface.h"
 
+#include <QtCore>
+
 class RleFile;
 class OpenTxFirmware;
 
 class OpenTxEepromInterface : public EEPROMInterface
 {
+  Q_DECLARE_TR_FUNCTIONS(OpenTxEepromInterface)
+
   public:
 
     OpenTxEepromInterface(OpenTxFirmware * firmware);
@@ -35,17 +39,17 @@ class OpenTxEepromInterface : public EEPROMInterface
     virtual ~OpenTxEepromInterface();
 
     virtual unsigned long load(RadioData &, const uint8_t * eeprom, int size);
-    
+
     bool loadModelFromBackup(ModelData & model, const uint8_t * data, unsigned int size, uint8_t version, uint32_t variant);
-    
+
     virtual unsigned long loadBackup(RadioData &, const uint8_t * eeprom, int esize, int index);
-    
+
     virtual int save(uint8_t * eeprom, const RadioData & radioData, uint8_t version=0, uint32_t variant=0);
 
     virtual int getSize(const ModelData &);
 
     virtual int getSize(const GeneralSettings &);
-    
+
   protected:
 
     const char * getName();
@@ -53,35 +57,35 @@ class OpenTxEepromInterface : public EEPROMInterface
     EepromLoadErrors checkVersion(unsigned int version);
 
     bool checkVariant(unsigned int version, unsigned int variant);
-    
+
     template <class T, class M>
     bool loadFromByteArray(T & dest, const QByteArray & data, uint8_t version, uint32_t variant=0);
-    
+
   public:
     template <class T, class M>
     bool loadFromByteArray(T & dest, const QByteArray & data);
-    
+
     template <class T, class M>
     bool saveToByteArray(const T & src, QByteArray & data, uint8_t version=0);
 
     bool loadRadioSettingsFromRLE(GeneralSettings & settings, RleFile * rleFile, uint8_t version);
-    
+
     bool loadModelFromRLE(ModelData & model, RleFile * rleFile, unsigned int index, 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;
 
 };
 
 class OpenTxFirmware: public Firmware
 {
+  Q_DECLARE_TR_FUNCTIONS(OpenTxFirmware)
+
   public:
     OpenTxFirmware(const QString & id, OpenTxFirmware * parent):
       Firmware(parent, id, parent->getName(), parent->getBoard())
@@ -102,19 +106,6 @@ class OpenTxFirmware: public Firmware
       addLanguage("pl");
       addLanguage("pt");
       addLanguage("se");
-
-      addTTSLanguage("en");
-      addTTSLanguage("cz");
-      addTTSLanguage("de");
-      addTTSLanguage("es");
-      addTTSLanguage("fr");
-      addTTSLanguage("hu");
-      addTTSLanguage("it");
-      addTTSLanguage("nl");
-      addTTSLanguage("pl");
-      addTTSLanguage("pt");
-      addTTSLanguage("se");
-      addTTSLanguage("sk");
     }
 
     virtual Firmware * getFirmwareVariant(const QString & id);
@@ -126,9 +117,9 @@ class OpenTxFirmware: public Firmware
     virtual QString getFirmwareUrl();
 
     virtual int getCapability(Capability);
-    
+
     virtual QString getAnalogInputName(unsigned int index);
-    
+
     virtual QTime getMaxTimerStart();
 
     virtual int isAvailable(PulsesProtocol proto, int port=0);

companion/src/firmwares/radiodata.cpp

@@ -19,62 +19,29 @@
  */
 
 #include "radiodata.h"
+#include "radiodataconversionstate.h"
 #include "eeprominterface.h"
 
-// TODO here we will move a lot of functions from eeprominterface.cpp when no merge risk
-
-void RawSource::convert(Board::Type before, Board::Type after)
+// static
+QString RadioData::getElementName(const QString & prefix, unsigned int index, const char * name, bool padding)
 {
-  if (type == SOURCE_TYPE_STICK && index >= 4 + getBoardCapability(before, Board::Pots)) {
-    // 1st slider alignment
-    index += getBoardCapability(after, Board::Pots) - getBoardCapability(before, Board::Pots);
-  }
-
-  if (IS_HORUS(after)) {
-    if (IS_TARANIS_X9D(before) || IS_TARANIS_X7(before)) {
-      if (type == SOURCE_TYPE_STICK && index >= 7) {
-        // LS and RS on Horus are after sliders L1 and L2
-        index += 2;
-      }
-    }
-  }
-
-  // SWI to SWR don't exist on !X9E board
-  if (!IS_TARANIS_X9E(after) && IS_TARANIS_X9E(before)) {
-    if (type == SOURCE_TYPE_SWITCH && index >= 8) {
-      index = index % 8;
-    }
-  }
-
-  // No SE and SG on X7 board
-  if (IS_TARANIS_X7(after)) {
-    if (IS_TARANIS_X9(before) || IS_HORUS(before)) {
-      if (type == SOURCE_TYPE_SWITCH && index >= 6) {
-        index -= 2;
-      }
-      else if (type == SOURCE_TYPE_SWITCH && index >= 4) {
-        index -= 1;
-      }
+  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;
 }
 
-void MixData::convert(Board::Type before, Board::Type after)
+RadioData::RadioData()
 {
-  srcRaw.convert(before, after);
-}
-
-void ModelData::convert(Board::Type before, Board::Type after)
-{
-  // Here we can add explicit conversions when moving from one board to another
-  for (int i=0; i<CPN_MAX_MIXERS; i++) {
-    mixData[i].convert(before, after);
-  }
-}
-
-void GeneralSettings::convert(Board::Type before, Board::Type after)
-{
-  // Here we can add explicit conversions when moving from one board to another
+  models.resize(getCurrentFirmware()->getCapability(Models));
 }
 
 void RadioData::setCurrentModel(unsigned int index)
@@ -134,20 +101,27 @@ QString RadioData::getNextModelFilename()
   return filename;
 }
 
-void RadioData::convert(Board::Type before, Board::Type after)
+void RadioData::convert(RadioDataConversionState & cstate)
 {
-  generalSettings.convert(before, after);
+  generalSettings.convert(cstate.withModelIndex(-1));
+
   for (unsigned i=0; i<models.size(); i++) {
-    models[i].convert(before, after);
+    models[i].convert(cstate.withModelIndex(i));
   }
+
   if (categories.size() == 0) {
-    categories.push_back(CategoryData(qPrintable(QObject::tr("Models"))));
+    categories.push_back(CategoryData(qPrintable(tr("Models"))));
     for (unsigned i=0; i<models.size(); i++) {
       models[i].category = 0;
     }
   }
 
-  if (IS_HORUS(after)) {
+  if (IS_HORUS(cstate.toType)) {
     fixModelFilenames();
   }
-}
+
+  // ensure proper number of model slots
+  if (getCurrentFirmware()->getCapability(Models) && getCurrentFirmware()->getCapability(Models) != (int)models.size()) {
+    models.resize(getCurrentFirmware()->getCapability(Models));
+  }
+}

companion/src/firmwares/radiodata.h

@@ -0,0 +1,41 @@
+#ifndef _RADIODATA_H_
+#define _RADIODATA_H_
+
+#include "generalsettings.h"
+#include "modeldata.h"
+
+#include <QtCore>
+
+class RadioDataConversionState;
+
+class CategoryData {
+  public:
+    CategoryData(const char * name) {
+      strncpy(this->name, name, sizeof(CategoryData::name));
+    }
+    char name[15+1];
+};
+
+class RadioData {
+  Q_DECLARE_TR_FUNCTIONS(RadioData)
+
+  public:
+    RadioData();
+
+    GeneralSettings generalSettings;
+    std::vector<CategoryData> categories;
+    std::vector<ModelData> models;
+
+    void convert(RadioDataConversionState & cstate);
+
+    void setCurrentModel(unsigned int index);
+    void fixModelFilenames();
+    QString getNextModelFilename();
+
+    static QString getElementName(const QString & prefix, unsigned int index, const char * name = 0, bool padding = false);
+
+  protected:
+    void fixModelFilename(unsigned int index);
+};
+
+#endif // _RADIODATA_H_

companion/src/firmwares/radiodataconversionstate.cpp

@@ -0,0 +1,223 @@
+/*
+ * 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 "radiodataconversionstate.h"
+#include "radiodata.h"
+
+#include <QStandardItemModel>
+
+RadioDataConversionState::RadioDataConversionState(Board::Type before, Board::Type after, RadioData * rdata) :
+  fromType(before),
+  toType(after),
+  fromBoard(Boards(before)),
+  toBoard(Boards(after)),
+  rd(NULL),
+  rdCopy(NULL),
+  maxEventType(EVT_NONE),
+  modelIdx(-1),
+  subCompIdx(-1)
+{
+  setRadioData(rdata);
+}
+
+RadioDataConversionState::~RadioDataConversionState()
+{
+  if (rdCopy)
+    delete rdCopy;
+}
+
+RadioDataConversionState & RadioDataConversionState::withModelIndex(int index)
+{
+  modelIdx = index;
+  subCompIdx = -1;
+  setLogField(FLD_ORIGIN);
+  return *this;
+}
+
+RadioDataConversionState & RadioDataConversionState::withComponentIndex(int index)
+{
+  subCompIdx = index;
+  setLogField(FLD_SUB_COMP);
+  return *this;
+}
+
+RadioDataConversionState &RadioDataConversionState::withComponentField(const QString & name)
+{
+  setLogField(FLD_COMP_FIELD, LogField(0, name));
+  return *this;
+}
+
+bool RadioDataConversionState::convert()
+{
+  if (rd) {
+    rd->convert(*this);
+    return true;
+  }
+
+  setErr(("No radio data to convert."));
+  return false;
+}
+
+void RadioDataConversionState::setRadioData(RadioData * rdata)
+{
+  rd = rdata;
+  if (rdCopy)
+    delete rdCopy;
+  rdCopy = new RadioData(*rdata);
+  logCache = LogRecord();
+}
+
+void RadioDataConversionState::setLogField(LogFieldType type, const LogField & data, bool clearRest)
+{
+  if (type >= FLD_ENUM_COUNT)
+    return;
+
+  logCache.fields[type].id = data.id;
+  logCache.fields[type].name = data.name;
+  if (clearRest && type + 1 < FLD_ENUM_COUNT)
+    setLogField(LogFieldType(type + 1));
+}
+
+void RadioDataConversionState::addLogEntry(EventType event, const QString & msg)
+{
+  if (event != EVT_NONE) {
+    setLogField(FLD_EVT_TYPE, LogField(event, eventTypeToString(event)), false);
+    setLogField(FLD_MSG, LogField(event, msg), false);
+    log.append(logCache);
+  }
+  maxEventType = qMax(event, maxEventType);
+  logCache.fields[FLD_MSG].clear();
+}
+
+void RadioDataConversionState::setInvalid(const LogField & item)
+{
+  setLogField(FLD_ITM_BEFORE, item);
+  addLogEntry(EVT_INV, tr("is invalid"));
+}
+
+void RadioDataConversionState::setConverted(const LogField & from, const LogField & to)
+{
+  setLogField(FLD_ITM_BEFORE, from);
+  setLogField(FLD_ITM_AFTER, to);
+  addLogEntry(EVT_CVRT, tr("converted to"));
+}
+
+void RadioDataConversionState::setMoved(const LogField & from, const LogField & to)
+{
+  setLogField(FLD_ITM_BEFORE, from);
+  setLogField(FLD_ITM_AFTER, to);
+  addLogEntry(EVT_INF, tr("verify is"));
+}
+
+const ModelData * RadioDataConversionState::toModel() const
+{
+  if (rd && modelIdx > -1 && modelIdx < (int)rd->models.size())
+    return &rd->models[modelIdx];
+  return NULL;
+}
+
+const ModelData *RadioDataConversionState::fromModel() const
+{
+  if (rdCopy && modelIdx > -1 && modelIdx < (int)rdCopy->models.size())
+    return &rdCopy->models[modelIdx];
+  return NULL;
+}
+
+const GeneralSettings * RadioDataConversionState::toGS() const
+{
+  if (rd)
+    return &rd->generalSettings;
+  return NULL;
+}
+
+const GeneralSettings *RadioDataConversionState::fromGS() const
+{
+  if (rdCopy)
+    return &rdCopy->generalSettings;
+  return NULL;
+}
+
+bool RadioDataConversionState::hasLogEntries(EventType logLevel) const
+{
+  return (maxEventType >= logLevel);
+}
+
+QString RadioDataConversionState::eventTypeToString(int type) const
+{
+  // enum EventType                             { EVT_NONE,   EVT_DBG,       EVT_INF,       EVT_WRN,       EVT_CVRT,      EVT_ERR,       EVT_INV
+  static const QStringList evtTypes =  QStringList() << "" << tr("[DBG]") << tr("[NFO]") << tr("[WRN]") << tr("[CVT]") << tr("[ERR]") << tr("[INV]");
+  return (type < evtTypes.size() ? evtTypes.at(type) : "");
+}
+
+QString RadioDataConversionState::eventTypeToColor(int type) const
+{
+  // enum EventType                                   { EVT_NONE,  EVT_DBG,     EVT_INF,   EVT_WRN,     EVT_CVRT,    EVT_ERR,  EVT_INV
+  static const QStringList evtColors = QStringList() << "black" << "dimgrey" << "black" << "#ea7104" << "#ea7104" << "red"  << "red";
+  return (type < evtColors.size() ? evtColors.at(type) : "black");
+}
+
+QString RadioDataConversionState::getFieldName(int field) const
+{
+  static const QStringList dataFields = QStringList() << tr("Event") << tr("Origin") << tr("Comp") << tr("Sub-Component") << tr("Field") << tr("Type") << tr("Old") << tr("Action") << tr("New");
+  return (field < dataFields.size() ? dataFields.at(field) : "");
+}
+
+QStandardItemModel * RadioDataConversionState::getLogModel(RadioDataConversionState::EventType logLevel, QObject * parent) const
+{
+  QStandardItemModel * stdmdl = new QStandardItemModel(parent);
+  const QString tooltip = "%1: %2 (ID: %3)";
+  const int sortRole = Qt::UserRole + 1;
+  const int seqdigits = floorf(logf(log.size()) / logf(10.0f)) + 1;
+
+  stdmdl->setSortRole(sortRole);
+
+  QStringList header;
+  header << tr("Seq");
+  for (int i=0; i < FLD_ENUM_COUNT; ++i)
+    header << getFieldName(i);
+  stdmdl->setHorizontalHeaderLabels(header);
+
+  QFont fnt("Courier");
+  fnt.setStyleHint(QFont::TypeWriter);
+  //fnt.setPointSize(fnt.pointSize()+1);
+
+  int row = 0;
+  foreach (const LogRecord & lr, log) {
+    if (lr.fields.at(FLD_EVT_TYPE).id < logLevel)
+      continue;
+    QBrush fg(QColor(eventTypeToColor(lr.fields.at(FLD_EVT_TYPE).id)));
+    stdmdl->setItem(row, 0, new QStandardItem(QString("%1").arg(row+1, seqdigits, 10, QChar('0'))));
+    stdmdl->item(row, 0)->setData(row, sortRole);
+    stdmdl->item(row, 0)->setData(fnt, Qt::FontRole);
+    for (int i=0; i < FLD_ENUM_COUNT; ++i) {
+      QStandardItem * itm = new QStandardItem(lr.fields.at(i).name);
+      itm->setData(lr.fields.at(i).id, sortRole);
+      itm->setData(fnt, Qt::FontRole);
+      itm->setData(tooltip.arg(getFieldName(i)).arg(lr.fields.at(i).name).arg(lr.fields.at(i).id), Qt::ToolTipRole);
+      itm->setEditable(false);
+      if (i == FLD_EVT_TYPE || i == FLD_MSG)
+        itm->setForeground(fg);
+      stdmdl->setItem(row, i+1, itm);
+    }
+    ++row;
+  }
+
+  return stdmdl;
+}

companion/src/firmwares/radiodataconversionstate.h

@@ -0,0 +1,121 @@
+/*
+ * 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 RADIODATACONVERSIONSTATE_H
+#define RADIODATACONVERSIONSTATE_H
+
+#include "boards.h"
+#include <QtCore>
+
+class ModelData;
+class GeneralSettings;
+class RadioData;
+class QStandardItemModel;
+
+class RadioDataConversionState
+{
+  Q_DECLARE_TR_FUNCTIONS(RadioDataConversionState)
+
+  public:
+    enum EventType {
+      EVT_NONE,  // does not get logged
+      EVT_DBG,   // debug
+      EVT_INF,   // misc. info
+      EVT_WRN,   // misc. warning, place warning-level events after this and before EVT_ERR
+      EVT_CVRT,  // something was converted (A->B)
+      EVT_ERR,   // misc. error, place error-level events after this
+      EVT_INV,   // invalid, control/etc not available on destination radio
+    };
+
+    enum LogFieldType {
+      FLD_EVT_TYPE,      // EventType
+      FLD_ORIGIN,        // General Settings or Model with name
+      FLD_COMP,          // Input/Mix/LS/CF/etc
+      FLD_SUB_COMP,      // Mix channel/Input line/LS number/etc
+      FLD_COMP_FIELD,    // optional item within subcomponent, eg. LS V1/V2/AND, etc
+      FLD_ITM_TYPE,      // Source/Switch
+      FLD_ITM_BEFORE,    // item before conversion
+      FLD_MSG,           // conversion details
+      FLD_ITM_AFTER,     // item after conversion
+      FLD_ENUM_COUNT
+    };
+
+    struct LogField {
+      LogField(int id = 0, const QString & name = QString()) : id(id), name(name) {}
+      void clear() { id = 0; name.clear(); }
+      int id;
+      QString name;
+    };
+
+    struct LogRecord
+    {
+      LogRecord() { fields.resize(FLD_ENUM_COUNT); }
+      QVector<LogField> fields;  // collected data fields indexed by LogColumn value
+    };
+
+    RadioDataConversionState(Board::Type before = Board::BOARD_UNKNOWN, Board::Type after = Board::BOARD_UNKNOWN, RadioData * rdata = NULL);
+    ~RadioDataConversionState();
+
+    RadioDataConversionState & withModelIndex(int index);
+    RadioDataConversionState & withComponentIndex(int index);
+    RadioDataConversionState & withComponentField(const QString & name);
+
+    bool convert();
+    void setRadioData(RadioData * rdata);
+    void setLogField(LogFieldType type, const LogField & data = LogField(), bool clearRest = true);
+    inline void setOrigin(const QString & name = QString())    { setLogField(FLD_ORIGIN, LogField(modelIdx, name)); }
+    inline void setSubComp(const QString & name = QString())   { setLogField(FLD_SUB_COMP, LogField(subCompIdx, name)); }
+    inline void setComponent(const QString & name = QString(), int id = 0) { setLogField(FLD_COMP, LogField(id, name)); }
+    inline void setItemType(const QString & name = QString(), int id = 0)  { setLogField(FLD_ITM_TYPE, LogField(id, name)); }
+
+    void addLogEntry(EventType event, const QString & msg = QString());
+    void setInvalid(const LogField & item);
+    void setConverted(const LogField & from, const LogField & to);
+    void setMoved(const LogField & from, const LogField & to);
+    inline void setDbg(const QString & msg) { addLogEntry(EVT_DBG, msg); }
+    inline void setInf(const QString & msg) { addLogEntry(EVT_INF, msg); }
+    inline void setWrn(const QString & msg) { addLogEntry(EVT_WRN, msg); }
+    inline void setErr(const QString & msg) { addLogEntry(EVT_ERR, msg); }
+
+    const ModelData * toModel() const;
+    const ModelData * fromModel() const;
+    const GeneralSettings * toGS() const;
+    const GeneralSettings * fromGS() const;
+    bool hasLogEntries(EventType logLevel = EVT_INF) const;
+
+    QString eventTypeToString(int type) const;
+    QString eventTypeToColor(int type) const;
+    QString getFieldName(int field) const;
+    QStandardItemModel * getLogModel(EventType logLevel = EVT_INF, QObject *parent = Q_NULLPTR) const;
+
+    Board::Type fromType;    // board type before conversion
+    Board::Type toType;      // board type after
+    Boards fromBoard;
+    Boards toBoard;
+    RadioData * rd;          // pointer to data struct being converted
+    RadioData * rdCopy;      // copy of original radio data before conversion
+    QVector<LogRecord> log;  // logged events
+    LogRecord logCache;      // buffer for holding event data before logging
+    EventType maxEventType;  // most severe event type recorded
+    int modelIdx;            // model index in radio data array, -1 if none
+    int subCompIdx;          // current row index within component (eg. model.mixData[componentIdx]), -1 if none
+};
+
+#endif // RADIODATACONVERSIONSTATE_H

companion/src/firmwares/rawsource.cpp

@@ -0,0 +1,644 @@
+/*
+ * 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 "rawsource.h"
+
+#include "eeprominterface.h"
+#include "radiodata.h"
+#include "radiodataconversionstate.h"
+
+#include <float.h>
+
+/*
+ * RawSourceRange
+ */
+
+float RawSourceRange::getValue(int value)
+{
+  if (IS_ARM(getCurrentBoard()))
+    return float(value) * step;
+  else
+    return min + float(value) * step;
+}
+
+
+/*
+ * RawSource
+ */
+
+RawSourceRange RawSource::getRange(const ModelData * model, const GeneralSettings & settings, unsigned int flags) const
+{
+  RawSourceRange result;
+
+  Firmware * firmware = Firmware::getCurrentVariant();
+  int board = firmware->getBoard();
+
+  switch (type) {
+    case SOURCE_TYPE_TELEMETRY:
+      if (IS_ARM(board)) {
+        div_t qr = div(index, 3);
+        const SensorData & sensor = model->sensorData[qr.quot];
+        if (sensor.prec == 2)
+          result.step = 0.01;
+        else if (sensor.prec == 1)
+          result.step = 0.1;
+        else
+          result.step = 1;
+        result.min = -30000 * result.step;
+        result.max = +30000 * result.step;
+        result.decimals = sensor.prec;
+        result.unit = sensor.unitString();
+      }
+      else {
+        result.offset = -DBL_MAX;
+
+        switch (index) {
+          case TELEMETRY_SOURCE_TX_BATT:
+            result.step = 0.1;
+            result.decimals = 1;
+            result.max = 25.5;
+            result.unit = tr("V");
+            break;
+          case TELEMETRY_SOURCE_TX_TIME:
+            result.step = 60;
+            result.max = 24 * 60 * result.step - 60;  // 23:59:00 with 1-minute resolution
+            result.unit = tr("s");
+            break;
+          case TELEMETRY_SOURCE_TIMER1:
+          case TELEMETRY_SOURCE_TIMER2:
+          case TELEMETRY_SOURCE_TIMER3:
+            result.step = 5;
+            result.max = 255 * result.step;
+            result.unit = tr("s");
+            break;
+          case TELEMETRY_SOURCE_RSSI_TX:
+          case TELEMETRY_SOURCE_RSSI_RX:
+            result.max = 100;
+            result.offset = 128;
+            break;
+          case TELEMETRY_SOURCE_A1_MIN:
+          case TELEMETRY_SOURCE_A2_MIN:
+          case TELEMETRY_SOURCE_A3_MIN:
+          case TELEMETRY_SOURCE_A4_MIN:
+            if (model) result = model->frsky.channels[index-TELEMETRY_SOURCE_A1_MIN].getRange();
+            break;
+          case TELEMETRY_SOURCE_A1:
+          case TELEMETRY_SOURCE_A2:
+          case TELEMETRY_SOURCE_A3:
+          case TELEMETRY_SOURCE_A4:
+            if (model) result = model->frsky.channels[index-TELEMETRY_SOURCE_A1].getRange();
+            break;
+          case TELEMETRY_SOURCE_ALT:
+          case TELEMETRY_SOURCE_ALT_MIN:
+          case TELEMETRY_SOURCE_ALT_MAX:
+          case TELEMETRY_SOURCE_GPS_ALT:
+            result.step = 8;
+            result.min = -500;
+            result.max = 1540;
+            if (firmware->getCapability(Imperial) || settings.imperial) {
+              result.step = (result.step * 105) / 32;
+              result.min = (result.min * 105) / 32;
+              result.max = (result.max * 105) / 32;
+              result.unit = tr("ft");
+            }
+            else {
+              result.unit = tr("m");
+            }
+            break;
+          case TELEMETRY_SOURCE_T1:
+          case TELEMETRY_SOURCE_T1_MAX:
+          case TELEMETRY_SOURCE_T2:
+          case TELEMETRY_SOURCE_T2_MAX:
+            result.min = -30;
+            result.max = 225;
+            result.unit = trUtf8("°C");
+            break;
+          case TELEMETRY_SOURCE_HDG:
+            result.step = 2;
+            result.max = 360;
+            result.offset = 256;
+            result.unit = trUtf8("°");
+            break;
+          case TELEMETRY_SOURCE_RPM:
+          case TELEMETRY_SOURCE_RPM_MAX:
+            result.step = 50;
+            result.max = 12750;
+            break;
+          case TELEMETRY_SOURCE_FUEL:
+            result.max = 100;
+            result.unit = tr("%");
+            break;
+          case TELEMETRY_SOURCE_ASPEED:
+          case TELEMETRY_SOURCE_ASPEED_MAX:
+            result.decimals = 1;
+            result.step = 2.0;
+            result.max = (2*255);
+            if (firmware->getCapability(Imperial) || settings.imperial) {
+              result.step *= 1.150779;
+              result.max *= 1.150779;
+              result.unit = tr("mph");
+            }
+            else {
+              result.step *= 1.852;
+              result.max *= 1.852;
+              result.unit = tr("km/h");
+            }
+            break;
+          case TELEMETRY_SOURCE_SPEED:
+          case TELEMETRY_SOURCE_SPEED_MAX:
+            result.step = 2;
+            result.max = (2*255);
+            if (firmware->getCapability(Imperial) || settings.imperial) {
+              result.step *= 1.150779;
+              result.max *= 1.150779;
+              result.unit = tr("mph");
+            }
+            else {
+              result.step *= 1.852;
+              result.max *= 1.852;
+              result.unit = tr("km/h");
+            }
+            break;
+          case TELEMETRY_SOURCE_VERTICAL_SPEED:
+            result.step = 0.1;
+            result.min = -12.5;
+            result.max = 13.0;
+            result.decimals = 1;
+            result.unit = tr("m/s");
+            break;
+          case TELEMETRY_SOURCE_DTE:
+            result.max = 30000;
+            break;
+          case TELEMETRY_SOURCE_DIST:
+          case TELEMETRY_SOURCE_DIST_MAX:
+            result.step = 8;
+            result.max = 2040;
+            result.unit = tr("m");
+            break;
+          case TELEMETRY_SOURCE_CELL:
+          case TELEMETRY_SOURCE_CELL_MIN:
+            result.step = 0.02;
+            result.max = 5.1;
+            result.decimals = 2;
+            result.unit = tr("V");
+            break;
+          case TELEMETRY_SOURCE_CELLS_SUM:
+          case TELEMETRY_SOURCE_CELLS_MIN:
+          case TELEMETRY_SOURCE_VFAS:
+          case TELEMETRY_SOURCE_VFAS_MIN:
+            result.step = 0.1;
+            result.max = 25.5;
+            result.decimals = 1;
+            result.unit = tr("V");
+            break;
+          case TELEMETRY_SOURCE_CURRENT:
+          case TELEMETRY_SOURCE_CURRENT_MAX:
+            result.step = 0.5;
+            result.max = 127.5;
+            result.decimals = 1;
+            result.unit = tr("A");
+            break;
+          case TELEMETRY_SOURCE_CONSUMPTION:
+            result.step = 100;
+            result.max =  25500;
+            result.unit = tr("mAh");
+            break;
+          case TELEMETRY_SOURCE_POWER:
+          case TELEMETRY_SOURCE_POWER_MAX:
+            result.step = 5;
+            result.max = 1275;
+            result.unit = tr("W");
+            break;
+          case TELEMETRY_SOURCE_ACCX:
+          case TELEMETRY_SOURCE_ACCY:
+          case TELEMETRY_SOURCE_ACCZ:
+            result.step = 0.01;
+            result.decimals = 2;
+            result.max = 2.55;
+            result.min = 0;
+            result.unit = tr("g");
+            break;
+          default:
+            result.max = 125;
+            break;
+        }
+
+        if (result.offset == -DBL_MAX) {
+          result.offset = result.max - (127*result.step);
+        }
+
+        if (flags & (RANGE_DELTA_FUNCTION | RANGE_ABS_FUNCTION)) {
+          result.offset = 0;
+          result.min = result.step * -127;
+          result.max = result.step * 127;
+        }
+      }
+      break;
+
+    case SOURCE_TYPE_LUA_OUTPUT:
+      result.max = 30000;
+      result.min = -result.max;
+      break;
+
+    case SOURCE_TYPE_TRIM:
+      result.max = (model && model->extendedTrims ? firmware->getCapability(ExtendedTrimsRange) : firmware->getCapability(TrimsRange));
+      result.min = -result.max;
+      break;
+
+    case SOURCE_TYPE_GVAR: {
+      GVarData gv = model->gvarData[index];
+      result.step = gv.multiplierGet();
+      result.decimals = gv.prec;
+      result.max = gv.getMaxPrec();
+      result.min = gv.getMinPrec();
+      result.unit = gv.unitToString();
+      break;
+    }
+
+    case SOURCE_TYPE_SPECIAL:
+      if (index == 0)  {  //Batt
+        result.step = 0.1;
+        result.decimals = 1;
+        result.max = 25.5;
+        result.unit = tr("V");
+      }
+      else if (index == 1) {   //Time
+        result.step = 60;
+        result.max = 24 * 60 * result.step - 60;  // 23:59:00 with 1-minute resolution
+        result.unit = tr("s");
+      }
+      else {      // Timers 1 - 3
+        result.step = 1;
+        result.max = 9 * 60 * 60 - 1;  // 8:59:59 (to match firmware)
+        result.min = -result.max;
+        result.unit = tr("s");
+      }
+      break;
+
+    case SOURCE_TYPE_CH:
+      result.max = model->getChannelsMax(false);
+      result.min = -result.max;
+      break;
+
+    default:
+      result.max = 100;
+      result.min = -result.max;
+      break;
+  }
+
+  if (flags & RANGE_ABS_FUNCTION) {
+    result.min = 0;
+  }
+
+  return result;
+}
+
+QString RawSource::toString(const ModelData * model, const GeneralSettings * const generalSettings, Board::Type board) const
+{
+  if (board == Board::BOARD_UNKNOWN) {
+    board = getCurrentBoard();
+  }
+
+  static const QString trims[] = {
+    tr("TrmR"), tr("TrmE"), tr("TrmT"), tr("TrmA"), tr("Trm5"), tr("Trm6")
+  };
+
+  static const QString trims2[] = {
+    tr("TrmH"), tr("TrmV")
+  };
+
+  static const QString special[] = {
+    tr("Batt"), tr("Time"), tr("Timer1"), tr("Timer2"), tr("Timer3"),
+  };
+
+  static const QString telemetry[] = {
+    tr("Batt"), tr("Time"), tr("Timer1"), tr("Timer2"), tr("Timer3"),
+    tr("RAS"), tr("RSSI Tx"), tr("RSSI Rx"),
+    tr("A1"), tr("A2"), tr("A3"), tr("A4"),
+    tr("Alt"), tr("Rpm"), tr("Fuel"), tr("T1"), tr("T2"),
+    tr("Speed"), tr("Dist"), tr("GPS Alt"),
+    tr("Cell"), tr("Cells"), tr("Vfas"), tr("Curr"), tr("Cnsp"), tr("Powr"),
+    tr("AccX"), tr("AccY"), tr("AccZ"),
+    tr("Hdg "), tr("VSpd"), tr("AirSpeed"), tr("dTE"),
+    tr("A1-"),  tr("A2-"), tr("A3-"),  tr("A4-"),
+    tr("Alt-"), tr("Alt+"), tr("Rpm+"), tr("T1+"), tr("T2+"), tr("Speed+"), tr("Dist+"), tr("AirSpeed+"),
+    tr("Cell-"), tr("Cells-"), tr("Vfas-"), tr("Curr+"), tr("Powr+"),
+    tr("ACC"), tr("GPS Time"),
+  };
+
+  static const QString rotary[]  = { tr("REa"), tr("REb") };
+
+  if (index<0) {
+    return tr("???");
+  }
+
+  QString result;
+  int genAryIdx = 0;
+  switch (type) {
+    case SOURCE_TYPE_NONE:
+      return tr("----");
+
+    case SOURCE_TYPE_VIRTUAL_INPUT:
+    {
+      const char * name = NULL;
+      if (model)
+        name = model->inputNames[index];
+      return RadioData::getElementName(tr("I", "as in Input"), index + 1, name);
+    }
+
+    case SOURCE_TYPE_LUA_OUTPUT:
+      return tr("LUA%1%2").arg(index/16+1).arg(QChar('a'+index%16));
+
+    case SOURCE_TYPE_STICK:
+      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 = Boards::getAnalogInputName(board, index);
+      return result;
+
+    case SOURCE_TYPE_TRIM:
+      return (Boards::getCapability(board, Board::NumTrims) == 2 ? CHECK_IN_ARRAY(trims2, index) : CHECK_IN_ARRAY(trims, index));
+
+    case SOURCE_TYPE_ROTARY_ENCODER:
+      return CHECK_IN_ARRAY(rotary, index);
+
+    case SOURCE_TYPE_MAX:
+      return tr("MAX");
+
+    case SOURCE_TYPE_SWITCH:
+      if (generalSettings)
+        result = QString(generalSettings->switchName[index]);
+      if (result.isEmpty())
+        result = Boards::getSwitchInfo(board, index).name;
+      return result;
+
+    case SOURCE_TYPE_CUSTOM_SWITCH:
+      return RawSwitch(SWITCH_TYPE_VIRTUAL, index+1).toString();
+
+    case SOURCE_TYPE_CYC:
+      return tr("CYC%1").arg(index+1);
+
+    case SOURCE_TYPE_PPM:
+      return RadioData::getElementName(tr("TR", "as in Trainer"), index + 1);
+
+    case SOURCE_TYPE_CH:
+      if (model)
+        return model->limitData[index].nameToString(index);
+      else
+        return LimitData().nameToString(index);
+
+    case SOURCE_TYPE_SPECIAL:
+      return CHECK_IN_ARRAY(special, index);
+
+    case SOURCE_TYPE_TELEMETRY:
+      if (IS_ARM(board)) {
+        div_t qr = div(index, 3);
+        if (model)
+          result = model->sensorData[qr.quot].nameToString(qr.quot);
+        else
+          result = SensorData().nameToString(qr.quot);
+        if (qr.rem)
+          result += (qr.rem == 1 ? "-" : "+");
+        return result;
+      }
+      else {
+        return CHECK_IN_ARRAY(telemetry, index);
+      }
+
+    case SOURCE_TYPE_GVAR:
+      if (model)
+        return model->gvarData[index].nameToString(index);
+      else
+        return GVarData().nameToString(index);
+
+    default:
+      return tr("???");
+  }
+}
+
+bool RawSource::isStick(int * stickIndex, Board::Type board) const
+{
+  if (board == Board::BOARD_UNKNOWN)
+    board = getCurrentBoard();
+
+  if (type == SOURCE_TYPE_STICK && index < Boards::getCapability(board, Board::Sticks)) {
+    if (stickIndex)
+      *stickIndex = index;
+    return true;
+  }
+  return false;
+}
+
+bool RawSource::isPot(int * potsIndex, Board::Type board) const
+{
+  if (board == Board::BOARD_UNKNOWN)
+    board = getCurrentBoard();
+
+  Boards b(board);
+  if (type == SOURCE_TYPE_STICK &&
+          index >= b.getCapability(Board::Sticks) &&
+          index < b.getCapability(Board::Sticks) + b.getCapability(Board::Pots)) {
+    if (potsIndex)
+      *potsIndex = index - b.getCapability(Board::Sticks);
+    return true;
+  }
+  return false;
+}
+
+bool RawSource::isSlider(int * sliderIndex, Board::Type board) const
+{
+  if (board == Board::BOARD_UNKNOWN)
+    board = getCurrentBoard();
+
+  Boards b(board);
+  if (type == SOURCE_TYPE_STICK &&
+          index >= b.getCapability(Board::Sticks) + b.getCapability(Board::Pots) &&
+          index < b.getCapability(Board::Sticks) + b.getCapability(Board::Pots) + b.getCapability(Board::Sliders)) {
+    if (sliderIndex)
+      *sliderIndex = index - b.getCapability(Board::Sticks) - b.getCapability(Board::Pots);
+    return true;
+  }
+  return false;
+}
+
+bool RawSource::isTimeBased(Board::Type board) const
+{
+  if (board == Board::BOARD_UNKNOWN)
+    board = getCurrentBoard();
+
+  if (IS_ARM(board))
+    return (type == SOURCE_TYPE_SPECIAL && index > 0);
+  else
+    return (type==SOURCE_TYPE_TELEMETRY && (index==TELEMETRY_SOURCE_TX_TIME || index==TELEMETRY_SOURCE_TIMER1 || index==TELEMETRY_SOURCE_TIMER2 || index==TELEMETRY_SOURCE_TIMER3));
+}
+
+bool RawSource::isAvailable(const ModelData * const model, const GeneralSettings * const gs, Board::Type board) const
+{
+  if (board == Board::BOARD_UNKNOWN)
+    board = getCurrentBoard();
+
+  Boards b(board);
+
+  if (type == SOURCE_TYPE_STICK && index >= b.getCapability(Board::MaxAnalogs))
+    return false;
+
+  if (type == SOURCE_TYPE_SWITCH && index >= b.getCapability(Board::Switches))
+    return false;
+
+  if (model) {
+    if (type == SOURCE_TYPE_VIRTUAL_INPUT && !model->isInputValid(index))
+      return false;
+
+    if (type == SOURCE_TYPE_CUSTOM_SWITCH && model->logicalSw[index].isEmpty())
+      return false;
+
+    if (type == SOURCE_TYPE_TELEMETRY) {
+      if (IS_ARM(board) && !model->sensorData[div(index, 3).quot].isAvailable()) {
+        return false;
+      }
+      else if (!IS_ARM(board)) {
+        Firmware * fw = getCurrentFirmware();
+        if (type == (int)TELEMETRY_SOURCE_TX_TIME && !fw->getCapability(RtcTime))
+          return false;
+
+        if (type == (int)TELEMETRY_SOURCE_RAS && !fw->getCapability(SportTelemetry))
+          return false;
+
+        if (type == (int)TELEMETRY_SOURCE_TIMER3 && fw->getCapability(Timers) < 3)
+          return false;
+      }
+    }
+  }
+
+  if (gs) {
+    int gsIdx = 0;
+    if (type == SOURCE_TYPE_STICK && ((isPot(&gsIdx) && !gs->isPotAvailable(gsIdx)) || (isSlider(&gsIdx) && !gs->isSliderAvailable(gsIdx))))
+      return false;
+
+    if (type == SOURCE_TYPE_SWITCH && IS_HORUS_OR_TARANIS(board) && !gs->switchSourceAllowedTaranis(index))
+      return false;
+  }
+
+  if (type == SOURCE_TYPE_TRIM && index >= b.getCapability(Board::NumTrims))
+    return false;
+
+  return true;
+}
+
+RawSource RawSource::convert(RadioDataConversionState & cstate)
+{
+  cstate.setItemType(tr("SRC"), 1);
+  RadioDataConversionState::EventType evt = RadioDataConversionState::EVT_NONE;
+  RadioDataConversionState::LogField oldData(index, toString(cstate.fromModel(), cstate.fromGS(), cstate.fromType));
+
+  if (type == SOURCE_TYPE_STICK) {
+    if (cstate.toBoard.getCapability(Board::Sliders)) {
+      if (index >= cstate.fromBoard.getCapability(Board::Sticks) + cstate.fromBoard.getCapability(Board::Pots)) {
+        // 1st slider alignment
+        index += cstate.toBoard.getCapability(Board::Pots) - cstate.fromBoard.getCapability(Board::Pots);
+      }
+
+      if (isSlider(0, cstate.fromType)) {
+        // LS and RS sliders are after 2 aux sliders on X12 and X9E
+        if ((IS_HORUS_X12S(cstate.toType) || IS_TARANIS_X9E(cstate.toType)) && !IS_HORUS_X12S(cstate.fromType) && !IS_TARANIS_X9E(cstate.fromType)) {
+          if (index >= 7) {
+            index += 2;  // LS/RS to LS/RS
+          }
+        }
+        else if (!IS_TARANIS_X9E(cstate.toType) && !IS_HORUS_X12S(cstate.toType) && (IS_HORUS_X12S(cstate.fromType) || IS_TARANIS_X9E(cstate.fromType))) {
+          if (index >= 7 && index <= 8) {
+            index += 2;   // aux sliders to spare analogs (which may not exist, this is validated later)
+            evt = RadioDataConversionState::EVT_CVRT;
+          }
+          else if (index >= 9 && index <= 10) {
+            index -= 2;  // LS/RS to LS/RS
+          }
+        }
+      }
+    }
+
+    if (IS_TARANIS(cstate.toType) && IS_HORUS(cstate.fromType)) {
+      if (index == 6)
+        index = 5;  // pot S2 to S2
+      else if (index == 5)
+        index = -1;  //  6P on Horus doesn't exist on Taranis
+    }
+    else  if (IS_HORUS(cstate.toType) && IS_TARANIS(cstate.fromType) && index == 5)
+    {
+      index = 6;  // pot S2 to S2
+    }
+
+  }  // SOURCE_TYPE_STICK
+
+  if (type == SOURCE_TYPE_SWITCH) {
+    // SWI to SWR don't exist on !X9E board
+    if (!IS_TARANIS_X9E(cstate.toType) && IS_TARANIS_X9E(cstate.fromType)) {
+      if (index >= 8) {
+        index = index % 8;
+        evt = RadioDataConversionState::EVT_CVRT;
+      }
+    }
+
+    if (IS_TARANIS_X7(cstate.toType) && (IS_TARANIS_X9(cstate.fromType) || IS_HORUS(cstate.fromType))) {
+      // No SE and SG on X7 board
+      if (index == 4 || index == 6) {
+        index = 3;  // SG and SE to SD
+        evt = RadioDataConversionState::EVT_CVRT;
+      }
+      else if (index == 5) {
+        index = 4;  // SF to SF
+      }
+      else if (index == 7) {
+        index = 5;  // SH to SH
+      }
+    }
+    // Compensate for SE and SG on X9/Horus board if converting from X7
+    else if ((IS_TARANIS_X9(cstate.toType) || IS_HORUS(cstate.toType)) && IS_TARANIS_X7(cstate.fromType)) {
+      if (index == 4) {
+        index = 5;  // SF to SF
+      }
+      else if (index == 5) {
+        index = 7;  // SH to SH
+      }
+    }
+  }  // SOURCE_TYPE_SWITCH
+
+  // final validation (we do not pass model to isAvailable() because we don't know what has or hasn't been converted)
+  if (!isAvailable(NULL, cstate.toGS(), cstate.toType)) {
+    cstate.setInvalid(oldData);
+    index = -1;  // TODO: better way to flag invalid sources?
+    type = MAX_SOURCE_TYPE;
+  }
+  else if (evt == RadioDataConversionState::EVT_CVRT) {
+    cstate.setConverted(oldData, RadioDataConversionState::LogField(index, toString(cstate.toModel(), cstate.toGS(), cstate.toType)));
+  }
+  else if (oldData.id != index) {
+    // provide info by default if anything changed
+    cstate.setMoved(oldData, RadioDataConversionState::LogField(index, toString(cstate.toModel(), cstate.toGS(), cstate.toType)));
+  }
+
+  return *this;
+}

companion/src/firmwares/rawsource.h

@@ -0,0 +1,274 @@
+/*
+ * 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 RAWSOURCE_H
+#define RAWSOURCE_H
+
+#include "boards.h"
+#include "constants.h"
+
+#include <QtCore>
+
+class Firmware;
+class ModelData;
+class GeneralSettings;
+class RadioDataConversionState;
+
+enum Switches {
+  SWITCH_NONE,
+
+  SWITCH_THR = SWITCH_NONE+1,
+  SWITCH_RUD,
+  SWITCH_ELE,
+  SWITCH_ID0,
+  SWITCH_ID1,
+  SWITCH_ID2,
+  SWITCH_AIL,
+  SWITCH_GEA,
+  SWITCH_TRN,
+
+  SWITCH_SA0 = SWITCH_NONE+1,
+  SWITCH_SA1,
+  SWITCH_SA2,
+  SWITCH_SB0,
+  SWITCH_SB1,
+  SWITCH_SB2,
+  SWITCH_SC0,
+  SWITCH_SC1,
+  SWITCH_SC2,
+  SWITCH_SD0,
+  SWITCH_SD1,
+  SWITCH_SD2,
+  SWITCH_SE0,
+  SWITCH_SE1,
+  SWITCH_SE2,
+  SWITCH_SF0,
+  SWITCH_SF1,
+  SWITCH_SG0,
+  SWITCH_SG1,
+  SWITCH_SG2,
+  SWITCH_SH0,
+  SWITCH_SH2,
+  SWITCH_SI0,
+  SWITCH_SI2,
+  SWITCH_SJ0,
+  SWITCH_SJ2,
+  SWITCH_SK0,
+  SWITCH_SK2,
+};
+
+enum TimerModes {
+  TMRMODE_NONE,
+  TMRMODE_ABS,
+  TMRMODE_THR,
+  TMRMODE_THR_REL,
+  TMRMODE_THR_TRG,
+  TMRMODE_FIRST_SWITCH
+};
+
+enum FailsafeModes {
+  FAILSAFE_NOT_SET,
+  FAILSAFE_HOLD,
+  FAILSAFE_CUSTOM,
+  FAILSAFE_NOPULSES,
+  FAILSAFE_RECEIVER,
+  FAILSAFE_LAST = FAILSAFE_RECEIVER
+};
+
+enum HeliSwashTypes {
+  HELI_SWASH_TYPE_NONE=0,
+  HELI_SWASH_TYPE_120,
+  HELI_SWASH_TYPE_120X,
+  HELI_SWASH_TYPE_140,
+  HELI_SWASH_TYPE_90
+};
+
+enum TelemetrySource {
+  TELEMETRY_SOURCE_TX_BATT,
+  TELEMETRY_SOURCE_TX_TIME,
+  TELEMETRY_SOURCE_TIMER1,
+  TELEMETRY_SOURCE_TIMER2,
+  TELEMETRY_SOURCE_TIMER3,
+  TELEMETRY_SOURCE_RAS,
+  TELEMETRY_SOURCE_RSSI_TX,
+  TELEMETRY_SOURCE_RSSI_RX,
+  TELEMETRY_SOURCE_A1,
+  TELEMETRY_SOURCE_A2,
+  TELEMETRY_SOURCE_A3,
+  TELEMETRY_SOURCE_A4,
+  TELEMETRY_SOURCE_ALT,
+  TELEMETRY_SOURCE_RPM,
+  TELEMETRY_SOURCE_FUEL,
+  TELEMETRY_SOURCE_T1,
+  TELEMETRY_SOURCE_T2,
+  TELEMETRY_SOURCE_SPEED,
+  TELEMETRY_SOURCE_DIST,
+  TELEMETRY_SOURCE_GPS_ALT,
+  TELEMETRY_SOURCE_CELL,
+  TELEMETRY_SOURCE_CELLS_SUM,
+  TELEMETRY_SOURCE_VFAS,
+  TELEMETRY_SOURCE_CURRENT,
+  TELEMETRY_SOURCE_CONSUMPTION,
+  TELEMETRY_SOURCE_POWER,
+  TELEMETRY_SOURCE_ACCX,
+  TELEMETRY_SOURCE_ACCY,
+  TELEMETRY_SOURCE_ACCZ,
+  TELEMETRY_SOURCE_HDG,
+  TELEMETRY_SOURCE_VERTICAL_SPEED,
+  TELEMETRY_SOURCE_ASPEED,
+  TELEMETRY_SOURCE_DTE,
+  TELEMETRY_SOURCE_A1_MIN,
+  TELEMETRY_SOURCE_A2_MIN,
+  TELEMETRY_SOURCE_A3_MIN,
+  TELEMETRY_SOURCE_A4_MIN,
+  TELEMETRY_SOURCE_ALT_MIN,
+  TELEMETRY_SOURCE_ALT_MAX,
+  TELEMETRY_SOURCE_RPM_MAX,
+  TELEMETRY_SOURCE_T1_MAX,
+  TELEMETRY_SOURCE_T2_MAX,
+  TELEMETRY_SOURCE_SPEED_MAX,
+  TELEMETRY_SOURCE_DIST_MAX,
+  TELEMETRY_SOURCE_ASPEED_MAX,
+  TELEMETRY_SOURCE_CELL_MIN,
+  TELEMETRY_SOURCE_CELLS_MIN,
+  TELEMETRY_SOURCE_VFAS_MIN,
+  TELEMETRY_SOURCE_CURRENT_MAX,
+  TELEMETRY_SOURCE_POWER_MAX,
+  TELEMETRY_SOURCE_ACC,
+  TELEMETRY_SOURCE_GPS_TIME,
+  TELEMETRY_SOURCES_STATUS_COUNT = TELEMETRY_SOURCE_GPS_TIME+1,
+  TELEMETRY_SOURCES_DISPLAY_COUNT = TELEMETRY_SOURCE_POWER_MAX+1,
+  TELEMETRY_SOURCES_COUNT = TELEMETRY_SOURCE_POWER_MAX+1,
+  TELEMETRY_SOURCE_RESERVE = -1
+};
+
+#define TM_HASTELEMETRY     0x01
+#define TM_HASOFFSET        0x02
+#define TM_HASWSHH          0x04
+
+enum RawSourceType {
+  SOURCE_TYPE_NONE,
+  SOURCE_TYPE_VIRTUAL_INPUT,
+  SOURCE_TYPE_LUA_OUTPUT,
+  SOURCE_TYPE_STICK, // and POTS
+  SOURCE_TYPE_ROTARY_ENCODER,
+  SOURCE_TYPE_TRIM,
+  SOURCE_TYPE_MAX,
+  SOURCE_TYPE_SWITCH,
+  SOURCE_TYPE_CUSTOM_SWITCH,
+  SOURCE_TYPE_CYC,
+  SOURCE_TYPE_PPM,
+  SOURCE_TYPE_CH,
+  SOURCE_TYPE_GVAR,
+  SOURCE_TYPE_SPECIAL,
+  SOURCE_TYPE_TELEMETRY,
+  MAX_SOURCE_TYPE
+};
+
+class RawSourceRange
+{
+  Q_DECLARE_TR_FUNCTIONS(RawSourceRange)
+
+  public:
+    RawSourceRange():
+      decimals(0),
+      min(0.0),
+      max(0.0),
+      step(1.0),
+      offset(0.0)
+    {
+    }
+
+    float getValue(int value);
+
+    int decimals;
+    double min;
+    double max;
+    double step;
+    double offset;
+    QString unit;
+};
+
+#define RANGE_DELTA_FUNCTION      1
+#define RANGE_ABS_FUNCTION        2
+
+class RawSource {
+  Q_DECLARE_TR_FUNCTIONS(RawSource)
+
+  public:
+    enum SourceGroups {
+      NoneGroup      = 0x001,
+      SourcesGroup   = 0x002,
+      TrimsGroup     = 0x004,
+      SwitchesGroup  = 0x008,
+      GVarsGroup     = 0x010,
+      TelemGroup     = 0x020,
+      InputsGroup    = 0x040,
+      ScriptsGroup   = 0x080,
+
+      InputSourceGroups = NoneGroup | SourcesGroup | TrimsGroup | SwitchesGroup | InputsGroup,
+      AllSourceGroups   = InputSourceGroups | GVarsGroup | TelemGroup | ScriptsGroup
+    };
+
+    RawSource():
+      type(SOURCE_TYPE_NONE),
+      index(0)
+    {
+    }
+
+    explicit RawSource(int value):
+      type(RawSourceType(abs(value)/65536)),
+      index(value >= 0 ? abs(value)%65536 : -(abs(value)%65536))
+    {
+    }
+
+    RawSource(RawSourceType type, int index=0):
+      type(type),
+      index(index)
+    {
+    }
+
+    inline const int toValue() const
+    {
+      return index >= 0 ? (type * 65536 + index) : -(type * 65536 - index);
+    }
+
+    RawSource convert(RadioDataConversionState & cstate);
+    QString toString(const ModelData * model = NULL, const GeneralSettings * const generalSettings = NULL, Board::Type board = Board::BOARD_UNKNOWN) const;
+    RawSourceRange getRange(const ModelData * model, const GeneralSettings & settings, unsigned int flags=0) const;
+    bool isStick(int * potsIndex = NULL, Board::Type board = Board::BOARD_UNKNOWN) const;
+    bool isPot(int * potsIndex = NULL, Board::Type board = Board::BOARD_UNKNOWN) const;
+    bool isSlider(int * sliderIndex = NULL, Board::Type board = Board::BOARD_UNKNOWN) const;
+    bool isTimeBased(Board::Type board = Board::BOARD_UNKNOWN) const;
+    bool isAvailable(const ModelData * const model = NULL, const GeneralSettings * const gs = NULL, Board::Type board = Board::BOARD_UNKNOWN) const;
+
+    bool operator == ( const RawSource & other) {
+      return (this->type == other.type) && (this->index == other.index);
+    }
+
+    bool operator != ( const RawSource & other) {
+      return (this->type != other.type) || (this->index != other.index);
+    }
+
+    RawSourceType type;
+    int index;
+};
+
+#endif // RAWSOURCE_H

companion/src/firmwares/rawswitch.cpp

@@ -0,0 +1,243 @@
+/*
+ * 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 "rawswitch.h"
+
+#include "eeprominterface.h"
+#include "radiodata.h"
+#include "radiodataconversionstate.h"
+
+QString RawSwitch::toString(Board::Type board, const GeneralSettings * const generalSettings, const ModelData * const modelData) const
+{
+  if (board == Board::BOARD_UNKNOWN) {
+    board = getCurrentBoard();
+  }
+
+  static const QString switches9X[] = {
+    QString("THR"), QString("RUD"), QString("ELE"),
+    QString("ID0"), QString("ID1"), QString("ID2"),
+    QString("AIL"), QString("GEA"), QString("TRN")
+  };
+
+  static const QString trimsSwitches[] = {
+    tr("RudTrim Left"), tr("RudTrim Right"),
+    tr("EleTrim Down"), tr("EleTrim Up"),
+    tr("ThrTrim Down"), tr("ThrTrim Up"),
+    tr("AilTrim Left"), tr("AilTrim Right"),
+    tr("Trim 5 Down"), tr("Trim 5 Up"),
+    tr("Trim 6 Down"), tr("Trim 6 Up")
+  };
+
+  static const QString trimsSwitches2[] = {
+    tr("TrmH Left"), tr("TrmH Right"),
+    tr("TrmV Down"), tr("TrmV Up")
+  };
+
+  static const QString rotaryEncoders[] = {
+    tr("REa"), tr("REb")
+  };
+
+  static const QString timerModes[] = {
+    tr("OFF"), tr("ON"),
+    tr("THs"), tr("TH%"), 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 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)) {
+          qr = div(index-1, 3);
+          if (generalSettings)
+            swName = QString(generalSettings->switchName[qr.quot]);
+          if (swName.isEmpty())
+            swName = Boards::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:
+        if (modelData)
+          return modelData->logicalSw[index].nameToString(index-1);
+        else
+          return LogicalSwitchData().nameToString(index-1);
+
+      case SWITCH_TYPE_MULTIPOS_POT:
+        if (!Boards::getCapability(board, Board::MultiposPotsPositions))
+          return tr("???");
+        qr = div(index - 1, Boards::getCapability(board, Board::MultiposPotsPositions));
+        if (generalSettings && qr.quot < (int)DIM(generalSettings->potConfig))
+          swName = QString(generalSettings->potName[qr.quot]);
+        if (swName.isEmpty())
+          swName = Boards::getAnalogInputName(board, qr.quot + Boards::getCapability(board, Board::Sticks));
+        return swName + "_" + QString::number(qr.rem + 1);
+
+      case SWITCH_TYPE_TRIM:
+        return (Boards::getCapability(board, Board::NumTrims) == 2 ? CHECK_IN_ARRAY(trimsSwitches2, index-1) : CHECK_IN_ARRAY(trimsSwitches, index-1));
+
+      case SWITCH_TYPE_ROTARY_ENCODER:
+        return CHECK_IN_ARRAY(rotaryEncoders, index-1);
+
+      case SWITCH_TYPE_ON:
+        return tr("ON");
+
+      case SWITCH_TYPE_OFF:
+        return tr("OFF");
+
+      case SWITCH_TYPE_ONE:
+        return tr("One");
+
+      case SWITCH_TYPE_FLIGHT_MODE:
+        if (modelData)
+          return modelData->flightModeData[index-1].nameToString(index - 1);
+        else
+          return FlightModeData().nameToString(index - 1);
+
+      case SWITCH_TYPE_NONE:
+        return tr("----");
+
+      case SWITCH_TYPE_TIMER_MODE:
+        return CHECK_IN_ARRAY(timerModes, index);
+
+      case SWITCH_TYPE_SENSOR:
+        if (modelData)
+          return modelData->sensorData[index-1].nameToString(index-1);
+        else
+          return SensorData().nameToString(index-1);
+
+      case SWITCH_TYPE_TELEMETRY:
+        return tr("Telemetry");
+
+      default:
+        return tr("???");
+    }
+  }
+}
+
+bool RawSwitch::isAvailable(const ModelData * const model, const GeneralSettings * const gs, Board::Type board) const
+{
+  if (board == Board::BOARD_UNKNOWN)
+    board = getCurrentBoard();
+
+  Boards b(board);
+
+  if (type == SWITCH_TYPE_SWITCH && abs(index) > b.getCapability(Board::SwitchPositions))
+    return false;
+
+  if (type == SWITCH_TYPE_TRIM && abs(index) > b.getCapability(Board::NumTrimSwitches))
+    return false;
+
+  if (gs) {
+    if (type == SWITCH_TYPE_SWITCH && IS_HORUS_OR_TARANIS(board) && !gs->switchPositionAllowedTaranis(abs(index)))
+      return false;
+
+    if (type == SWITCH_TYPE_MULTIPOS_POT) {
+      int pot = div(abs(index) - 1, b.getCapability(Board::MultiposPotsPositions)).quot;
+      if (!gs->isPotAvailable(pot) || gs->potConfig[pot] != Board::POT_MULTIPOS_SWITCH)
+        return false;
+    }
+  }
+
+  if (model && !model->isAvailable(*this))
+    return false;
+
+  return true;
+}
+
+RawSwitch RawSwitch::convert(RadioDataConversionState & cstate)
+{
+  if (!index)
+    return *this;
+
+  cstate.setItemType(tr("SW"), 2);
+  RadioDataConversionState::EventType evt = RadioDataConversionState::EVT_NONE;
+  RadioDataConversionState::LogField oldData(index, toString(cstate.fromType, cstate.fromGS(), cstate.fromModel()));
+
+  if (type == SWITCH_TYPE_SWITCH) {
+    int srcIdx = div(abs(index)-1, 3).quot;  // raw source index
+    int delta = 0;
+
+    // SWI to SWR don't exist on !X9E board
+    if (!IS_TARANIS_X9E(cstate.toType) && IS_TARANIS_X9E(cstate.fromType)) {
+      if (srcIdx > 7) {
+        index %= 24;
+        evt = RadioDataConversionState::EVT_CVRT;
+      }
+    }
+
+    // No SE and SG on X7 board
+    if (IS_TARANIS_X7(cstate.toType) && (IS_TARANIS_X9(cstate.fromType) || IS_HORUS(cstate.fromType))) {
+      if (srcIdx == 4 || srcIdx == 5) {
+        delta = 3;  // SE to SD & SF to SF
+        if (srcIdx == 4)
+          evt = RadioDataConversionState::EVT_CVRT;
+      }
+      else if (srcIdx == 6) {
+        delta = 9;  // SG to SD
+        evt = RadioDataConversionState::EVT_CVRT;
+      }
+      else if (srcIdx == 7) {
+        delta = 6;  // SH to SH
+      }
+    }
+    // Compensate for SE and SG on X9/Horus board if converting from X7
+    else if ((IS_TARANIS_X9(cstate.toType) || IS_HORUS(cstate.toType)) && IS_TARANIS_X7(cstate.fromType)) {
+      if (srcIdx == 4) {
+        delta = -3;  // SF to SF
+      }
+      else if (srcIdx == 5) {
+        delta = -6;  // SH to SH
+      }
+    }
+
+    if (index < 0) {
+      delta = -delta;  // invert for !switch
+    }
+
+    index -= delta;
+
+  }  // SWITCH_TYPE_SWITCH
+
+  // final validation (we do not pass model to isAvailable() because we don't know what has or hasn't been converted)
+  if (!isAvailable(NULL, cstate.toGS(), cstate.toType)) {
+    cstate.setInvalid(oldData);
+    type = MAX_SWITCH_TYPE;  // TODO: better way to flag invalid switches?
+  }
+  else if (evt == RadioDataConversionState::EVT_CVRT) {
+    cstate.setConverted(oldData, RadioDataConversionState::LogField(index, toString(cstate.toType, cstate.toGS(), cstate.toModel())));
+  }
+  else if (oldData.id != index) {
+    // provide info by default if anything changed
+    cstate.setMoved(oldData, RadioDataConversionState::LogField(index, toString(cstate.toType, cstate.toGS(), cstate.toModel())));
+  }
+
+  return *this;
+}

companion/src/firmwares/rawswitch.h

@@ -0,0 +1,107 @@
+/*
+ * 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 RAWSWITCH_H
+#define RAWSWITCH_H
+
+#include "boards.h"
+#include "constants.h"
+
+#include <QtCore>
+
+class Firmware;
+class ModelData;
+class GeneralSettings;
+class RadioDataConversionState;
+
+enum RawSwitchType {
+  SWITCH_TYPE_NONE,
+  SWITCH_TYPE_SWITCH,
+  SWITCH_TYPE_VIRTUAL,
+  SWITCH_TYPE_MULTIPOS_POT,
+  SWITCH_TYPE_TRIM,
+  SWITCH_TYPE_ROTARY_ENCODER,
+  SWITCH_TYPE_ON,
+  SWITCH_TYPE_OFF,
+  SWITCH_TYPE_ONE,
+  SWITCH_TYPE_FLIGHT_MODE,
+  SWITCH_TYPE_TIMER_MODE,
+  SWITCH_TYPE_TELEMETRY,
+  SWITCH_TYPE_SENSOR,
+  MAX_SWITCH_TYPE
+};
+
+class RawSwitch {
+  Q_DECLARE_TR_FUNCTIONS(RawSwitch)
+
+  public:
+    enum SwitchContext
+    {
+      LogicalSwitchesContext  = 0x01,
+      SpecialFunctionsContext = 0x02,
+      GlobalFunctionsContext  = 0x04,
+      TimersContext           = 0x08,
+      MixesContext            = 0x10,
+
+      AllModelContexts        = SpecialFunctionsContext | LogicalSwitchesContext | TimersContext | MixesContext,
+      AllSwitchContexts       = AllModelContexts | GlobalFunctionsContext
+    };
+
+    RawSwitch():
+      type(SWITCH_TYPE_NONE),
+      index(0)
+    {
+    }
+
+    explicit RawSwitch(int value):
+      type(RawSwitchType(abs(value)/256)),
+      index(value >= 0 ? abs(value)%256 : -(abs(value)%256))
+    {
+    }
+
+    RawSwitch(RawSwitchType type, int index=0):
+      type(type),
+      index(index)
+    {
+    }
+
+    inline const int toValue() const
+    {
+      return index >= 0 ? (type * 256 + index) : -(type * 256 - index);
+    }
+
+    RawSwitch convert(RadioDataConversionState & cstate);
+    QString toString(Board::Type board = Board::BOARD_UNKNOWN, const GeneralSettings * const generalSettings = NULL, const ModelData * const modelData = NULL) const;
+    bool isAvailable(const ModelData * const model = NULL, const GeneralSettings * const gs = NULL, Board::Type board = Board::BOARD_UNKNOWN) const;
+
+    bool operator== ( const RawSwitch& other) {
+      return (this->type == other.type) && (this->index == other.index);
+    }
+
+    bool operator!= ( const RawSwitch& other) {
+      return (this->type != other.type) || (this->index != other.index);
+    }
+
+
+    RawSwitchType type;
+    int index;
+};
+
+#endif // RAWSWITCH_H

companion/src/firmwares/sensordata.cpp

@@ -0,0 +1,92 @@
+/*
+ * 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 "sensordata.h"
+
+#include "radiodata.h"
+
+void SensorData::updateUnit()
+{
+  if (type == TELEM_TYPE_CALCULATED) {
+    if (formula == TELEM_FORMULA_CONSUMPTION)
+      unit = UNIT_MAH;
+  }
+}
+
+QString SensorData::unitString() const
+{
+  switch (unit) {
+    case UNIT_VOLTS:
+      return tr("V");
+    case UNIT_AMPS:
+      return tr("A");
+    case UNIT_MILLIAMPS:
+      return tr("mA");
+    case UNIT_KTS:
+      return tr("kts");
+    case UNIT_METERS_PER_SECOND:
+      return tr("m/s");
+    case UNIT_KMH:
+      return tr("km/h");
+    case UNIT_MPH:
+      return tr("mph");
+    case UNIT_METERS:
+      return tr("m");
+    case UNIT_FEET:
+      return tr("f");
+    case UNIT_CELSIUS:
+      return trUtf8("°C");
+    case UNIT_FAHRENHEIT:
+      return trUtf8("°F");
+    case UNIT_PERCENT:
+      return tr("%");
+    case UNIT_MAH:
+      return tr("mAh");
+    case UNIT_WATTS:
+      return tr("W");
+    case UNIT_MILLIWATTS:
+        return tr("mW");
+    case UNIT_DB:
+      return tr("dB");
+    case UNIT_RPMS:
+      return tr("rpms");
+    case UNIT_G:
+      return tr("g");
+    case UNIT_DEGREE:
+      return trUtf8("°");
+    case UNIT_RADIANS:
+      return trUtf8("Rad");
+    case UNIT_HOURS:
+      return tr("hours");
+    case UNIT_MINUTES:
+      return tr("minutes");
+    case UNIT_SECONDS:
+      return tr("seconds");
+    case UNIT_CELLS:
+      return tr("V");
+    default:
+      return "";
+  }
+}
+
+QString SensorData::nameToString(int index) const
+{
+  return RadioData::getElementName(tr("TELE"), index + 1, label);
+}

companion/src/firmwares/sensordata.h

@@ -0,0 +1,153 @@
+/*
+ * 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 SENSORDATA_H
+#define SENSORDATA_H
+
+#include <QtCore>
+
+#define CPN_MAX_SENSORS       32
+
+class SensorData {
+  Q_DECLARE_TR_FUNCTIONS(SensorData)
+
+  public:
+
+    enum
+    {
+      TELEM_TYPE_CUSTOM,
+      TELEM_TYPE_CALCULATED
+    };
+
+    enum
+    {
+      TELEM_FORMULA_ADD,
+      TELEM_FORMULA_AVERAGE,
+      TELEM_FORMULA_MIN,
+      TELEM_FORMULA_MAX,
+      TELEM_FORMULA_MULTIPLY,
+      TELEM_FORMULA_TOTALIZE,
+      TELEM_FORMULA_CELL,
+      TELEM_FORMULA_CONSUMPTION,
+      TELEM_FORMULA_DIST,
+      TELEM_FORMULA_LAST = TELEM_FORMULA_DIST
+    };
+
+    enum {
+      TELEM_CELL_INDEX_LOWEST,
+      TELEM_CELL_INDEX_1,
+      TELEM_CELL_INDEX_2,
+      TELEM_CELL_INDEX_3,
+      TELEM_CELL_INDEX_4,
+      TELEM_CELL_INDEX_5,
+      TELEM_CELL_INDEX_6,
+//      TELEM_CELL_INDEX_7, // PCBI6X: uses RAM and I don't think someone will use 8S with i6X
+//      TELEM_CELL_INDEX_8,
+      TELEM_CELL_INDEX_HIGHEST,
+      TELEM_CELL_INDEX_DELTA,
+      TELEM_CELL_INDEX_LAST = TELEM_CELL_INDEX_DELTA
+    };
+
+    enum
+    {
+      UNIT_RAW,
+      UNIT_VOLTS,
+      UNIT_AMPS,
+      UNIT_MILLIAMPS,
+      UNIT_KTS,
+      UNIT_METERS_PER_SECOND,
+      UNIT_FEET_PER_SECOND,
+      UNIT_KMH,
+      UNIT_MPH,
+      UNIT_METERS,
+      UNIT_FEET,
+      UNIT_CELSIUS,
+      UNIT_FAHRENHEIT,
+      UNIT_PERCENT,
+      UNIT_MAH,
+      UNIT_WATTS,
+      UNIT_MILLIWATTS,
+      UNIT_DB,
+      UNIT_RPMS,
+      UNIT_G,
+      UNIT_DEGREE,
+      UNIT_RADIANS,
+      UNIT_MILLILITERS,
+      UNIT_FLOZ,
+      UNIT_HOURS,
+      UNIT_MINUTES,
+      UNIT_SECONDS,
+      // FrSky format used for these fields, could be another format in the future
+        UNIT_FIRST_VIRTUAL,
+      UNIT_CELLS = UNIT_FIRST_VIRTUAL,
+      UNIT_DATETIME,
+      UNIT_GPS,
+      UNIT_GPS_LONGITUDE,
+      UNIT_GPS_LATITUDE,
+      UNIT_GPS_LONGITUDE_EW,
+      UNIT_GPS_LATITUDE_NS,
+      UNIT_DATETIME_YEAR,
+      UNIT_DATETIME_DAY_MONTH,
+      UNIT_DATETIME_HOUR_MIN,
+      UNIT_DATETIME_SEC
+    };
+
+    SensorData() { clear(); }
+    unsigned int type; // custom / formula
+    unsigned int id;
+    unsigned int subid;
+    unsigned int instance;
+    unsigned int persistentValue;
+    unsigned int formula;
+    char label[4+1];
+    unsigned int unit;
+    unsigned int prec;
+    bool autoOffset;
+    bool filter;
+    bool logs;
+    bool persistent;
+    bool onlyPositive;
+
+    // for custom sensors
+    unsigned int ratio;
+    int offset;
+
+    // for consumption
+    unsigned int amps;
+
+    // for cell
+    unsigned int source;
+    unsigned int index;
+
+    // for calculations
+    int sources[4];
+
+    // for GPS dist
+    unsigned int gps;
+    unsigned int alt;
+
+    bool isAvailable() const { return strlen(label) > 0; }
+    void updateUnit();
+    QString unitString() const;
+    QString nameToString(int index) const;
+    void clear() { memset(this, 0, sizeof(SensorData)); }
+};
+
+#endif // SENSORDATA_H

companion/src/firmwares/telem_data.cpp

@@ -0,0 +1,74 @@
+/*
+ * 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 "telem_data.h"
+
+#include "eeprominterface.h"  // for getCurrentBoard()
+
+float FrSkyChannelData::getRatio() const
+{
+  if (type==0 || type==1 || type==2)
+    return float(ratio << multiplier) / 10.0;
+  else
+    return ratio << multiplier;
+}
+
+RawSourceRange FrSkyChannelData::getRange() const
+{
+  RawSourceRange result;
+  float ratio = getRatio();
+  if (type==0 || type==1 || type==2)
+    result.decimals = 2;
+  else
+    result.decimals = 0;
+  result.step = ratio / 255;
+  result.min = offset * result.step;
+  result.max = ratio + result.min;
+  result.unit = tr("V");
+  return result;
+}
+
+void FrSkyScreenData::clear()
+{
+  memset(reinterpret_cast<void *>(this), 0, sizeof(FrSkyScreenData));
+  if (!IS_ARM(getCurrentBoard())) {
+    type = TELEMETRY_SCREEN_NUMBERS;
+  }
+}
+
+void FrSkyData::clear()
+{
+  usrProto = 0;
+  voltsSource = 0;
+  altitudeSource = 0;
+  currentSource = 0;
+  varioMin = 0;
+  varioCenterMin = 0;    // if increment in 0.2m/s = 3.0m/s max
+  varioCenterMax = 0;
+  varioMax = 0;
+  mAhPersistent = 0;
+  storedMah = 0;
+  fasOffset = 0;
+  for (int i=0; i<4; i++)
+    screens[i].clear();
+  varioSource = 2/*VARIO*/;
+  blades = 2;
+}
+

companion/src/firmwares/telem_data.h

@@ -0,0 +1,176 @@
+/*
+ * 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 TELEMETRYDATA_H
+#define TELEMETRYDATA_H
+
+#include "rawsource.h"
+
+#include <QtCore>
+
+class FrSkyAlarmData {
+  Q_DECLARE_TR_FUNCTIONS(FrSkyAlarmData)
+
+  public:
+    FrSkyAlarmData() { clear(); }
+    unsigned int   level;               // 0=none, 1=Yellow, 2=Orange, 3=Red
+    unsigned int   greater;             // 0=LT(<), 1=GT(>)
+    unsigned int value;               // 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
+
+    void clear() { memset(this, 0, sizeof(FrSkyAlarmData)); }
+
+    static QString alarmLevelName(int alarm)
+    {
+      switch (alarm) {
+        case 1:
+          return tr("Yellow");
+        case 2:
+          return tr("Orange");
+        case 3:
+          return tr("Red");
+        default:
+          return "----";
+      }
+    }
+};
+
+class FrSkyChannelData {
+  Q_DECLARE_TR_FUNCTIONS(FrSkyChannelData)
+
+  public:
+    FrSkyChannelData() { clear(); }
+    unsigned int ratio;                // 0.0 means not used, 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
+    unsigned int type;                 // future use: 0=volts, 1=ml...
+    int   offset;
+    unsigned int multiplier;
+    FrSkyAlarmData alarms[2];
+
+    float getRatio() const;
+    RawSourceRange getRange() const;
+    void clear() { memset(reinterpret_cast<void *>(this), 0, sizeof(FrSkyChannelData)); }
+
+    static QString unitString(int units)
+    {
+      switch(units) {
+        case 1:
+          return QCoreApplication::translate("FrSkyChannelData", "---");
+        default:
+          return QCoreApplication::translate("FrSkyChannelData", "V");
+      }
+    }
+};
+
+struct FrSkyBarData {
+  RawSource source;
+  int barMin;           // minimum for bar display
+  int barMax;           // ditto for max display (would usually = ratio)
+};
+
+struct FrSkyLineData {
+  RawSource source[3];
+};
+
+struct TelemetryScriptData {
+  char filename[8+1];
+};
+
+enum TelemetryScreenEnum {
+  TELEMETRY_SCREEN_NONE,
+  TELEMETRY_SCREEN_NUMBERS,
+  TELEMETRY_SCREEN_BARS,
+  TELEMETRY_SCREEN_SCRIPT
+};
+
+class FrSkyScreenData {
+  public:
+    FrSkyScreenData() { clear(); }
+
+    typedef struct {
+      FrSkyBarData bars[4];
+      FrSkyLineData lines[4];
+      TelemetryScriptData script;
+    } FrSkyScreenBody;
+
+    unsigned int type;
+    FrSkyScreenBody body;
+
+    void clear();
+};
+
+enum TelemetryVarioSources {
+  TELEMETRY_VARIO_SOURCE_ALTI,
+  TELEMETRY_VARIO_SOURCE_ALTI_PLUS,
+  TELEMETRY_VARIO_SOURCE_VSPEED,
+  TELEMETRY_VARIO_SOURCE_A1,
+  TELEMETRY_VARIO_SOURCE_A2,
+  TELEMETRY_VARIO_SOURCE_DTE,
+};
+
+enum TelemetryVoltsSources {
+  TELEMETRY_VOLTS_SOURCE_A1,
+  TELEMETRY_VOLTS_SOURCE_A2,
+  TELEMETRY_VOLTS_SOURCE_A3,
+  TELEMETRY_VOLTS_SOURCE_A4,
+  TELEMETRY_VOLTS_SOURCE_FAS,
+  TELEMETRY_VOLTS_SOURCE_CELLS
+};
+
+enum TelemetryCurrentSources {
+  TELEMETRY_CURRENT_SOURCE_NONE,
+  TELEMETRY_CURRENT_SOURCE_A1,
+  TELEMETRY_CURRENT_SOURCE_A2,
+  TELEMETRY_CURRENT_SOURCE_A3,
+  TELEMETRY_CURRENT_SOURCE_A4,
+  TELEMETRY_CURRENT_SOURCE_FAS
+};
+
+class FrSkyData {
+  public:
+    FrSkyData() { clear(); }
+    FrSkyChannelData channels[4];
+    unsigned int usrProto;
+    int blades;
+    unsigned int voltsSource;
+    unsigned int altitudeSource;
+    unsigned int currentSource;
+    FrSkyScreenData screens[4];
+    unsigned int varioSource;
+    bool varioCenterSilent;
+    int varioMin;
+    int varioCenterMin;    // if increment in 0.2m/s = 3.0m/s max
+    int varioCenterMax;
+    int varioMax;
+    bool mAhPersistent;
+    unsigned int storedMah;
+    int fasOffset;
+    bool ignoreSensorIds;
+
+    void clear();
+};
+
+class MavlinkData {
+  public:
+    MavlinkData() { clear();}
+    unsigned int rc_rssi_scale;
+    unsigned int pc_rssi_en;
+    void clear() { memset(this, 0, sizeof(MavlinkData)); }
+};
+
+#endif // TELEMETRYDATA_H

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();
@@ -118,7 +118,7 @@ int FlashEEpromDialog::getEEpromVersion(const QString & filename)
     result = radioData->generalSettings.version;
   }
   else {
-    QMessageBox::warning(this, tr("Error"), storage.error());
+    QMessageBox::warning(this, CPN_STR_TTL_ERROR, storage.error());
   }
   return result;
 }
@@ -163,7 +163,7 @@ bool FlashEEpromDialog::patchCalibration()
     return true;
   }
   else {
-    QMessageBox::critical(this, tr("Warning"), tr("Wrong radio calibration data in profile, Settings not patched"));
+    QMessageBox::critical(this, CPN_STR_TTL_WARNING, tr("Wrong radio calibration data in profile, Settings not patched"));
     return false;
   }
 }
@@ -208,7 +208,7 @@ bool FlashEEpromDialog::patchHardwareSettings()
     return true;
   }
   else {
-    QMessageBox::critical(this, tr("Warning"), tr("Wrong radio setting data in profile, Settings not patched"));
+    QMessageBox::critical(this, CPN_STR_TTL_WARNING, tr("Wrong radio setting data in profile, Settings not patched"));
     return false;
   }
 }
@@ -227,19 +227,19 @@ 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 == 0) {
       return;
     }
     if (!file.open(QIODevice::WriteOnly)) {
-      QMessageBox::warning(this, tr("Error"), tr("Cannot write file %1:\n%2.").arg(filename).arg(file.errorString()));
+      QMessageBox::warning(this, CPN_STR_TTL_ERROR, tr("Cannot write file %1:\n%2.").arg(filename).arg(file.errorString()));
       return;
     }
     QTextStream outputStream(&file);
     long result = file.write((char*)eeprom, eeprom_size);
     if (result != eeprom_size) {
-      QMessageBox::warning(this, tr("Error"), tr("Error writing file %1:\n%2.").arg(filename).arg(file.errorString()));
+      QMessageBox::warning(this, CPN_STR_TTL_ERROR, tr("Error writing file %1:\n%2.").arg(filename).arg(file.errorString()));
       return;
     }
   }
@@ -277,16 +277,16 @@ void FlashEEpromDialog::on_burnButton_clicked()
     if (convertEEprom(filename, compatEEprom, firmwareFilename)) {
       int compatVersion = getEEpromVersion(compatEEprom);
       if ((compatVersion / 100) != (eepromVersion / 100)) {
-        QMessageBox::warning(this, tr("Warning"), tr("The radio firmware belongs to another product family, check file and preferences!"));
+        QMessageBox::warning(this, CPN_STR_TTL_WARNING, tr("The radio firmware belongs to another product family, check file and preferences!"));
         return;
       }
       else if (compatVersion < eepromVersion) {
-        QMessageBox::warning(this, tr("Warning"), tr("The radio firmware is outdated, please upgrade!"));
+        QMessageBox::warning(this, CPN_STR_TTL_WARNING, tr("The radio firmware is outdated, please upgrade!"));
         return;
       }
       filename = compatEEprom;
     }
-    else if (QMessageBox::question(this, "Error", tr("Cannot check Models and Settings compatibility! Continue anyway?"), QMessageBox::Yes|QMessageBox::No) == QMessageBox::No) {
+    else if (QMessageBox::question(this, CPN_STR_TTL_ERROR, tr("Cannot check Models and Settings compatibility! Continue anyway?"), QMessageBox::Yes|QMessageBox::No) == QMessageBox::No) {
       return;
     }
     qunlink(firmwareFilename);

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/flashfirmwaredialog.cpp

@@ -142,7 +142,7 @@ void FlashFirmwareDialog::on_firmwareLoad_clicked()
   if (!fileName.isEmpty()) {
     fwName = fileName;
     if (!fwName.isEmpty() && !fwName.endsWith(".dfu") && !FirmwareInterface(fwName).isValid()) {
-      QMessageBox::warning(this, tr("Warning"), tr("%1 may not be a valid firmware file").arg(fwName));
+      QMessageBox::warning(this, CPN_STR_TTL_WARNING, tr("%1 may not be a valid firmware file").arg(fwName));
     }
     updateUI();
   }
@@ -152,10 +152,10 @@ void FlashFirmwareDialog::on_useFirmwareSplash_clicked()
 {
   FirmwareInterface firmware(fwName);
   if (!firmware.isValid()) {
-    QMessageBox::warning(this, tr("Error"), tr( "The firmware file is not valid." ));
+    QMessageBox::warning(this, CPN_STR_TTL_ERROR, tr( "The firmware file is not valid." ));
   }
   else if (!firmware.hasSplash()) {
-    QMessageBox::warning(this, tr("Error"), tr( "There is no start screen image in the firmware file." ));
+    QMessageBox::warning(this, CPN_STR_TTL_ERROR, tr( "There is no start screen image in the firmware file." ));
   }
   else {
     imageSource = FIRMWARE;
@@ -169,7 +169,7 @@ void FlashFirmwareDialog::on_useProfileSplash_clicked()
   if (!fileName.isEmpty()) {
     QImage image(fileName);
     if (image.isNull()) {
-      QMessageBox::critical(this, tr("Error"), tr("Profile image %1 is invalid.").arg(fileName));
+      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("Profile image %1 is invalid.").arg(fileName));
     }
     else {
       imageSource = PROFILE;
@@ -189,12 +189,12 @@ void FlashFirmwareDialog::on_useExternalSplash_clicked()
     g.imagesDir( QFileInfo(fileName).dir().absolutePath() );
     QImage image(fileName);
     if (image.isNull()) {
-      QMessageBox::critical(this, tr("Error"), tr("Image could not be loaded from %1").arg(fileName));
+      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("Image could not be loaded from %1").arg(fileName));
     }
     else{
       imageSource = EXTERNAL;
       imageFile = fileName;
-    }  
+    }
   }
   updateUI();
 }
@@ -207,7 +207,7 @@ void FlashFirmwareDialog::on_useLibrarySplash_clicked()
   if (!fileName.isEmpty()) {
     QImage image(fileName);
     if (image.isNull()) {
-      QMessageBox::critical(this, tr("Error"), tr("The library image could not be loaded"));
+      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("The library image could not be loaded"));
     }
     else {
       imageSource = LIBRARY;
@@ -234,7 +234,7 @@ void FlashFirmwareDialog::on_burnButton_clicked()
       image = pixmap->toImage().scaled(ui->splash->width(), ui->splash->height());
     }
     if (image.isNull()) {
-      QMessageBox::critical(this, tr("Warning"), tr("Splash image not found"));
+      QMessageBox::critical(this, CPN_STR_TTL_WARNING, tr("Splash image not found"));
       return;
     }
     // write the customized firmware
@@ -247,7 +247,7 @@ void FlashFirmwareDialog::on_burnButton_clicked()
     FirmwareInterface firmware(fwName);
     firmware.setSplash(image);
     if (firmware.save(tempFile) <= 0) {
-      QMessageBox::critical(this, tr("Warning"), tr("Cannot save customized firmware"));
+      QMessageBox::critical(this, CPN_STR_TTL_WARNING, tr("Cannot save customized firmware"));
       return;
     }
     startFlash(tempFile);
@@ -304,7 +304,7 @@ void FlashFirmwareDialog::startFlash(const QString &filename)
     backupPath = g.profile[g.id()].pBackupDir();
     if (backupPath.isEmpty()) {
       backupPath=g.backupDir();
-    }     
+    }
     backupFilename = backupPath + "/backup-" + QDateTime().currentDateTime().toString("yyyy-MM-dd-HHmmss") + ".bin";
     result = readEeprom(backupFilename, progressDialog.progress());
     sleep(2);

companion/src/fwpreferencesdialog.cpp

@@ -21,25 +21,19 @@
 #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) :
+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);
-  }
+  MainWindow * mw = qobject_cast<MainWindow *>(this->parent());
+  if (mw)
+    connect(mw, &MainWindow::firmwareDownloadCompleted, this, &FirmwarePreferencesDialog::initSettings);
 }
 
 FirmwarePreferencesDialog::~FirmwarePreferencesDialog()
@@ -49,35 +43,36 @@ FirmwarePreferencesDialog::~FirmwarePreferencesDialog()
 
 void FirmwarePreferencesDialog::initSettings()
 {
-  ui->fwTypeLbl->setText(g.profile[g.id()].fwType());
-  int version = g.fwRev.get(g.profile[g.id()].fwType());
-  if (version > 0) {
+  ui->fwTypeLbl->setText(g.currentProfile().fwType());
+  int version = g.fwRev.get(g.currentProfile().fwType());
+  if (version > 0)
     ui->lastRevisionLbl->setText(index2version(version));
-  }
+  else
+    ui->lastRevisionLbl->setText(tr("Unknown"));
 }
 
 void FirmwarePreferencesDialog::on_checkFWUpdates_clicked()
 {
-  MainWindow * mw = (MainWindow *)this->parent();
-  mw->checkForFirmwareUpdate();
-  initSettings();
+  MainWindow * mw = qobject_cast<MainWindow *>(this->parent());
+  if (mw)
+    mw->checkForFirmwareUpdate();
 }
 
 void FirmwarePreferencesDialog::on_fw_dnld_clicked()
 {
-  MainWindow * mw = (MainWindow *)this->parent();
-  mw->dowloadLastFirmwareUpdate();
-  initSettings();
+  MainWindow * mw = qobject_cast<MainWindow *>(this->parent());
+  if (mw)
+    mw->dowloadLastFirmwareUpdate();
 }
 
-void FirmwarePreferencesDialog::on_voice_dnld_clicked()
+void FirmwarePreferencesDialog::on_sd_dnld_clicked()
 {
-  QString url = "http://voices-21.open-tx.org/";
+  QString url = g.openTxCurrentDownloadBranchUrl() % QStringLiteral("sdcard/");
   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() != AppData::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();
 };