Implement AUtobind and low power modes

This is useful if OpenTX firmware is older than the multi module firmware and the protocol in question is not yet in the protocol list of the OpenTX firmware.

.gitattributes

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

.gitignore

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

.gitmodules

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

.travis.yml

@@ -1,93 +1,20 @@
-sudo: required
-dist: trusty
-language: python
-compiler: gcc
-
-virtualenv:
-  system_site_packages: true
-
-python:
-  - 3.4
-
-env:
-  global:
-    - 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"
-    - PYTHONPATH=${PYTHONPATH}:/usr/lib/python3/dist-packages
-  matrix:
-    #
-    # ALL will build every individual board & DEFAULT, sequentially.
-    # DEFAULT is "make all" (including Companion & Simulator), with default settings
-    #
-    # - FLAVOR=ALL
-    - FLAVOR=DEFAULT
-    - FLAVOR=AVR9X
-    # - FLAVOR=9X
-    # - FLAVOR=GRUVIN9X
-    # - FLAVOR=MEGA2560
-    - FLAVOR=ARM9X
-    # - FLAVOR=AR9X
-    # - FLAVOR=SKY9X
-    # - FLAVOR=9XRPRO
-    - FLAVOR=X7
-    - FLAVOR=X9
-    # - FLAVOR=X9D
-    # - FLAVOR=X9D+
-    # - FLAVOR=X9E
-    - FLAVOR=HORUS
-    # - FLAVOR=X10
-    # - FLAVOR=X12Sr10
-    # - FLAVOR=X12S
+language: cpp
 
 before_install:
-  - sudo add-apt-repository ppa:ubuntu-sdk-team/ppa --yes
+  - sudo apt-get remove cmake cmake-data --yes
+  - sudo add-apt-repository ppa:george-edison55/precise-backports --yes
   - sudo add-apt-repository ppa:terry.guo/gcc-arm-embedded --yes
   - sudo add-apt-repository ppa:ubuntu-toolchain-r/test --yes
-  - if [ "$QT_BASE" = "53" ]; then sudo add-apt-repository ppa:beineri/opt-qt532-trusty -y; fi
-  - if [ "$QT_BASE" = "54" ]; then sudo add-apt-repository ppa:beineri/opt-qt542-trusty -y; fi
-  - if [ "$QT_BASE" = "55" ]; then sudo add-apt-repository ppa:beineri/opt-qt551-trusty -y; fi
-  - 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 add-apt-repository ppa:beineri/opt-qt551 --yes
+  - sudo add-apt-repository 'deb http://llvm.org/apt/precise/ llvm-toolchain-precise main' --yes
+  - wget -O - http://llvm.org/apt/llvm-snapshot.gpg.key | sudo apt-key add -
   - sudo apt-get update -qq
+  - rsync -av firmware.diydrones.com::Tools/Travis/*.deb ExtraPackages
 
 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 
-      # - 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
-
-addons:
-  sonarcloud:
-    organization: "opentx-github"
-    token:
-      secure: "BuQrGRijNpL2V/IQNcOxvjChj8PScfCdiv403EE73Nqb4+sB8YL92Fnzrnw9bC8wF7BVSDJVpYF0gbdaTzuCmaeZfM8NJK0TOJAbH6+B8bhIrU/V1SBuVjHQnndV/wysieruKnK/KxYJZqItgSlnPo+PmiFxtXJNlas0Kstb2O4="
-    # github_token:
-    #   secure: "Qkmp4VrQJtKgZ/pz65SNnCDiF4slgFfQS/3whyLXLcDbFb1Hv1oj7Hqz9EVDUSO2eEhgQGaOKkRc0CfAAOBwW6OvhE0xh7P1CJEjzOp6+3gI/LyZUNsqa+awVRZTsfm1YZaOPaPWJ7cI0uz3/OoSUeIecs4PDWPrQMGRlsrq7Q8="
-    branches:
-      - "2.2"
+  - sudo apt-get install -y xvfb lcov cmake cmake-data bc curl gcc-arm-none-eabi qt-latest g++-5 libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libfox-1.6-dev libgtest-dev python-clang-3.8 libclang-3.8-dev python-qt4
+  - sudo dpkg -i ExtraPackages/*.deb || echo "FAILED INSTALL OF EXTRA DEBS"
+  - export CXX="g++-5" CC="gcc-5"
 
 script:
-  - build-wrapper-linux-x86-64 --out-dir bw_output ./tools/commit-tests.sh
-  - sonar-scanner
-
-cache:
-  directories:
-    - '$HOME/.sonar/cache'
-
+  - ./radio/util/commit-tests.sh .

CMakeLists.txt

@@ -2,184 +2,39 @@ project(OpenTX)
 
 set(VERSION_MAJOR "2")
 set(VERSION_MINOR "2")
-set(VERSION_REVISION "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 "0013")
-set(SDCARD_VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
+message(STATUS "OpenTX ${VERSION}")
 
 cmake_minimum_required(VERSION 2.8)
 cmake_policy(SET CMP0020 NEW)
 cmake_policy(SET CMP0023 OLD)
-if(POLICY CMP0042)
-  cmake_policy(SET CMP0042 NEW)
-endif()
-if(POLICY CMP0043)
-  cmake_policy(SET CMP0043 NEW)
-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)
 
 set(CMAKE_CXX_STANDARD 11)
 
 set(RADIO_DIRECTORY ${PROJECT_SOURCE_DIR}/radio)
 set(RADIO_SRC_DIRECTORY ${RADIO_DIRECTORY}/src)
 set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src)
-set(SIMU_SRC_DIRECTORY ${COMPANION_SRC_DIRECTORY}/simulation)
 
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
 
+find_package(Qt5Widgets)
+find_package(Qt5Xml)
+find_package(Qt5LinguistTools)
+find_package(Qt5PrintSupport)
+find_package(Qt5Multimedia)
+
 include(Macros)
 today(DATE)
 now(TIME)
 git_id(GIT_STR)
 
-message(STATUS "OpenTX ${VERSION} @${GIT_STR}")
-
-# options shared by all targets
-
-option(APP_CUSTOM_DBG_HANDLER "Use custom message handler for debug output in all Qt apps." ON)
-set(APP_CUSTOM_DBG_LEVEL "0" CACHE STRING
-  "Debug output level: 0=debug+; 1=info+; 2=warn+; 3=critical+; 4=fatal only.")
-set(APP_CUSTOM_DBG_SHOW_FILE "DEFAULT" CACHE STRING
-  "Show source file names in debug output. 1/0/DEFAULT (default is ON with DEBUG builds).")
-
-option(VERBOSE_CMAKELISTS "Show extra information while processing CMakeLists.txt files." OFF)
-option(WARNINGS_AS_ERRORS "Treat any compiler warning as an error (adds -Werror flag)." OFF)
-
-if(WIN32)
-  set(WIN_EXTRA_LIBS_PATH "C:/Programs" CACHE PATH
-    "Base path to extra libs/headers on Windows (SDL & pthreads folders should be in here).")
-  list(APPEND CMAKE_PREFIX_PATH "${WIN_EXTRA_LIBS_PATH}" "${WIN_EXTRA_LIBS_PATH}/SDL")  # hints for FindSDL
-endif()
-
-# Python check
-find_package("PythonInterp")
-if(PYTHONINTERP_FOUND)
-  message(STATUS "Python found, version: ${PYTHON_VERSION_STRING}")
-  get_filename_component(PYTHON_DIRECTORY ${PYTHON_EXECUTABLE} DIRECTORY)
-else()
-  message(WARNING "Python not found! Most firmware and simu flavors not buildable.")
-  set(LUA NO)
-endif()
-
-find_package(Qt5Core)
-find_package(Qt5Widgets)
-find_package(Qt5Xml)
-find_package(Qt5LinguistTools)
-find_package(Qt5PrintSupport)
-find_package(Qt5Multimedia)
-find_package(Qt5Svg)
-
-if(Qt5Core_FOUND)
-  message(STATUS "Qt Version: ${Qt5Core_VERSION}")
-
-  ### Get locations of Qt binary executables & libs (libs are for distros, not for linking)
-  # first set up some hints
-  get_target_property(QtCore_LOCATION Qt5::Core LOCATION)
-  get_filename_component(qt_core_path ${QtCore_LOCATION} PATH)
-  if(APPLE)
-    get_filename_component(qt_core_path "${qt_core_path}/.." ABSOLUTE)
-  endif()
-
-  set(QT_LIB_DIR ${qt_core_path} CACHE PATH "Path to Qt libraries (.dll|.framework|.so).")
-  find_path(QT_BIN_DIR NAMES "qmake" "qmake.exe" HINTS "${CMAKE_PREFIX_PATH}/bin" "${qt_core_path}/../bin" "${qt_core_path}" DOC "Path to Qt binaries (qmake, lupdate, etc.).")
-  find_program(QT_QMAKE_EXECUTABLE qmake HINTS "${QT_BIN_DIR}" DOC "Location of qmake program.")
-  find_program(QT_LUPDATE_EXECUTABLE lupdate HINTS "${QT_BIN_DIR}" DOC "Location of Qt's 'lupdate' program for updating translation files.")
-
-  # Try to find Qt translations
-  if(QT_QMAKE_EXECUTABLE)
-    execute_process(
-      COMMAND ${QT_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS
-      OUTPUT_VARIABLE qt_translations_hint
-      OUTPUT_STRIP_TRAILING_WHITESPACE
-      )
-  endif()
-  find_path(QT_TRANSLATIONS_DIR NAMES "qt_en.qm" HINTS "${qt_translations_hint}" DOC "Path to prebuilt Qt translations (qt_*.qm).")
-
-  ### Common definitions for the Qt-based apps
-  list(APPEND APP_COMMON_DEFINES -DSIMU)
-  list(APPEND APP_COMMON_DEFINES -DQXT_STATIC)
-  list(APPEND APP_COMMON_DEFINES -DQT_USE_QSTRINGBUILDER)  # more efficient QString construction using % operator
-
-  if(APP_CUSTOM_DBG_HANDLER)
-    # provide full qDebug log context to our custom handler. This may also affect libsimulator, which is why it is here
-    list(APPEND APP_COMMON_DEFINES -DQT_MESSAGELOGCONTEXT)
-    list(APPEND APP_COMMON_DEFINES -DAPP_DBG_HANDLER_ENABLE=1)
-    if(APP_CUSTOM_DBG_LEVEL GREATER -1 AND APP_CUSTOM_DBG_LEVEL LESS 5)
-      list(APPEND APP_COMMON_DEFINES -DAPP_DBG_HANDLER_DEFAULT_LEVEL=${APP_CUSTOM_DBG_LEVEL})
-    endif()
-    if(NOT APP_CUSTOM_DBG_SHOW_FILE STREQUAL "DEFAULT" AND (APP_CUSTOM_DBG_SHOW_FILE STREQUAL "1" OR APP_CUSTOM_DBG_SHOW_FILE STREQUAL "0"))
-      list(APPEND APP_COMMON_DEFINES -DAPP_DBG_HANDLER_SHOW_SRC_PATH=${APP_CUSTOM_DBG_SHOW_FILE})
-    endif()
-  else()
-    list(APPEND APP_COMMON_DEFINES -DAPP_DBG_HANDLER_ENABLE=0)
-  endif()
-
-else()
-  message(WARNING "Qt not found! Companion and Simulator builds disabled.")
-endif()
-
-if(NOT WIN32)
-  find_package(Fox QUIET)  # QUIET not working on WIN32?
-  if (FOX_FOUND)
-    message(STATUS "Foxlib found at ${FOX_LIBRARY}")
-  else() # if(NOT WIN32)
-    message("Libfox not found, simu target will not be available")
-  endif()
-endif()
-
-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()
-
-# 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)
-   message(FATAL_ERROR "Source directory contains files leftover from a OpenTX 2.1 build. Please run `git clean -f` in source directory (Careful: Will remove any extra files) or do a new clean git checkout")
-endif()
-
-# Windows-specific includes and libs shared by sub-projects
-if(WIN32)
-  list(APPEND WIN_INCLUDE_DIRS "${RADIO_SRC_DIRECTORY}/thirdparty/windows/dirent")
-  if(MSVC)
-    list(APPEND WIN_INCLUDE_DIRS "${RADIO_SRC_DIRECTORY}/thirdparty/windows/msinttypes")
-    set(WIN_PTHREAD_BASE_PATH "${WIN_EXTRA_LIBS_PATH}/pthreads/Pre-built.2" CACHE PATH "Where to find pthreads include and lib folders.")
-    list(APPEND WIN_INCLUDE_DIRS "${WIN_PTHREAD_BASE_PATH}/include")
-    find_file(WIN_PTHREAD_LIB pthreadVC2.lib PATHS "${WIN_PTHREAD_BASE_PATH}" PATH_SUFFIXES lib/x86 lib NO_DEFAULT_PATH)
-    find_file(WIN_PTHREAD_DLL pthreadVC2.dll PATHS "${WIN_PTHREAD_BASE_PATH}" PATH_SUFFIXES lib/x86 lib dll/x86 dll NO_DEFAULT_PATH)
-    if(WIN_PTHREAD_LIB)
-      list(APPEND WIN_LINK_LIBRARIES "${WIN_PTHREAD_LIB}")
-    else()
-      message(SEND_ERROR "pthreadVC2.lib not found!")
-    endif()
-  else()
-    set(CMAKE_C_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
-    set(CMAKE_C_USE_RESPONSE_FILE_FOR_LIBRARIES OFF)
-    set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_INCLUDES OFF)
-    set(CMAKE_CXX_USE_RESPONSE_FILE_FOR_LIBRARIES OFF)
-  endif()
-endif()
-
 add_subdirectory(${RADIO_SRC_DIRECTORY})
 
-if(Qt5Core_FOUND)
+if(Qt5Widgets_FOUND)
   add_subdirectory(${COMPANION_SRC_DIRECTORY})
 endif()

DONATIONS.txt

@@ -0,0 +1,852 @@
+<a href="http://frsky-rc.com">FrSky (monthly)</a>
+<a href="http://alofthobbies.com">Aloft Hobbies</a>
+<a href="http://jonathan.it">Jonathan Modellismo</a>
+<a href="http://wstech.de">WsTech</a>
+<a href="http://aviomotive.com">Aviomotive</a>
+<a href="http://boltrc.com">BoltRC</a>
+<a href="http://aerialtechhobbies.com">Aerial Tech Hobbies</a>
+<a href="http://litepilots.com">LitePilots</a>
+<a href="http://openpilot.com">David Ankers (OpenPilot)</a>
+<a href="http://3drobotics.com">3D Robotics</a>
+<a href="http://rcstudio.cz">RC Studio (monthly)</a>
+
+Mario Sette
+Felice Baratto
+Alessandro Mari
+Gianpiero Spontina
+Ingo Kuzniak
+Hans-Åke Rahm
+Tamas Varga
+Thomas Gregg
+Didier Christien
+Alain Pinard
+Sergio Melas
+Paul Montenot
+Chris Guy
+Adrien Gravouille
+Thomas Black
+Marc Lucht
+Zdenek Trojanek
+Martin Hotar
+Stefan Grundevik
+Fabio Eboli
+Federico Zotti
+Albin Esbjörnsson
+Kilian Hüttenhofer
+Stephen Stough
+Adilson Oliveira
+Robert Saint Marie
+Tad Leake
+Andreas Weitl
+Chan Lofland
+Dirk Kasten
+Denisov Alexander
+Timo Varppee
+Ondrej Hatapka
+Valérie Billon
+R. Scott Page
+Johan Cronje
+Renato Aranghelovici
+Jeffrey Irvin
+John Rodgers
+Kenneth Crump
+Damjan Adamic
+Martin Wilson
+Joe Street
+John Holdsworth
+Daniel Schwartz
+Dean Church (monthly)
+Michael Halse
+David Mark
+Ted Moss
+Jim Wagner
+Nicola Porzi
+Michael Halse
+Chewytm
+Espen Solbu
+Mike Frizell
+Bruce Jones
+Stefano Airaghi
+Dan Eeckhout
+Alex Calderhead
+Leonard MacKey
+Heung Jin Choi
+Mike Retterer
+Keith Wood
+Viljo Liukku
+Eric Beier
+Burt Pickard-Richardson
+Helmut Renz
+Rick Harms
+Vincenzo Vavala
+Patricia Martin
+Harald Klein
+Carl Petersen
+Douglas Burkett
+Clifford Evans
+Teodor Yantchev
+Jarad Berkman
+Christian Schulz
+Gregory J Shepherd
+Michael Shellim
+Ming Wang
+Bernard Lukaschek
+Nigel Chippindale
+Mike Perkins
+Ted Hammond 
+David Beanland
+Bernd Koehler
+Frédéric Duflos 
+Dave Fasken
+Heinrich Illig
+Michael Collins
+Michael Manning
+Craig Lorentz
+André Lasseret
+Felipe Alexandre de Oliveira
+Brian Harris
+Philippe Herbots
+Rainer Nelte
+Franck Bernhard
+Erhard Werner
+Stig Jøran Moen
+Keith Hertzog
+Christophe Dauvergne
+Tauno Rautakorpi
+Sven Assmus
+Paul Dittman
+Mike Matheny
+Cheryl Wynne
+Emay Toha
+Don Nolder
+André Lasseret
+Filip Lowette
+Arnaldo Gabella
+Fiorenzo Agnelli
+Michele Villa
+Christophe Rodriguez
+Larisa Filocamo
+Hartmut Sahm
+Åke Brodin
+Ted Moss
+Filippos Tigarakis
+Chewytm
+Eric Burdis
+Nigel Chippindale
+Michael Deasy
+Stephen Stough
+Kenneth Lilja (monthly)
+Robert Jero
+Gary Bancroft
+Robert Cotsford
+NorthSide
+George Constandinides
+Robert Schonk Jr
+Kevin Berkefeld
+Peter Webster
+Mike Matheny
+Martin Sniedze
+Fernando Rimoldi
+Sidney Fisher
+Bruce Anderson
+John Rodgers
+Ed Pare
+Thomas Kilduff
+Robert Ferguson
+Bryan Green
+Kevin Berkefeld
+Julien Michel
+Krittikun Chiraphanda
+Douglas Law
+Alberto Scotti
+Oliver Kunkel
+D. Joseph Frazier
+Heiko Polig
+Andrew Fernie
+Marco Lange
+Nick McMillan
+Michel Baily (monthly)
+Patrick Mullen
+Scott Campbell
+Erich Roeder
+Wayne Davy
+Michael Fontenot
+Willie Swanepoel
+Satoru Sasaki
+Tyler Darby
+Nicholas Crego
+Johan Moelich
+Timo Esser
+Brian Paddock
+Jean Pierre Parisy
+Norbert Martsch
+Jean-Marie Guitard
+Tilman Baumann
+Fred Larssen
+Ari Aalto
+Robert Sams 
+Kirk Robertson
+John Koontz
+Jeffery Golias
+Paul Robinson
+Dave Matison
+Mike Matheny
+Pino Agostino
+Graham Boucher
+Nelson Noura
+Joel Allamy
+Philip David Martin
+Sean Stephen
+Bruce Mackay
+Blake Spilman
+Timothy Pelletier
+Glen Roe (ShowMaster)
+Jan Van Ooteghem
+Lawrence Christensen
+Leo Duflou
+Bruce Wood
+Arnd Feige
+Tauno Rautakorpi
+Steve Coley
+Stefan Kiendl
+Gregory Nuspel
+Mitchell Brenner
+Ronnnie DePrez
+Ferenc Koller
+Robert Sessler
+Didier Lanot
+Rodney Hunt
+Steve Bernard
+Paul Nazaroff
+Gordon Ernenputsch
+Ksamak
+Marc Gittelman
+David Poole
+Ralph Sauer
+Karl-Heinz Gansel
+Michels Bernhard
+Thomas Demmelbauer
+Felice Baratto
+Michael Halse
+Horst Kampen
+Ian Gough
+Matthew Brett
+Lexington S Morley
+Clemens Drews
+Axel Stöckle
+Roberto Orsello
+Richard Ruck
+Hugh Caldwell
+Christian Marauli
+Albin Esbjörnsson
+Per Esbjörnsson
+Bernd Hohmann
+Sławomir Juszczak
+Stephen Henderson
+David Morgan
+Aloft Hobbies
+Netanel Hobara
+Cameron Galipo
+Doug Schafer
+Pietro Rossin
+Earl Killingsworth
+Victor B Wright
+Terry McKinley
+Марков Алексей
+Offer Shmuely
+Ian Lobley
+Stéphane Fortas
+Peter Mitrik
+Thomas Majewski
+ANF King
+Henrik Hammarström
+Kenneth Lilja
+R Wells
+Uwe Jordt
+Harald Wilczak
+Bernhard Lohmann
+Ferenc Koller
+Robert Ferguson
+Daniel Byers
+Tyler Darby
+Miguel Villalpando
+Kim Dong Hoon 
+Terry McKinley
+Walter Bell
+Clinton Linck
+Josep Clodas Sola 
+Thierry Martin
+Peter Mauro 
+Mitchell Brenner
+Yak
+Lluis Bullich Rañe 
+Steffen Rohr 
+Eric Jacquin
+Harvest Lane
+Ville Kuvaja
+DK-System
+Heinz Vogel
+Heung Jin Choi
+MMJS van der Helm 
+Dan Neelands
+Yashiro Masayuki
+Isaac Sloan
+Harold Baird
+Roy Bender
+Bradley Murchie
+Maximilian Süß
+Dean Jansa
+Ronald Donker
+Paul Oldenkamp
+Dietmar Drees
+Bradley Murchie
+Richard Fahie
+James Kaufman
+Henry Deucker
+Christian Fuchs
+Arold Reinders
+Robert Miller
+Mark Gaskievicz
+Roland Müller
+Frank Gewalt
+Remi Viard
+Reginald H Millsom
+Pierluigi Sommaruga
+A Harris
+Stefan Grunenberg 
+Francisco Gutierrez Muñoz
+Steve Coley
+Sean Cull
+Roberto Orsello
+David Finger
+Jean-Marie Oddo
+Mike Matheny
+Glen Roe (Showmaster)
+Arron Bates
+Tim Spurr
+Daniel Morgan
+Trent Ready
+Mark Maskiell
+Robert Crockford
+Mark Illum
+David McGuire
+Martyn Coles
+Jose Sobral
+Heung Jin Choi
+Tomasz Janiak
+Fabien Gagné
+Joe Street
+Micha Ronen
+Albert Blondin
+Klaus Schuebel
+Evening Shade Pottery
+Thomas Kilduff
+Sven Assmus
+Markus Eberl
+Nicholas Field
+Harald Wilczak
+John Grepps
+Anthony Burbidge
+Sherba Baine
+Gordon Evans
+Fred Figge
+Uwe Kuehn 
+David Beatty
+Aaron Stringer
+Alan J Wasserman
+Wolfgang Rauser
+Samuel Cook
+Friedrich Ipolt
+Barrington Cole 
+Charles Lakins
+Thos. O'Meara Photography
+Adam Chevalier
+Mike Mulligan
+Serge Michaux 
+Robert Young
+Wilco Hijink
+Roy Nixon
+Lexington S Morley
+Daryl Dacko
+Beat Zurflueh
+Piotr Kundu
+Kevin Berkefeld
+Tomasz Klys
+Mirco Didone'
+Christoph Schroeter
+Zdenek Trojanek
+Bryan Anderson
+Kamco Enterprises 
+Robert Bates
+Robert Brown  
+Dennis Marinus
+Ronald Van Putte
+Thomas Kvitle Jenssen
+Patrick Tuxbury 
+Istvan Magi
+Sasaki Satoru
+David Laburthe
+Vit Jelinek
+Pablo Gomez Martinez
+Alan Thoren
+Jack Clodfelter
+William Simon
+James Houck
+Peter Fithern
+Thomas Svedman
+TechFixPros
+Rafael Eric Suarez Nordlow
+Colin Rycroft
+Emanuel Stassar
+Michael Gregory
+Robert Russell
+Felix Kaiser
+Joshua Bardwell
+Davd Goodall
+Leonard MacKey
+Miles Kelly
+Sergio Robledo
+Mikael Wallbäck
+Daniel Malcman
+Paul Dittman
+Attilio Rausse
+Sidney Gates
+Andrea Montefusco
+Paul Luby
+Donald L Webster
+Kenneth Frehafer 
+Matthias Hase 
+Markus Wolf
+Andrew Fazio
+Stefan Künst
+Stephen Adams
+Tauno Rautakorpi
+Frank Houvenaghel
+George Neusse
+Andreja Rusjakovski
+Axel Stöckle
+Erwin Störrle
+Rodger Hopper
+Fernando Cesar
+Jonathan Gillis
+DK-System
+Lexington S Morley
+Bernd Koehler
+Davis RC
+Pete Johnson
+Patricia Martin
+Florian Tschacher
+Brian Spearing
+Craig Hall
+Joseph Case
+Harald Klein
+Robert Crockford
+Chris Boultinghouse
+Kitsew
+Georgios Papadopoulos
+Fourmost Products
+Dennis Miller
+Dave Matison
+Maximilian Radig
+Juan Rodriguez
+Robert Sessler
+John Murray
+Martin Sniedze
+David Poole
+Manfred Delakowitz
+Martijn Kruissen
+Jörgen Norman
+Nathan Kinney
+John Godden
+Larry Roper
+Mike Frizell
+Daniel Pospolita
+Peter Herz
+Don Mondrik
+Paul Fram
+Charles Knight
+Matthew Adams
+Kenneth Reed
+Gary Wild
+Christof Ramm
+Bruno Bedard
+Salih Samim Aydin
+Alexander Pils
+Andrew Scerbina
+Donovan Bodishbaugh
+Ray Dunn
+Burt Pickard-Richardson
+Robert Ferguson
+CY Enterprise 
+Michel Stathakis Neto
+Beat Zurflueh
+Portstate Pty Ltd
+Jens Hoffmann
+Ricardo Santos
+Jean-Francois Le Breton
+Michael Deasy
+Anindya Mukerjee
+Emay Toha
+Kamco Enterprises
+Peter Mueller
+Giovanni Trentini
+Cecil Porter
+Robert Canavan
+Greg Higginbottom
+Tim Walker
+Spis Ltd/TurboNote
+Patricia Cox
+Matthew Lukes
+Sabine Witte
+Phillip Perry
+Beat Zurflueh
+Russell Stutzman
+Dietmar Drees
+Kenneth Ward
+Jens Lochmüller
+Anthony Witham
+Peter Hauke
+Arizona Action Photos
+Francis F Dale
+Willie Swanepoel
+Edward Hauser
+Adilson Oliveira
+Joseph Ordille
+Michael Shellim 
+Teddie Holmes
+Alexandre Rault
+Eric Albin
+Lukas Kliment
+Bernard Philippe
+Bernard Delpy
+Didier Klein
+Arnaldo Guedes
+Cyberauto Systems
+John Alsbrooks
+John Kearney
+Christopher Borden
+Marc Virgilio Ricci
+Frederick Davie
+Jürgen Enders
+Terrence Pitts
+Thomas Sandner
+Marco Coltorti
+Harald Wilczak
+Rodney Lorimor
+Richard Davis
+Stephen Palmer
+Michael Napolitan
+Joshua Bardwell
+Fred Dawson
+Jim Wagner
+Peter Johnson
+Fredrik Lewerth
+Arvin Stenersen
+Daniel Morgan
+Roy Nixon
+Joachim Blunck
+Karl-Heinz Gansel
+Monrovia Mountain Enterprises
+Alessandro Villa
+Jan-Åke Nilsson
+Matthias Rei
+DVR Solutions BV
+Bertrand Condevaux Lanloy
+Henri Mirra
+Aurélien Planiol
+Kevin Caldwell
+Andrew Garello
+Tomasz Maziarz
+Russell Flack
+Fernando Rimoldi
+Greg Reid
+Dietmar Drees
+Holger Landwehr
+Arno Loehdorf
+Boon Sripattha
+Patrik Åkerfeldt
+Alonzo Fretwell
+Renjith Chandrasekharan
+Ruben Gomez Hernandez
+Michael Gardner
+Judith Green
+Timo Ruppell
+John Lipscomb
+Norbert Wenke
+Erik Frieberg
+Raimo Ruotsalainen
+Brian Harris
+Sebastian Blüml 
+Efisio Maxia
+Jeff Theobald
+Anthony Rizzo
+Rodney Huddleston
+Dietmar Drees
+Jürgen Monden
+David Morgan
+Andrew Fernie
+Donald Burke
+Ronald Donker
+Fredie Singh
+Patrizio Simoncini
+Harald Gabler
+Michael Brown
+Julien Gérard
+Alexandre d'Alton
+Peter Mergaerts
+Jan Houwers
+Christian Grandjean
+Roger Bergevin
+NorthSide
+Sigmund Martinsen
+Lionel Lafraise
+Gisli Ofeigsson 
+The Gruvin9x Project
+Manuel McLure
+Fernando Rimoldi
+Hiltenkamp Stephan
+Sandeep Kishore Jain
+Greg Parker 
+Norman Maaß
+Adriano Del Ben
+Justin Poole
+Kenneth Harrison
+Eugene LaFaille
+John O'Shaughnessy
+Uwe Jordt
+Stuart Olson
+Frédéric Devillard
+Cheung Leo
+Peter Webster
+Jean-Claude Bachetta
+Delfin Perena
+Sae-wook Yoon
+Focus on Excellence
+Jeffery Golias
+Nick Milton
+Paul Zasso
+Reidar Johannes Lillebotn
+Handley William
+Luke Williams
+Michael Shellim
+Brian Spearing
+Derek Foster
+Pasi Pitkänen
+Lexington S Morley
+Jeff Roberson
+Volkov Victor
+Bryan Anderson
+Daniel Garber
+Pavel Stein 
+Ravi Gupta
+Patrick Tuxbury
+Mark Deverell
+John Capell 
+Neil McVean
+Matthew Elyash
+Kerry Cochrell
+Willem Aandewiel 
+Reg Bell
+Jean Chenoz
+Philippe Grand
+Tauno Rautakorpi
+Jeff Dillingham
+Brad Kelley
+Shaun Currier
+Danilo Schiara
+John Hennig
+RK Custom Homes
+James Houck
+Piet Teekens
+Tommy Widenflycht
+Johan Petrus Theophilus
+Maria van Melis
+Ralph Gustafson
+Paul Luby
+Andrew Duncan
+Stephen Crowther
+Edward Glover
+Kelly Byrd
+Brad Curtis
+Wolfgang Kuhl
+John Beidl
+Roy Nixon
+Glen Roe
+CY Enterprise
+Evening Shade Pottery
+Gilles Dando
+Patrick Richard
+Justin Altemeier
+Constant Dupuis
+Tony Kenward
+Pierre Rondel
+Ernest Luguera Sanchez
+Adam Brackney
+Joe Baker
+单 雷平
+Ben Fay
+Chris Monk
+Stan von Miller
+Christian Krebs
+Michel Motte
+Graziano Rampinelli
+Joe Baker
+Jean-Philippe Laurent
+Romain Rouzaud
+Michel Garbarino
+Henri Mirra
+Otto Fröhlich
+Thomas Cramer
+Anthony Trombetta
+Fernando Rimoldi
+Dietmar Drees
+Michal Kowalski
+Ivan Correa
+Modellbau
+Massimo Luigi Stara
+Graham Baldwin
+Tomasz Rejman
+Wolfgang Lang
+John Greenwood
+Till von Reumont
+Paul Pereira Brunner 
+Donald L Singer
+Junsun Lee
+Guy Lamaison
+Erwin Dulken
+Mike H Dailey
+Jon Cammarata
+Martin Krueger
+Adolfo Perogio
+Sylvain Techer
+Wes Warner
+Kevin Caldwell
+Ali Ersan Gur
+Hans-Rudolf Riniker
+Sébastien Boutard
+Jean Chessé 
+Mike H Dailey 
+Don Polk
+Roberto Orsello
+Borovikov Dmitriy
+John Lipscomb
+Peter Glassey
+Joseph Kramer
+F.Javier Martinez Velasco
+Claudio Piccinini
+John Jackson
+John Beech
+Rene TraaJohn Jackson
+Sebastien Charpentier (monthly)
+Nigel Hendriks
+Frédéric Devillard
+Albert Herzog
+Anindya Mukerjee
+Kenny Stanberry
+Tauno Rautakorpi
+Mathias Krapp
+Fernando Rimoldi
+Wolfgang Rauser
+Richard Shagam
+Stephen Bailey
+DK-System
+Casa Kuxtal
+Christopher Potts
+Douglas George
+Michael Banks
+Jon Wiltshire
+David Green
+Guy Willems
+Xavier Mestelan Pinon
+Maik Gottschalk 
+Scott Sparks
+John Dunning
+RAD51
+Ron Powell 
+Alain Labonne
+Carol Sills
+Franck Aßmann
+Larry Anderson
+Mikael Wallbäck
+Wes Warner
+Christoffer H Henni
+Donna Bayer
+Garry Ogilvie
+Karlheinz Sirsch
+Fred Larssen
+Rob Coppock 
+Franz Josef Hahn
+Serge Ribault
+Tanguy Le Moign
+Barrett Powell
+Patrice Lafeuille
+Martin Blume
+Marek Kopyto
+Marco Lange
+Gary Nix
+Jack Oliphant
+John Lever 
+Adolphe Montefiore
+Steven De Weerdt
+Håkan Berggen
+Ayelet Egosi
+Jean-Frederic Gaudreault
+Jim Wagner
+Lee Scott
+Roger Keatley
+Sherman Lovell
+Hugh Caldwell
+JB Fisher Company
+Michels Bernhard 
+Pietro Rossin
+Carsten Wache
+Brock White 
+Steven Poretz
+David Huelster
+Gordon Stahl (monthly)
+John Mathison
+Richard Duczmal
+Gregory Barron
+Marcel Fischer
+Klas Mälman
+Viljo Liukku
+Eric Smith
+Sven Assmus
+Luke Mole
+NorthSide
+Hannes Mössler 
+James Kaufman
+Ravi Gupta
+Lexington S Morley
+Ralph Segar 
+Frédéric Devillard
+Cory Theurer
+Valentinos Zachariou
+Garrett Paquette 
+Heung Jin Choi
+Kerry Cochrell
+Doug Miller
+Andrzej Weydmann
+Chair-man.nl
+Eric Beier	
+Jay Warren
+Marian Matej 
+Alastair Smith
+Timothy Senecal
+Dietmar Drees
+Bruce Jones
+Adil Busaidy
+Herman Hofman
+Jean Paul Michel
+Peter McHenry
+Julien lecoquierre
+Jean-Marie Clay
+Robert Nicoll
+Dan Nixon
+Ewald Moehring
+Giovanni Carnesecchi 
+Paul Dumsday
+Tadeusz Adamowski
+Andrew Newton
+Neil Horne
+Kerstin Appelqvist

README.md

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

cmake/Bitmaps.cmake

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

cmake/FindFox.cmake

@@ -1,63 +0,0 @@
-# Imported from the DeskVox project (LPGL 2.1)
-
-include(FindPackageHandleStandardArgs)
-
-set(hints
-  $ENV{LIB_BASE_PATH}/fox
-)
-
-set(paths
-  /usr
-  /usr/local
-)
-
-find_path(FOX_INCLUDE_DIR
-  NAMES
-    fx.h
-  HINTS
-    ${hints}
-  PATHS
-    ${paths}
-  PATH_SUFFIXES
-    include
-    include/fox
-    include/fox-1.6
-)
-
-find_library(FOX_LIBRARY
-  NAMES
-    FOX-1.6
-    fox-1.6
-  HINTS
-    ${hints}
-  PATHS
-    ${paths}
-  PATH_SUFFIXES
-    lib64
-    lib
-)
-
-find_library(FOX_LIBRARY_DEBUG
-  NAMES
-    FOXD-1.6
-    foxd-1.6
-  HINTS
-    ${hints}
-  PATHS
-    ${paths}
-  PATH_SUFFIXES
-    lib64
-    lib
-)
-
-if(FOX_LIBRARY_DEBUG)
-  set(FOX_LIBRARIES optimized ${FOX_LIBRARY} debug ${FOX_LIBRARY_DEBUG})
-else()
-  set(FOX_LIBRARIES ${FOX_LIBRARY})
-endif()
-
-find_package_handle_standard_args(FOX
-  DEFAULT_MSG
-  FOX_INCLUDE_DIR
-  FOX_LIBRARY
-)

cmake/FindLupdate.cmake

@@ -0,0 +1,19 @@
+# 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
+)
+
+MESSAGE( STATUS ${LUPDATE_EXECUTABLE} )
+
+# 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/FindSDL.cmake

@@ -1,256 +0,0 @@
-#.rst:
-# FindSDL
-# -------
-#
-# Locate SDL library
-#
-# This module defines
-#
-# ::
-#
-#   SDL_FOUND, if false, do not try to link to SDL
-#   SDL_LIBRARY, the name(s) of the library(ies) to link against
-#   SDL_LIBSDL, the full path and name of libSDL (or SDL.[lib|dll].
-#   SDL_LIBSDLMAIN, full path and name of libSDLmain (or SDLmain.lib).
-#   SDL_LIBRARY_PATH, the full path to the found libSDL
-#   SDL_INCLUDE_DIR, where to find SDL.h
-#   SDL_VERSION_STRING, human-readable string containing the version of SDL
-#
-#
-#
-# This module responds to the flag:
-#
-# ::
-#
-#   SDL_BUILDING_LIBRARY
-#     If this is defined, then no SDL_main will be linked in because
-#     only applications need main().
-#     Otherwise, it is assumed you are building an application and this
-#     module will attempt to locate and set the proper link flags
-#     as part of the returned SDL_LIBRARY variable.
-#
-#
-#
-# Don't forget to include SDLmain.h and SDLmain.m your project for the
-# OS X framework based version.  (Other versions link to -lSDLmain which
-# this module will try to find on your behalf.) Also for OS X, this
-# module will automatically add the -framework Cocoa on your behalf.
-#
-#
-#
-# Additional Note: If you see an empty SDL_LIBSDL in your
-# configuration and no SDL_LIBRARY, it means CMake did not find your SDL
-# library (SDL.dll, libsdl.so, SDL.framework, etc).  Set
-# SDL_LIBSDL to point to your SDL library, and configure again.
-# Similarly, if you see an empty SDL_LIBSDLMAIN, you should set this
-# value as appropriate.  These values are used to generate the final
-# SDL_LIBRARY variable, but when these values are unset, SDL_LIBRARY
-# does not get created.
-#
-#
-#
-# $SDLDIR is an environment variable that would correspond to the
-# ./configure --prefix=$SDLDIR used in building SDL.  l.e.galup 9-20-02
-#
-# Modified by Eric Wing.  Added code to assist with automated building
-# by using environmental variables and providing a more
-# controlled/consistent search behavior.  Added new modifications to
-# recognize OS X frameworks and additional Unix paths (FreeBSD, etc).
-# Also corrected the header search path to follow "proper" SDL
-# guidelines.  Added a search for SDLmain which is needed by some
-# platforms.  Added a search for threads which is needed by some
-# platforms.  Added needed compile switches for MinGW.
-#
-# On OSX, this will prefer the Framework version (if found) over others.
-# People will have to manually change the cache values of SDL_LIBRARY to
-# override this selection or set the CMake environment
-# CMAKE_INCLUDE_PATH to modify the search paths.
-#
-# Note that the header path has changed from SDL/SDL.h to just SDL.h
-# This needed to change because "proper" SDL convention is #include
-# "SDL.h", not <SDL/SDL.h>.  This is done for portability reasons
-# because not all systems place things in SDL/ (see FreeBSD).
-
-#
-# Modified for OpenTx by Maxim Paperno 19-Dec-2016
-# Added SDL_LIBSDL, SDL_LIBSDLMAIN & SDL_LIBRARY_PATH, removed SDLMAIN_LIBRARY,
-#  SDL_LIBRARY_TEMP, and fixed bug with recursive appending of supporting 
-#  libraries to cached SDL_LIBRARY_TEMP variable.
-#
-
-#=============================================================================
-#CMake - Cross Platform Makefile Generator
-#Copyright 2000-2015 Kitware, Inc.
-#Copyright 2000-2011 Insight Software Consortium
-#All rights reserved.
-#
-#Redistribution and use in source and binary forms, with or without
-#modification, are permitted provided that the following conditions
-#are met:
-#
-#* Redistributions of source code must retain the above copyright
-#  notice, this list of conditions and the following disclaimer.
-#
-#* Redistributions in binary form must reproduce the above copyright
-#  notice, this list of conditions and the following disclaimer in the
-#  documentation and/or other materials provided with the distribution.
-#
-#* Neither the names of Kitware, Inc., the Insight Software Consortium,
-#  nor the names of their contributors may be used to endorse or promote
-#  products derived from this software without specific prior written
-#  permission.
-#
-#THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-#"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-#LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-#A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-#HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-#LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-#DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-#THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-#(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-#OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#------------------------------------------------------------------------------
-#
-#The above copyright and license notice applies to distributions of
-#CMake in source and binary form.  Some source files contain additional
-#notices of original copyright by their contributors; see each source
-#for details.  Third-party software packages supplied with CMake under
-#compatible licenses provide their own copyright notices documented in
-#corresponding subdirectories.
-#
-#------------------------------------------------------------------------------
-#
-#CMake was initially developed by Kitware with the following sponsorship:
-#
-# * National Library of Medicine at the National Institutes of Health
-#   as part of the Insight Segmentation and Registration Toolkit (ITK).
-#
-# * US National Labs (Los Alamos, Livermore, Sandia) ASC Parallel
-#   Visualization Initiative.
-#
-# * National Alliance for Medical Image Computing (NAMIC) is funded by the
-#   National Institutes of Health through the NIH Roadmap for Medical Research,
-#   Grant U54 EB005149.
-#
-# * Kitware, Inc.
-#=============================================================================
-
-
-find_path(SDL_INCLUDE_DIR SDL.h
-  HINTS
-    ENV SDLDIR
-  PATH_SUFFIXES SDL SDL12 SDL11
-                # path suffixes to search inside ENV{SDLDIR}
-                include/SDL include/SDL12 include/SDL11 include
-)
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(VC_LIB_PATH_SUFFIX lib/x64)
-else()
-  set(VC_LIB_PATH_SUFFIX lib/x86)
-endif()
-
-# SDL-1.1 is the name used by FreeBSD ports...
-# don't confuse it for the version number.
-find_library(SDL_LIBSDL
-  NAMES SDL SDL-1.1
-  HINTS
-    ENV SDLDIR
-  PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
-)
-
-# Non-OS X framework versions expect you to also dynamically link to
-# SDLmain. This is mainly for Windows and OS X. Other (Unix) platforms
-# seem to provide SDLmain for compatibility even though they don't
-# necessarily need it.
-find_library(SDL_LIBSDLMAIN
-  NAMES SDLmain SDLmain-1.1
-  HINTS
-    ENV SDLDIR
-  PATH_SUFFIXES lib ${VC_LIB_PATH_SUFFIX}
-  PATHS
-  /sw
-  /opt/local
-  /opt/csw
-  /opt
-)
-
-# SDL may require threads on your system.
-# The Apple build may not need an explicit flag because one of the
-# frameworks may already provide it.
-# But for non-OSX systems, I will use the CMake Threads package.
-if(NOT APPLE)
-  find_package(Threads)
-endif()
-
-# MinGW needs an additional library, mwindows
-# It's total link flags should look like -lmingw32 -lSDLmain -lSDL
-if(MINGW)
-  set(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
-endif()
-
-if(SDL_LIBSDL)
-  # For SDLmain
-  if(SDL_LIBSDLMAIN AND NOT SDL_BUILDING_LIBRARY AND NOT SDL_INCLUDE_DIR MATCHES ".framework")
-    list(FIND SDL_LIBSDL "${SDL_LIBSDLMAIN}" _SDL_MAIN_INDEX)
-    if(_SDL_MAIN_INDEX EQUAL -1)
-      list(APPEND _SDL_LIBRARY_TEMP "${SDL_LIBSDLMAIN}")
-    endif()
-    unset(_SDL_MAIN_INDEX)
-  endif()
-
-  list(APPEND _SDL_LIBRARY_TEMP "${SDL_LIBSDL}")
-
-  # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
-  # CMake doesn't display the -framework Cocoa string in the UI even
-  # though it actually is there if I modify a pre-used variable.
-  # I think it has something to do with the CACHE STRING.
-  # So I use a temporary variable until the end so I can set the
-  # "real" variable in one-shot.
-  if(APPLE)
-    list(APPEND _SDL_LIBRARY_TEMP "-framework Cocoa")
-  endif()
-
-  if(Threads_FOUND)
-    list(APPEND _SDL_LIBRARY_TEMP ${CMAKE_THREAD_LIBS_INIT})
-  endif()
-
-  # MinGW needs an additional library, mwindows
-  # It's total link flags should look like -lmingw32 -lSDLmain -lSDL
-  if(MINGW)
-    list(INSERT 0 _SDL_LIBRARY_TEMP mingw32)
-  endif()
-
-  # Set the final string here so the GUI reflects the final state.
-  set(SDL_LIBRARY ${_SDL_LIBRARY_TEMP} CACHE STRING "Full list of required SDL & supporting libraries.")
-  unset(_SDL_LIBRARY_TEMP)
-
-  get_filename_component(_SDL_LIBRARY_TEMP ${SDL_LIBSDL} PATH)
-  set(SDL_LIBRARY_PATH ${_SDL_LIBRARY_TEMP} CACHE PATH "Path to SDL library.")
-  unset(_SDL_LIBRARY_TEMP)
-endif()
-
-if(SDL_INCLUDE_DIR AND EXISTS "${SDL_INCLUDE_DIR}/SDL_version.h")
-  file(STRINGS "${SDL_INCLUDE_DIR}/SDL_version.h" SDL_VERSION_MAJOR_LINE REGEX "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+[0-9]+$")
-  file(STRINGS "${SDL_INCLUDE_DIR}/SDL_version.h" SDL_VERSION_MINOR_LINE REGEX "^#define[ \t]+SDL_MINOR_VERSION[ \t]+[0-9]+$")
-  file(STRINGS "${SDL_INCLUDE_DIR}/SDL_version.h" SDL_VERSION_PATCH_LINE REGEX "^#define[ \t]+SDL_PATCHLEVEL[ \t]+[0-9]+$")
-  string(REGEX REPLACE "^#define[ \t]+SDL_MAJOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_VERSION_MAJOR "${SDL_VERSION_MAJOR_LINE}")
-  string(REGEX REPLACE "^#define[ \t]+SDL_MINOR_VERSION[ \t]+([0-9]+)$" "\\1" SDL_VERSION_MINOR "${SDL_VERSION_MINOR_LINE}")
-  string(REGEX REPLACE "^#define[ \t]+SDL_PATCHLEVEL[ \t]+([0-9]+)$" "\\1" SDL_VERSION_PATCH "${SDL_VERSION_PATCH_LINE}")
-  set(SDL_VERSION_STRING ${SDL_VERSION_MAJOR}.${SDL_VERSION_MINOR}.${SDL_VERSION_PATCH})
-  unset(SDL_VERSION_MAJOR_LINE)
-  unset(SDL_VERSION_MINOR_LINE)
-  unset(SDL_VERSION_PATCH_LINE)
-  unset(SDL_VERSION_MAJOR)
-  unset(SDL_VERSION_MINOR)
-  unset(SDL_VERSION_PATCH)
-endif()
-
-include(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(SDL
-                                  REQUIRED_VARS SDL_LIBRARY SDL_LIBRARY_PATH SDL_INCLUDE_DIR
-                                  VERSION_VAR SDL_VERSION_STRING)

cmake/FindSdl.cmake

@@ -0,0 +1,164 @@
+# - Locate the SDL library
+# This module defines
+#  SDL_LIBRARY, the library to link against
+#  SDL_FOUND, if false, do not try to link to SDL
+#  SDL_INCLUDE_DIR, where to find SDL.h
+#
+# Don't forget to include SDLmain.h and SDLmain.m your project for the
+# OS X framework based version. (Other versions link to -lSDLmain which
+# this module will try to find on your behalf.) Also for OS X, this
+# module will automatically add the -framework Cocoa on your behalf.
+# $SDLDIR is an environment variable that would
+# correspond to the ./configure --prefix=$SDLDIR
+# used in building SDL.
+# l.e.galup  9-20-02
+#
+# Modified by Eric Wing.
+# Added new modifications to recognize OS X frameworks and
+# additional Unix paths (FreeBSD, etc).
+# Also corrected the header search path to follow "proper" SDL guidelines.
+# Added a search for SDLmain which is needed by some platforms.
+# Added a search for threads which is needed by some platforms.
+# Added needed compile switches for MinGW.
+#
+# On OSX, this will prefer the Framework version (if found) over others.
+# People will have to manually change the cache values of
+# SDL_LIBRARY to override this selection.
+#
+# Note that the header path has changed from SDL/SDL.h to just SDL.h
+# This needed to change because "proper" SDL convention
+# is #include "SDL.h", not <SDL/SDL.h>. This is done for portability
+# reasons because not all systems place things in SDL/ (see FreeBSD).
+FIND_PATH(SDL_INCLUDE_DIR SDL.h
+  $ENV{SDLDIR}/include
+  ~/Library/Frameworks/SDL.framework/Headers
+  /Library/Frameworks/SDL.framework/Headers
+  /usr/local/include/SDL
+  /usr/include/SDL
+  /usr/local/include/SDL12
+  /usr/local/include/SDL11 # FreeBSD ports
+  /usr/include/SDL12
+  /usr/include/SDL11
+  /usr/local/include
+  /usr/include
+  /sw/include/SDL # Fink
+  /sw/include
+  /opt/local/include/SDL # DarwinPorts
+  /opt/local/include
+  /opt/csw/include/SDL # Blastwave
+  /opt/csw/include
+  /opt/include/SDL
+  /opt/include
+  C:/Programs/SDL/include
+  )
+# I'm not sure if I should do a special casing for Apple. It is
+# unlikely that other Unix systems will find the framework path.
+# But if they do ([Next|Open|GNU]Step?),
+# do they want the -framework option also?
+IF(${SDL_INCLUDE_DIR} MATCHES ".framework")
+  # The Cocoa framework must be linked into SDL because SDL is Cocoa based.
+  # Remember that the OS X framework version expects you to drop in
+  # SDLmain.h and SDLmain.m directly into your project.
+  # (Cocoa link moved to bottom of this script.)
+  # SET (SDL_LIBRARY "-framework SDL -framework Cocoa" CACHE STRING "SDL framework for OSX")
+  # SET(SDL_LIBRARY "-framework SDL" CACHE STRING "SDL framework for OSX")
+  # Extract the path the framework resides in so we can use it for the -F flag
+  STRING(REGEX REPLACE "(.*)/.*\\.framework/.*" "\\1" SDL_FRAMEWORK_PATH_TEMP ${SDL_INCLUDE_DIR})
+  IF("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+      OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+      )
+    # String is in default search path, don't need to use -F
+    SET(SDL_LIBRARY_TEMP "-framework SDL")
+  ELSE("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+      OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+      )
+    # String is not /Library/Frameworks, need to use -F
+    SET(SDL_LIBRARY_TEMP "-F${SDL_FRAMEWORK_PATH_TEMP} -framework SDL")
+  ENDIF("${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/Library/Frameworks"
+    OR "${SDL_FRAMEWORK_PATH_TEMP}" STREQUAL "/System/Library/Frameworks"
+    )
+  # Clear the temp variable so nobody can see it
+  SET(SDL_FRAMEWORK_PATH_TEMP "" CACHE INTERNAL "")
+
+ELSE(${SDL_INCLUDE_DIR} MATCHES ".framework")
+  # SDL-1.1 is the name used by FreeBSD ports...
+  # don't confuse it for the version number.
+  FIND_LIBRARY(SDL_LIBRARY_TEMP
+    NAMES SDL SDL-1.1
+    PATHS
+    $ENV{SDLDIR}/lib
+    /usr/local/lib
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    C:/Programs/SDL/lib/x86
+    )
+  # Non-OS X framework versions expect you to also dynamically link to
+  # SDLmain. This is mainly for Windows and OS X. Other platforms
+  # seem to provide SDLmain for compatibility even though they don't
+  # necessarily need it.
+  FIND_LIBRARY(SDLMAIN_LIBRARY
+    NAMES SDLmain SDLmain-1.1
+    PATHS
+    $ENV{SDLDIR}/lib
+    /usr/local/lib
+    /usr/lib
+    /sw/lib
+    /opt/local/lib
+    /opt/csw/lib
+    /opt/lib
+    )
+ENDIF(${SDL_INCLUDE_DIR} MATCHES ".framework")
+
+# SDL may require threads on your system.
+# The Apple build may not need an explicit flag because one of the
+# frameworks may already provide it.
+# But for non-OSX systems, I will use the CMake Threads package.
+IF(NOT APPLE)
+  FIND_PACKAGE(Threads)
+ENDIF(NOT APPLE)
+
+# MinGW needs an additional library, mwindows
+# It's total link flags should look like -lmingw32 -lSDLmain -lSDL -lmwindows
+# (Actually on second look, I think it only needs one of the m* libraries.)
+IF(MINGW)
+  SET(MINGW32_LIBRARY mingw32 CACHE STRING "mwindows for MinGW")
+ENDIF(MINGW)
+
+SET(SDL_FOUND "NO")
+IF(SDL_LIBRARY_TEMP)
+  # For SDLmain
+  IF(SDLMAIN_LIBRARY)
+    SET(SDL_LIBRARY_TEMP ${SDLMAIN_LIBRARY} ${SDL_LIBRARY_TEMP})
+  ENDIF(SDLMAIN_LIBRARY)
+
+  # For OS X, SDL uses Cocoa as a backend so it must link to Cocoa.
+  # CMake doesn't display the -framework Cocoa string in the UI even
+  # though it actually is there. I think it has something to do
+  # with the CACHE STRING. Maybe somebody else knows how to fix this.
+  # The problem is mainly cosmetic, and not a functional issue.
+  IF(APPLE)
+    SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} "-framework Cocoa")
+  ENDIF(APPLE)
+
+  # For threads, as mentioned Apple doesn't need this.
+  # In fact, there seems to be a problem if Find the threads package
+  # and try using this line, so I'm just skipping it entirely for OS X.
+  IF(NOT APPLE)
+    SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY_TEMP} ${CMAKE_THREAD_LIBS_INIT})
+  ENDIF(NOT APPLE)
+
+  # For MinGW library
+  IF(MINGW)
+    SET(SDL_LIBRARY_TEMP ${MINGW32_LIBRARY} ${SDL_LIBRARY_TEMP})
+  ENDIF(MINGW)
+
+  # Set the final string here so the GUI reflects the final state.
+  SET(SDL_LIBRARY ${SDL_LIBRARY_TEMP} CACHE STRING "Where the SDL Library can be found")
+
+  SET(SDL_FOUND "YES")
+ENDIF(SDL_LIBRARY_TEMP)
+
+MARK_AS_ADVANCED(SDL_LIBRARY_TEMP)

cmake/FindXercesC.cmake

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

cmake/Macros.cmake

@@ -1,13 +1,14 @@
 macro(today RESULT)
   if(WIN32)
     execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT})
-    string(REGEX REPLACE "[^0-9]*([0-9]+)[^0-9]([0-9]+)[^0-9]([0-9]+).*" "\\1-\\2-\\3" ${RESULT} ${${RESULT}})
+    string(REGEX REPLACE "(..)/(..)/(....).*" "\\1.\\2.\\3" ${RESULT} ${${RESULT}})
+    string(SUBSTRING ${${RESULT}} 0 10 ${RESULT})
   elseif(UNIX)
     execute_process(COMMAND "date" "+%Y-%m-%d" OUTPUT_VARIABLE ${RESULT})
     string(REGEX REPLACE "(....)-(..)-(..).*" "\\1-\\2-\\3" ${RESULT} ${${RESULT}})
   else(WIN32)
-    message(WARNING "date not implemented")
-    set(${RESULT} 00-00-0000)
+    message(SEND_ERROR "date not implemented")
+    set(${RESULT} 00.00.0000)
   endif(WIN32)
 endmacro(today)
 
@@ -19,57 +20,20 @@ macro(now RESULT)
     execute_process(COMMAND "date" "+%H:%M:%S" OUTPUT_VARIABLE ${RESULT})
     string(REGEX REPLACE "(..):(..):(..).*" "\\1:\\2:\\3" ${RESULT} ${${RESULT}})
   else(WIN32)
-    message(WARNING "time not implemented")
+    message(SEND_ERROR "time not implemented")
     set(${RESULT} 00:00:00)
   endif(WIN32)
 endmacro(now)
 
-find_package(Git)
-
 macro(git_id RESULT)
-  set(${RESULT} 0)
-  if (GIT_FOUND AND EXISTS "${PROJECT_SOURCE_DIR}/.git")
-    execute_process(COMMAND "${GIT_EXECUTABLE}" "--git-dir=${PROJECT_SOURCE_DIR}/.git" "rev-parse" "--short=8" "HEAD" OUTPUT_VARIABLE proc_out ERROR_VARIABLE proc_err)
-    if(proc_err)
-      message(WARNING "Git failed with error: ${proc_err}")
-    else()
-      string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${proc_out})
-    endif()
-  elseif(NOT GIT_FOUND)
-    message(WARNING "Git executable not found, revision number not available.")
-  else()
-    message(STATUS "Git repository not found, revision number not available.")
-  endif()
+  if(WIN32)
+    execute_process(COMMAND "cmd" " /C git --git-dir=${PROJECT_SOURCE_DIR}/.git rev-parse HEAD" OUTPUT_VARIABLE ${RESULT})
+    string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})
+  elseif(UNIX)
+    execute_process(COMMAND "git" "--git-dir=${PROJECT_SOURCE_DIR}/.git" "rev-parse" "HEAD" OUTPUT_VARIABLE ${RESULT})
+    string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})
+  else(WIN32)
+    message(SEND_ERROR "Git ID implemented")
+    set(${RESULT} 0)
+  endif(WIN32)
 endmacro(git_id)
-
-macro(use_cxx11)
-  if (CMAKE_VERSION VERSION_LESS "3.1" AND CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-    set (CMAKE_CXX_FLAGS "--std=gnu++11 ${CMAKE_CXX_FLAGS}")
-  endif ()
-endmacro(use_cxx11)
-
-macro(PrintTargetReport targetName)
-  if(CMAKE_CXX_COMPILER MATCHES "/cl\\.exe$")
-    set(cpp_version ${MSVC_VERSION})
-  else()
-    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE cpp_version)
-  endif()
-  if(cpp_version)
-    string(STRIP "v${cpp_version}" cpp_version)
-  else()
-    set(cpp_version "WARNING: COMPILER NOT FOUND!")
-  endif()
-  message("TARGET ${targetName}: cpp compiler ${CMAKE_CXX_COMPILER} ${cpp_version}")
-
-  if(VERBOSE_CMAKELISTS)
-    get_directory_property(DirOpts COMPILE_OPTIONS)
-    get_directory_property(DirDefs COMPILE_DEFINITIONS)
-    string(REPLACE ";" " " DirOpts "${DirOpts}")
-    string(REPLACE ";" "; " DirDefs "${DirDefs}")
-    string(TOUPPER "${CMAKE_BUILD_TYPE}" build_type)
-    message("\twith cpp flags: ${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${build_type}} ${DirOpts}")
-    message("\twith link flags: ${CMAKE_EXE_LINKER_FLAGS}")
-    message("\twith defs: ${DirDefs}")
-    message("--------------")
-  endif()
-endmacro(PrintTargetReport)

companion/releasenotes.txt

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

companion/src/CMakeLists.txt

@@ -1,225 +1,123 @@
-set(SIMULATOR_INSTALL_PREFIX "" CACHE STRING "Alternative simulator library search path")
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "(Linux|FreeBSD)")
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(C9X_NAME_SUFFIX ${VERSION_MAJOR}${VERSION_MINOR})
   set(COMPANION_NAME "companion${C9X_NAME_SUFFIX}")
   set(SIMULATOR_NAME "simulator${C9X_NAME_SUFFIX}")
-  if (NOT ${SIMULATOR_INSTALL_PREFIX} STREQUAL "")
-    set(SIMULATOR_LIB_PATH ${SIMULATOR_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
-  else()
-    set(SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
-  endif()
-  message(STATUS "Simulators library search path: " ${SIMULATOR_LIB_PATH})
-  set(SIMULATOR_LIB_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
-else()
+  set(SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
+else(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set(COMPANION_NAME "companion")
   set(SIMULATOR_NAME "simulator")
-endif()
-
-# 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
-# different versions for different eeproms easier, i.e. without manually renaming
-set(COMPANION_OSX_APP_BUNDLE_NAME "OpenTX Companion ${VERSION_MAJOR}.${VERSION_MINOR}")
-
-# On OS X we copy dfu-util to the application bundle. This the path from which we copy
-# 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")
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
 option(ALLOW_NIGHTLY_BUILDS "Allow nightly builds download / update") # Disabled by default
 if(ALLOW_NIGHTLY_BUILDS)
   add_definitions(-DALLOW_NIGHTLY_BUILDS)
 endif(ALLOW_NIGHTLY_BUILDS)
 
-option(DEBUG_STORAGE_IMPORT "Turn on debug output for storage import") # Disabled by default
-if(DEBUG_STORAGE_IMPORT)
-  add_definitions(-DDEBUG_STORAGE_IMPORT)
-  message(STATUS "Storage import debugging enabled")
-endif()
-if(DEBUG)
-  add_definitions(-DDEBUG)
-endif()
+option(DEBUG_IMPORT "Turn on debug output for EEPROM import") # Disabled by default
+if(DEBUG_IMPORT)
+  add_definitions(-DDEBUG_MODEL_IMPORT)
+  message(STATUS "EEPROM import debugging enabled")
+endif(DEBUG_IMPORT)
 
 option(TABLE_LAYOUT "Use QTableWidget for grid layouts") # Disabled by default
 if(TABLE_LAYOUT)
   add_definitions(-DTABLE_LAYOUT)
   message(STATUS "Using QTableWidget")
-endif()
-
-if(WIN32)
-  option(WIN_DO_FULL_INSTALL "'install' target will perform a full installation into CMAKE_INSTALL_PREFIX path, otherwise only supporting DLLs are copied to binaries folder (default)" OFF)
-  option(WIN_USE_CONSOLE "Open a Windows command console for Simulator debug output." OFF)
-  if(WIN_USE_CONSOLE)
-    add_definitions(-DWIN_USE_CONSOLE_STDIO)
-  endif()
-endif()
+endif(TABLE_LAYOUT)
 
+message(STATUS "Looking for SDL ")
+find_package(Sdl)
 if(SDL_FOUND)
   include_directories(${SDL_INCLUDE_DIR})
+  message("SDL Include Path: " ${SDL_INCLUDE_DIR})
   add_definitions(-DJOYSTICKS)
-endif()
-
-add_definitions(${APP_COMMON_DEFINES})  # set in top-level CMakeLists
-
-if(NOT MSVC)
-  set(WARNING_FLAGS "${WARNING_FLAGS} -Wall")
-  if(WARNINGS_AS_ERRORS)
-    set(WARNING_FLAGS "${WARNING_FLAGS} -Werror")
-  endif()
+  add_definitions(-DSIMU_AUDIO)
 else()
-  # silence lots of warnings regarding "insecure" use of functions (sprintf, strcpy, etc)
-  set(WARNING_FLAGS "${WARNING_FLAGS} /D_CRT_SECURE_NO_WARNINGS")
-  if(WARNINGS_AS_ERRORS)
-    set(WARNING_FLAGS "${WARNING_FLAGS} /WX")
-  endif()
+  message("SDL not found! Joysticks support will be disabled. Simulator audio will not work.")
 endif()
 
-if(WIN32)
-  include_directories(SYSTEM ${WIN_INCLUDE_DIRS})
-  if(NOT WIN_USE_CONSOLE)
-    set(WIN_EXECUTABLE_TYPE WIN32)  # GUI (WinMain) app
-  endif()
-  if(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /LD /MP")
-    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)
-    # 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()
+message(STATUS "Looking for QT lupdate ")
+find_package(Lupdate)
+if(LUPDATE_FOUND)
+  message("QT lupdate: " ${LUPDATE_EXECUTABLE})
+else()
+  message("QT lupdate not found!")
+endif()
+
+add_definitions(-DQXT_STATIC)
+
+if(MSVC)
+  set(CMAKE_CXX_FLAGS "/EHsc /LD")
+  include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes C:/Programs/dirent/include)
+  link_directories(C:/Programs/pthreads/Pre-built.2/lib/)
+  set(PTHREAD_LIBRARY pthreadVC2.lib)
 else()
   set(PTHREAD_LIBRARY pthread)
+  add_definitions(-Wall)
   link_directories(/usr/local/lib)
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${WARNING_FLAGS}")
-
-use_cxx11()  # ensure gnu++11 in CXX_FLAGS with CMake < 3.1
+set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/radio/src)
+set(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src/simulation)
+set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src)
 
 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/qcustomplot
-  ${COMPANION_SRC_DIRECTORY}/thirdparty/miniz
-  ${COMPANION_SRC_DIRECTORY}/storage
+  ${COMPANION_SRC_DIRECTORY}/qxtcommandoptions
 )
 
-############# Do macro replacements on input files #############
-configure_file(${COMPANION_SRC_DIRECTORY}/version.h.in ${CMAKE_BINARY_DIR}/version.h @ONLY)
-configure_file(${COMPANION_SRC_DIRECTORY}/companion.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop @ONLY)
-configure_file(${COMPANION_SRC_DIRECTORY}/simulator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop @ONLY)
-
-############# Translations ###############
-
-### Generate .qm files and assemble resource (qrc) file.
-
-# available Companion translations (src/translations/*.ts)
-set(LANGUAGES cs de en es fi fr it pl sv zh_CN)
-foreach(language ${LANGUAGES})
-  list(APPEND companion_TS translations/companion_${language}.ts)
-endforeach(language)
-# .ts -> .qm
-qt5_add_translation(companion_QM ${companion_TS})
-
-# add Qt translations if found
-if(QT_TRANSLATIONS_DIR)
-  # Some languages have all translations in one qt_*.qm file and others break them up into modules, in which case we need qt_base_*.qm
-  file(GLOB qtbase_QM "${QT_TRANSLATIONS_DIR}/qtbase_*.qm")
-  file(GLOB qt_QM "${QT_TRANSLATIONS_DIR}/qt_??.qm")  # don't want to match "qt_help_*.qm"
-  list(APPEND qt_QM "${QT_TRANSLATIONS_DIR}/qt_zh_CN.qm" "${QT_TRANSLATIONS_DIR}/qt_zh_TW.qm")  # exceptions not matched by the GLOB
-else()
-  message(STATUS "QT_TRANSLATIONS_DIR not found, unable to package pre-built Qt translations with application.")
-endif()
-
-set(TRANSLATIONS_QRC "${CMAKE_CURRENT_BINARY_DIR}/translations.qrc")
-
-# Dynamically create translations.qrc file (XML) from all collected translation files.
-foreach(qm_file ${companion_QM} ${qt_QM} ${qtbase_QM})
-  get_filename_component(qm_file_name ${qm_file} NAME)
-  # Add file with full path and file name (w/out path) as alias to be used in actual code
-  set(TRANSLATION_FILES_LIST "${TRANSLATION_FILES_LIST}    <file alias=\"${qm_file_name}\">${qm_file}</file>\n")
-endforeach()
-configure_file(${COMPANION_SRC_DIRECTORY}/translations.qrc.in ${TRANSLATIONS_QRC} @ONLY)
-
-### Add optional "translations" target for updating .ts files
-if(QT_LUPDATE_EXECUTABLE)
-  add_custom_target(translations
-    WORKING_DIRECTORY ${COMPANION_SRC_DIRECTORY}
-    COMMAND ${QT_LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
-    )
-else()
-  message(STATUS "Qt lupdate not found, 'translations' target will not be availabe.")
-endif()
-
-############# Common lib ###############
-
-set(common_SRCS
-  appdebugmessagehandler.cpp
-  boards.cpp
-  customdebug.cpp
-  eeprominterface.cpp
-  helpers.cpp
-  radiodata.cpp
-  translations.cpp
-  firmwares/er9x/er9xeeprom.cpp
-  firmwares/er9x/er9xinterface.cpp
-  firmwares/ersky9x/ersky9xeeprom.cpp
-  firmwares/ersky9x/ersky9xinterface.cpp
-  firmwares/opentx/opentxeeprom.cpp
-  firmwares/opentx/opentxinterface.cpp
-  modeledit/node.cpp  # used in simulator
-  modeledit/edge.cpp  # used by node
-  )
-
-set(common_MOC_HDRS
-  appdebugmessagehandler.h
-  helpers.h
-  modeledit/node.h
-  )
-
-set(common_RESOURCES
-  companion.qrc
-  ${TRANSLATIONS_QRC}
-  )
-
-qt5_wrap_cpp(common_SRCS ${common_MOC_HDRS})
-qt5_add_resources(common_RCC ${common_RESOURCES})
-#add_custom_target(gen_qrc DEPENDS ${common_RCC} ${companion_QM})
-
-add_library(common ${common_SRCS} ${common_RCC})
-qt5_use_modules(common Core Xml Widgets)
-target_link_libraries(common PRIVATE simulation)
-#add_dependencies(common gen_qrc)
-
-set(CPN_COMMON_LIB common)
-
-############# Supporting libraries ###############
-
 add_subdirectory(shared)
 add_subdirectory(modeledit)
 add_subdirectory(generaledit)
 add_subdirectory(simulation)
-add_subdirectory(storage)
-add_subdirectory(thirdparty/qcustomplot)
+add_subdirectory(qcustomplot)
+add_subdirectory(qxtcommandoptions)
 
-############# Companion ###############
+set(common_SRCS
+  eeprominterface.cpp
+  firmwares/th9x/th9xeeprom.cpp # TODO not needed
+  firmwares/th9x/th9xinterface.cpp
+  firmwares/er9x/er9xeeprom.cpp
+  firmwares/er9x/er9xinterface.cpp
+  firmwares/gruvin9x/gruvin9xeeprom.cpp
+  firmwares/gruvin9x/gruvin9xinterface.cpp
+  firmwares/ersky9x/ersky9xeeprom.cpp
+  firmwares/ersky9x/ersky9xinterface.cpp
+  firmwares/opentx/opentxeeprom.cpp
+  firmwares/opentx/open9xStockeeprom.cpp
+  firmwares/opentx/open9xGruvin9xeeprom.cpp
+  firmwares/opentx/open9xSky9xeeprom.cpp
+  firmwares/opentx/opentxinterface.cpp
+  file.cpp
+  appdata.cpp
+  )
+
+qt5_wrap_cpp(common_SRCS)
+
+add_library(common ${common_SRCS})
+qt5_use_modules(common Core Xml Widgets)
 
 set(companion_SRCS
+  hexinterface.cpp
+  firmwareinterface.cpp
+  converteeprom.cpp
+  # xmlinterface.cpp
+  # ${PROJECT_BINARY_DIR}/radio.cxx
+  helpers.cpp
   helpers_html.cpp
   mdichild.cpp
   modelslist.cpp
+  mountlist.cpp
   apppreferencesdialog.cpp
   fwpreferencesdialog.cpp
   burnconfigdialog.cpp
   multimodelprinter.cpp
   comparedialog.cpp
-  creditsdialog.cpp
+  contributorsdialog.cpp
   releasenotesdialog.cpp
   releasenotesfirmwaredialog.cpp
   customizesplashdialog.cpp
@@ -242,7 +140,6 @@ set(companion_SRCS
   radionotfound.cpp
   wizarddata.cpp
   wizarddialog.cpp
-  multiprotocols.cpp
   )
 
 set(companion_MOC_HDRS
@@ -253,7 +150,7 @@ set(companion_MOC_HDRS
   printdialog.h
   fusesdialog.h
   logsdialog.h
-  creditsdialog.h
+  contributorsdialog.h
   releasenotesdialog.h
   releasenotesfirmwaredialog.h
   customizesplashdialog.h
@@ -267,13 +164,14 @@ set(companion_MOC_HDRS
   flashfirmwaredialog.h
   flasheepromdialog.h
   downloaddialog.h
+  modelslist.h
   mdichild.h
   mainwindow.h
   radionotfound.h
+  helpers.h
   wizarddialog.h
   modelprinter.h
   multimodelprinter.h
-  modelslist.h
   )
 
 set(companion_UIS
@@ -296,135 +194,103 @@ set(companion_UIS
   radionotfound.ui
   )
 
+set(companion_RESOURCES
+  companion.qrc
+  ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
+  )
+
+configure_file(${COMPANION_SRC_DIRECTORY}/version.h.in ${CMAKE_BINARY_DIR}/version.h @ONLY)
+configure_file(${COMPANION_SRC_DIRECTORY}/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc @ONLY)
+configure_file(${COMPANION_SRC_DIRECTORY}/companion.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop @ONLY)
+configure_file(${COMPANION_SRC_DIRECTORY}/simulator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop @ONLY)
+
 if(WIN32)
-  set(icon_RC icon.rc)
+  set(companion_SRCS ${companion_SRCS} icon.rc)
+  if(NOT MSVC)
+    set(CMAKE_EXE_LINKER_FLAGS -mwindows)
+  endif()
 endif()
 
+include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR})
+
+set(LANGUAGES he pl pt ru de fr es it sv cs fi nl)
+foreach(language ${LANGUAGES})
+  set(companion_TS ${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_executable(${COMPANION_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${companion_SRCS} ${icon_RC})
-qt5_use_modules(${COMPANION_NAME} Core Widgets Network)
-target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit simulation ${CPN_COMMON_LIB} qcustomplot shared storage ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${WIN_LINK_LIBRARIES})
+add_definitions(-DQT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}")
 
-PrintTargetReport("${COMPANION_NAME}")
-
-############# Standalone simulator ###############
-
-set(simu_SRCS simulator.cpp )
-
-add_executable(${SIMULATOR_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${simu_SRCS} ${icon_RC})
-target_link_libraries(${SIMULATOR_NAME} PRIVATE simulation ${CPN_COMMON_LIB} storage ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${WIN_LINK_LIBRARIES})
-
-############# Install ####################
-
-# Generate list of simulator plugins, used by all platforms
-file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/*opentx-*simulator${CMAKE_SHARED_LIBRARY_SUFFIX}")
-# the current flavour is not automatically added if build in the current cmake iteration, so always
-# add its library name to be sure
-string(TOLOWER ${PCB} FLAVOUR)
-if(POLICY CMP0026)
-  cmake_policy(SET CMP0026 OLD)  # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
+if(APPLE)
+  add_executable(${COMPANION_NAME} MACOSX_BUNDLE ${companion_SRCS} ${companion_RCC} ${companion_QM})
+  # OS X compiler no longer automatically includes /Library/Frameworks in search path
+  set(CMAKE_EXE_LINKER_FLAGS -F/Library/Frameworks)
+else()
+  add_executable(${COMPANION_NAME} WIN32 ${companion_SRCS} ${companion_RCC} ${companion_QM})
 endif()
-get_property(current_plugin TARGET opentx-${FLAVOUR}-simulator PROPERTY LOCATION)
-list(APPEND simulator_plugins "${current_plugin}")
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+qt5_use_modules(${COMPANION_NAME} Core Widgets Network)
+target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit simulation common qcustomplot shared ${PTHREAD_LIBRARY} ${SDL_LIBRARY})
 
-  message(STATUS "install " ${CMAKE_BINARY_DIR} " to " ${CMAKE_INSTALL_PREFIX}/bin)
-  install(TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-  install(TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-  install(FILES ${simulator_plugins} DESTINATION "${SIMULATOR_LIB_INSTALL_PATH}")
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop DESTINATION share/applications RENAME companion${C9X_NAME_SUFFIX}.desktop)
-  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop DESTINATION share/applications RENAME simulator${C9X_NAME_SUFFIX}.desktop)
-  if(${CMAKE_INSTALL_PREFIX} MATCHES "/usr/local")
-    set(INSTALL_TEMP_SHR_PFX "/usr/")
-    set(INSTALL_TEMP_LIB_PFX "/")
-  endif()
-  install(FILES images/linuxicons/16x16/companion.png DESTINATION ${INSTALL_TEMP_SHR_PFX}share/icons/hicolor/16x16/apps RENAME companion${C9X_NAME_SUFFIX}.png)
-  install(FILES images/linuxicons/22x22/companion.png DESTINATION ${INSTALL_TEMP_SHR_PFX}share/icons/hicolor/22x22/apps RENAME companion${C9X_NAME_SUFFIX}.png)
-  install(FILES images/linuxicons/24x24/companion.png DESTINATION ${INSTALL_TEMP_SHR_PFX}share/icons/hicolor/24x24/apps RENAME companion${C9X_NAME_SUFFIX}.png)
-  install(FILES images/linuxicons/32x32/companion.png DESTINATION ${INSTALL_TEMP_SHR_PFX}share/icons/hicolor/32x32/apps RENAME companion${C9X_NAME_SUFFIX}.png)
-  install(FILES images/linuxicons/48x48/companion.png DESTINATION ${INSTALL_TEMP_SHR_PFX}share/icons/hicolor/48x48/apps RENAME companion${C9X_NAME_SUFFIX}.png)
-  install(FILES images/linuxicons/128x128/companion.png DESTINATION ${INSTALL_TEMP_SHR_PFX}share/icons/hicolor/128x128/apps RENAME companion${C9X_NAME_SUFFIX}.png)
-  install(FILES images/linuxicons/256x256/companion.png DESTINATION ${INSTALL_TEMP_SHR_PFX}share/icons/hicolor/256x256/apps RENAME companion${C9X_NAME_SUFFIX}.png)
-  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")
+############# Standalone simu ###############
 
-elseif(WIN32)
+set(simu_SRCS
+  modeledit/node.cpp
+  modeledit/edge.cpp # TODO not needed
+  simulator.cpp
+  )
 
-  set(QT_DLL_DIR ${QT_LIB_DIR})
-  set(INSTALL_TEMP_QTDLL_FILES Qt5Core Qt5Gui Qt5Widgets Qt5Xml Qt5Network Qt5PrintSupport Qt5Multimedia Qt5Svg)
-  set(INSTALL_TEMP_ICUDLL_FILES icudt54.dll icuin54.dll icuuc54.dll)
-  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-    set(INSTALL_TEMP_QTDLL_SFX "d")
-  endif()
+set(simu_MOC_HDRS
+  modeledit/node.h
+  )
 
-  if(NOT WIN_DO_FULL_INSTALL)
-    # Just copy supporting DLLs to build folder
-    set(INSTALL_DESTINATION "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
-    message(STATUS "Partial install to " ${INSTALL_DESTINATION})
-  else()
-    # Full Windows installation with all supporting files
-    set(INSTALL_DESTINATION "${CMAKE_INSTALL_PREFIX}")
-    message(STATUS "Full install to " ${INSTALL_DESTINATION})
-    # companion & simulator binaries
-    install(TARGETS ${COMPANION_NAME} DESTINATION ${INSTALL_DESTINATION})
-    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)
-    foreach(tmpfile ${INSTALL_TEMP_FILES})
-      install(FILES "${COMPANION_SRC_DIRECTORY}/../targets/windows/${tmpfile}" DESTINATION ${INSTALL_DESTINATION})
-    endforeach()
-  endif()  # WIN_DO_FULL_INSTALL
+qt5_wrap_cpp(simu_SRCS ${simu_MOC_HDRS} )
 
-  # 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()
-  # SDL dll
-  if(SDL_FOUND AND SDL_LIBRARY_PATH 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!")
-  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)
-    endif()
-    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()
+if(WIN32)
+  set(simu_SRCS ${simu_SRCS} icon.rc)
+endif()
 
-endif() # WIN32 install
+if(APPLE)
+  add_executable(${SIMULATOR_NAME} MACOSX_BUNDLE ${simu_SRCS} ${companion_RCC})
+else()
+  add_executable(${SIMULATOR_NAME} WIN32 ${simu_SRCS} ${companion_RCC})
+endif()
+
+# TODO not the same link command than companion?
+target_link_libraries(${SIMULATOR_NAME} PRIVATE simulation common qxtcommandoptions ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${OPENTX_SIMULATOR_LIBS})
 
 ############# Packaging ####################
 
-# Create Windows installer with NSIS (only works for MSVC for now)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  install(TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  install(TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop DESTINATION share/applications RENAME companion${C9X_NAME_SUFFIX}.desktop)
+  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop DESTINATION share/applications RENAME simulator${C9X_NAME_SUFFIX}.desktop)
+  install(FILES images/linuxicons/16x16/companion.png DESTINATION /usr/share/icons/hicolor/16x16/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+  install(FILES images/linuxicons/22x22/companion.png DESTINATION /usr/share/icons/hicolor/22x22/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+  install(FILES images/linuxicons/24x24/companion.png DESTINATION /usr/share/icons/hicolor/24x24/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+  install(FILES images/linuxicons/32x32/companion.png DESTINATION /usr/share/icons/hicolor/32x32/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+  install(FILES images/linuxicons/48x48/companion.png DESTINATION /usr/share/icons/hicolor/48x48/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+  install(FILES images/linuxicons/128x128/companion.png DESTINATION /usr/share/icons/hicolor/128x128/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+  install(FILES images/linuxicons/256x256/companion.png DESTINATION /usr/share/icons/hicolor/256x256/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+  install(FILES images/linuxicons/512x512/companion.png DESTINATION /usr/share/icons/hicolor/512x512/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+  install(FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps RENAME companion${C9X_NAME_SUFFIX}.svg)
+  install(FILES ../targets/linux/45-companion-taranis.rules DESTINATION /lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-taranis.rules)
+  # Linux specific code
+  set(OperatingSystem "Linux")
+else()
+  get_target_property(QtCore_LOCATION Qt5::Core LOCATION)
+  get_filename_component(QT_DLL_DIR ${QtCore_LOCATION} PATH)
+  get_filename_component(SDL_DIR ${SDL_LIBRARY} PATH)
+  install(FILES ${QT_DLL_DIR}/icudt54.dll ${QT_DLL_DIR}/icuin54.dll ${QT_DLL_DIR}/icuuc54.dll ${QT_DLL_DIR}/Qt5Core.dll ${QT_DLL_DIR}/Qt5Gui.dll ${QT_DLL_DIR}/Qt5Widgets.dll ${QT_DLL_DIR}/Qt5Xml.dll ${QT_DLL_DIR}/Qt5Network.dll ${QT_DLL_DIR}/Qt5PrintSupport.dll ${QT_DLL_DIR}/Qt5Multimedia.dll ${SDL_DIR}/SDL.dll DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>)
+  install(FILES ${QT_DLL_DIR}/icudt54.dll ${QT_DLL_DIR}/icuin54.dll ${QT_DLL_DIR}/icuuc54.dll ${QT_DLL_DIR}/Qt5Cored.dll ${QT_DLL_DIR}/Qt5Guid.dll ${QT_DLL_DIR}/Qt5Widgetsd.dll ${QT_DLL_DIR}/Qt5Xmld.dll ${QT_DLL_DIR}/Qt5Networkd.dll ${QT_DLL_DIR}/Qt5PrintSupportd.dll ${QT_DLL_DIR}/Qt5Multimediad.dll ${SDL_DIR}/SDL.dll DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>)
+endif()
+
 if(WIN32)
   if(MSVC)
     set(COMPANION_NSI_IN_FILE companion-vs.nsi.in)
@@ -436,7 +302,7 @@ if(WIN32)
 
   set(SYSDIR "$ENV{windir}/system32")
   configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${COMPANION_NSI_IN_FILE} ${PROJECT_BINARY_DIR}/companion/companion.nsi @ONLY)
-  #configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${SIMULATOR_NSI_IN_FILE} ${PROJECT_BINARY_DIR}/companion/simulator.nsi @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${SIMULATOR_NSI_IN_FILE} ${PROJECT_BINARY_DIR}/companion/simulator.nsi @ONLY)
 
   find_program(NSIS_EXE makensis.exe PATHS
     "C:/Program Files/NSIS"
@@ -449,103 +315,67 @@ if(WIN32)
     DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion/companion.nsi
     COMMENT "Companion Windows NSIS Installer")
 
-#  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/companion/simulator-install.exe
-#    COMMAND "${NSIS_EXE}" ARGS ${PROJECT_BINARY_DIR}/companion/simulator.nsi
-#    DEPENDS simulator ${PROJECT_BINARY_DIR}/companion/simulator.nsi
-#    COMMENT "Simulator Windows NSIS Installer")
+  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/companion/simulator-install.exe
+    COMMAND "${NSIS_EXE}" ARGS ${PROJECT_BINARY_DIR}/companion/simulator.nsi
+    DEPENDS simulator ${PROJECT_BINARY_DIR}/companion/simulator.nsi
+    COMMENT "Simulator Windows NSIS Installer")
 
   add_custom_target(installer
     DEPENDS ${PROJECT_BINARY_DIR}/companion/companion-windows.exe
-#    DEPENDS ${PROJECT_BINARY_DIR}/companion/simulator-windows.exe
+    DEPENDS ${PROJECT_BINARY_DIR}/companion/simulator-windows.exe
     SOURCES ${PROJECT_BINARY_DIR}/companion/companion.nsi
-#    SOURCES ${PROJECT_BINARY_DIR}/companion/simulator.nsi
+    SOURCES ${PROJECT_BINARY_DIR}/companion/simulator.nsi
+    )
+endif()
+
+if(APPLE)
+  set(MACOSX_BUNDLE_ICON_FILE iconmac.icns)
+  if(CMAKE_GENERATOR STREQUAL Xcode)
+    set(WORK_DIR ${CMAKE_BINARY_DIR}/Debug)
+  else()
+    set(WORK_DIR ${PROJECT_BINARY_DIR})
+  endif()
+
+  add_custom_target(addframeworks
+    COMMAND mkdir -p companion.app/Contents/Frameworks
+    COMMAND mkdir -p companion.app/Contents/Resources
+    COMMAND mkdir -p companion.app/Contents/translations
+    COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
+    COMMAND rsync -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/
+    COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
+    COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
+    COMMAND rsync -r /Library/Frameworks/SDL.framework companion.app/Contents/Frameworks/
+    COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
+    COMMAND install_name_tool -change @rpath/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL companion.app/Contents/MacOS/companion
+    WORKING_DIRECTORY ${WORK_DIR}
+    DEPENDS ${COMPANION_NAME})
+
+  add_custom_target(makedmg
+    COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
+    WORKING_DIRECTORY ${WORK_DIR}
+    DEPENDS addframeworks opentx-simulators-bundle)
+endif()
+
+if(LUPDATE_FOUND)
+  add_custom_target(translations
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
+    )
+else()
+  add_custom_target(translations
+    COMMAND echo "Sorry, QT lupdate was not found."
     )
 endif()
 
 set(CPACK_PACKAGE_NAME "companion${C9X_NAME_SUFFIX}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTX open source firmware")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
 string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
 
 # The file stripping is deliberately disabled, with the stripped file we get
 # very poor trace-backs from the users when they report Companion crash
 set(CPACK_STRIP_FILES FALSE)
 
-# Qt5 + Cmake + Mac is poorly documented. A lot of this is guesswork
-# and trial and error. Do not hesitate to fix it for the better
-IF(APPLE)
-  set(plugin_dest_dir ${COMPANION_NAME}.app/Contents/Plugins)
-  set(qtconf_dest_dir ${COMPANION_NAME}.app/Contents/Resources)
-  set(APPS "\${CMAKE_INSTALL_PREFIX}/${COMPANION_NAME}.app")
-  set(companion_res_dir ${COMPANION_NAME}.app/Contents/Resources)
-
-  set_target_properties(${COMPANION_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Companion ${VERSION_MAJOR}.${VERSION_MINOR}")
-  set_target_properties(${SIMULATOR_NAME} PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Simulator ${VERSION_MAJOR}.${VERSION_MINOR}")
-
-  # Use a non standard Info.plist that adds Retina support flags
-  set_target_properties(${COMPANION_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/companion/targets/mac/MacOSXBundleInfo.plist.in)
-  set_target_properties(${SIMULATOR_NAME} PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${PROJECT_SOURCE_DIR}/companion/targets/mac/MacOSXBundleInfo.plist.in)
-
-  INSTALL(TARGETS ${COMPANION_NAME}
-      BUNDLE DESTINATION . COMPONENT Runtime
-      RUNTIME DESTINATION bin COMPONENT Runtime
-      )
-
-  install(FILES ${simulator_plugins} DESTINATION "${companion_res_dir}" COMPONENT Runtime)
-
-  # Write qt.conf to tell qt where to find it plugins
-  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
-    "[Paths]\nPlugins = Plugins\n")
-  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/qt.conf"
-    DESTINATION "${companion_res_dir}"
-    COMPONENT Runtime)
-
-  # menu file
-  install(DIRECTORY ${PROJECT_SOURCE_DIR}/companion/targets/mac/qt_menu.nib DESTINATION "${companion_res_dir}" COMPONENT Runtime)
-
-  # manually add the required plugins
-  foreach (plugin ${Qt5Multimedia_PLUGINS} ${Qt5PrintSupport_PLUGINS} ${Qt5Gui_PLUGINS} ${Qt5Svg_PLUGINS})
-    get_target_property(QPA_PLUGIN ${plugin} LOCATION)
-    get_filename_component(QPA_PLUGIN_FILENAME ${QPA_PLUGIN} NAME)
-    # Todo is there a nicer way to get the QT Plugin directory name?!
-    get_filename_component(QPA_PLUGIN_DIRECTORY ${QPA_PLUGIN} DIRECTORY)
-    get_filename_component(QPA_PLUGIN_DIRECTORY ${QPA_PLUGIN_DIRECTORY} NAME)
-
-    install(FILES ${QPA_PLUGIN} DESTINATION "${plugin_dest_dir}/${QPA_PLUGIN_DIRECTORY}/" COMPONENT Runtime)
-
-    list(APPEND bundle_qt_libs "\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/${QPA_PLUGIN_DIRECTORY}/${QPA_PLUGIN_FILENAME}")
-  endforeach()
-
-  # Add icon
-  set(MACOSX_BUNDLE_ICON_FILE iconmac.icns)
-  set(MAC_ICON_FILE ${COMPANION_SRC_DIRECTORY}/images/${MACOSX_BUNDLE_ICON_FILE})
-  SET_SOURCE_FILES_PROPERTIES(${MAC_ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
-  set(${COMPANION_SOURCES} ${COMPANION_SOURCES} ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE})
-  install(FILES ${MAC_ICON_FILE} DESTINATION ${companion_res_dir} COMPONENT Runtime)
-
-  # 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")
-  
-
-  # Include depencies (adding frameworks, fixing the embbeded libraries)
-  # I get write errors without setting BU_CHMOD_BUNDLE_ITEMS even though it is
-  # technically a hack (that is already is in the Bundle library ...)
-  install(CODE "
-   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_LIB_DIR}\")
-   file(RENAME \"\${CMAKE_INSTALL_PREFIX}/${COMPANION_NAME}.app\" \"\${CMAKE_INSTALL_PREFIX}/${COMPANION_OSX_APP_BUNDLE_NAME}.app\")
-   " COMPONENT Runtime)
-endif()
-
 find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
-
 if(DPKG_PROGRAM)
   set(CPACK_GENERATOR "DEB")
   execute_process(
@@ -559,22 +389,13 @@ 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")
-# set(CPACK_GENERATOR "TGZ")  # for quick testing
-  set(CPACK_BINARY_DRAGNDROP ON)
-  set(CPACK_DMG_BACKGROUND_IMAGE ${COMPANION_SRC_DIRECTORY}/images/splash22_3_dmg.png)
-  set(CPACK_DMG_VOLUME_NAME "OpenTX Companion")
-  set(CPACK_DMG_DS_STORE ${PROJECT_SOURCE_DIR}/companion/targets/mac/DS_Store)
-  set(CPACK_PACKAGE_FILE_NAME "opentx-${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}")
 else(DPKG_PROGRAM)
   set(CPACK_GENERATOR "RPM")
   set(CPACK_RPM_PACKAGE_VERSION ${VERSION})
   set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
   set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
-  set(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib /lib/udev /lib/udev/rules.d")
+  SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib /lib/udev /lib/udev/rules.d")
 endif(DPKG_PROGRAM)
 
 include(CPack)

companion/src/appdata.cpp

@@ -1,12 +1,5 @@
 /*
- * 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
+ * Author - Kjell Kernen
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,6 +9,7 @@
  * 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 "appdata.h"
@@ -24,93 +18,191 @@
 AppData g;
 
 // ** CompStoreObj class********************
-void CompStoreObj::clear (const QString &tag1, const QString &tag2, const QString &tag3)
+void CompStoreObj::clear (const QString tag1, const QString tag2, const QString tag3)
 {
-  QSettings settings(COMPANY, PRODUCT);
-  if (tag2.isEmpty())
-  {
-    settings.remove(tag1);
-  }
-  else if (tag3.isEmpty())
-  {
-    settings.beginGroup(tag1);
-    settings.remove(tag2);
-    settings.endGroup();
-  }
-  else
-  {
-    settings.beginGroup(tag1);
-    settings.beginGroup(tag2);
-    settings.remove(tag3);
-    settings.endGroup();
-    settings.endGroup();
-  }
+    QSettings settings(COMPANY, PRODUCT);
+    if (tag2.isEmpty())
+    {
+        settings.remove(tag1);
+    }
+    else if (tag3.isEmpty())
+    {
+        settings.beginGroup(tag1);
+        settings.remove(tag2);
+        settings.endGroup();
+    }
+    else
+    {
+        settings.beginGroup(tag1);
+        settings.beginGroup(tag2);
+        settings.remove(tag3);
+        settings.endGroup();
+        settings.endGroup();
+    }
 }
 
-template <typename OBJ_T, typename TAG_T, typename GP1_T, typename GP2_T>
-void CompStoreObj::store(const OBJ_T newValue, OBJ_T & destValue, const TAG_T tag, const GP1_T group1, const GP2_T group2)
+void CompStoreObj::store(const QByteArray newArray, QByteArray &array, const QString tag, const QString group1, const QString group2 )
 {
-  QSettings settings(COMPANY, PRODUCT);
-  QString g1 = group1;  // these may come in as const char * or QString
-  QString g2 = group2;
-  if (!g1.isEmpty()){
-    settings.beginGroup(g1);
-    if (!g2.isEmpty())
-      settings.beginGroup(g2);
-  }
+    QSettings settings(COMPANY, PRODUCT);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
 
-  settings.setValue(tag, QVariant::fromValue(newValue));
-  destValue = newValue;
+    settings.setValue(tag, newArray);
+    array = newArray;
 
-  if (!g1.isEmpty()){
-    settings.endGroup();
-    if (!g2.isEmpty())
-      settings.endGroup();
-  }
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
 }
 
-template <typename OBJ_T, typename TAG_T, typename DEF_T, typename GP1_T, typename GP2_T>
-void CompStoreObj::retrieve(OBJ_T & destValue, const TAG_T tag, const DEF_T def, const GP1_T group1, const GP2_T group2)
+void CompStoreObj::store(const QStringList newSList, QStringList &stringList, const QString tag, const QString group1, const QString group2 )
 {
-  QSettings settings(COMPANY, PRODUCT);
-  QString g1 = group1;  // these may come in as const char * or QString
-  QString g2 = group2;
-  if (!g1.isEmpty()){
-    settings.beginGroup(g1);
-    if (!g2.isEmpty())
-      settings.beginGroup(g2);
-  }
+    QSettings settings(COMPANY, PRODUCT);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
 
-  QVariant val = settings.value(QString(tag), QVariant::fromValue(def));
-  if (val.canConvert<OBJ_T>())
-    destValue = val.value<OBJ_T>();
+    settings.setValue(tag, newSList);
+    stringList = newSList;
 
-  if (!g1.isEmpty()){;
-    settings.endGroup();
-    if (!g2.isEmpty())
-      settings.endGroup();
-  }
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
 }
 
-template <typename OBJ_T, typename TAG_T, typename DEF_T, typename GP1_T, typename GP2_T>
-void CompStoreObj::getset(OBJ_T & value, const TAG_T tag, const DEF_T def, const GP1_T group1, const GP2_T group2 )
+void CompStoreObj::store(const QString newString, QString &string, const QString tag, const QString group1, const QString group2 )
 {
-  retrieve(value, tag, def, group1, group2);
-  store(value, value, tag, group1, group2);
+    QSettings settings(COMPANY, PRODUCT);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
+
+    settings.setValue(tag, newString);
+    string = newString;
+
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
 }
 
-template <typename OBJ_T, typename TAG_T, typename GP1_T, typename GP2_T>
-void CompStoreObj::getset(OBJ_T & value, const TAG_T tag, const char * def, const GP1_T group1, const GP2_T group2 )
+void CompStoreObj::store(const bool newTruth, bool &truth, const QString tag, const QString group1, const QString group2 )
 {
-  getset(value, tag, QString(def), group1, group2);
+    QSettings settings(COMPANY, PRODUCT);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
+
+    settings.setValue(tag, newTruth);
+    truth = newTruth;
+
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
 }
 
+void CompStoreObj::store(const int newNumber, int &number, const QString tag, const QString group1, const QString group2 )
+{
+    QSettings settings(COMPANY, PRODUCT);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
+
+    settings.setValue(tag, newNumber);
+    number = newNumber;
+
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
+}
+
+// Retrieval functions
+void CompStoreObj::retrieve( QByteArray &array, const QString tag, const QString def, const QString group1, const QString group2 )
+{
+    QSettings settings(COMPANY, PRODUCT);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
+
+    array = settings.value(tag, def).toByteArray();
+
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
+}
+
+void CompStoreObj::retrieve( QStringList &stringList, const QString tag, const QString def, const QString group1, const QString group2 )
+{
+    QSettings settings(COMPANY, PRODUCT);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
+
+    stringList = settings.value(tag, def).toStringList();
+
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
+}
+
+void CompStoreObj::retrieve( QString &string, const QString tag, const QString def, const QString group1, const QString group2 )
+{
+    QSettings settings(COMPANY, PRODUCT);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
+
+    string = settings.value(tag, def).toString();
+
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
+}
+
+void CompStoreObj::retrieve( bool &truth, const QString tag, const bool def, const QString group1, const QString group2 )
+{
+    QSettings settings(COMPANY, PRODUCT);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
+
+    truth = settings.value(tag, def).toBool();
+
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
+}
+
+void CompStoreObj::retrieve( int &number, const QString tag, const int def, const QString group1, const QString group2 )
+{
+    QSettings settings(COMPANY, PRODUCT);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
+
+    number = settings.value(tag, def).toInt();
+
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
+}
+
+// Retrieve and Store functions
+void CompStoreObj::getset( QByteArray &array, const QString tag, const QString def, const QString group1, const QString group2 )
+{
+    retrieve( array, tag, def, group1, group2);
+    store(array, array, tag, group1, group2);
+}
+
+void CompStoreObj::getset( QStringList &stringList, const QString tag, const QString def, const QString group1, const QString group2 )
+{
+    retrieve( stringList, tag, def, group1, group2);
+    store(stringList, stringList, tag, group1, group2);
+}
+
+void CompStoreObj::getset( QString &string, const QString tag, const QString def, const QString group1, const QString group2 )
+{
+    retrieve( string, tag, def, group1, group2);
+    store(string, string, tag, group1, group2);
+}
+
+void CompStoreObj::getset( bool &truth, const QString tag, const bool def, const QString group1, const QString group2 )
+{
+    retrieve( truth, tag, def, group1, group2);
+    store(truth, truth, tag, group1, group2);
+}
+
+void CompStoreObj::getset( int &number, const QString tag, const int def, const QString group1, const QString group2 )
+{
+    retrieve( number, tag, def, group1, group2);
+    store(number, number, tag, group1, group2);
+}
 
 // ** FwRevision class********************
 int FwRevision::get( const QString fwType )
 {
     QString result;
-    retrieve( result, fwType, QString(""), "FwRevisions" );
+    retrieve( result, fwType, "", "FwRevisions" );
     return result.toInt();
 }
 
@@ -222,48 +314,45 @@ QString Profile::timeStamp()     const { return _timeStamp;     }
 QString Profile::trainerCalib()  const { return _trainerCalib;  }
 QString Profile::controlTypes()  const { return _controlTypes;  }
 QString Profile::controlNames()  const { return _controlNames;  }
+int     Profile::txCurrentCalibration()  const { return _txCurrentCalibration;  }
 int     Profile::gsStickMode()   const { return _gsStickMode;   }
 int     Profile::ppmMultiplier() const { return _ppmMultiplier; }
+int     Profile::txVoltageCalibration()     const { return _txVoltageCalibration;     }
 int     Profile::vBatWarn()      const { return _vBatWarn;      }
 int     Profile::vBatMin()       const { return _vBatMin;       }
 int     Profile::vBatMax()       const { return _vBatMax;       }
-int     Profile::txCurrentCalibration()  const { return _txCurrentCalibration; }
-int     Profile::txVoltageCalibration()  const { return _txVoltageCalibration; }
-
-SimulatorOptions Profile::simulatorOptions() const { return _simulatorOptions; }
 
 // Set declarations
-void Profile::name          (const QString x) { store(x, _name,          "Name"                  ,"Profiles", groupId());}
-void Profile::fwName        (const QString x) { store(x, _fwName,        "fwName"                ,"Profiles", groupId());}
-void Profile::fwType        (const QString x) { store(x, _fwType,        "fwType"                ,"Profiles", groupId());}
-void Profile::sdPath        (const QString x) { store(x, _sdPath,        "sdPath"                ,"Profiles", groupId());}
-void Profile::volumeGain    (const int     x) { store(x, _volumeGain,    "volumeGain"            ,"Profiles", groupId());}
-void Profile::pBackupDir    (const QString x) { store(x, _pBackupDir,    "pBackupDir"            ,"Profiles", groupId());}
-void Profile::splashFile    (const QString x) { store(x, _splashFile,    "SplashFileName"        ,"Profiles", groupId());}
-void Profile::burnFirmware  (const bool    x) { store(x, _burnFirmware,  "burnFirmware"          ,"Profiles", groupId());}
-void Profile::renameFwFiles (const bool    x) { store(x, _renameFwFiles, "rename_firmware_files" ,"Profiles", groupId());}
-void Profile::penableBackup (const bool    x) { store(x, _penableBackup, "penableBackup"         ,"Profiles", groupId());}
-void Profile::channelOrder  (const int     x) { store(x, _channelOrder,  "default_channel_order" ,"Profiles", groupId());}
-void Profile::defaultMode   (const int     x) { store(x, _defaultMode,   "default_mode"          ,"Profiles", groupId());}
-void Profile::beeper        (const QString x) { store(x, _beeper,        "Beeper"                ,"Profiles", groupId());}
-void Profile::countryCode   (const QString x) { store(x, _countryCode,   "countryCode"           ,"Profiles", groupId());}
-void Profile::display       (const QString x) { store(x, _display,       "Display"               ,"Profiles", groupId());}
-void Profile::haptic        (const QString x) { store(x, _haptic,        "Haptic"                ,"Profiles", groupId());}
-void Profile::speaker       (const QString x) { store(x, _speaker,       "Speaker"               ,"Profiles", groupId());}
-void Profile::stickPotCalib (const QString x) { store(x, _stickPotCalib, "StickPotCalib"         ,"Profiles", groupId());}
-void Profile::timeStamp     (const QString x) { store(x, _timeStamp,     "TimeStamp"             ,"Profiles", groupId());}
-void Profile::trainerCalib  (const QString x) { store(x, _trainerCalib,  "TrainerCalib"          ,"Profiles", groupId());}
-void Profile::controlTypes  (const QString x) { store(x, _controlTypes,  "ControlTypes"          ,"Profiles", groupId());}
-void Profile::controlNames  (const QString x) { store(x, _controlNames,  "ControlNames"          ,"Profiles", groupId());}
-void Profile::gsStickMode   (const int     x) { store(x, _gsStickMode,   "GSStickMode"           ,"Profiles", groupId());}
-void Profile::ppmMultiplier (const int     x) { store(x, _ppmMultiplier, "PPM_Multiplier"        ,"Profiles", groupId());}
-void Profile::vBatWarn      (const int     x) { store(x, _vBatWarn,      "vBatWarn"              ,"Profiles", groupId());}
-void Profile::vBatMin       (const int     x) { store(x, _vBatMin,       "VbatMin"               ,"Profiles", groupId());}
-void Profile::vBatMax       (const int     x) { store(x, _vBatMax,       "VbatMax"               ,"Profiles", groupId());}
-void Profile::txCurrentCalibration (const int x) { store(x, _txCurrentCalibration, "currentCalib","Profiles", groupId());}
-void Profile::txVoltageCalibration (const int x) { store(x, _txVoltageCalibration, "VbatCalib"   ,"Profiles", groupId());}
+void Profile::name          (const QString x) { store(x, _name,          "Name"                  ,"Profiles", QString("profile%1").arg(index));}
+void Profile::fwName        (const QString x) { store(x, _fwName,        "fwName"                ,"Profiles", QString("profile%1").arg(index));}
+void Profile::fwType        (const QString x) { store(x, _fwType,        "fwType"                ,"Profiles", QString("profile%1").arg(index));}
+void Profile::sdPath        (const QString x) { store(x, _sdPath,        "sdPath"                ,"Profiles", QString("profile%1").arg(index));}
+void Profile::volumeGain    (const int     x) { store(x, _volumeGain,    "volumeGain"            ,"Profiles", QString("profile%1").arg(index));}
+void Profile::pBackupDir    (const QString x) { store(x, _pBackupDir,    "pBackupDir"            ,"Profiles", QString("profile%1").arg(index));}
+void Profile::splashFile    (const QString x) { store(x, _splashFile,    "SplashFileName"        ,"Profiles", QString("profile%1").arg(index));}
+void Profile::burnFirmware  (const bool    x) { store(x, _burnFirmware,  "burnFirmware"          ,"Profiles", QString("profile%1").arg(index));}
+void Profile::renameFwFiles (const bool    x) { store(x, _renameFwFiles, "rename_firmware_files" ,"Profiles", QString("profile%1").arg(index));}
+void Profile::penableBackup (const bool    x) { store(x, _penableBackup, "penableBackup"         ,"Profiles", QString("profile%1").arg(index));}
+void Profile::channelOrder  (const int     x) { store(x, _channelOrder,  "default_channel_order" ,"Profiles", QString("profile%1").arg(index));}
+void Profile::defaultMode   (const int     x) { store(x, _defaultMode,   "default_mode"          ,"Profiles", QString("profile%1").arg(index));}
 
-void Profile::simulatorOptions(const SimulatorOptions & x) { store(x, _simulatorOptions, "simulatorOptions" ,"Profiles", groupId()); }
+void Profile::beeper        (const QString x) { store(x, _beeper,        "Beeper"                ,"Profiles", QString("profile%1").arg(index));}
+void Profile::countryCode   (const QString x) { store(x, _countryCode,   "countryCode"           ,"Profiles", QString("profile%1").arg(index));}
+void Profile::display       (const QString x) { store(x, _display,       "Display"               ,"Profiles", QString("profile%1").arg(index));}
+void Profile::haptic        (const QString x) { store(x, _haptic,        "Haptic"                ,"Profiles", QString("profile%1").arg(index));}
+void Profile::speaker       (const QString x) { store(x, _speaker,       "Speaker"               ,"Profiles", QString("profile%1").arg(index));}
+void Profile::stickPotCalib (const QString x) { store(x, _stickPotCalib, "StickPotCalib"         ,"Profiles", QString("profile%1").arg(index));}
+void Profile::timeStamp     (const QString x) { store(x, _timeStamp,     "TimeStamp"             ,"Profiles", QString("profile%1").arg(index));}
+void Profile::trainerCalib  (const QString x) { store(x, _trainerCalib,  "TrainerCalib"          ,"Profiles", QString("profile%1").arg(index));}
+void Profile::controlTypes  (const QString x) { store(x, _controlTypes,  "ControlTypes"          ,"Profiles", QString("profile%1").arg(index));}
+void Profile::controlNames  (const QString x) { store(x, _controlNames,  "ControlNames"          ,"Profiles", QString("profile%1").arg(index));}
+void Profile::txCurrentCalibration  (const int x) { store(x, _txCurrentCalibration, "currentCalib","Profiles", QString("profile%1").arg(index));}
+void Profile::gsStickMode   (const int     x) { store(x, _gsStickMode,   "GSStickMode"           ,"Profiles", QString("profile%1").arg(index));}
+void Profile::ppmMultiplier (const int     x) { store(x, _ppmMultiplier, "PPM_Multiplier"        ,"Profiles", QString("profile%1").arg(index));}
+void Profile::txVoltageCalibration     (const int x) { store(x, _txVoltageCalibration, "VbatCalib","Profiles", QString("profile%1").arg(index));}
+void Profile::vBatWarn      (const int     x) { store(x, _vBatWarn,      "vBatWarn"              ,"Profiles", QString("profile%1").arg(index));}
+void Profile::vBatMin       (const int     x) { store(x, _vBatMin,       "VbatMin"               ,"Profiles", QString("profile%1").arg(index));}
+void Profile::vBatMax       (const int     x) { store(x, _vBatMax,       "VbatMax"               ,"Profiles", QString("profile%1").arg(index));}
 
 // Constructor
 Profile::Profile()
@@ -295,14 +384,13 @@ Profile& Profile::operator=(const Profile& rhs)
     trainerCalib ( rhs.trainerCalib()  );
     controlTypes ( rhs.controlTypes()  );
     controlNames ( rhs.controlNames()  );
+    txCurrentCalibration ( rhs.txCurrentCalibration()  );
     gsStickMode  ( rhs.gsStickMode()   );
     ppmMultiplier( rhs.ppmMultiplier() );
+    txVoltageCalibration    ( rhs.txVoltageCalibration()     );
     vBatWarn     ( rhs.vBatWarn()      );
     vBatMin      ( rhs.vBatMin()       );
     vBatMax      ( rhs.vBatMax()       );
-    txCurrentCalibration ( rhs.txCurrentCalibration() );
-    txVoltageCalibration ( rhs.txVoltageCalibration() );
-    simulatorOptions     ( rhs.simulatorOptions()     );
 
     return *this;
 }
@@ -312,7 +400,7 @@ void Profile::remove()
     // Remove all profile values from settings file
     QSettings settings(COMPANY, PRODUCT);
     settings.beginGroup("Profiles");
-    settings.remove(groupId());
+    settings.remove(QString("profile%1").arg(index));
     settings.endGroup();
 
     // Reset all profile variables to initial values
@@ -323,7 +411,7 @@ bool Profile::existsOnDisk()
 {
     QSettings settings(COMPANY, PRODUCT);
     settings.beginGroup("Profiles");
-    settings.beginGroup(groupId());
+    settings.beginGroup(QString("profile%1").arg(index));
     QStringList keyList = settings.allKeys();
     settings.endGroup();
     settings.endGroup();
@@ -370,8 +458,6 @@ void Profile::init(int newIndex)
     _channelOrder =  0;
     _defaultMode =   1;
 
-    _simulatorOptions = SimulatorOptions();
-
     initFwVariables();
 
     // Do not write empty profiles to disk except the default (0) profile.
@@ -384,59 +470,46 @@ void Profile::init(int newIndex)
 void Profile::flush()
 {
     // Load and store all variables. Use default values if setting values are missing
-    getset( _fwName,        "fwName"                ,""     ,"Profiles", groupId());
-    getset( _fwType,        "fwType"                ,""     ,"Profiles", groupId());
-    getset( _name,          "Name"                  ,""     ,"Profiles", groupId());
-    getset( _sdPath,        "sdPath"                ,""     ,"Profiles", groupId());
-    getset( _volumeGain,    "volumeGain"            ,10     ,"Profiles", groupId());
-    getset( _pBackupDir,    "pBackupDir"            ,""     ,"Profiles", groupId());
-    getset( _splashFile,    "SplashFileName"        ,""     ,"Profiles", groupId());
-    getset( _burnFirmware,  "burnFirmware"          ,false  ,"Profiles", groupId());
-    getset( _penableBackup, "penableBackup"         ,false  ,"Profiles", groupId());
-    getset( _renameFwFiles, "rename_firmware_files" ,false  ,"Profiles", groupId());
-    getset( _channelOrder,  "default_channel_order" ,0      ,"Profiles", groupId());
-    getset( _defaultMode,   "default_mode"          ,1      ,"Profiles", groupId());
+    getset( _fwName,        "fwName"                ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _fwType,        "fwType"                ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _name,          "Name"                  ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _sdPath,        "sdPath"                ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _volumeGain,    "volumeGain"            ,10     ,"Profiles", QString("profile%1").arg(index));
+    getset( _pBackupDir,    "pBackupDir"            ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _splashFile,    "SplashFileName"        ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _burnFirmware,  "burnFirmware"          ,false  ,"Profiles", QString("profile%1").arg(index));
+    getset( _penableBackup, "penableBackup"         ,false  ,"Profiles", QString("profile%1").arg(index));
+    getset( _renameFwFiles, "rename_firmware_files" ,false  ,"Profiles", QString("profile%1").arg(index));
+    getset( _channelOrder,  "default_channel_order" ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _defaultMode,   "default_mode"          ,1      ,"Profiles", QString("profile%1").arg(index));
 
-    getset( _beeper,        "Beeper"                ,""     ,"Profiles", groupId());
-    getset( _countryCode,   "countryCode"           ,""     ,"Profiles", groupId());
-    getset( _display,       "Display"               ,""     ,"Profiles", groupId());
-    getset( _haptic,        "Haptic"                ,""     ,"Profiles", groupId());
-    getset( _speaker,       "Speaker"               ,""     ,"Profiles", groupId());
-    getset( _stickPotCalib, "StickPotCalib"         ,""     ,"Profiles", groupId());
-    getset( _timeStamp,     "TimeStamp"             ,""     ,"Profiles", groupId());
-    getset( _trainerCalib,  "TrainerCalib"          ,""     ,"Profiles", groupId());
-    getset( _controlTypes,  "ControlTypes"          ,""     ,"Profiles", groupId());
-    getset( _controlNames,  "ControlNames"          ,""     ,"Profiles", groupId());
-    getset( _gsStickMode,   "GSStickMode"           ,0      ,"Profiles", groupId());
-    getset( _ppmMultiplier, "PPM_Multiplier"        ,0      ,"Profiles", groupId());
-    getset( _vBatWarn,      "vBatWarn"              ,0      ,"Profiles", groupId());
-    getset( _vBatMin,       "VbatMin"               ,0      ,"Profiles", groupId());
-    getset( _vBatMax,       "VbatMax"               ,0      ,"Profiles", groupId());
-    getset( _txCurrentCalibration,  "currentCalib"  ,0      ,"Profiles", groupId());
-    getset( _txVoltageCalibration,  "VbatCalib"     ,0      ,"Profiles", groupId());
-
-    getset( _simulatorOptions, "simulatorOptions", SimulatorOptions(), "Profiles", groupId());
-
-}
-
-QString Profile::groupId()
-{
-  return QString("profile%1").arg(index);
+    getset( _beeper,        "Beeper"                ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _countryCode,   "countryCode"           ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _display,       "Display"               ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _haptic,        "Haptic"                ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _speaker,       "Speaker"               ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _stickPotCalib, "StickPotCalib"         ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _timeStamp,     "TimeStamp"             ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _trainerCalib,  "TrainerCalib"          ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _controlTypes,  "ControlTypes"          ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _controlNames,  "ControlNames"          ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _txCurrentCalibration,  "currentCalib"          ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _gsStickMode,   "GSStickMode"           ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _ppmMultiplier, "PPM_Multiplier"        ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _txVoltageCalibration,     "VbatCalib"             ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _vBatWarn,      "vBatWarn"              ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _vBatMin,       "VbatMin"               ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _vBatMax,       "VbatMax"               ,0      ,"Profiles", QString("profile%1").arg(index));
 }
 
 
 // ** AppData class********************
 
 // Get declarations
-QStringList AppData::recentFiles()    { return _recentFiles;     }
-QStringList AppData::simuDbgFilters() { return _simuDbgFilters;  }
-
+QStringList AppData::recentFiles() { return _recentFiles;     }
 QByteArray AppData::mainWinGeo()   { return _mainWinGeo;      }
 QByteArray AppData::mainWinState() { return _mainWinState;    }
 QByteArray AppData::modelEditGeo() { return _modelEditGeo;    }
-QByteArray AppData::mdiWinGeo()    { return _mdiWinGeo;       }
-QByteArray AppData::mdiWinState()  { return _mdiWinState;     }
-QByteArray AppData::compareWinGeo(){ return _compareWinGeo;   }
 
 QString AppData::armMcu()          { return _armMcu;          }
 QString AppData::avrArguments()    { return _avrArguments;    }
@@ -449,6 +522,7 @@ QString AppData::mcu()             { return _mcu;             }
 QString AppData::programmer()      { return _programmer;      }
 QString AppData::sambaLocation()   { return _sambaLocation;   }
 QString AppData::sambaPort()       { return _sambaPort;       }
+QString AppData::lastSimulator()   { return _lastSimulator;   }
 
 QString AppData::backupDir()       { return _backupDir;       }
 QString AppData::gePath()          { return _gePath;          }
@@ -460,7 +534,15 @@ QString AppData::libDir()          { return _libDir;          }
 QString AppData::snapshotDir()     { return _snapshotDir;     }
 QString AppData::updatesDir()      { return _updatesDir;      }
 
-int AppData::newModelAction()      { return _newModelAction;  }
+bool AppData::jsSupport()          { return _jsSupport;       }
+bool AppData::maximized()          { return _maximized;       }
+bool AppData::showSplash()         { return _showSplash;      }
+bool AppData::snapToClpbrd()       { return _snapToClpbrd;    }
+bool AppData::autoCheckApp()       { return _autoCheckApp;    }
+bool AppData::autoCheckFw()        { return _autoCheckFw;     }
+bool AppData::simuSW()             { return _simuSW;          }
+bool AppData::useWizard()          { return _useWizard;       }
+
 int AppData::backLight()           { return _backLight;       }
 int AppData::embedSplashes()       { return _embedSplashes;   }
 int AppData::fwServerFails()       { return _fwServerFails;   }
@@ -471,19 +553,12 @@ int AppData::jsCtrl()              { return _jsCtrl;          }
 int AppData::id()                  { return _id;              }
 int AppData::theme()               { return _theme;           }
 int AppData::warningId()           { return _warningId;       }
-int AppData::simuLastProfId()      { return _simuLastProfId;  }
-int AppData::sessionId()           { return _sessionId;       }
 
 // Set declarations
 void AppData::recentFiles     (const QStringList x) { store(x, _recentFiles,     "recentFileList"          );}
-void AppData::simuDbgFilters  (const QStringList x) { store(x, _simuDbgFilters,  "simuDbgFilters"          );}
-
 void AppData::mainWinGeo      (const QByteArray  x) { store(x, _mainWinGeo,      "mainWindowGeometry"      );}
 void AppData::mainWinState    (const QByteArray  x) { store(x, _mainWinState,    "mainWindowState"         );}
 void AppData::modelEditGeo    (const QByteArray  x) { store(x, _modelEditGeo,    "modelEditGeometry"       );}
-void AppData::mdiWinGeo       (const QByteArray  x) { store(x, _mdiWinGeo,       "mdiWinGeo"               );}
-void AppData::mdiWinState     (const QByteArray  x) { store(x, _mdiWinState,     "mdiWinState"             );}
-void AppData::compareWinGeo   (const QByteArray  x) { store(x, _compareWinGeo,   "compareWinGeo"           );}
 
 void AppData::armMcu          (const QString     x) { store(x, _armMcu,          "arm_mcu"                 );}
 void AppData::avrArguments    (const QString     x) { store(x, _avrArguments,    "avr_arguments"           );}
@@ -496,6 +571,7 @@ void AppData::mcu             (const QString     x) { store(x, _mcu,
 void AppData::programmer      (const QString     x) { store(x, _programmer,      "programmer"              );}
 void AppData::sambaLocation   (const QString     x) { store(x, _sambaLocation,   "samba_location"          );}
 void AppData::sambaPort       (const QString     x) { store(x, _sambaPort,       "samba_port"              );}
+void AppData::lastSimulator   (const QString     x) { store(x, _lastSimulator,   "last_simulator"          );}
 
 void AppData::backupDir       (const QString     x) { store(x, _backupDir,       "backupPath"              );}
 void AppData::gePath          (const QString     x) { store(x, _gePath,          "gePath"                  );}
@@ -507,7 +583,15 @@ void AppData::libDir          (const QString     x) { store(x, _libDir,
 void AppData::snapshotDir     (const QString     x) { store(x, _snapshotDir,     "snapshotpath"            );}
 void AppData::updatesDir      (const QString     x) { store(x, _updatesDir,      "lastUpdatesDir"          );}
 
-void AppData::newModelAction  (const int         x) { store(x, _newModelAction,  "newModelAction"          );}
+void AppData::maximized       (const bool        x) { store(x, _maximized,       "maximized"               );}
+void AppData::jsSupport       (const bool        x) { store(x, _jsSupport,       "js_support"              );}
+void AppData::showSplash      (const bool        x) { store(x, _showSplash,      "show_splash"             );}
+void AppData::snapToClpbrd    (const bool        x) { store(x, _snapToClpbrd,    "snapshot_to_clipboard"   );}
+void AppData::autoCheckApp    (const bool        x) { store(x, _autoCheckApp,    "startup_check_companion" );}
+void AppData::autoCheckFw     (const bool        x) { store(x, _autoCheckFw,     "startup_check_fw"        );}
+void AppData::simuSW          (const bool        x) { store(x, _simuSW,          "simuSW"                  );}
+void AppData::useWizard       (const bool        x) { store(x, _useWizard,       "useWizard"               );}
+
 void AppData::backLight       (const int         x) { store(x, _backLight,       "backLight"               );}
 void AppData::embedSplashes   (const int         x) { store(x, _embedSplashes,   "embedded_splashes"       );}
 void AppData::fwServerFails   (const int         x) { store(x, _fwServerFails,   "fwserver"                );}
@@ -515,18 +599,9 @@ void AppData::generalEditTab  (const int         x) { store(x, _generalEditTab,
 void AppData::iconSize        (const int         x) { store(x, _iconSize,        "icon_size"               );}
 void AppData::historySize     (const int         x) { store(x, _historySize,     "history_size"            );}
 void AppData::jsCtrl          (const int         x) { store(x, _jsCtrl,          "js_ctrl"                 );}
+void AppData::id              (const int         x) { store(x, _id,              "profileId"               );}
 void AppData::theme           (const int         x) { store(x, _theme,           "theme"                   );}
 void AppData::warningId       (const int         x) { store(x, _warningId,       "warningId"               );}
-void AppData::simuLastProfId  (const int         x) { store(x, _simuLastProfId,  "simuLastProfId"          );}
-
-void AppData::id(const int x)
-{
-  store(x, _id, "profileId");
-  sessionId(x);
-}
-
-// currently loaded radio profile ID, NOT saved to persistent storage
-void AppData::sessionId       (const int         x) { _sessionId = x; }
 
 // Constructor
 AppData::AppData()
@@ -535,37 +610,142 @@ AppData::AppData()
 
 void AppData::init()
 {
-    qRegisterMetaTypeStreamOperators<SimulatorOptions>("SimulatorOptions");
-
-    firstUse = false;
-
-    QSettings settings(COMPANY, PRODUCT);
-    if (!settings.contains("settings_version")) {
-      firstUse = true;
-    }
-    convertSettings(settings);
-
-    // Initialize the profiles
+    //Initialize the profiles
     for (int i=0; i<MAX_PROFILES; i++)
         profile[i].init( i );
 
-    // Initialize the joysticks
+    //Initialize the joysticks
     for (int i=0; i<MAX_JOYSTICKS; i++)
         joystick[i].init( i );
 
+    QSettings settings(COMPANY, PRODUCT);
+
+    // Copy existing 2.1 settings if present
+    if (profile[0].name().isEmpty())
+    {
+        QSettings settings21("OpenTX", "Companion 2.1");
+
+        QStringList keys = settings21.allKeys();
+        for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
+        {
+            if (settings21.value(*i) != QString("") && settings21.value(*i) != QString("Start Menu Folder"))
+            {
+                settings.setValue(*i, settings21.value(*i));
+            }
+        }
+
+        //Reload profiles
+        for (int i=0; i<MAX_PROFILES; i++)
+            profile[i].init( i );
+    }
+
+    // Copy existing 2.0 settings if present
+    if (profile[0].name().isEmpty())
+    {
+        QSettings settings20("OpenTX", "Companion 2.0");
+
+        QStringList keys = settings20.allKeys();
+        for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
+        {
+            if (settings20.value(*i) != QString("") && settings20.value(*i) != QString("Start Menu Folder"))
+            {
+                settings.setValue(*i, settings20.value(*i));
+            }
+        }
+
+        //Reload profiles
+        for (int i=0; i<MAX_PROFILES; i++)
+            profile[i].init( i );
+    }
+
+    // Else copy existing <2.0.16 settings if present
+    if (profile[0].name().isEmpty())
+    {
+        QSettings pre2016settings("OpenTX", "OpenTX Companion");
+
+        QStringList keys = pre2016settings.allKeys();
+        for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
+        {
+            if (pre2016settings.value(*i) != QString("") && pre2016settings.value(*i) != QString("Start Menu Folder"))
+            {
+                settings.setValue(*i, pre2016settings.value(*i));
+            }
+        }
+
+        //Reload profiles
+        for (int i=0; i<MAX_PROFILES; i++)
+            profile[i].init( i );
+    }
+
+    // Else import settings from companion9x if present
+    if (profile[0].name().isEmpty())
+    {
+        QSettings c9x_settings("companion9x", "companion9x");
+        // Copy all settings from companion9x to companion
+        QStringList keys = c9x_settings.allKeys();
+        for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
+        {
+            settings.setValue(*i, c9x_settings.value(*i));
+        }
+
+        // Store old values in new locations
+        autoCheckApp(settings.value("startup_check_companion9x", true).toBool());
+        useWizard(settings.value("wizardEnable", true).toBool());
+
+        // Convert and store the firmware type
+        QString fwType  = settings.value("firmware", "").toString();
+        fwType.replace("open9x","opentx");
+        fwType.replace("x9da","taranis");
+        profile[0].fwType( fwType );
+
+        // Move the Companion9x profile settings to profile0, the new default profile
+        profile[0].name( settings.value(          "Name",                  ""    ).toString());
+        profile[0].sdPath( settings.value(        "sdPath",                ""    ).toString());
+        profile[0].splashFile( settings.value(    "SplashFileName",        ""    ).toString());
+        profile[0].burnFirmware( settings.value(  "burnFirmware",          false ).toBool());
+        profile[0].renameFwFiles( settings.value( "rename_firmware_files", false ).toBool());
+        profile[0].channelOrder( settings.value(  "default_channel_order", "0"   ).toInt());
+        profile[0].defaultMode( settings.value(   "default_mode",          "1"   ).toInt());
+
+        // Ensure that the default profile has a name
+        if ( profile[0].name().isEmpty() )
+            profile[0].name("My Radio");
+
+        // Delete obsolete settings fields from companion9x
+        settings.remove("ActiveProfile");
+        settings.remove("burnFirmware");
+        settings.remove("custom_id");
+        settings.remove("default_channel_order");
+        settings.remove("default_mode");
+        settings.remove("firmware");
+        settings.remove("lastFw");
+        settings.remove("modelEditTab");
+        settings.remove("Name");
+        settings.remove("patchImage");
+        settings.remove("rename_firmware_files");
+        settings.remove("sdPath");
+        settings.remove("SplashFileName");
+        settings.remove("startup_check_companion9x");
+        settings.remove("wizardEnable");
+
+        // Delete settings that we do not want to carry over from 1.52
+        settings.remove("dfu_location");
+
+        // Select the new default profile as current profile
+        id( 0 );
+    }
+
+    // Remove settings that have been made obsolete during companion2.0 development
+    settings.remove("compilation-server");
+
     // Load and store all variables. Use default values if setting values are missing
     QString _tempString;                                          // Do not touch. Do not change the settings version before a new verson update!
-    getset( _tempString,      "settings_version"        ,"220" ); // This is a version marker. Will be used to upgrade the settings later on.
+    getset( _tempString,      "settings_version"        ,"210" ); // This is a version marker. Will be used to upgrade the settings later on.
 
     getset( _recentFiles,     "recentFileList"          ,"" );
-    getset( _simuDbgFilters,  "simuDbgFilters"          ,"" );
-
     getset( _mainWinGeo,      "mainWindowGeometry"      ,"" );
     getset( _mainWinState,    "mainWindowState"         ,"" );
     getset( _modelEditGeo,    "modelEditGeometry"       ,"" );
-    getset( _mdiWinGeo,       "mdiWinGeo"               ,"" );
-    getset( _mdiWinState,     "mdiWinState"             ,"" );
-    getset( _compareWinGeo,   "compareWinGeo"           ,"" );
 
     getset( _armMcu,          "arm_mcu"                 ,"at91sam3s4-9x" );
     getset( _avrArguments,    "avr_arguments"           ,"" );
@@ -578,6 +758,7 @@ void AppData::init()
     getset( _programmer,      "programmer"              ,"usbasp" );
     getset( _sambaLocation,   "samba_location"          ,"" );
     getset( _sambaPort,       "samba_port"              ,"\\USBserial\\COM23" );
+    getset( _lastSimulator,   "last_simulator"          ,"" );
 
     getset( _backupDir,       "backupPath"              ,"" );
     getset( _gePath,          "gePath"                  ,"" );
@@ -589,26 +770,23 @@ void AppData::init()
     getset( _snapshotDir,     "snapshotpath"            ,"" );
     getset( _updatesDir,      "lastUpdatesDir"          ,"" );
 
-    getset( _OpenTxBranch, "OpenTxBranch", BRANCH_RELEASE_STABLE);
-    
-    appLogsDir_init();
-    enableBackup_init();
-    backupOnFlash_init();
-    outputDisplayDetails_init();
-    checkHardwareCompatibility_init();
-    removeModelSlots_init();
-    maximized_init();
-    simuSW_init();
-    tabbedMdi_init();
-    appDebugLog_init();
-    fwTraceLog_init();
-    jsSupport_init();
-    showSplash_init();
-    snapToClpbrd_init();
-    autoCheckApp_init();
-    autoCheckFw_init();
+    getset( _outputDisplayDetails,  "outputDisplayDetails"     ,false );
+    getset( _enableBackup,    "enableBackup"            ,false );
+    getset( _backupOnFlash,   "backupOnFlash"           ,true  );
+    getset( _checkHardwareCompatibility,   "checkHardwareCompatibility"           ,true  );
+
+    getset( _useCompanionNightlyBuilds,   "useCompanionNightlyBuilds"           ,false  );
+    getset( _useFirmwareNightlyBuilds,   "useFirmwareNightlyBuilds"           ,false  );
+
+    getset( _jsSupport,       "js_support"              ,false );
+    getset( _maximized,       "maximized"               ,false );
+    getset( _showSplash,      "show_splash"             ,true  );
+    getset( _snapToClpbrd,    "snapshot_to_clipboard"   ,false );
+    getset( _autoCheckApp,    "startup_check_companion" ,true  );
+    getset( _autoCheckFw,     "startup_check_fw"        ,true  );
+    getset( _simuSW,          "simuSW"                  ,false );
+    getset( _useWizard,       "useWizard"               ,true  );
 
-    getset( _newModelAction,  "newModelAction"          ,1  );
     getset( _backLight,       "backLight"               ,0  );
     getset( _embedSplashes,   "embedded_splashes"       ,0  );
     getset( _fwServerFails,   "fwserver"                ,0  );
@@ -619,130 +797,4 @@ void AppData::init()
     getset( _id,              "profileId"               ,0  );
     getset( _theme,           "theme"                   ,1  );
     getset( _warningId,       "warningId"               ,0  );
-    getset( _simuLastProfId,  "simuLastProfId"          ,-1 );
-
-    sessionId(id());
-}
-
-QMap<int, QString> AppData::getActiveProfiles()
-{
-  QMap<int, QString> active;
-  for (int i=0; i<MAX_PROFILES; i++) {
-    if (g.profile[i].existsOnDisk())
-      active.insert(i, g.profile[i].name());
-  }
-  return active;
-}
-
-void AppData::convertSettings(QSettings & settings)
-{
-  // convert old settings to new
-  if (settings.contains("useWizard")) {
-    if (!settings.contains("newModelAction")) {
-      newModelAction(settings.value("useWizard").toBool() ? 1 : 2);
-    }
-    settings.remove("useWizard");
-  }
-  if (settings.contains("warningId") && settings.value("warningId").toInt() == 7) {
-    // meaning of warningId changed during v2.2 development but value of "7" indicates old setting, removing it will restore defaults
-    settings.remove("warningId");
-  }
-}
-
-bool AppData::hasCurrentSettings()
-{
-  QSettings settings(COMPANY, PRODUCT);
-  if (!settings.contains("settings_version")) {
-    return false;
-  }
-  return true;
-}
-
-bool AppData::findPreviousVersionSettings(QString * version)
-{
-  QSettings * fromSettings = NULL;
-  *version = "";
-
-  QSettings settings21("OpenTX", "Companion 2.1");
-  if (settings21.contains("settings_version")) {
-    fromSettings = &settings21;
-    *version = "2.1";
-  }
-  else {
-    settings21.clear();
-  }
-
-  QSettings settings20("OpenTX", "Companion 2.0");
-  if (settings20.contains("settings_version")) {
-    if (!fromSettings) {
-      fromSettings = &settings20;
-      *version = "2.0";
-    }
-  }
-  else {
-    settings20.clear();
-  }
-
-  QSettings settings16("OpenTX", "OpenTX Companion");
-  if (settings16.contains("settings_version")) {
-    if (!fromSettings) {
-      fromSettings = &settings16;
-      *version = "1.x";
-    }
-  }
-  else {
-    settings16.clear();
-  }
-
-  if (!fromSettings)
-    return false;
-
-  return true;
-}
-
-bool AppData::importSettings(QString fromVersion)
-{
-  QSettings toSettings(COMPANY, PRODUCT);
-
-  QString fromCompany;
-  QString fromProduct;
-
-  upgradeFromVersion = "";
-
-  if (fromVersion == "2.1") {
-    fromCompany = "OpenTX";
-    fromProduct = "Companion 2.1";
-  }
-  else if (fromVersion == "2.0") {
-    fromCompany = "OpenTX";
-    fromProduct = "Companion 2.0";
-  }
-  else if (fromVersion == "1.x") {
-    fromCompany = "OpenTX";
-    fromProduct = "OpenTX Companion";
-  }
-  else
-    return false;
-
-  upgradeFromVersion = fromVersion;
-
-  QSettings fromSettings(fromCompany, fromProduct);
-
-  // do not copy these settings
-  QStringList excludeKeys = QStringList() << "compilation-server";
-#ifdef WIN32
-  // locations of tools which come with Companion distros
-  excludeKeys << "avrdude_location" << "avrdudeLocation" << "dfu_location";
-  // install-specific keys;  "." is the "default" key which may contain install path
-  excludeKeys << "Start Menu Folder" << ".";
-#endif
-
-  // import settings
-  foreach (const QString & key, fromSettings.allKeys()) {
-    if (fromSettings.value(key).isValid() && !excludeKeys.contains(key)) {
-      toSettings.setValue(key, fromSettings.value(key));
-    }
-  }
-
-  return true;
 }

companion/src/appdata.h

@@ -1,12 +1,5 @@
 /*
- * 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
+ * Author - Kjell Kernen
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,6 +9,7 @@
  * 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.
+ *
  */
 
 // All temporary and permanent global variables are defined here to make
@@ -23,23 +17,15 @@
 // Do not access variables in QSettings directly, it is not type safe!
 
 
-#ifndef _APPDATA_H_
-#define _APPDATA_H_
-
+#ifndef COMPANION_APPDATA_H
+#define COMPANION_APPDATA_H
 #include <QByteArray>
 #include <QStringList>
 #include <QString>
 #include <QSettings>
-#include <QStandardPaths>
 
-#include "constants.h"
-#include "simulator.h"
-
-#define COMPANY            "OpenTX"
-#define COMPANY_DOMAIN     "open-tx.org"
-#define PRODUCT            "Companion 2.2"
-#define APP_COMPANION      "OpenTX Companion"
-#define APP_SIMULATOR      "OpenTX Simulator"
+#define COMPANY "OpenTX"
+#define PRODUCT "Companion 2.2"
 
 #define MAX_PROFILES 15
 #define MAX_JOYSTICKS 8
@@ -47,24 +33,26 @@
 class CompStoreObj
 {
   public:
-    void clear (const QString & tag1 = "", const QString &tag2 = "", const QString &tag3 = "");
+    void clear (const QString tag1="", const QString tag2="", const QString tag3="");
+    void store(const QByteArray newArray, QByteArray &array, const QString tag, const QString group1="", const QString group2="" );
+    void store(const QStringList newSList, QStringList &stringList, const QString tag, const QString group1="", const QString group2="" );
+    void store(const QString newString, QString &string, const QString tag, const QString group1="", const QString group2="" );
+    void store(const bool newTruth, bool &truth, const QString tag, const QString group1="", const QString group2="" );
+    void store(const int newNumber, int &number, const QString tag, const QString group1="", const QString group2="" );
 
-    // NOTE: OBJ_T can only be a standard or registered Qt type. To use custom types,
-    //   either Q_DECLARE_METATYPE() them or add additional logic in retrieve() to handle QMetaType::User.
-
-    template <typename OBJ_T, typename TAG_T, typename GP1_T = QString, typename GP2_T = QString>
-    void store(const OBJ_T newValue, OBJ_T & destValue, const TAG_T tag, const GP1_T group1 = "", const GP2_T group2 = "");
-
-    template <typename OBJ_T, typename TAG_T, typename DEF_T, typename GP1_T = QString, typename GP2_T = QString>
-    void retrieve(OBJ_T & destValue, const TAG_T tag, const DEF_T def, const GP1_T group1 = "", const GP2_T group2 = "");
-
-    template <typename OBJ_T, typename TAG_T, typename DEF_T, typename GP1_T = QString, typename GP2_T = QString>
-    void getset(OBJ_T & value, const TAG_T tag, const DEF_T def, const GP1_T group1 = "", const GP2_T group2 = "" );
-
-    // this specialization is needed because QVariant::fromValue(const char *) fails
-    template <typename OBJ_T, typename TAG_T, typename GP1_T = QString, typename GP2_T = QString>
-    void getset(OBJ_T & value, const TAG_T tag, const char * def, const GP1_T group1 = "", const GP2_T group2 = "" );
+    // Retrieval functions
+    void retrieve( QByteArray &array, const QString tag, const QString def, const QString group1="", const QString group2="" );
+    void retrieve( QStringList &stringList, const QString tag, const QString def, const QString group1="", const QString group2="" );
+    void retrieve( QString &string, const QString tag, const QString def, const QString group1="", const QString group2="" );
+    void retrieve( bool &truth, const QString tag, const bool def, const QString group1="", const QString group2="" );
+    void retrieve( int &number, const QString tag, const int def, const QString group1="", const QString group2="" );
 
+    // Retrieve and Store functions
+    void getset( QByteArray &array, const QString tag, const QString def, const QString group1="", const QString group2="" );
+    void getset( QStringList &stringList, const QString tag, const QString def, const QString group1="", const QString group2="" );
+    void getset( QString &string, const QString tag, const QString def, const QString group1="", const QString group2="" );
+    void getset( bool &truth, const QString tag, const bool def, const QString group1="", const QString group2="" );
+    void getset( int &number, const QString tag, const int def, const QString group1="", const QString group2="" );
 };
 
 class FwRevision: protected CompStoreObj
@@ -139,16 +127,13 @@ class Profile: protected CompStoreObj
     QString _trainerCalib;
     QString _controlTypes;
     QString _controlNames;
+    int     _txCurrentCalibration;
     int     _gsStickMode;
     int     _ppmMultiplier;
+    int     _txVoltageCalibration;
     int     _vBatWarn;
     int     _vBatMin;
     int     _vBatMax;
-    int     _txCurrentCalibration;
-    int     _txVoltageCalibration;
-
-    // Simulator variables
-    SimulatorOptions _simulatorOptions;
 
   public:
     // All the get definitions
@@ -183,8 +168,6 @@ class Profile: protected CompStoreObj
     int     vBatMin() const;
     int     vBatMax() const;
 
-    SimulatorOptions simulatorOptions() const;
-
     // All the set definitions
     void name          (const QString);
     void fwName        (const QString);
@@ -217,8 +200,6 @@ class Profile: protected CompStoreObj
     void vBatMin       (const int);
     void vBatMax       (const int);
 
-    void simulatorOptions (const SimulatorOptions &);
-
     Profile();
     Profile& operator=(const Profile&);
     void remove();
@@ -226,40 +207,23 @@ class Profile: protected CompStoreObj
     void init(int newIndex);
     void initFwVariables();
     void flush();
-    QString groupId();
 };
 
-
-#define PROPERTY4(type, name, key, dflt)                            \
+#define BOOL_PROPERTY(name, dflt)                                   \
     public:                                                         \
-      inline type name() { return _ ## name; }                      \
-      void name(const type val) { store(val, _ ## name, # key); }   \
+      inline bool name() { return _ ## name; }                      \
+      void name(const bool val) { store(val, _ ## name, # name); }  \
     private:                                                        \
-      void name ## _init() { getset(_ ## name, # key, dflt); }      \
-      type _ ## name;
-
-#define PROPERTY(type, name, dflt)    PROPERTY4(type, name, name, dflt)
+      bool _ ## name;
 
 class AppData: protected CompStoreObj
 {
-  PROPERTY(bool, enableBackup,               false)
-  PROPERTY(bool, backupOnFlash,              true)
-  PROPERTY(bool, outputDisplayDetails,       false)
-  PROPERTY(bool, checkHardwareCompatibility, true)
-  PROPERTY(bool, removeModelSlots,           true)
-  PROPERTY(bool, maximized,   false)
-  PROPERTY(bool, simuSW,      false)
-  PROPERTY(bool, tabbedMdi,   false)
-  PROPERTY(bool, appDebugLog, false)
-  PROPERTY(bool, fwTraceLog,  false)
-
-  PROPERTY(unsigned, OpenTxBranch, BRANCH_RELEASE_STABLE);
-
-  PROPERTY4(bool, jsSupport,       js_support              ,false)
-  PROPERTY4(bool, showSplash,      show_splash             ,true)
-  PROPERTY4(bool, snapToClpbrd,    snapshot_to_clipboard   ,false)
-  PROPERTY4(bool, autoCheckApp,    startup_check_companion ,true)
-  PROPERTY4(bool, autoCheckFw,     startup_check_fw        ,true)
+  BOOL_PROPERTY(enableBackup, false)
+  BOOL_PROPERTY(outputDisplayDetails, false)
+  BOOL_PROPERTY(backupOnFlash, true)
+  BOOL_PROPERTY(checkHardwareCompatibility, true)
+  BOOL_PROPERTY(useCompanionNightlyBuilds, false)
+  BOOL_PROPERTY(useFirmwareNightlyBuilds, false)
 
   // All the global variables
   public:
@@ -269,14 +233,9 @@ class AppData: protected CompStoreObj
 
   private:
     QStringList _recentFiles;
-    QStringList _simuDbgFilters;
-
     QByteArray _mainWinGeo;
     QByteArray _mainWinState;
     QByteArray _modelEditGeo;
-    QByteArray _mdiWinGeo;
-    QByteArray _mdiWinState;
-    QByteArray _compareWinGeo;
 
     QString _armMcu;
     QString _avrArguments;
@@ -289,6 +248,7 @@ class AppData: protected CompStoreObj
     QString _programmer;
     QString _sambaLocation;
     QString _sambaPort;
+    QString _lastSimulator;
 
     QString _backupDir;
     QString _gePath;
@@ -299,9 +259,16 @@ class AppData: protected CompStoreObj
     QString _libDir;
     QString _snapshotDir;
     QString _updatesDir;
-    PROPERTY(QString, appLogsDir,  QString(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) % "/" COMPANY "/DebugLogs"))
 
-    int _newModelAction;  // 0=no action; 1=model wizard; 2=model edit
+    bool _maximized;
+    bool _jsSupport;
+    bool _showSplash;
+    bool _snapToClpbrd;
+    bool _autoCheckApp;
+    bool _autoCheckFw;
+    bool _simuSW;
+    bool _useWizard;
+
     int _backLight;
     int _embedSplashes;
     int _fwServerFails;
@@ -312,21 +279,13 @@ class AppData: protected CompStoreObj
     int _id;
     int _theme;
     int _warningId;
-    int _simuLastProfId;
-    // currently loaded radio profile ID, NOT saved to persistent storage
-    int _sessionId;
 
   public:
     // All the get definitions
     QStringList recentFiles();
-    QStringList simuDbgFilters();
-
     QByteArray mainWinGeo();
     QByteArray mainWinState();
     QByteArray modelEditGeo();
-    QByteArray mdiWinGeo();
-    QByteArray mdiWinState();
-    QByteArray compareWinGeo();
 
     QString armMcu();
     QString avrArguments();
@@ -340,6 +299,7 @@ class AppData: protected CompStoreObj
     QString programmer();
     QString sambaLocation();
     QString sambaPort();
+    QString lastSimulator();
 
     QString backupDir();
     QString gePath();
@@ -351,7 +311,15 @@ class AppData: protected CompStoreObj
     QString snapshotDir();
     QString updatesDir();
 
-    int newModelAction();
+    bool jsSupport();
+    bool maximized();
+    bool showSplash();
+    bool snapToClpbrd();
+    bool autoCheckApp();
+    bool autoCheckFw();
+    bool simuSW();
+    bool useWizard();
+
     int backLight();
     int embedSplashes();
     int fwServerFails();
@@ -362,19 +330,12 @@ class AppData: protected CompStoreObj
     int id();
     int theme();
     int warningId();
-    int simuLastProfId();
-    int sessionId();
 
     // All the set definitions
     void recentFiles     (const QStringList x);
-    void simuDbgFilters  (const QStringList x);
-
     void mainWinGeo      (const QByteArray);
     void mainWinState    (const QByteArray);
     void modelEditGeo    (const QByteArray);
-    void mdiWinGeo       (const QByteArray);
-    void mdiWinState     (const QByteArray);
-    void compareWinGeo   (const QByteArray);
 
     void armMcu          (const QString);
     void avrArguments    (const QString);
@@ -388,6 +349,7 @@ class AppData: protected CompStoreObj
     void programmer      (const QString);
     void sambaLocation   (const QString);
     void sambaPort       (const QString);
+    void lastSimulator   (const QString);
 
     void backupDir       (const QString);
     void gePath          (const QString);
@@ -399,7 +361,15 @@ class AppData: protected CompStoreObj
     void snapshotDir     (const QString);
     void updatesDir      (const QString);
 
-    void newModelAction  (const int);
+    void maximized       (const bool);
+    void jsSupport       (const bool);
+    void showSplash      (const bool);
+    void snapToClpbrd    (const bool);
+    void autoCheckApp    (const bool);
+    void autoCheckFw     (const bool);
+    void simuSW          (const bool);
+    void useWizard       (const bool);
+
     void backLight       (const int);
     void embedSplashes   (const int);
     void fwServerFails   (const int);
@@ -411,35 +381,12 @@ class AppData: protected CompStoreObj
     void id              (const int);
     void theme           (const int);
     void warningId       (const int);
-    void simuLastProfId  (const int);
-    void sessionId       (const int);
 
     // Constructor
     AppData();
     void init();
-
-    QMap<int, QString> getActiveProfiles();
-    inline bool isFirstUse() const { return firstUse; }
-    inline QString previousVersion() const { return upgradeFromVersion; }
-    bool hasCurrentSettings();
-    bool findPreviousVersionSettings(QString * version);
-    bool importSettings(QString fromVersion);
-
-    inline DownloadBranchType boundedOpenTxBranch() {
-#if defined(ALLOW_NIGHTLY_BUILDS)
-      return qBound(BRANCH_RELEASE_STABLE, DownloadBranchType(OpenTxBranch()), BRANCH_NIGHTLY_UNSTABLE);
-#else
-      return qBound(BRANCH_RELEASE_STABLE, DownloadBranchType(OpenTxBranch()), BRANCH_RC_TESTING);
-#endif
-    }
-
-  protected:
-    void convertSettings(QSettings & settings);
-
-    bool firstUse;
-    QString upgradeFromVersion;
 };
 
 extern AppData g;
 
-#endif // _APPDATA_H_
+#endif // COMPANION_APPDATA_H

companion/src/appdebugmessagehandler.cpp

@@ -1,163 +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 "appdebugmessagehandler.h"
-
-#include <QFileDevice>
-
-AppDebugMessageHandler::AppDebugMessageHandler(QObject * parent) :
-  QObject(parent),
-  m_appDebugOutputLevel(APP_DBG_HANDLER_DEFAULT_LEVEL),
-  m_showSourcePath(APP_DBG_HANDLER_SHOW_SRC_PATH),
-  m_showFunctionDeclarations(APP_DBG_HANDLER_SHOW_FUNCTION_DECL)
-{
-  m_srcPathFilter = QRegularExpression("^" APP_DBG_HANDLER_SRC_PATH "[\\\\\\/](.*?)$", QRegularExpression::InvertedGreedinessOption);
-  m_functionFilter = QRegularExpression("^.+?(\\w+\\().+$");
-}
-
-AppDebugMessageHandler * AppDebugMessageHandler::instance()
-{
-  static AppDebugMessageHandler * _instance = NULL;
-#if APP_DBG_HANDLER_ENABLE
-  if(_instance == NULL && !qApp->closingDown())
-    _instance = new AppDebugMessageHandler(qApp);  // Ensure this object is cleaned up when the QApplication exits.
-#endif
-  return _instance;
-}
-
-void AppDebugMessageHandler::setAppDebugOutputLevel(const quint8 & appDebugOutputLevel)
-{
-  m_appDebugOutputLevel = appDebugOutputLevel;
-}
-
-void AppDebugMessageHandler::setShowSourcePath(bool showSourcePath)
-{
-  m_showSourcePath = showSourcePath;
-}
-
-void AppDebugMessageHandler::setShowFunctionDeclarations(bool showFunctionDeclarations)
-{
-  m_showFunctionDeclarations = showFunctionDeclarations;
-}
-
-void AppDebugMessageHandler::addOutputDevice(QIODevice * device)
-{
-  if (device && !m_outputDevices.contains(device))
-    m_outputDevices.append(device);
-}
-
-void AppDebugMessageHandler::removeOutputDevice(QIODevice * device)
-{
-  if (device) {
-    // no QVector::removeAll() in Qt < 5.4
-    int i = 0;
-    foreach (QIODevice * d, m_outputDevices) {
-      if (d == device)
-        m_outputDevices.remove(i);
-      ++i;
-    }
-  }
-}
-
-void AppDebugMessageHandler::installAppMessageHandler()
-{
-  m_defaultHandler = qInstallMessageHandler(g_appDebugMessageHandler);
-}
-
-void AppDebugMessageHandler::messageHandler(QtMsgType type, const QMessageLogContext & context, const QString & msg)
-{
-  static const char symbols[] = { 'D', 'W', 'E', 'X', 'I' };  // correspond to QtMsgType enum
-  // normalize types, QtDebugMsg stays 0, QtInfoMsg becomes 1, rest are QtMsgType + 1
-  quint8 lvl = type;
-  if (type == QtInfoMsg)
-    lvl = 1;
-  else if (type > QtDebugMsg)
-    ++lvl;
-
-  if (lvl < m_appDebugOutputLevel && type != QtFatalMsg)
-    return;
-
-#if defined(Q_OS_LINUX) && (QT_VERSION < QT_VERSION_CHECK(5, 3, 0))
-  // Filter out lots of QPainter warnings from undocked QDockWidgets... hackish but effective (only workaround found so far)
-  if (lvl == 2 && QString(context.function).contains("QPainter::"))
-    return;
-#endif
-
-  QString msgPattern = QString("[%1] ").arg(symbols[type]);
-
-  if (m_showSourcePath) {
-    QString file = QString("%1::").arg(context.file);
-    file.replace(m_srcPathFilter, "\\1");
-    msgPattern.append(file);
-  }
-  if (m_showFunctionDeclarations)
-    msgPattern.append(context.function);
-  else
-    msgPattern.append("%{function}()");
-
-  msgPattern.append(":%{line} -%{if-category} [%{category}]%{endif} %{message}");
-
-  if (type == QtFatalMsg)
-    msgPattern.append("\nBACKTRACE:\n%{backtrace depth=12 separator=\"\n\"}");
-
-  qSetMessagePattern(msgPattern);
-
-  if (!m_defaultHandler || m_outputDevices.size() || receivers(SIGNAL(messageOutput(quint8, const QString &)))) {
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
-    msgPattern = qFormatLogMessage(type, context, msg);
-#else
-    msgPattern.replace("%{line}", QString::number(context.line));
-    msgPattern.replace("%{if-category} [%{category}]%{endif}", QString(context.category));
-    msgPattern.replace("%{message}", msg);
-    if (!m_showFunctionDeclarations) {
-      QString func = context.function;
-      msgPattern.replace("%{function}", func.replace(m_functionFilter, "\\1)"));
-    }
-#endif
-
-    emit messageOutput(lvl, msgPattern);
-
-    foreach (QIODevice * d, m_outputDevices) {
-      if (d && d->isWritable() && (!d->property("level").isValid() || d->property("level").toInt() <= lvl)) {
-        d->write(qPrintable(msgPattern % "\n"));
-        if (QFileDevice * fd = qobject_cast<QFileDevice *>(d))
-          fd->flush();
-      }
-    }
-  }
-
-  // if (QThread::currentThread() == qApp->thread())  // gui thread
-
-  if (m_defaultHandler) {
-    m_defaultHandler(type, context, msg);
-  }
-  else {
-    fprintf(stderr, "%s", qPrintable(msgPattern));
-    if (type == QtFatalMsg)
-      abort();
-  }
-}
-
-// Message handler which is installed using qInstallMessageHandler. This needs to be global.
-void g_appDebugMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
-{
-  if (AppDebugMessageHandler::instance())
-    AppDebugMessageHandler::instance()->messageHandler(type, context, msg);
-}

companion/src/appdebugmessagehandler.h

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

companion/src/apppreferencesdialog.cpp

@@ -1,34 +1,17 @@
-/*
- * 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 "apppreferencesdialog.h"
 #include "ui_apppreferencesdialog.h"
 #include "mainwindow.h"
 #include "appdata.h"
 #include "helpers.h"
-#if defined(JOYSTICKS)
+#include "firmwareinterface.h"
+#ifdef JOYSTICKS
 #include "joystick.h"
 #include "joystickdialog.h"
 #endif
+#include <QDesktopServices>
+#include <QtGui>
 
-AppPreferencesDialog::AppPreferencesDialog(QWidget * parent) :
+AppPreferencesDialog::AppPreferencesDialog(QWidget *parent) :
   QDialog(parent),
   ui(new Ui::AppPreferencesDialog)
 {
@@ -38,11 +21,9 @@ AppPreferencesDialog::AppPreferencesDialog(QWidget * parent) :
 
   initSettings();
   connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
-  connect(ui->opt_appDebugLog, &QCheckBox::toggled, this, &AppPreferencesDialog::toggleAppLogSettings);
-  connect(ui->opt_fwTraceLog, &QCheckBox::toggled, this, &AppPreferencesDialog::toggleAppLogSettings);
   connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
 
-#if !defined(JOYSTICKS)
+#ifndef JOYSTICKS
   ui->joystickCB->hide();
   ui->joystickCB->setDisabled(true);
   ui->joystickcalButton->hide();
@@ -60,13 +41,13 @@ AppPreferencesDialog::~AppPreferencesDialog()
 
 void AppPreferencesDialog::writeValues()
 {
+  g.useCompanionNightlyBuilds(ui->useCompanionNightlyBuilds->isChecked());
   g.autoCheckApp(ui->autoCheckCompanion->isChecked());
-  g.OpenTxBranch(DownloadBranchType(ui->OpenTxBranch->currentIndex()));
+  g.useFirmwareNightlyBuilds(ui->useFirmwareNightlyBuilds->isChecked());
   g.autoCheckFw(ui->autoCheckFirmware->isChecked());
   g.showSplash(ui->showSplash->isChecked());
   g.simuSW(ui->simuSW->isChecked());
-  g.removeModelSlots(ui->opt_removeBlankSlots->isChecked());
-  g.newModelAction(ui->opt_newMdl_useWizard->isChecked() ? 1 : ui->opt_newMdl_useEditor->isChecked() ? 2 : 0);
+  g.useWizard(ui->modelWizard_CB->isChecked());
   g.historySize(ui->historySize->value());
   g.backLight(ui->backLightColor->currentIndex());
   g.profile[g.id()].volumeGain(round(ui->volumeGain->value() * 10.0));
@@ -75,12 +56,8 @@ void AppPreferencesDialog::writeValues()
   g.embedSplashes(ui->splashincludeCB->currentIndex());
   g.enableBackup(ui->backupEnable->isChecked());
 
-  g.appDebugLog(ui->opt_appDebugLog->isChecked());
-  g.fwTraceLog(ui->opt_fwTraceLog->isChecked());
-  g.appLogsDir(ui->appLogsDir->text());
-
   if (ui->joystickChkB ->isChecked() && ui->joystickCB->isEnabled()) {
-    g.jsSupport(ui->joystickChkB ->isChecked());
+    g.jsSupport(ui->joystickChkB ->isChecked());  
     g.jsCtrl(ui->joystickCB ->currentIndex());
   }
   else {
@@ -103,19 +80,18 @@ void AppPreferencesDialog::writeValues()
     g.profile[g.id()].name(ui->profileNameLE->text());
 
   // If a new fw type has been choosen, several things need to reset
-  Firmware::setCurrentVariant(getFirmwareVariant());
-  QString id = Firmware::getCurrentVariant()->getId();
+  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);
-    emit firmwareProfileChanged(g.id());
   }
 }
 
 void AppPreferencesDialog::on_snapshotPathButton_clicked()
 {
-  QString fileName = QFileDialog::getExistingDirectory(this, tr("Select your snapshot folder"), g.snapshotDir());
+  QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your snapshot folder"), g.snapshotDir());
   if (!fileName.isEmpty()) {
     g.snapshotDir(fileName);
     g.snapToClpbrd(false);
@@ -133,26 +109,21 @@ void AppPreferencesDialog::initSettings()
     ui->snapshotPath->setDisabled(true);
     ui->snapshotPathButton->setDisabled(true);
   }
-#if !defined(ALLOW_NIGHTLY_BUILDS)
-  // TODO should we gray out nightly builds here?
-#endif
-  ui->OpenTxBranch->setCurrentIndex(g.OpenTxBranch());
+  ui->useCompanionNightlyBuilds->setChecked(g.useCompanionNightlyBuilds());
   ui->autoCheckCompanion->setChecked(g.autoCheckApp());
+  ui->useFirmwareNightlyBuilds->setChecked(g.useFirmwareNightlyBuilds());
   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);
 
-  if (IS_TARANIS(getCurrentBoard())) {
+  if (IS_TARANIS(GetCurrentFirmware()->getBoard())) {
     ui->backLightColor->setEnabled(false);
   }
 
   ui->simuSW->setChecked(g.simuSW());
-  ui->opt_removeBlankSlots->setChecked(g.removeModelSlots());
-  ui->opt_newMdl_useNone->setChecked(g.newModelAction() == 0);
-  ui->opt_newMdl_useWizard->setChecked(g.newModelAction() == 1);
-  ui->opt_newMdl_useEditor->setChecked(g.newModelAction() == 2);
+  ui->modelWizard_CB->setChecked(g.useWizard());
   ui->libraryPath->setText(g.libDir());
   ui->ge_lineedit->setText(g.gePath());
 
@@ -161,22 +132,15 @@ void AppPreferencesDialog::initSettings()
       ui->backupPath->setText(g.backupDir());
       ui->backupEnable->setEnabled(true);
       ui->backupEnable->setChecked(g.enableBackup());
-    }
-    else {
+    } else {
       ui->backupEnable->setDisabled(true);
     }
-  }
-  else {
-    ui->backupEnable->setDisabled(true);
+  } else {
+      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)
+#ifdef JOYSTICKS
   ui->joystickChkB->setChecked(g.jsSupport());
   if (ui->joystickChkB->isChecked()) {
     QStringList joystickNames;
@@ -202,8 +166,8 @@ void AppPreferencesDialog::initSettings()
     ui->joystickCB->setDisabled(true);
     ui->joystickcalButton->setDisabled(true);
   }
-#endif
-  //  Profile Tab Inits
+#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());
@@ -216,12 +180,14 @@ void AppPreferencesDialog::initSettings()
     } else {
       ui->pbackupEnable->setDisabled(true);
     }
-  }
-  else {
+  } else {
       ui->pbackupEnable->setDisabled(true);
   }
 
   ui->profileNameLE->setText(g.profile[g.id()].name());
+  ui->SplashFileName->setText(g.profile[g.id()].splashFile());
+
+  displayImage( g.profile[g.id()].splashFile() );
 
   QString hwSettings;
   if (g.profile[g.id()].stickPotCalib() == "" ) {
@@ -236,14 +202,15 @@ void AppPreferencesDialog::initSettings()
   }
   ui->lblGeneralSettings->setText(hwSettings);
 
-  QString currType = QStringList(g.profile[g.id()].fwType().split('-').mid(0, 2)).join('-');
-  foreach(Firmware * firmware, Firmware::getRegisteredFirmwares()) {
+  Firmware * current_firmware = GetCurrentFirmware();
+
+  foreach(Firmware * firmware, firmwares) {
     ui->downloadVerCB->addItem(firmware->getName(), firmware->getId());
-    if (currType == firmware->getId()) {
+    if (current_firmware->getFirmwareBase() == firmware) {
       ui->downloadVerCB->setCurrentIndex(ui->downloadVerCB->count() - 1);
     }
   }
-
+  
   baseFirmwareChanged();
 }
 
@@ -290,15 +257,6 @@ 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,8 +264,8 @@ void AppPreferencesDialog::on_ge_pathButton_clicked()
     ui->ge_lineedit->setText(fileName);
   }
 }
-
-#if defined(JOYSTICKS)
+ 
+#ifdef JOYSTICKS
 void AppPreferencesDialog::on_joystickChkB_clicked() {
   if (ui->joystickChkB->isChecked()) {
     QStringList joystickNames;
@@ -350,20 +308,35 @@ void AppPreferencesDialog::on_sdPathButton_clicked()
   }
 }
 
-bool AppPreferencesDialog::displayImage(const QString & fileName)
+void AppPreferencesDialog::on_removeProfileButton_clicked()
 {
-  // Start by clearing the label
-  ui->imageLabel->clear();
+  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();
+  }
+}
 
-  if (fileName.isEmpty())
-    return false;
+
+bool AppPreferencesDialog::displayImage( QString fileName )
+{
+  // Start by clearing the pixmap
+  ui->imageLabel->setPixmap(QPixmap());
 
   QImage image(fileName);
-  if (image.isNull())
+  if (image.isNull()) 
     return false;
 
-  ui->imageLabel->setPixmap(makePixMap(image));
-  ui->imageLabel->setFixedSize(getCurrentFirmware()->getCapability(LcdWidth), getCurrentFirmware()->getCapability(LcdHeight));
+  // Use the firmware name to determine splash width
+  int width = SPLASH_WIDTH;
+  if (g.profile[g.id()].fwType().contains("taranis"))
+    width = SPLASHX9D_WIDTH;
+  
+  ui->imageLabel->setPixmap( makePixMap( image, g.profile[g.id()].fwType()));
+  ui->imageLabel->setFixedSize(width, SPLASH_HEIGHT);
   return true;
 }
 
@@ -379,7 +352,7 @@ void AppPreferencesDialog::on_SplashSelect_clicked()
 
   if (!fileName.isEmpty()){
     g.imagesDir(QFileInfo(fileName).dir().absolutePath());
-
+   
     displayImage(fileName);
     ui->SplashFileName->setText(fileName);
   }
@@ -396,13 +369,14 @@ void AppPreferencesDialog::showVoice(bool show)
 {
   ui->voiceLabel->setVisible(show);
   ui->voiceCombo->setVisible(show);
+  QTimer::singleShot(0, this, SLOT(shrink()));
 }
 
 void AppPreferencesDialog::baseFirmwareChanged()
 {
-  QString selected_firmware = ui->downloadVerCB->currentData().toString();
+  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
 
-  foreach(Firmware * firmware, Firmware::getRegisteredFirmwares()) {
+  foreach(Firmware * firmware, firmwares) {
     if (firmware->getId() == selected_firmware) {
       populateFirmwareOptions(firmware);
       break;
@@ -412,31 +386,31 @@ void AppPreferencesDialog::baseFirmwareChanged()
 
 Firmware * AppPreferencesDialog::getFirmwareVariant()
 {
-  QString selected_firmware = ui->downloadVerCB->currentData().toString();
+  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
 
-  foreach(Firmware * firmware, Firmware::getRegisteredFirmwares()) {
+  foreach(Firmware * firmware, firmwares) {
     QString id = firmware->getId();
     if (id == selected_firmware) {
       foreach(QCheckBox *cb, optionsCheckBoxes) {
         if (cb->isChecked()) {
-          id += "-" + cb->text();
+          id += QString("-") + cb->text();
         }
       }
 
       if (voice && voice->isChecked()) {
-        id += "-tts" + ui->voiceCombo->currentText();
+        id += QString("-tts") + ui->voiceCombo->currentText();
       }
 
       if (ui->langCombo->count()) {
-        id += "-" + ui->langCombo->currentText();
+        id += QString("-") + ui->langCombo->currentText();
       }
 
-      return Firmware::getFirmwareForId(id);
+      return GetFirmware(id);
     }
   }
 
   // Should never occur...
-  return Firmware::getDefaultVariant();
+  return default_firmware_variant;
 }
 
 void AppPreferencesDialog::firmwareOptionChanged(bool state)
@@ -447,8 +421,8 @@ void AppPreferencesDialog::firmwareOptionChanged(bool state)
   }
   Firmware * firmware=NULL;
   if (cb && state) {
-    QVariant selected_firmware = ui->downloadVerCB->currentData();
-    foreach(firmware, Firmware::getRegisteredFirmwares()) {
+    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) {
@@ -468,15 +442,7 @@ void AppPreferencesDialog::firmwareOptionChanged(bool state)
         }
       }
     }
-  }
-}
-
-void AppPreferencesDialog::toggleAppLogSettings()
-{
-  bool vis = (ui->opt_appDebugLog->isChecked() || ui->opt_fwTraceLog->isChecked());
-  ui->appLogsDir->setVisible(vis);
-  ui->lbl_appLogsDir->setVisible(vis);
-  ui->btn_appLogsDir->setVisible(vis);
+  } 
 }
 
 void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware)
@@ -485,7 +451,7 @@ void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware)
 
   updateLock = true;
 
-  QString id = Firmware::getCurrentVariant()->getId();
+  QString id = current_firmware_variant->getId();
   ui->langCombo->clear();
   foreach(const char *lang, parent->languages) {
     ui->langCombo->addItem(lang);
@@ -502,7 +468,7 @@ void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware)
     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);
+        ui->optionsLayout->addWidget(checkbox, optionsCheckBoxes.count()/5, optionsCheckBoxes.count()%5, 1, 1);
         optionsCheckBoxes.push_back(checkbox);
         connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
         if (prevFocus) {
@@ -540,23 +506,12 @@ void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware)
 
   showVoice(voice && voice->isChecked());
 
-  // TODO: Remove once splash replacement supported on Horus
-  // NOTE: 480x272 image causes issues on screens <800px high, needs a solution like scrolling once reinstated
-  if (IS_HORUS(parent->getBoard())) {
-    ui->widget_splashImage->hide();
-    ui->SplashFileName->setText("");
-  }
-  else {
-    ui->widget_splashImage->show();
-    ui->SplashFileName->setText(g.profile[g.id()].splashFile());
-    displayImage(g.profile[g.id()].splashFile());
-  }
-
   updateLock = false;
-  QTimer::singleShot(50, this, SLOT(shrink()));
+  QTimer::singleShot(0, this, SLOT(shrink()));
 }
 
 void AppPreferencesDialog::shrink()
 {
-  adjustSize();
+  resize(0,0);
 }
+

companion/src/apppreferencesdialog.h

@@ -1,25 +1,5 @@
-/*
- * 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 _APPPREFERENCESDIALOG_H_
-#define _APPPREFERENCESDIALOG_H_
+#ifndef APPPREFERENCESDIALOG_H
+#define APPPREFERENCESDIALOG_H
 
 #include <QDialog>
 #include <QCheckBox>
@@ -36,12 +16,9 @@ class AppPreferencesDialog : public QDialog
     Q_OBJECT
 
   public:
-    explicit AppPreferencesDialog(QWidget * parent = 0);
+    explicit AppPreferencesDialog(QWidget *parent = 0);
     ~AppPreferencesDialog();
-    Joystick * joystick;
-
-  signals:
-    void firmwareProfileChanged(int profId);
+    Joystick *joystick;
 
   private:
     QList<QCheckBox *> optionsCheckBoxes;
@@ -56,13 +33,14 @@ class AppPreferencesDialog : public QDialog
 
     Ui::AppPreferencesDialog *ui;
     void initSettings();
-    bool displayImage(const QString & fileName);
+    bool displayImage( QString fileName );
+    void loadProfileString(QString profile, QString label);
+    void loadFromProfile();
 
   protected slots:
-    void shrink();
+    void shrink();  
     void baseFirmwareChanged();
     void firmwareOptionChanged(bool state);
-    void toggleAppLogSettings();
 
     void writeValues();
     void on_libraryPathButton_clicked();
@@ -71,16 +49,16 @@ class AppPreferencesDialog : public QDialog
     void on_backupPathButton_clicked();
     void on_ProfilebackupPathButton_clicked();
     void on_ge_pathButton_clicked();
-
+    
     void on_sdPathButton_clicked();
+    void on_removeProfileButton_clicked();
     void on_SplashSelect_clicked();
     void on_clearImageButton_clicked();
-    void on_btn_appLogsDir_clicked();
 
-#if defined(JOYSTICKS)
+#ifdef JOYSTICKS
     void on_joystickChkB_clicked();
     void on_joystickcalButton_clicked();
 #endif
 };
 
-#endif // _APPPREFERENCESDIALOG_H_
+#endif // APPPREFERENCESDIALOG_H

companion/src/boards.cpp

@@ -1,284 +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"
-
-// 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;
-}
-
-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_X7:
-    case BOARD_TARANIS_X9D:
-    case BOARD_TARANIS_X9DP:
-    case BOARD_TARANIS_X9E:
-    case BOARD_FLAMENCO:
-      return EESIZE_TARANIS;
-    case BOARD_UNKNOWN:
-      return EESIZE_MAX;
-    default:
-      return 0; // unlimited
-  }
-}
-
-const int Boards::getFlashSize(Type board)
-{
-  switch (board) {
-    case BOARD_STOCK:
-      return FSIZE_STOCK;
-    case BOARD_M128:
-      return FSIZE_M128;
-    case BOARD_MEGA2560:
-    case BOARD_GRUVIN9X:
-      return FSIZE_GRUVIN9X;
-    case BOARD_SKY9X:
-      return FSIZE_SKY9X;
-    case BOARD_9XRPRO:
-    case BOARD_AR9X:
-      return FSIZE_9XRPRO;
-    case BOARD_TARANIS_X9D:
-    case BOARD_TARANIS_X9DP:
-    case BOARD_TARANIS_X9E:
-    case BOARD_TARANIS_X7:
-    case BOARD_FLAMENCO:
-      return FSIZE_TARANIS;
-    case BOARD_X12S:
-    case BOARD_X10:
-      return FSIZE_HORUS;
-    case BOARD_UNKNOWN:
-      return FSIZE_MAX;
-    default:
-      return 0;
-  }
-}
-
-const SwitchInfo Boards::getSwitchInfo(Board::Type board, unsigned index)
-{
-  if (IS_TARANIS_X7(board)) {
-    const Board::SwitchInfo switches[] = {
-      {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, "???"};
-}
-
-const int Boards::getCapability(Board::Type board, Board::Capability capability)
-{
-  switch (capability) {
-    case Sticks:
-      return 4;
-
-    case Pots:
-      if (IS_TARANIS_X7(board))
-        return 2;
-      else if (IS_TARANIS_X9E(board))
-        return 4;
-      else
-        return 3;
-
-    case Sliders:
-      if (IS_HORUS_X12S(board) || IS_TARANIS_X9E(board))
-        return 4;
-      else if (IS_TARANIS_X9D(board) || IS_HORUS_X10(board))
-        return 2;
-      else
-        return 0;
-
-    case MouseAnalogs:
-      if (IS_HORUS_X12S(board))
-        return 2;
-      else
-        return 0;
-
-    case Switches:
-      if (IS_TARANIS_X9E(board))
-        return 18;
-      else if (IS_TARANIS_X7(board))
-        return 6;
-      else if (IS_HORUS_OR_TARANIS(board))
-        return 8;
-      else
-        return 7;
-
-    case FactoryInstalledSwitches:
-      if (IS_TARANIS_X9E(board))
-        return 8;
-      else
-        return getCapability(board, Switches);
-
-    case SwitchPositions:
-      if (IS_HORUS_OR_TARANIS(board))
-        return getCapability(board, Switches) * 3;
-      else
-        return 9;
-
-    case NumTrims:
-      if (IS_HORUS(board))
-        return 6;
-      else
-        return 4;
-
-    case NumTrimSwitches:
-      return getCapability(board, NumTrims) * 2;
-  }
-
-  return 0;
-}
-
-const QString Boards::getAxisName(int index)
-{
-  const QString axes[] = {
-    QObject::tr("Left Horizontal"),
-    QObject::tr("Left Vertical"),
-    QObject::tr("Right Vertical"),
-    QObject::tr("Right Horizontal"),
-    QObject::tr("Aux. 1"),
-    QObject::tr("Aux. 2"),
-  };
-  if (index < (int)DIM(axes))
-    return axes[index];
-  else
-    return QObject::tr("Unknown");
-}
-
-/* Currently unused
-
-const QString Boards::getBoardName(Board::Type board)
-{
-  switch (board) {
-    case BOARD_STOCK:
-      return "9X";
-    case BOARD_M128:
-      return "9X128";
-    case BOARD_GRUVIN9X:
-      return "Gruvin9x";
-    case BOARD_MEGA2560:
-      return "MEGA2560";
-    case BOARD_TARANIS_X7:
-      return "Taranis X7";
-    case BOARD_TARANIS_X9D:
-      return "Taranis X9D";
-    case BOARD_TARANIS_X9DP:
-      return "Taranis X9D+";
-    case BOARD_TARANIS_X9E:
-      return "Taranis X9E";
-    case BOARD_SKY9X:
-      return "Sky9x";
-    case BOARD_9XRPRO:
-      return "9XR-PRO";
-    case BOARD_AR9X:
-      return "AR9X";
-    case BOARD_X12S:
-      return "Horus";
-    case BOARD_X10:
-      return "X10";
-    default:
-      return QObject::tr("Unknown");
-  }
-}
-*/

companion/src/boards.h

@@ -1,191 +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.
- */
-
-#ifndef _BOARDS_H_
-#define _BOARDS_H_
-
-#include <QObject>
-#include <QString>
-
-// TODO create a Board class with all these functions
-
-namespace Board {
-
-  enum Type
-  {
-    BOARD_UNKNOWN = -1,
-    BOARD_STOCK = 0,
-    BOARD_M128,
-    BOARD_MEGA2560,
-    BOARD_GRUVIN9X,
-    BOARD_SKY9X,
-    BOARD_9XRPRO,
-    BOARD_AR9X,
-    BOARD_TARANIS_X7,
-    BOARD_TARANIS_X9D,
-    BOARD_TARANIS_X9DP,
-    BOARD_TARANIS_X9E,
-    BOARD_FLAMENCO,
-    BOARD_X12S,
-    BOARD_X10,
-    BOARD_ENUM_COUNT
-  };
-
-  enum PotType
-  {
-    POT_NONE,
-    POT_WITH_DETENT,
-    POT_MULTIPOS_SWITCH,
-    POT_WITHOUT_DETENT
-  };
-
-  enum SliderType
-  {
-    SLIDER_NONE,
-    SLIDER_WITH_DETENT
-  };
-
-  enum SwitchType
-  {
-    SWITCH_NOT_AVAILABLE,
-    SWITCH_TOGGLE,
-    SWITCH_2POS,
-    SWITCH_3POS
-  };
-
-  enum StickAxes {
-    STICK_AXIS_LH = 0,
-    STICK_AXIS_LV,
-    STICK_AXIS_RV,
-    STICK_AXIS_RH,
-    STICK_AXIS_COUNT
-  };
-
-  enum TrimAxes {
-    TRIM_AXIS_LH = 0,
-    TRIM_AXIS_LV,
-    TRIM_AXIS_RV,
-    TRIM_AXIS_RH,
-    TRIM_AXIS_T5,
-    TRIM_AXIS_T6,
-    TRIM_AXIS_COUNT
-  };
-
-  enum TrimSwitches
-  {
-    TRIM_SW_LH_DEC,
-    TRIM_SW_LH_INC,
-    TRIM_SW_LV_DEC,
-    TRIM_SW_LV_INC,
-    TRIM_SW_RV_DEC,
-    TRIM_SW_RV_INC,
-    TRIM_SW_RH_DEC,
-    TRIM_SW_RH_INC,
-    TRIM_SW_T5_DEC,
-    TRIM_SW_T5_INC,
-    TRIM_SW_T6_DEC,
-    TRIM_SW_T6_INC,
-    TRIM_SW_COUNT
-  };
-
-  enum Capability {
-    Sticks,
-    Pots,
-    Sliders,
-    MouseAnalogs,
-    Switches,
-    SwitchPositions,
-    FactoryInstalledSwitches,
-    NumTrims,
-    NumTrimSwitches
-  };
-
-  struct SwitchInfo
-  {
-    SwitchType config;
-    QString name;
-  };
-
-  struct SwitchPosition {
-    SwitchPosition(unsigned int index, unsigned int position):
-      index(index),
-      position(position)
-      {
-      }
-      unsigned int index;
-      unsigned int position;
-  };
-
-}
-
-class Boards
-{
-  public:
-
-    Boards(Board::Type board)
-    {
-      setBoardType(board);
-    }
-
-    void setBoardType(const Board::Type & board);
-    Board::Type getBoardType() const { return m_boardType; }
-
-    const int getEEpromSize() { return getEEpromSize(m_boardType); }
-    const int getFlashSize() { return getFlashSize(m_boardType); }
-    const Board::SwitchInfo getSwitchInfo(unsigned index) { return getSwitchInfo(m_boardType, index); }
-    const int getCapability(Board::Capability capability) { return getCapability(m_boardType, capability); }
-
-    static const int getEEpromSize(Board::Type board);
-    static const int getFlashSize(Board::Type board);
-    static const Board::SwitchInfo getSwitchInfo(Board::Type board, unsigned index);
-    static const int getCapability(Board::Type board, Board::Capability capability);
-    static const QString getAxisName(int index);
-
-  protected:
-
-    Board::Type m_boardType;
-};
-
-// temporary aliases for transition period, use Boards class instead.
-#define getBoardCapability(b__, c__)   Boards::getCapability(b__, c__)
-#define getEEpromSize(b__)             Boards::getEEpromSize(b__)
-#define getSwitchInfo(b__, i__)        Boards::getSwitchInfo(b__, i__)
-
-#define IS_9X(board)                   (board==Board::BOARD_STOCK || board==Board::BOARD_M128)
-#define IS_STOCK(board)                (board==Board::BOARD_STOCK)
-#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_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_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_ARM(board)                  (IS_STM32(board) || IS_SKY9X(board))
-#define HAS_LARGE_LCD(board)           (IS_HORUS(board) || (IS_TARANIS(board) && !IS_TARANIS_X7(board)))
-
-#endif // _BOARDS_H_

companion/src/burnconfigdialog.cpp

@@ -1,23 +1,3 @@
-/*
- * 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 "burnconfigdialog.h"
 #include "ui_burnconfigdialog.h"
 #include "eeprominterface.h"
@@ -26,7 +6,7 @@
 #include "progressdialog.h"
 #include "process_flash.h"
 
-#if !defined _MSC_VER && defined __GNUC__
+#if !defined WIN32 && defined __GNUC__
 #include <unistd.h>
 #endif
 
@@ -40,8 +20,8 @@ burnConfigDialog::burnConfigDialog(QWidget *parent) :
 
     getSettings();
     populateProgrammers();
-    Board::Type board = getCurrentBoard();
-    if (IS_STM32(board)) {
+    EEPROMInterface *eepromInterface = GetEepromInterface();
+    if (IS_TARANIS(eepromInterface->getBoard())) {
       setWindowTitle(tr("DFU-UTIL Configuration"));
       ui->avrArgs->hide();
       ui->avrdude_location->hide();
@@ -60,7 +40,7 @@ burnConfigDialog::burnConfigDialog(QWidget *parent) :
       ui->samba_port->hide();      
       ui->sb_browse->hide();
     }
-    else if (IS_SKY9X(board)) {
+    else if (IS_SKY9X(eepromInterface->getBoard())) {
       setWindowTitle(tr("SAM-BA Configuration"));
       ui->avrArgs->hide();
       ui->avrdude_location->hide();
@@ -97,7 +77,7 @@ burnConfigDialog::burnConfigDialog(QWidget *parent) :
     ui->dfuArgs->hide();
 
     QTimer::singleShot(0, this, SLOT(shrink()));
-    connect(this, SIGNAL(accepted()), this, SLOT(putSettings()));
+    connect(this,SIGNAL(accepted()),this,SLOT(putSettings()));
 }
 
 burnConfigDialog::~burnConfigDialog()
@@ -105,18 +85,6 @@ 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();
@@ -132,16 +100,11 @@ void burnConfigDialog::getSettings()
       dfuLoc =  QFileInfo("dfu-util.exe").absoluteFilePath();
 #elif defined __APPLE__
     if ( avrLoc.isEmpty())
-      avrLoc = QFileInfo(QApplication::applicationDirPath() + "/../Resources/avrdude").absoluteFilePath();
+      avrLoc = "/usr/local/bin/avrdude";
     if ( sambaLoc.isEmpty())
       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";
+      dfuLoc =  QFileInfo("/opt/local/bin/dfu-util").absoluteFilePath();
 #else
     if ( avrLoc.isEmpty())
       avrLoc = "/usr/bin/avrdude";
@@ -345,13 +308,13 @@ void burnConfigDialog::on_pushButton_4_clicked()
 
 void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
 {
-  Board::Type board = getCurrentBoard();
+  EEPROMInterface *eepromInterface = GetEepromInterface();
   if (checked) {
-    if (IS_STM32(board)) {
+    if (IS_TARANIS(eepromInterface->getBoard())) {
       ui->label_dfu2->show();
       ui->dfuArgs->show();
     }
-    else if (IS_SKY9X(board)) {
+    else if (IS_SKY9X(eepromInterface->getBoard())) {
       ui->label_sb2->show();
       ui->arm_mcu->show();
     }
@@ -364,11 +327,11 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
     }
   }
   else {
-    if (IS_STM32(board)) {
+    if (IS_TARANIS(eepromInterface->getBoard())) {
       ui->label_dfu2->hide();
       ui->dfuArgs->hide();
     }
-    else if (IS_SKY9X(board)) {
+    else if (IS_SKY9X(eepromInterface->getBoard())) {
       ui->label_sb2->hide();
       ui->arm_mcu->hide();
     }
@@ -383,7 +346,7 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
 
 void burnConfigDialog::shrink()
 {
-  resize(0, 0);
+  resize(0,0);
 }
 
 

companion/src/burnconfigdialog.h

@@ -1,25 +1,5 @@
-/*
- * 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 _BURNCONFIGDIALOG_H_
-#define _BURNCONFIGDIALOG_H_
+#ifndef BURNCONFIGDIALOG_H_
+#define BURNCONFIGDIALOG_H_
 
 #include <QtWidgets>
 
@@ -42,7 +22,7 @@ public:
     QString getAVRDUDE() {return avrLoc;}
     QString getSAMBA() {return sambaLoc;}
     QString getDFU() {return dfuLoc;}
-    QStringList getAvrdudeArgs();
+    QStringList getAvrdudeArgs() { QStringList args = avrArgs; if (!avrPort.isEmpty()) args << "-P" << avrPort; return args; }
     QStringList getDFUArgs() {return dfuArgs;}
     QString getProgrammer() {return avrProgrammer;}
     QString getMCU() {return avrMCU;}
@@ -90,4 +70,4 @@ private slots:
     void putSettings();
 };
 
-#endif // _BURNCONFIGDIALOG_H_
+#endif // BURNCONFIGDIALOG_H_

companion/src/companion.cpp

@@ -1,173 +1,171 @@
-/*
- * 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 <QApplication>
-#include <QDateTime>
-#include <QDir>
-#include <QFile>
-#include <QSplashScreen>
-#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
-  #include <SDL.h>
-  #undef main
-#endif
-
-#include "appdebugmessagehandler.h"
-#include "customdebug.h"
-#include "mainwindow.h"
-#include "version.h"
-#include "appdata.h"
-#include "storage.h"
-#include "translations.h"
-
-#ifdef __APPLE__
-#include <QProxyStyle>
-
-class MyProxyStyle : public QProxyStyle
- {
-   public:
-    void polish ( QWidget * w ) {
-      QMenu* mn = dynamic_cast<QMenu*>(w);
-      QPushButton* pb = dynamic_cast<QPushButton*>(w);
-      if(!(mn || pb) && !w->testAttribute(Qt::WA_MacNormalSize))
-          w->setAttribute(Qt::WA_MacSmallSize);
-    }
- };
-#endif
-
-int main(int argc, char *argv[])
-{
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
-  /* From doc: This attribute must be set before Q(Gui)Application is constructed. */
-  QApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
-#endif
-
-  QApplication app(argc, argv);
-  app.setApplicationName(APP_COMPANION);
-  app.setOrganizationName(COMPANY);
-  app.setOrganizationDomain(COMPANY_DOMAIN);
-  app.setAttribute(Qt::AA_DontShowIconsInMenus, false);
-
-  Q_INIT_RESOURCE(companion);
-
-  if (AppDebugMessageHandler::instance())
-    AppDebugMessageHandler::instance()->installAppMessageHandler();
-
-  CustomDebug::setFilterRules();
-
-  if (!g.hasCurrentSettings()) {
-    QString previousVersion;
-    if (g.findPreviousVersionSettings(&previousVersion)) {
-       QMessageBox msgBox;
-       msgBox.setText(QObject::tr("We have found existing settings for Companion version: %1.\nDo you want to import them?").arg(previousVersion));
-       msgBox.setIcon(QMessageBox::Information);
-       msgBox.setStandardButtons(QMessageBox::Yes | QMessageBox::No);
-       msgBox.setDefaultButton(QMessageBox::Yes);
-       int ret = msgBox.exec();
-
-       if (ret == QMessageBox::Yes)
-  	     g.importSettings(previousVersion);
-    }
-  }
-  g.init();
-
-  QStringList strl = QApplication::arguments();
-  if (strl.contains("--version")) {
-    printf("%s\n", VERSION);
-    fflush(stdout);
-    exit(0);
-  }
-
-  QFile dbgLog;
-  if (AppDebugMessageHandler::instance() && g.appDebugLog() && !g.appLogsDir().isEmpty() && QDir().mkpath(g.appLogsDir())) {
-    QString fn = g.appLogsDir() % "/CompanionDebug_" % QDateTime::currentDateTime().toString("yy-MM-dd_HH-mm-ss") % ".log";
-    dbgLog.setFileName(fn);
-    if (dbgLog.open(QIODevice::WriteOnly | QIODevice::Text)) {
-      AppDebugMessageHandler::instance()->addOutputDevice(&dbgLog);
-    }
-  }
-
-#ifdef __APPLE__
-  app.setStyle(new MyProxyStyle);
-#endif
-
-  Translations::installTranslators();
-
-#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
-  uint32_t sdlFlags = 0;
-  #ifdef JOYSTICKS
-    sdlFlags |= SDL_INIT_JOYSTICK;
-  #endif
-  #ifdef SIMU_AUDIO
-    sdlFlags |= SDL_INIT_AUDIO;
-  #endif
-  if (SDL_Init(sdlFlags) < 0) {
-    fprintf(stderr, "ERROR: couldn't initialize SDL: %s\n", SDL_GetError());
-  }
-#endif
-
-  registerStorageFactories();
-  registerOpenTxFirmwares();
-  SimulatorLoader::registerSimulators();
-
-  if (g.profile[g.id()].fwType().isEmpty()){
-    g.profile[g.id()].fwType(Firmware::getDefaultVariant()->getId());
-    g.profile[g.id()].fwName("");
-  }
-
-  QString splashScreen;
-  splashScreen = ":/images/splash.png";
-
-  QPixmap pixmap = QPixmap(splashScreen);
-  QSplashScreen *splash = new QSplashScreen(pixmap);
-
-  Firmware::setCurrentVariant(Firmware::getFirmwareForId(g.profile[g.id()].fwType()));
-
-  MainWindow *mainWin = new MainWindow();
-  if (g.showSplash()) {
-    splash->show();
-    QTimer::singleShot(1000*SPLASH_TIME, splash, SLOT(close()));
-    QTimer::singleShot(1000*SPLASH_TIME, mainWin, SLOT(show()));
-  }
-  else {
-    mainWin->show();
-  }
-
-  int result = app.exec();
-
-  delete splash;
-  delete mainWin;
-
-  SimulatorLoader::unregisterSimulators();
-  unregisterOpenTxFirmwares();
-  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;
-}
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QTranslator>
+#include <QLocale>
+#include <QString>
+#include <QDir>
+#include <QFileInfo>
+#include <QSplashScreen>
+#include <QThread>
+#include <iostream>
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  #include <SDL.h>
+  #undef main
+#endif
+#include "mainwindow.h"
+#include "version.h"
+#include "eeprominterface.h"
+#include "appdata.h"
+
+#if defined WIN32 || !defined __GNUC__
+#include <windows.h>
+#define sleep(x) Sleep(x*1000)
+#else
+#include <unistd.h>
+#endif
+
+#ifdef __APPLE__
+#include <QProxyStyle> 
+
+class MyProxyStyle : public QProxyStyle
+ {
+   public:
+    void polish ( QWidget * w ) {
+      QMenu* mn = dynamic_cast<QMenu*>(w);
+      QPushButton* pb = dynamic_cast<QPushButton*>(w);
+      if(!(mn || pb) && !w->testAttribute(Qt::WA_MacNormalSize))
+          w->setAttribute(Qt::WA_MacSmallSize);
+    }
+ };
+#endif
+
+int main(int argc, char *argv[])
+{
+  Q_INIT_RESOURCE(companion);
+
+  QApplication app(argc, argv);
+  app.setApplicationName("OpenTX Companion");
+  app.setOrganizationName("OpenTX");
+  app.setOrganizationDomain("open-tx.org");
+  app.setAttribute(Qt::AA_DontShowIconsInMenus, false);
+
+  g.init();
+
+  QStringList strl = QApplication::arguments();
+  if (strl.contains("--version")) {
+    printf("%s\n", VERSION);
+    fflush(stdout);
+    exit(0);
+  }
+
+#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"));
+
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  uint32_t sdlFlags = 0;
+  #ifdef JOYSTICKS
+    sdlFlags |= SDL_INIT_JOYSTICK;
+  #endif
+  #ifdef SIMU_AUDIO
+    sdlFlags |= SDL_INIT_AUDIO;
+  #endif
+  if (SDL_Init(sdlFlags) < 0) {
+    fprintf(stderr, "ERROR: couldn't initialize SDL: %s\n", SDL_GetError());
+  }
+#endif
+
+  registerEEpromInterfaces();
+  registerOpenTxFirmwares();
+  registerSimulators();
+
+  if (g.profile[g.id()].fwType().isEmpty()){
+    g.profile[g.id()].fwType(default_firmware_variant->getId());
+    g.profile[g.id()].fwName("");
+  }
+
+  QString splashScreen;
+  if ( g.profile[g.id()].fwType().contains("taranis"))     splashScreen = ":/images/splash-taranis.png";
+  else if ( g.profile[g.id()].fwType().contains("9xrpro")) splashScreen = ":/images/splash-9xrpro.png";
+  else if ( g.profile[g.id()].fwType().contains("9xr"))    splashScreen = ":/images/splash-9xr.png";
+  else  splashScreen = ":/images/splash-9x.png";
+
+  QPixmap pixmap = QPixmap(splashScreen);
+  QSplashScreen *splash = new QSplashScreen(pixmap);
+
+  current_firmware_variant = GetFirmware(g.profile[g.id()].fwType());
+
+  MainWindow *mainWin = new MainWindow();
+  if (g.showSplash()) {
+    splash->show();
+    QTimer::singleShot(1000*SPLASH_TIME, splash, SLOT(close()));
+    QTimer::singleShot(1000*SPLASH_TIME, mainWin, SLOT(show()));
+  }
+  else {
+    mainWin->show();
+  }
+
+  int result = app.exec();
+
+  delete splash;
+  delete mainWin;
+
+  unregisterSimulators();
+  unregisterOpenTxFirmwares();
+  unregisterEEpromInterfaces();
+
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  SDL_Quit();
+#endif
+
+  return result;
+}

companion/src/companion.qrc

@@ -3,76 +3,23 @@
     <file>images/customize.png</file>
     <file>icon.png</file>
     <file>../../CREDITS.txt</file>
+    <file>../../DONATIONS.txt</file>
     <file>../releasenotes.txt</file>
-    <file>images/screenshot.png</file>
-    <file>images/splash.png</file>
-    <file>images/companion-title.png</file>
-    <file>images/maps.png</file>
-    <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-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/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/9X/9xdb.png</file>
     <file>images/simulator/9X/9xdl.png</file>
     <file>images/simulator/9X/9xdr.png</file>
@@ -106,6 +53,15 @@
     <file>images/simulator/9X/9xcursmin.png</file>
     <file>images/simulator/9X/9xcursdown.png</file>
     <file>images/simulator/9X/9xcursphoto.png</file>
+    <file>images/screenshot.png</file>
+    <file>images/splash-9x.png</file>
+    <file>images/splash-9xrpro.png</file>
+    <file>images/splash-9xr.png</file>
+    <file>images/splash-taranis.png</file>
+    <file>images/companion-title.png</file>
+    <file>images/maps.png</file>
+    <file>images/track.png</file>
+    <file>images/track0.png</file>
     <file>images/simulator/Taranis/x9b0.png</file>
     <file>images/simulator/Taranis/x9l0.png</file>
     <file>images/simulator/Taranis/x9l1.png</file>
@@ -118,24 +74,7 @@
     <file>images/simulator/Taranis/x9r3.png</file>
     <file>images/simulator/Taranis/x9s0.png</file>
     <file>images/simulator/Taranis/x9t0.png</file>
-    <file>images/simulator/X7/bottom.png</file>
-    <file>images/simulator/X7/left.png</file>
-    <file>images/simulator/X7/left_exit.png</file>
-    <file>images/simulator/X7/left_menu.png</file>
-    <file>images/simulator/X7/left_page.png</file>
-    <file>images/simulator/X7/left_scrnshot.png</file>
-    <file>images/simulator/X7/right.png</file>
-    <file>images/simulator/X7/right_ent.png</file>
-    <file>images/simulator/X7/top.png</file>
-    <file>images/simulator/X9E/bottom.png</file>
-    <file>images/simulator/X9E/left.png</file>
-    <file>images/simulator/X9E/left_exit.png</file>
-    <file>images/simulator/X9E/left_menu.png</file>
-    <file>images/simulator/X9E/left_page.png</file>
-    <file>images/simulator/X9E/left_scrnshot.png</file>
-    <file>images/simulator/X9E/right.png</file>
-    <file>images/simulator/X9E/right_enter.png</file>
-    <file>images/simulator/X9E/top.png</file>
+    <file>images/taranison.png</file>    
     <file>images/wizard/ailerons.png</file>
     <file>images/wizard/airbrakes.png</file>
     <file>images/wizard/elevons.png</file> 
@@ -233,8 +172,6 @@
     <file>images/library/10702.png</file>
     <file>images/library/10801.png</file>
     <file>images/library/10802.png</file>
-    <file>themes/default/style.css</file>
-    <file>themes/default/style-osx.css</file>
     <file>themes/monochrome/16/paintbrush.png</file>
     <file>themes/monochrome/16/open.png</file>
     <file>themes/monochrome/16/edit.png</file>
@@ -630,7 +567,6 @@
     <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>
@@ -674,7 +610,6 @@
     <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>
@@ -718,7 +653,6 @@
     <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>
@@ -762,7 +696,6 @@
     <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>
@@ -806,7 +739,6 @@
     <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>
@@ -850,7 +782,6 @@
     <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>
@@ -894,7 +825,6 @@
     <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>
@@ -938,7 +868,6 @@
     <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

@@ -1,65 +1,45 @@
-/*
- * 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 "comparedialog.h"
 #include "ui_comparedialog.h"
-#include "appdata.h"
 #include "helpers.h"
-#include "modelslist.h"
 #include <QPrinter>
 #include <QPrintDialog>
 
-//class DragDropHeader {
-//  public:
-//    DragDropHeader():
-//      general_settings(false),
-//      models_count(0)
-//    {
-//    }
-//    bool general_settings;
-//    uint8_t models_count;
-//    uint8_t models[CPN_MAX_MODELS];
-//};
+// #if !defined WIN32 && defined __GNUC__
+// #include <unistd.h>
+// #endif
+
+class DragDropHeader {
+  public:
+    DragDropHeader():
+      general_settings(false),
+      models_count(0)
+    {
+    }
+    bool general_settings;
+    uint8_t models_count;
+    uint8_t models[C9X_MAX_MODELS];
+};
 
 CompareDialog::CompareDialog(QWidget * parent, Firmware * firmware):
-  QDialog(parent, Qt::Window),
-  multimodelprinter(new MultiModelPrinter(firmware)),
+  QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+  multimodelprinter(firmware),
+  model1Valid(false),
+  model2Valid(false),
   ui(new Ui::CompareDialog)
 {
   ui->setupUi(this);
+
   setWindowIcon(CompanionIcon("compare.png"));
   setAcceptDrops(true);
-  if (!g.compareWinGeo().isEmpty()) {
-    restoreGeometry(g.compareWinGeo());
-  }
-}
 
-CompareDialog::~CompareDialog()
-{
-  delete multimodelprinter;
-  delete ui;
+  //setDragDropOverwriteMode(true);
+  //setDropIndicatorShown(true);
+  // TODO scroll to top ... ui->textEdit->scrollToAnchor("1");
 }
 
 void CompareDialog::dragMoveEvent(QDragMoveEvent * event)
 {
-  if (event->mimeData()->hasFormat("application/x-companion-modeldata")) {
+  if (event->mimeData()->hasFormat("application/x-companion")) {   
     event->acceptProposedAction();
   }
   else {
@@ -69,7 +49,8 @@ void CompareDialog::dragMoveEvent(QDragMoveEvent * event)
 
 void CompareDialog::dragEnterEvent(QDragEnterEvent * event)
 {
-  if (event->mimeData()->hasFormat("application/x-companion-modeldata")) {
+  // accept just text/uri-list mime format
+  if (event->mimeData()->hasFormat("application/x-companion")) {   
     event->acceptProposedAction();
   }
   else {
@@ -82,85 +63,55 @@ void CompareDialog::dragLeaveEvent(QDragLeaveEvent * event)
   event->accept();
 }
 
-bool CompareDialog::handleMimeData(const QMimeData * mimeData)
+bool CompareDialog::handleDroppedModel(const QMimeData * mimeData, ModelData & model, QLabel * label)
 {
-  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);
+  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;
+        }
+      }
+    }
   }
-  return true;
-}
-
-void CompareDialog::closeEvent(QCloseEvent * event)
-{
-  g.compareWinGeo(saveGeometry());
+  return false;
 }
 
 void CompareDialog::dropEvent(QDropEvent *event)
 {
-  if (handleMimeData(event->mimeData())) {
-    event->accept();
-    compare();
+  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()));
   }
 }
 
-void CompareDialog::compare()
+void CompareDialog::closeEvent(QCloseEvent *event) 
 {
-  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()));
 }
 
-void CompareDialog::removeModel(int idx)
+CompareDialog::~CompareDialog()
 {
-  if (idx < modelsList.size()) {
-    modelsList.remove(idx);
-    compare();
-  }
-}
-
-void CompareDialog::removeModelBtnClicked()
-{
-  if (sender() && sender()->property("index").isValid())
-    removeModel(sender()->property("index").toInt());
+  delete ui;
 }
 
 void CompareDialog::on_printButton_clicked()

companion/src/comparedialog.h

@@ -1,66 +1,41 @@
-/*
- * 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 _COMPAREDIALOG_H_
-#define _COMPAREDIALOG_H_
-
-#include <QtWidgets>
-#include "multimodelprinter.h"
-
-namespace Ui {
-  class CompareDialog;
-}
-
-class CompareDialog : public QDialog
-{
-  Q_OBJECT
-
-  public:
-    CompareDialog(QWidget *parent, Firmware * firmware);
-    ~CompareDialog();
-
-  protected:
-    struct GMData {
-        ModelData model;
-        GeneralSettings gs;
-    };
-
-    MultiModelPrinter * multimodelprinter;
-    QVector<GMData> modelsList;
-    QMap<int, GMData> modelsMap;
-    Ui::CompareDialog * ui;
-
-  protected slots:
-    void removeModelBtnClicked();
-    void on_printButton_clicked();
-    void on_printFileButton_clicked();
-
-  protected:
-    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_
+#ifndef _COMPAREDIALOG_H
+#define _COMPAREDIALOG_H
+
+#include <QtWidgets>
+#include "multimodelprinter.h"
+
+namespace Ui {
+  class CompareDialog;
+}
+
+class CompareDialog : public QDialog
+{
+  Q_OBJECT
+
+  public:
+    CompareDialog(QWidget *parent, Firmware * firmware);
+    ~CompareDialog();
+    
+  protected:
+    MultiModelPrinter multimodelprinter;
+    ModelData model1;
+    ModelData model2;
+    bool model1Valid;
+    bool model2Valid;
+    Ui::CompareDialog * ui;
+    
+  protected slots:
+    void on_printButton_clicked();
+    void on_printFileButton_clicked();
+    
+  protected:
+    void closeEvent(QCloseEvent * event);
+    bool handleDroppedModel(const QMimeData * mimeData, ModelData & model, QLabel * label);
+    void dropEvent(QDropEvent *event);
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dragLeaveEvent(QDragLeaveEvent *event);
+    void printDiff();
+};
+
+#endif // _COMPAREDIALOG_H

companion/src/comparedialog.ui

@@ -29,22 +29,63 @@
    <string>Compare Models</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="2" column="0">
+   <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">
     <widget class="QTextEdit" name="textEdit">
      <property name="readOnly">
       <bool>true</bool>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="2" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="text">
-        <string>To compare models, drag and drop them anywhere in this window.</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
@@ -81,28 +122,11 @@
      </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/>
+ <resources>
+  <include location="companion.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>closeButton</sender>

companion/src/constants.h

@@ -1,79 +1,41 @@
-/*
- * 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 _constants_h_
+#define _constants_h_
 
-#ifndef _CONSTANTS_H_
-#define _CONSTANTS_H_
-
-#include <QCoreApplication>
-
-#define CPN_MAX_MODELS                 60
-#define CPN_MAX_TIMERS                 3
-#define CPN_MAX_FLIGHT_MODES           9
-#define CPN_MAX_MIXERS                 64
-#define CPN_MAX_INPUTS                 32
-#define CPN_MAX_EXPOS                  64
-#define CPN_MAX_CURVES                 32
-#define CPN_MAX_POINTS                 17
-#define CPN_MAX_GVARS                  9
-#define CPN_MAX_ENCODERS               2  // rotary encoders
-#define CPN_MAX_CHNOUT                 32 // number of real output channels
-#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                 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 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_SW_INDICATOR_UP        QCoreApplication::translate("RawSwitch", "\xE2\x86\x91")  // Switch up position indicator: Up arrow, or similar.
-#define CPN_STR_SW_INDICATOR_DN        QCoreApplication::translate("RawSwitch", "\xE2\x86\x93")  // Switch down position indicator: Down arrow, or similar.
-#define CPN_STR_SW_INDICATOR_NEUT      QCoreApplication::translate("RawSwitch", "-")             // Switch neutral (middle) position indicator.
-#define CPN_STR_SW_INDICATOR_REV       QCoreApplication::translate("RawSwitch", "!")             // Switch reversed logic (NOT) indicator.
-
-enum DownloadBranchType {
-  BRANCH_RELEASE_STABLE,
-  BRANCH_RC_TESTING,
-  BRANCH_NIGHTLY_UNSTABLE
+enum BoardEnum {
+  BOARD_STOCK,
+  BOARD_M128,
+  BOARD_MEGA2560,
+  BOARD_GRUVIN9X,
+  BOARD_SKY9X,
+  BOARD_9XRPRO,
+  BOARD_AR9X,
+  BOARD_TARANIS,
+  BOARD_TARANIS_PLUS,
+  BOARD_TARANIS_X9E,
+  BOARD_FLAMENCO,
+  BOARD_HORUS
 };
 
-Q_DECLARE_METATYPE(DownloadBranchType)
+#define C9X_MAX_MODELS            60
+#define C9X_MAX_TIMERS            3
+#define C9X_MAX_FLIGHT_MODES      9
+#define C9X_MAX_MIXERS            64
+#define C9X_MAX_INPUTS            32
+#define C9X_MAX_EXPOS             64
+#define C9X_MAX_CURVES            32
+#define C9X_MAX_POINTS            17
+#define C9X_MAX_GVARS             9
+#define C9X_MAX_ENCODERS          2
+#define C9X_NUM_CHNOUT            32 // number of real output channels
+#define C9X_NUM_CSW               64 // number of custom switches
+#define C9X_MAX_CUSTOM_FUNCTIONS  64 // number of functions assigned to switches
+#define C9X_NUM_MODULES           2
+#define NUM_STICKS                4
+#define BOARD_9X_NUM_POTS         3
+#define C9X_NUM_POTS              8
+#define NUM_CAL_PPM               4
+#define NUM_CYC                   3
+#define C9X_NUM_SWITCHES          32
+#define C9X_NUM_KEYS              32
 
-#endif // _CONSTANTS_H_
+#endif

companion/src/contributorsdialog.cpp

@@ -1,30 +1,9 @@
-/*
- * 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 "creditsdialog.h"
+#include "contributorsdialog.h"
 #include "ui_htmldialog.h"
 #include "helpers.h"
-#include <QFile>
 
-CreditsDialog::CreditsDialog(QWidget * parent):
-  QDialog(parent),
+ContributorsDialog::ContributorsDialog(QWidget * parent):
+  QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
   ui(new Ui::HtmlDialog)
 {
   ui->setupUi(this);
@@ -42,8 +21,42 @@ CreditsDialog::CreditsDialog(QWidget * parent):
                 "</head>"
                 "<body class=\"normal\">";
 
-  foreach(CreditsSection section, readCredits()) {
-    str.append(formatTable(sectionTitle(section.title), section.names, 3));
+  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));
   }
 
   str.append("<table><tr><td class=\"normal\">&nbsp;</td></tr>" \
@@ -53,9 +66,9 @@ CreditsDialog::CreditsDialog(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
 
@@ -65,45 +78,12 @@ CreditsDialog::CreditsDialog(QWidget * parent):
   ui->textEditor->setOpenExternalLinks(true);
 }
 
-CreditsDialog::~CreditsDialog()
+ContributorsDialog::~ContributorsDialog()
 {
   delete ui;
 }
 
-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)
+QString ContributorsDialog::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/contributorsdialog.h

@@ -0,0 +1,23 @@
+#ifndef CONTRIBUTORSDIALOG_H
+#define CONTRIBUTORSDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+  class HtmlDialog;
+}
+
+class ContributorsDialog : public QDialog
+{
+  Q_OBJECT
+
+  public:
+    explicit ContributorsDialog(QWidget * parent = 0);
+    ~ContributorsDialog();
+
+  private:
+    Ui::HtmlDialog * ui;
+    QString formatTable(const QString & title, const QStringList & names, int colums);
+};
+
+#endif // CONTRIBUTORSDIALOG_H

companion/src/converteeprom.cpp

@@ -0,0 +1,45 @@
+#include "converteeprom.h"
+#include "eeprominterface.h"
+#include "firmwareinterface.h"
+#include <QFile>
+
+bool convertEEprom(const QString &sourceEEprom, const QString &destinationEEprom, const QString &firmwareFilename)
+{
+  Firmware *currentFirmware = GetCurrentFirmware();
+  FirmwareInterface firmware(firmwareFilename);
+  if (!firmware.isValid())
+    return false;
+
+  unsigned int version = firmware.getEEpromVersion();
+  unsigned int variant = firmware.getEEpromVariant();
+
+  QFile sourceFile(sourceEEprom);
+  int eeprom_size = sourceFile.size();
+  if (!eeprom_size)
+    return false;
+
+  if (!sourceFile.open(QIODevice::ReadOnly))
+    return false;
+
+  QByteArray eeprom(eeprom_size, 0);
+  long result = sourceFile.read(eeprom.data(), eeprom_size);
+  sourceFile.close();
+
+  QSharedPointer<RadioData> radioData = QSharedPointer<RadioData>(new RadioData());
+  std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEeprom(*radioData, (uint8_t *)eeprom.data(), eeprom_size));
+  if (!errors.test(ALL_OK)
+    || !currentFirmware->saveEEPROM((uint8_t *)eeprom.data(), *radioData, variant, version)) {
+    return false;
+  }
+
+  QFile destinationFile(destinationEEprom);
+  if (!destinationFile.open(QIODevice::WriteOnly))
+    return false;
+
+  result = destinationFile.write(eeprom.constData(), eeprom_size);
+  destinationFile.close();
+  if (result != eeprom_size)
+    return false;
+
+  return true;
+}

companion/src/converteeprom.h

@@ -0,0 +1,8 @@
+#ifndef CONVERTHEADER_H_
+#define CONVERTHEADER_H_
+
+#include <QString>
+
+bool convertEEprom(const QString &sourceEEprom, const QString &destinationEEprom, const QString &firmware);
+
+#endif /* CONVERTHEADER_H_ */

companion/src/creditsdialog.h

@@ -1,62 +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.
- */
-
-#ifndef _CREDITSDIALOG_H_
-#define _CREDITSDIALOG_H_
-
-#include <QDialog>
-
-namespace Ui {
-  class HtmlDialog;
-}
-
-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 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 // _CREDITSDIALOG_H_

companion/src/customdebug.cpp

@@ -1,40 +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 "customdebug.h"
-
-Q_LOGGING_CATEGORY(eepromImport, "eeprom.import")
-
-Q_LOGGING_CATEGORY(simulatorInterfaceLoader, "simulator.interface.loader")
-
-void CustomDebug::setFilterRules()
-{
-  QString rules;
-  rules.append("eeprom.import=");
-#if defined(DEBUG_STORAGE_IMPORT)
-  rules.append("true\n");
-#else
-  rules.append("false\n");
-#endif
-
-  rules.append("simulator.interface.*=true\n");
-
-  QLoggingCategory::setFilterRules(rules);
-}

companion/src/customdebug.h

@@ -1,38 +1,16 @@
-/*
- * 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 customdebug_h
+#define customdebug_h
 
-#ifndef _CUSTOMDEBUG_H_
-#define _CUSTOMDEBUG_H_
+#include <QDebug>
 
-#include <QLoggingCategory>
 
 // Controls the generation of debug output for EEPROM import
-Q_DECLARE_LOGGING_CATEGORY(eepromImport)  // "eeprom.import"
+#if defined(DEBUG_MODEL_IMPORT)
+  inline QDebug eepromImportDebug() { return QDebug(QtDebugMsg); }
+#else
+  #undef eepromImportDebug
+  inline QNoDebug eepromImportDebug() { return QNoDebug(); }
+#endif
 
-// 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_
+#endif

companion/src/customizesplashdialog.cpp

@@ -1,23 +1,3 @@
-/*
- * 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 "customizesplashdialog.h"
 #include "ui_customizesplashdialog.h"
 #include "flashfirmwaredialog.h"
@@ -49,11 +29,11 @@ void Side::markSourceButton()
 
 void Side::copyImage( Side side )
 {
-  if ((*source!=UNDEFINED) && (*side.source!=UNDEFINED))
+ if ((*source!=UNDEFINED) && (*side.source!=UNDEFINED))
     imageLabel->setPixmap(*side.imageLabel->pixmap());
 }
 
-bool Side::displayImage(QString fileName, Source pictSource)
+bool Side::displayImage( QString fileName, Source pictSource )
 {
   QImage image;
 
@@ -61,7 +41,7 @@ bool Side::displayImage(QString fileName, Source pictSource)
     return false;
 
   // Determine which picture format to use
-  if (pictSource == FW) {
+  if (pictSource == FW ){
     FirmwareInterface firmware(fileName);
     if (!firmware.hasSplash())
       return false;
@@ -74,36 +54,39 @@ 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("taranis")) ? LCDTARANIS : LCD9X; 
   }
-
   if (image.isNull()) {
     return false;
   }
-
   // Load image
-  QPixmap pixmap = makePixMap(image);
-  imageLabel->setPixmap(pixmap);
-  imageLabel->setFixedSize(pixmap.width()*2, pixmap.height()*2);
+  if (*format==LCDTARANIS) {
+    imageLabel->setPixmap( makePixMap( image, "taranis" ));
+    imageLabel->setFixedSize(WIDTH_TARANIS*2, HEIGHT_TARANIS*2);
+  }
+  else {
+    imageLabel->setPixmap( makePixMap( image, "9x" )); 
+    imageLabel->setFixedSize(WIDTH_9X*2, HEIGHT_9X*2);
+  }
 
-  switch (pictSource) {
-    case FW:
-      fileNameEdit->setText(QObject::tr("FW: %1").arg(fileName));
-      *saveToFileName = fileName;
-      *source = FW;
-      break;
-    case PICT:
-      fileNameEdit->setText(QObject::tr("Pict: %1").arg(fileName));
-      *saveToFileName = fileName;
-      *source = PICT;
-      break;
-    case PROFILE:
-      fileNameEdit->setText(QObject::tr("Profile image"));
-      *saveToFileName = fileName;
-      *source = PROFILE;
-      break;
-    default:
-      break;
+  switch (pictSource){
+  case FW:
+    fileNameEdit->setText(QObject::tr("FW: %1").arg(fileName));
+    *saveToFileName = fileName;
+    *source=FW;
+    break;
+  case PICT:
+    fileNameEdit->setText(QObject::tr("Pict: %1").arg(fileName));
+    *saveToFileName = fileName;
+    *source=PICT;
+    break;
+  case PROFILE:
+    fileNameEdit->setText(QObject::tr("Profile image"));
+    *saveToFileName = fileName;
+    *source=PROFILE;
+    break;
+  default:
+    break;
   }
   saveButton->setEnabled(true);
   libraryButton->setEnabled(true);
@@ -150,9 +133,11 @@ bool Side::saveImage()
   return true;
 }
 
-CustomizeSplashDialog::CustomizeSplashDialog(QWidget *parent) :
+//*** customizeSplashDialog Class ***
+
+customizeSplashDialog::customizeSplashDialog(QWidget *parent) :
   QDialog(parent),
-  ui(new Ui::CustomizeSplashDialog)
+  ui(new Ui::customizeSplashDialog)
 {
   ui->setupUi(this);
   setWindowIcon(CompanionIcon("paintbrush.png"));
@@ -183,22 +168,22 @@ CustomizeSplashDialog::CustomizeSplashDialog(QWidget *parent) :
   resize(0,0);
 }
 
-CustomizeSplashDialog::~CustomizeSplashDialog()
+customizeSplashDialog::~customizeSplashDialog()
 {
   delete ui;
 }
 
-void CustomizeSplashDialog::on_copyRightToLeftButton_clicked() {
+void customizeSplashDialog::on_copyRightToLeftButton_clicked() {
   left.copyImage(right);
 }
-void CustomizeSplashDialog::on_copyLeftToRightButton_clicked() {
+void customizeSplashDialog::on_copyLeftToRightButton_clicked() {
 right.copyImage(left);
 }
 
 
-void CustomizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);}
-void CustomizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);}
-void CustomizeSplashDialog::loadFirmware(Side side)
+void customizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);}
+void customizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);}
+void customizeSplashDialog::loadFirmware(Side side)
 {
   QString fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER);
   if (!fileName.isEmpty()) {
@@ -210,9 +195,9 @@ void CustomizeSplashDialog::loadFirmware(Side side)
   side.markSourceButton();
 }
 
-void CustomizeSplashDialog::on_leftLoadPictButton_clicked() {loadPicture(left);}
-void CustomizeSplashDialog::on_rightLoadPictButton_clicked() {loadPicture(right);}
-void CustomizeSplashDialog::loadPicture(Side side)
+void customizeSplashDialog::on_leftLoadPictButton_clicked() {loadPicture(left);}
+void customizeSplashDialog::on_rightLoadPictButton_clicked() {loadPicture(right);}
+void customizeSplashDialog::loadPicture(Side side)
 {
   QString supportedImageFormats;
   for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) {
@@ -230,9 +215,9 @@ void CustomizeSplashDialog::loadPicture(Side side)
   side.markSourceButton();
 }
 
-void CustomizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);}
-void CustomizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);}
-void CustomizeSplashDialog::loadProfile(Side side)
+void customizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);}
+void customizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);}
+void customizeSplashDialog::loadProfile(Side side)
 {
   QString fileName=g.profile[g.id()].splashFile();
 
@@ -243,9 +228,9 @@ void CustomizeSplashDialog::loadProfile(Side side)
   side.markSourceButton();
 }
 
-void CustomizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);}
-void CustomizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);}
-void CustomizeSplashDialog::libraryButton_clicked( Side side )
+void customizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);}
+void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);}
+void customizeSplashDialog::libraryButton_clicked( Side side )
 {
   QString fileName;
   SplashLibraryDialog *ld = new SplashLibraryDialog(this,&fileName);
@@ -256,9 +241,9 @@ void CustomizeSplashDialog::libraryButton_clicked( Side side )
   }
 }
 
-void CustomizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);}
-void CustomizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);}
-void CustomizeSplashDialog::saveButton_clicked( Side side )
+void customizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);}
+void customizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);}
+void customizeSplashDialog::saveButton_clicked( Side side )
 {
   if (side.saveImage()){
     QMessageBox::information(this, tr("File Saved"), tr("The image was saved to the file %1").arg(*side.saveToFileName));
@@ -270,9 +255,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

@@ -1,32 +1,12 @@
-/*
- * 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 _CUSTOMIZESPLASHDIALOG_H_
-#define _CUSTOMIZESPLASHDIALOG_H_
+#ifndef CUSTOMIZESPLASHDIALOG_H
+#define CUSTOMIZESPLASHDIALOG_H
 
 #include <QtWidgets>
 #include "firmwareinterface.h"
 
 namespace Ui
 {
-  class CustomizeSplashDialog;
+  class customizeSplashDialog;
 }
 
 const int WIDTH_TARANIS = 212;
@@ -63,15 +43,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,8 +79,8 @@ private:
   void saveButton_clicked( Side );
   void invertButton_clicked( Side );
 
-  Ui::CustomizeSplashDialog *ui;
+  Ui::customizeSplashDialog *ui;
   enum sideEnum { LEFT, RIGHT };
 };
 
-#endif // _CUSTOMIZESPLASHDIALOG_H_
+#endif // CUSTOMIZESPLASHDIALOG_H

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

@@ -1,23 +1,3 @@
-/*
- * 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 "downloaddialog.h"
 #include "ui_downloaddialog.h"
 #include <QTime>

companion/src/downloaddialog.h

@@ -1,25 +1,5 @@
-/*
- * 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 _DOWNLOADDIALOG_H_
-#define _DOWNLOADDIALOG_H_
+#ifndef DOWNLOADDIALOG_H
+#define DOWNLOADDIALOG_H
 
 #include <QtWidgets>
 #include <QNetworkAccessManager>
@@ -57,4 +37,4 @@ private:
 
 };
 
-#endif // _DOWNLOADDIALOG_H_
+#endif // DOWNLOADDIALOG_H

companion/src/file.cpp

@@ -1,12 +1,7 @@
 /*
- * Copyright (C) OpenTX
+ * Author - Bertrand Songis <bsongis@gmail.com>
  *
- * 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
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,15 +11,17 @@
  * 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 <stdio.h>
 #include <inttypes.h>
 #include <string.h>
 #include <assert.h>
 #include <algorithm>
 #include "eeprominterface.h"
-#include "rlefile.h"
+#include "file.h"
 
 RleFile::RleFile():
 eeprom(NULL),
@@ -44,7 +41,7 @@ eepromFatHeader(NULL)
 #define EEPROM_MAX_FILES      (EEPROM_MAX_ZONES - 1)
 #define FIRST_FILE_AVAILABLE  (1+MAX_MODELS)
 
-void RleFile::EeFsCreate(uint8_t *eeprom, int size, Board::Type board, unsigned int version)
+void RleFile::EeFsCreate(uint8_t *eeprom, int size, BoardEnum board, unsigned int version)
 {
   this->eeprom = eeprom;
   this->eeprom_size = size;
@@ -71,7 +68,7 @@ void RleFile::EeFsCreate(uint8_t *eeprom, int size, Board::Type board, unsigned
     eeFsBlockSize = 64;
     eeFsFirstBlock = 1;
     eeFsBlocksOffset = eeFsSize - eeFsBlockSize;
-    eeFsBlocksMax = 1 + (Boards::getEEpromSize(board)-eeFsSize) / eeFsBlockSize;
+    eeFsBlocksMax = 1 + (EESIZE_TARANIS-eeFsSize)/eeFsBlockSize;
     eeFsLinkSize = sizeof(int16_t);
     memset(eeprom, 0, size);
     eeFsArm->version  = eeFsVersion;
@@ -86,7 +83,7 @@ void RleFile::EeFsCreate(uint8_t *eeprom, int size, Board::Type board, unsigned
   }
   else {
     eeFs = (EeFs *)eeprom;
-    eeFsVersion = (IS_2560(board) || board==Board::BOARD_M128) ? 5 : 4;
+    eeFsVersion = (IS_2560(board) || board==BOARD_M128) ? 5 : 4;
     eeFsBlockSize = 16;
     eeFsLinkSize = 1;
 
@@ -128,7 +125,7 @@ bool RleFile::searchFat()
   uint32_t bestFatIndex = 0;
   for (int i=0; i<EEPROM_ZONE_SIZE/EEPROM_FAT_SIZE; i++) {
     EepromHeader * header = (EepromHeader *)(eeprom+i*EEPROM_FAT_SIZE);
-    if (header->mark == EEPROM_MARK && header->index >= bestFatIndex) {
+    if (header->mark == EEPROM_MARK && (int)header->index >= bestFatIndex) {
       eepromFatHeader = header;
       bestFatIndex = header->index;
     }
@@ -136,7 +133,7 @@ bool RleFile::searchFat()
   return (eepromFatHeader != NULL);
 }
 
-bool RleFile::EeFsOpen(uint8_t *eeprom, int size, Board::Type board)
+bool RleFile::EeFsOpen(uint8_t *eeprom, int size, BoardEnum board)
 {
   this->eeprom = eeprom;
   this->eeprom_size = size;
@@ -154,7 +151,7 @@ bool RleFile::EeFsOpen(uint8_t *eeprom, int size, Board::Type board)
     eeFsLinkSize = sizeof(int16_t);
     eeFsFirstBlock = 1;
     eeFsBlocksOffset = eeFsSize - eeFsBlockSize;
-    eeFsBlocksMax = 1 + (Boards::getEEpromSize(board)-eeFsSize) / eeFsBlockSize;
+    eeFsBlocksMax = 1 + (EESIZE_TARANIS-eeFsSize)/eeFsBlockSize;
     return eeFsArm->mySize == eeFsSize;
   }
   else {
@@ -406,7 +403,7 @@ unsigned int RleFile::readRlc12(uint8_t *buf, unsigned int i_len, bool rlc2)
         qDebug() << "RLC decoding error!";
         return 0;
       }
-
+      
       if (rlc2) {
         if(m_bRlc&0x80){ // if contains high byte
           m_zeroes  =(m_bRlc>>4) & 0x7;

companion/src/file.h

@@ -1,12 +1,9 @@
+// TODO should be rle
+
 /*
- * 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
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,12 +13,10 @@
  * 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.
+ *
  */
-
-// TODO should be rle
-
-#ifndef _RLEFILE_H_
-#define _RLEFILE_H_
+#ifndef file_h
+#define file_h
 
 #include "eeprominterface.h"
 
@@ -90,7 +85,7 @@ class RleFile
   unsigned int  m_err;       //error reasons
   uint16_t      m_size;
 
-  Board::Type board;
+  BoardEnum board;
   unsigned int version;
   uint8_t *eeprom;
   unsigned int eeprom_size;
@@ -125,9 +120,9 @@ public:
 
   RleFile();
 
-  void EeFsCreate(uint8_t *eeprom, int size, Board::Type board, unsigned int version);
+  void EeFsCreate(uint8_t *eeprom, int size, BoardEnum board, unsigned int version);
 
-  bool EeFsOpen(uint8_t *eeprom, int size, Board::Type board);
+  bool EeFsOpen(uint8_t *eeprom, int size, BoardEnum board);
 
   ///open file for reading, no close necessary
   ///for writing use writeRlc() or create()
@@ -170,4 +165,4 @@ public:
 
 unsigned int importRlc(QByteArray & dst, QByteArray & src, unsigned int rlcVersion=2);
 
-#endif // _RLEFILE_H_
+#endif

companion/src/firmwareinterface.cpp

@@ -1,12 +1,7 @@
 /*
- * 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
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,25 +11,40 @@
  * 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 <QtGui>
 #include "hexinterface.h"
 #include "splash.h"
 #include "firmwareinterface.h"
 #include "helpers.h"
-#include "storage.h"
-
-#include <QFile>
 
 #define FW_MARK     "FW"
 #define VERS_MARK   "VERS"
 #define DATE_MARK   "DATE"
 #define TIME_MARK   "TIME"
 #define EEPR_MARK   "EEPR"
-#define FSIZE_MAX   Boards::getFlashSize(Board::BOARD_UNKNOWN)
 
-FirmwareInterface::FirmwareInterface(const QString & filename):
-  flash(FSIZE_MAX, 0),
+int getFileType(const QString &fullFileName)
+{
+  QString suffix = QFileInfo(fullFileName).suffix().toUpper();
+  if (suffix == "HEX")
+    return FILE_TYPE_HEX;
+  else if (suffix == "BIN")
+    return FILE_TYPE_BIN;
+  else if (suffix == "EEPM")
+    return FILE_TYPE_EEPM;
+  else if (suffix == "EEPE")
+    return FILE_TYPE_EEPE;
+  else if (suffix == "XML")
+    return FILE_TYPE_XML;
+  else
+    return 0;
+}
+
+FirmwareInterface::FirmwareInterface(const QString &filename):
+  flash(MAX_FSIZE, 0),
   flashSize(0),
   versionId(0),
   eepromVersion(0),
@@ -49,11 +59,11 @@ FirmwareInterface::FirmwareInterface(const QString & filename):
     QFile file(filename);
     if (file.open(QIODevice::ReadOnly | QIODevice::Text)) { // reading HEX TEXT file
       QTextStream inputStream(&file);
-      flashSize = HexInterface(inputStream).load((uint8_t *)flash.data(), FSIZE_MAX);
+      flashSize = HexInterface(inputStream).load((uint8_t *)flash.data(), MAX_FSIZE);
       file.close();
       if (flashSize == 0) {
         file.open(QIODevice::ReadOnly);
-        flashSize = file.read((char *)flash.data(), FSIZE_MAX);
+        flashSize = file.read((char *)flash.data(), MAX_FSIZE);
       }
     }
   }
@@ -81,7 +91,7 @@ FirmwareInterface::FirmwareInterface(const QString & filename):
     }
 
     versionId = version2index(version);
-    seekSplash();
+    SeekSplash();
     isValidFlag = !version.isEmpty();
   }
 }
@@ -112,25 +122,18 @@ QString FirmwareInterface::seekString(const QString & string)
 QString FirmwareInterface::seekLabel(const QString & label)
 {
   QString result = seekString(label + "\037\033:");
-  if (result.isEmpty()) {
-    result = seekString(label + "\037\075:"); // This is for Horus
-  }
-  if (!result.isEmpty()) {
+  if (!result.isEmpty())
     return result;
-  }
+
   return seekString(label + ":");
 }
 
 QString FirmwareInterface::getFlavour() const
 {
-  if (flavour == "opentx-taranis-x9e")
-    return "opentx-x9e";
-  else if (flavour == "opentx-x9dp" || flavour == "opentx-taranis-plus")
-    return "opentx-x9d+";
-  else if (flavour == "opentx-taranis")
-    return "opentx-x9d";
-  else if (flavour == "opentx-horus")
-    return "opentx-x12s";
+  if (flavour == "opentx-x9dp")
+    return "opentx-taranis-plus";
+  else if (flavour == "opentx-x9d")
+    return "opentx-taranis";
   else
     return flavour;
 }
@@ -138,17 +141,17 @@ QString FirmwareInterface::getFlavour() const
 bool FirmwareInterface::isHardwareCompatible(const FirmwareInterface &previousFirmware) const
 {
   QString newFlavour = getFlavour();
-  if (newFlavour.isEmpty()) {
+  if (newFlavour.isEmpty())
     return true;
-  }
+
   QString previousFlavour = previousFirmware.getFlavour();
-  if (previousFlavour.isEmpty()) {
+  if (previousFlavour.isEmpty())
     return true;
-  }
+
   return (newFlavour == previousFlavour);
 }
 
-bool FirmwareInterface::seekSplash(QByteArray splash)
+bool FirmwareInterface::SeekSplash(QByteArray splash)
 {
   int start = flash.indexOf(splash);
   if (start>0) {
@@ -161,7 +164,7 @@ bool FirmwareInterface::seekSplash(QByteArray splash)
   }
 }
 
-bool FirmwareInterface::seekSplash(QByteArray sps, QByteArray spe, int size)
+bool FirmwareInterface::SeekSplash(QByteArray sps, QByteArray spe, int size)
 {
   int start = 0;
   while (start>=0) {
@@ -187,7 +190,7 @@ bool FirmwareInterface::seekSplash(QByteArray sps, QByteArray spe, int size)
 #define OTX_SPE         "SPE"
 #define OTX_SPE_SIZE    4
 
-void FirmwareInterface::seekSplash()
+void FirmwareInterface::SeekSplash(void) 
 {
   splashSize = 0;
   splashOffset = 0;
@@ -195,45 +198,45 @@ void FirmwareInterface::seekSplash()
   splashHeight = SPLASH_HEIGHT;
   splash_format = QImage::Format_Mono;
 
-  if (seekSplash(QByteArray((const char *)gr9x_splash, sizeof(gr9x_splash))) || seekSplash(QByteArray((const char *)gr9xv4_splash, sizeof(gr9xv4_splash)))) {
+  if (SeekSplash(QByteArray((const char *)gr9x_splash, sizeof(gr9x_splash))) || SeekSplash(QByteArray((const char *)gr9xv4_splash, sizeof(gr9xv4_splash)))) {
     return;
   }
 
-  if (seekSplash(QByteArray((const char *)er9x_splash, sizeof(er9x_splash)))) {
+  if (SeekSplash(QByteArray((const char *)er9x_splash, sizeof(er9x_splash)))) {
     return;
   }
 
-  if (seekSplash(QByteArray((const char *)opentx_splash, sizeof(opentx_splash)))) {
+  if (SeekSplash(QByteArray((const char *)opentx_splash, sizeof(opentx_splash)))) {
     return;
   }
 
-  if (seekSplash(QByteArray((const char *)opentxtaranis_splash, sizeof(opentxtaranis_splash)))) {
+  if (SeekSplash(QByteArray((const char *)opentxtaranis_splash, sizeof(opentxtaranis_splash)))) {
     splashWidth = SPLASHX9D_WIDTH;
     splashHeight = SPLASHX9D_HEIGHT;
     splash_format = QImage::Format_Indexed8;
     return;
   }
 
-  if (seekSplash(QByteArray((const char *)ersky9x_splash, sizeof(ersky9x_splash)))) {
+  if (SeekSplash(QByteArray((const char *)ersky9x_splash, sizeof(ersky9x_splash)))) {
     return;
   }
 
-  if (seekSplash(QByteArray(OTX_SPS_9X, OTX_SPS_SIZE), QByteArray(OTX_SPE, OTX_SPE_SIZE), 1024)) {
+  if (SeekSplash(QByteArray(OTX_SPS_9X, OTX_SPS_SIZE), QByteArray(OTX_SPE, OTX_SPE_SIZE), 1024)) {
     return;
   }
 
-  if (seekSplash(QByteArray(OTX_SPS_TARANIS, OTX_SPS_SIZE), QByteArray(OTX_SPE, OTX_SPE_SIZE), 6784)) {
+  if (SeekSplash(QByteArray(OTX_SPS_TARANIS, OTX_SPS_SIZE), QByteArray(OTX_SPE, OTX_SPE_SIZE), 6784)) {
     splashWidth = SPLASHX9D_WIDTH;
     splashHeight = SPLASHX9D_HEIGHT;
     splash_format = QImage::Format_Indexed8;
     return;
   }
 
-  if (seekSplash(QByteArray(ERSKY9X_SPS, sizeof(ERSKY9X_SPS)), QByteArray(ERSKY9X_SPE, sizeof(ERSKY9X_SPE)), 1030)) {
+  if (SeekSplash(QByteArray(ERSKY9X_SPS, sizeof(ERSKY9X_SPS)), QByteArray(ERSKY9X_SPE, sizeof(ERSKY9X_SPE)), 1030)) {
     return;
   }
 
-  if (seekSplash(QByteArray(ERSPLASH_MARKER, sizeof(ERSPLASH_MARKER)))) {
+  if (SeekSplash(QByteArray(ERSPLASH_MARKER, sizeof(ERSPLASH_MARKER)))) {
     splashOffset += sizeof(ERSPLASH_MARKER);
     splashSize = sizeof(er9x_splash);
   }
@@ -335,20 +338,16 @@ bool FirmwareInterface::isValid()
   return isValidFlag;
 }
 
-unsigned int FirmwareInterface::save(const QString & filename)
+unsigned int FirmwareInterface::save(QString fileName)
 {
-  uint8_t * binflash  = (uint8_t*)malloc(FSIZE_MAX);
-  if (binflash == NULL) {
-    return -1;
-  }
-  memcpy(binflash, flash.constData(), flashSize);
-  QFile file(filename);
+  uint8_t binflash[MAX_FSIZE];
+  memcpy(&binflash, flash.constData(), flashSize);
+  QFile file(fileName);
+  
+  int fileType = getFileType(fileName);
 
-  int fileType = getStorageType(filename);
-
-  if (fileType == STORAGE_TYPE_HEX) {
+  if (fileType == FILE_TYPE_HEX) {
     if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate | QIODevice::Text)) { //reading HEX TEXT file
-      free(binflash);
       return -1;
     }
     QTextStream outputStream(&file);
@@ -357,7 +356,6 @@ unsigned int FirmwareInterface::save(const QString & filename)
   }
   else {
     if (!file.open(QIODevice::ReadWrite | QIODevice::Truncate)) { //reading HEX TEXT file
-      free(binflash);
       return -1;
     }
     file.write((char*)binflash, flashSize);
@@ -365,6 +363,5 @@ unsigned int FirmwareInterface::save(const QString & filename)
 
   file.close();
 
-  free(binflash);
   return flashSize;
 }

companion/src/firmwareinterface.h

@@ -1,13 +1,6 @@
 /*
- * 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
- *
+ * Author - Romolo Manfredini <romolo.manfredini@gmail.com>
+ * 
  * 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.
@@ -16,15 +9,17 @@
  * 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 _FIRMWAREINTERFACE_H_
-#define _FIRMWAREINTERFACE_H_
+#ifndef FIRMWAREINTERFACE_H_
+#define FIRMWAREINTERFACE_H_
 
 #include <QString>
 #include <QImage>
 #include <QByteArray>
 
+#define MAX_FSIZE (512*1024)
 #define SPLASH_WIDTH (128)
 #define SPLASH_HEIGHT (64)
 #define SPLASHX9D_WIDTH (212)
@@ -36,6 +31,14 @@
 #define ERSKY9X_SPE "SPE"
 #define ERSKY9X_OFFSET (7)
 
+#define FILE_TYPE_BIN  1
+#define FILE_TYPE_HEX  2
+#define FILE_TYPE_EEPE 3
+#define FILE_TYPE_EEPM 4
+#define FILE_TYPE_XML  5
+
+int getFileType(const QString &fullFileName);
+
 class FirmwareInterface
 {
   public:
@@ -56,7 +59,7 @@ class FirmwareInterface
     int getSplashWidth();
     uint getSplashHeight();
     QImage::Format getSplashFormat();
-    unsigned int save(const QString & fileName);
+    unsigned int save(QString fileName);
     bool isValid();
 
   private:
@@ -64,9 +67,9 @@ class FirmwareInterface
     uint flashSize;
     QString seekString(const QString & string);
     QString seekLabel(const QString & label);
-    void seekSplash();
-    bool seekSplash(QByteArray sps, QByteArray spe, int size);
-    bool seekSplash(QByteArray splash);
+    void SeekSplash();
+    bool SeekSplash(QByteArray sps, QByteArray spe, int size);
+    bool SeekSplash(QByteArray splash);
     QString filename;
     QString date;
     QString time;
@@ -85,4 +88,4 @@ class FirmwareInterface
     bool isValidFlag;
 };
 
-#endif // _FIRMWAREINTERFACE_H_
+#endif /* FIRMWAREINTERFACE_H_ */

companion/src/firmwares/er9x/er9xeeprom.cpp

@@ -1,23 +1,3 @@
-/*
- * 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 <algorithm>
 #include "er9xeeprom.h"
 #include "helpers.h"
@@ -65,7 +45,7 @@ t_Er9xTrainerData::t_Er9xTrainerData()
 t_Er9xTrainerData::operator TrainerData ()
 {
   TrainerData c9x;
-  for (int i=0; i<CPN_MAX_STICKS; i++) {
+  for (int i=0; i<NUM_STICKS; i++) {
     c9x.calib[i] = calib[i];
     c9x.mix[i] = mix[i];
   }
@@ -81,20 +61,26 @@ Er9xGeneral::operator GeneralSettings ()
 {
   GeneralSettings result;
   result.version = myVers;
-  for (int i=0; i<CPN_MAX_STICKSnPOTS; i++) {
+  for (int i=0; i<NUM_STICKSnPOTS; i++) {
     result.calibMid[i] = calibMid[i];
     result.calibSpanNeg[i] = calibSpanNeg[i];
     result.calibSpanPos[i] = calibSpanPos[i];
   }
 
-  result.currModelIndex = currModel;
+  result.currModel = currModel;
   result.contrast = contrast;
   result.vBatWarn = vBatWarn;
   result.txVoltageCalibration = txVoltageCalibration;
   result.trainer = trainer;
+  result.blightinv=blightinv;
+  result.stickScroll=stickScroll;
+  result.crosstrim=crosstrim;
+  result.hideNameOnSplash=hideNameOnSplash;
+  result.enablePpmsim=enablePpmsim;
 
   result.view = std::min((uint8_t)4, view);
   result.disableThrottleWarning = disableThrottleWarning;
+  result.switchWarning = disableSwitchWarning ? 0 : -1;
   result.disableMemoryWarning = disableMemoryWarning;
 
   switch (beeperVal) {
@@ -117,6 +103,9 @@ Er9xGeneral::operator GeneralSettings ()
   result.preBeep = preBeep;
   result.flashBeep = flashBeep;
   result.splashMode = disableSplashScreen;
+  result.disablePotScroll=(disablePotScroll==1);
+  result.disableBG=(disableBG==1);
+  result.frskyinternalalarm = frskyinternalalarm;
 
   result.backlightMode = 0;
   if (lightSw == 22) {
@@ -137,6 +126,7 @@ Er9xGeneral::operator GeneralSettings ()
   result.speakerPitch = speakerPitch;
   result.hapticStrength = hapticStrength - 3;
   result.speakerMode = speakerMode;
+  result.switchWarningStates =switchWarningStates;
   return result;
 }
 
@@ -383,17 +373,17 @@ t_Er9xModelData::operator ModelData ()
       c9x.moduleData[0].protocol = PULSES_PPM;
       break;
   }
-  c9x.moduleData[0].ppm.frameLength=ppmFrameLength;
+  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
   c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
   c9x.thrTrim = thrTrim;
   c9x.trimInc = trimInc-2;
-  c9x.moduleData[0].ppm.delay = 300 + 50 * ppmDelay;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
   c9x.customFn[0].func = FuncInstantTrim;
   if (trimSw) {
     c9x.customFn[0].swtch = er9xToSwitch(trimSw);
   }
   c9x.beepANACenter = beepANACenter;
-  c9x.moduleData[0].ppm.pulsePol = pulsePol;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
   c9x.extendedLimits = extendedLimits;
   c9x.swashRingData.elevatorWeight = swashInvertELE ? -100 : 100;
   c9x.swashRingData.aileronWeight = swashInvertAIL ? -100 : 100;
@@ -412,8 +402,8 @@ t_Er9xModelData::operator ModelData ()
 
   // expoData
   int e = 0;
-  for (int ch = 0; ch < 4 && e < CPN_MAX_EXPOS; ch++) {
-    for (int dr = 0, pos = 0; dr < 3 && e < CPN_MAX_EXPOS; dr++, pos++) {
+  for (int ch = 0; ch < 4 && e < C9X_MAX_EXPOS; ch++) {
+    for (int dr = 0, pos = 0; dr < 3 && e < C9X_MAX_EXPOS; dr++, pos++) {
       if ((dr == 0 && !expoData[ch].drSw1) || (dr == 1 && !expoData[ch].drSw2))
         dr = 2;
       if (dr == 2 && !expoData[ch].expo[0][0][0] && !expoData[ch].expo[0][0][1] && !expoData[ch].expo[0][1][0] && !expoData[ch].expo[0][1][1])
@@ -436,7 +426,7 @@ t_Er9xModelData::operator ModelData ()
       }
       else {
         c9x.expoData[e].mode = 2;
-        if (e < CPN_MAX_EXPOS - 1) {
+        if (e < C9X_MAX_EXPOS - 1) {
           c9x.expoData[e + 1].swtch = c9x.expoData[e].swtch;
           c9x.expoData[++e].chn = ch;
           c9x.expoData[e].mode = 1;
@@ -450,7 +440,7 @@ t_Er9xModelData::operator ModelData ()
     }
   }
 
-  for (int i=0; i<CPN_MAX_STICKS; i++)
+  for (int i=0; i<NUM_STICKS; i++)
     c9x.flightModeData[0].trim[i] = trim[i];
 
   for (int i=0; i<ER9X_MAX_CURVE5; i++) {

companion/src/firmwares/er9x/er9xeeprom.h

@@ -1,12 +1,7 @@
 /*
- * Copyright (C) OpenTX
+ * Author - Bertrand Songis <bsongis@gmail.com>
  *
- * 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
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,10 +11,10 @@
  * 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 _ER9XEEPROM_H_
-#define _ER9XEEPROM_H_
+#ifndef er9xeeprom_h
+#define er9xeeprom_h
 
 #include <inttypes.h>
 #include "eeprominterface.h"
@@ -34,7 +29,7 @@
 
 #define ER9X_NUM_CHNOUT      16 //number of real outputchannels CH1-CH8
 #define ER9X_NUM_CSW         12 //number of custom switches
-#define CPN_MAX_STICKSnPOTS  7  //number of sticks and pots
+#define NUM_STICKSnPOTS 7  //number of sticks and pots
 #define ER9X_MAX_GVARS 7
 
 #define ER9X_MAX_MODES		4
@@ -59,9 +54,9 @@ PACK(typedef struct t_Er9xTrainerData {
 
 PACK(typedef struct t_Er9xGeneral {
   uint8_t   myVers;
-  int16_t   calibMid[CPN_MAX_STICKSnPOTS];
-  int16_t   calibSpanNeg[CPN_MAX_STICKSnPOTS];
-  int16_t   calibSpanPos[CPN_MAX_STICKSnPOTS];
+  int16_t   calibMid[NUM_STICKSnPOTS];
+  int16_t   calibSpanNeg[NUM_STICKSnPOTS];
+  int16_t   calibSpanPos[NUM_STICKSnPOTS];
   uint16_t  chkSum;
   uint8_t   currModel; //0..15
   uint8_t   contrast;
@@ -136,7 +131,7 @@ PACK(typedef struct t_Er9xLimitData {
 #define MLTPX_REP  2
 
 PACK(typedef struct t_Er9xMixData {
-  uint8_t destCh;            //        1..CPN_MAX_CHNOUT
+  uint8_t destCh;            //        1..C9X_NUM_CHNOUT
   uint8_t srcRaw;            //
   int8_t  weight;
   int8_t  swtch;
@@ -262,4 +257,4 @@ PACK(typedef struct t_Er9xModelData {
   t_Er9xModelData() { memset(this, 0, sizeof(t_Er9xModelData)); }
 }) Er9xModelData;
 
-#endif // _ER9XEEPROM_H_
+#endif

companion/src/firmwares/er9x/er9xinterface.cpp

@@ -1,12 +1,7 @@
 /*
- * 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
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,14 +11,15 @@
  * 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 <iostream>
 #include "er9xinterface.h"
 #include "er9xeeprom.h"
-#include "rlefile.h"
-// #include "appdata.h"
-// #include <iostream>
-#include <bitset>
+#include "simulator/er9xsimulator.h"
+#include "file.h"
+#include "appdata.h"
 
 #define FILE_TYP_GENERAL 1
 #define FILE_TYP_MODEL   2
@@ -32,8 +28,8 @@
 #define FILE_MODEL(n) (1+n)
 
 Er9xInterface::Er9xInterface():
-  EEPROMInterface(Board::BOARD_STOCK),
-  efile(new RleFile())
+EEPROMInterface(BOARD_STOCK),
+efile(new RleFile())
 {
 }
 
@@ -47,6 +43,20 @@ const char * Er9xInterface::getName()
   return "Er9x";
 }
 
+const int Er9xInterface::getEEpromSize()
+{
+  QString avrMCU = g.mcu();
+  if (avrMCU==QString("m128")) {
+    return 2*EESIZE_STOCK;
+  }
+  return EESIZE_STOCK;
+}
+
+const int Er9xInterface::getMaxModels()
+{
+  return 16;
+}
+
 inline void applyStickModeToModel(Er9xModelData & model, unsigned int mode)
 {
   for (int i=0; i<2; i++) {
@@ -79,26 +89,23 @@ inline void applyStickModeToModel(Er9xModelData & model, unsigned int mode)
   model.swashCollectiveSource = applyStickMode(model.swashCollectiveSource, mode);
 }
 
-#if 0
 unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  QDebug dbg = qDebug();
-  dbg.setAutoInsertSpaces(false);
-  dbg << "trying er9x xml import... ";
+  std::cout << "trying er9x xml import... ";
 
   std::bitset<NUM_ERRORS> errors;
 
   Er9xGeneral er9xGeneral;
   memset(&er9xGeneral,0,sizeof(er9xGeneral));
-  if (!loadRadioSettingsDataXML(&doc, &er9xGeneral)) {
+  if(!loadGeneralDataXML(&doc, &er9xGeneral)) {
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
-  }
-  else {
+  } else {
     radioData.generalSettings=er9xGeneral;
-    dbg << "version " << (unsigned int)er9xGeneral.myVers << " ";
+    std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
   }
-  for (int i=0; i<getCapability(Models); i++) {
+  for(int i=0; i<getMaxModels(); i++)
+  {
     Er9xModelData er9xModel;
     memset(&er9xModel,0,sizeof(er9xModel));
     if(loadModelDataXML(&doc, &er9xModel, i)) {
@@ -106,46 +113,43 @@ unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
       radioData.models[i] = er9xModel;
     }
   }
-  dbg << "ok";
+  std::cout << "ok\n";
   errors.set(ALL_OK);
   return errors.to_ulong();
 }
-#endif
 
 unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
-  QDebug dbg = qDebug();
-  dbg.setAutoInsertSpaces(false);
-  dbg << "trying er9x import... ";
+  std::cout << "trying er9x import... ";
 
   std::bitset<NUM_ERRORS> errors;
 
-  if (size != Boards::getEEpromSize(Board::BOARD_STOCK)) {
-    dbg << "wrong size";
+  if (size != getEEpromSize()) {
+    std::cout << "wrong size\n";
     errors.set(WRONG_SIZE);
     return errors.to_ulong();
   }
 
-  if (!efile->EeFsOpen((uint8_t *)eeprom, size, Board::BOARD_STOCK)) {
-    dbg << "wrong file system";
+  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
+    std::cout << "wrong file system\n";
     errors.set(WRONG_FILE_SYSTEM);
     return errors.to_ulong();
   }
-
+    
   efile->openRd(FILE_GENERAL);
   Er9xGeneral er9xGeneral;
 
   if (efile->readRlc1((uint8_t*)&er9xGeneral, 1) != 1) {
-    dbg << "no";
+    std::cout << "no\n";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
   }
 
-  dbg << "version " << (unsigned int)er9xGeneral.myVers << " ";
+  std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
 
   switch(er9xGeneral.myVers) {
     case 3:
-      dbg << "(old gruvin9x) ";
+      std::cout << "(old gruvin9x) ";
     case 4:
 //    case 5:
     case 6:
@@ -155,21 +159,21 @@ unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, i
     case 10:
       break;
     default:
-      dbg << "not er9x";
+      std::cout << "not er9x\n";
       errors.set(NOT_ER9X);
       return errors.to_ulong();
   }
 
   efile->openRd(FILE_GENERAL);
   if (!efile->readRlc1((uint8_t*)&er9xGeneral, sizeof(Er9xGeneral))) {
-    dbg << "ko";
+    std::cout << "ko\n";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
 
   }
   radioData.generalSettings = er9xGeneral;
-
-  for (int i=0; i<getCapability(Models); i++) {
+  
+  for (int i=0; i<getMaxModels(); i++) {
     Er9xModelData er9xModel;
     efile->openRd(FILE_MODEL(i));
     if (!efile->readRlc1((uint8_t*)&er9xModel, sizeof(Er9xModelData))) {
@@ -178,21 +182,29 @@ unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, i
     else {
       applyStickModeToModel(er9xModel, radioData.generalSettings.stickMode+1);
       radioData.models[i] = er9xModel;
-    }
+    } 
   }
 
-  dbg << "ok";
+  std::cout << "ok\n";
   errors.set(ALL_OK);
   return errors.to_ulong();
 }
 
-unsigned long Er9xInterface::loadBackup(RadioData &radioData, const uint8_t *eeprom, int esize, int index)
+unsigned long Er9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
   std::bitset<NUM_ERRORS> errors;
   errors.set(UNKNOWN_ERROR);
   return errors.to_ulong();
 }
 
+int Er9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
+{
+  std::cout << "NO!\n";
+  // TODO an error
+
+  return 0;
+}
+
 int Er9xInterface::getSize(const ModelData &model)
 {
   return 0;
@@ -218,11 +230,11 @@ int Er9xInterface::isAvailable(PulsesProtocol prot, int port)
 
 void Er9xInterface::appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value)
 {
-  QDomElement e = qdoc->createElement(name);
-  QDomText t = qdoc->createTextNode(name);
-  t.setNodeValue(value);
-  e.appendChild(t);
-  pe->appendChild(e);
+    QDomElement e = qdoc->createElement(name);
+    QDomText t = qdoc->createTextNode(name);
+    t.setNodeValue(value);
+    e.appendChild(t);
+    pe->appendChild(e);
 }
 
 void Er9xInterface::appendNumberElement(QDomDocument * qdoc, QDomElement * pe,QString name, int value, bool forceZeroWrite)
@@ -264,15 +276,15 @@ QDomElement Er9xInterface::getModelDataXML(QDomDocument * qdoc, Er9xModelData *
   return md;
 }
 
-bool Er9xInterface::loadRadioSettingsDataXML(QDomDocument * qdoc, Er9xGeneral * tgen)
+bool Er9xInterface::loadGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen)
 {
-  // look for "GENERAL_DATA" tag
+  //look for "GENERAL_DATA" tag
   QDomElement gde = qdoc->elementsByTagName("GENERAL_DATA").at(0).toElement();
 
   if(gde.isNull()) // couldn't find
     return false;
 
-  // load cdata into tgen
+  //load cdata into tgen
   QDomNode n = gde.elementsByTagName("Data").at(0).firstChild();// get all children in Data
   while (!n.isNull()) {
     if (n.isCDATASection()) {
@@ -284,17 +296,17 @@ bool Er9xInterface::loadRadioSettingsDataXML(QDomDocument * qdoc, Er9xGeneral *
     }
     n = n.nextSibling();
   }
-  // check version?
+  //check version?
   return true;
 }
 
 bool Er9xInterface::loadModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum)
 {
-  // look for MODEL_DATA with modelNum attribute.
-  // if modelNum = -1 then just pick the first one
+  //look for MODEL_DATA with modelNum attribute.
+  //if modelNum = -1 then just pick the first one
   QDomNodeList ndl = qdoc->elementsByTagName("MODEL_DATA");
 
-  // cycle through nodes to find correct model number
+  //cycle through nodes to find correct model number
   QDomNode k = ndl.at(0);
   if(modelNum>=0) {
     while(!k.isNull()) {
@@ -305,11 +317,11 @@ bool Er9xInterface::loadModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod,
     }
   }
 
-  if (k.isNull()) // couldn't find
+  if(k.isNull()) // couldn't find
     return false;
 
 
-  // load cdata into tgen
+  //load cdata into tgen
   QDomNode n = k.toElement().elementsByTagName("Data").at(0).firstChild();// get all children in Data
   while (!n.isNull()) {
     if (n.isCDATASection()) {
@@ -321,16 +333,6 @@ bool Er9xInterface::loadModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod,
     }
     n = n.nextSibling();
   }
-  // check version?
+  //check version?
   return true;
 }
-
-int Er9xInterface::getCapability(Capability capability)
-{
-  switch (capability) {
-    case Models:
-      return 16;
-    default:
-      return 0;
-  }
-}

companion/src/firmwares/er9x/er9xinterface.h

@@ -1,12 +1,7 @@
 /*
- * Copyright (C) OpenTX
+ * Author - Bertrand Songis <bsongis@gmail.com>
  *
- * 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
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,15 +11,13 @@
  * 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 _ER9XINTERFACE_H_
-#define _ER9XINTERFACE_H_
-
+#ifndef er9x_interface_h
+#define er9x_interface_h
 #include <QtXml>
 #include "eeprominterface.h"
 #include "er9xeeprom.h"
-
 class RleFile;
 
 class Er9xInterface : public EEPROMInterface
@@ -37,28 +30,27 @@ class Er9xInterface : public EEPROMInterface
 
     virtual const char * getName();
 
+    virtual const int getEEpromSize();
+
+    virtual const int getMaxModels();
+
     virtual unsigned long load(RadioData &, const uint8_t * eeprom, int size);
 
-    virtual unsigned long loadBackup(RadioData &, const uint8_t * eeprom, int esize, int index);
+    virtual unsigned long loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
 
     virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
-    virtual int save(uint8_t * eeprom, const RadioData & radioData, uint8_t version=0, uint32_t variant=0)
-    {
-      return 0;
-    }
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
 
     virtual int getSize(const ModelData &);
 
     virtual int getSize(const GeneralSettings &settings);
 
     virtual int isAvailable(PulsesProtocol proto, int port=0);
-    
-    virtual int getCapability(Capability capability);
 
   protected:
 
-    RleFile * efile;
+    RleFile *efile;
 
   private:
     void appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value);
@@ -71,10 +63,10 @@ class Er9xInterface : public EEPROMInterface
 
     QDomElement getModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum, int mdver); //parse out data to XML format
 
-    bool loadRadioSettingsDataXML(QDomDocument * qdoc, Er9xGeneral * tgen); // get data from XML
+    bool loadGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen); // get data from XML
 
     bool loadModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum = -1); // get data from XML
 
 };
 
-#endif // _ER9XINTERFACE_H_
+#endif

companion/src/firmwares/er9x/simulator/CMakeLists.txt

@@ -0,0 +1,15 @@
+set(ER9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/er9x)
+add_custom_command(
+  OUTPUT ${ER9X_CHECKOUT_DIRECTORY}/er9xsimulator.cpp
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${ER9X_CHECKOUT_DIRECTORY}
+  COMMAND cd ${ER9X_CHECKOUT_DIRECTORY} && svn checkout http://er9x.googlecode.com/svn/trunk/src@790 .
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/er9x/er9xsimulator.cpp ${ER9X_CHECKOUT_DIRECTORY}
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/er9x/er9xsimulator.cpp
+)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}
+)
+
+add_library(er9x-simulator er9xsimulator.cpp)

companion/src/firmwares/er9x/simulator/er9xsimulator.cpp

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

companion/src/firmwares/er9x/simulator/er9xsimulator.h

@@ -0,0 +1,70 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef er9x_simulator_h
+#define er9x_simulator_h
+
+#include "simulatorinterface.h"
+
+class RadioData;
+class Er9xInterface;
+
+class Er9xSimulator : public SimulatorInterface {
+
+  public:
+
+    Er9xSimulator(Er9xInterface *);
+
+    virtual void start(RadioData & radioData, bool tests);
+
+    virtual void stop();
+
+    virtual bool timer10ms();
+
+    virtual uint8_t * getLcd();
+
+    virtual bool lcdChanged(bool & lightEnable);
+
+    virtual void setValues(TxInputs &inputs);
+
+    virtual void getValues(TxOutputs &outputs);
+
+    virtual void setTrim(unsigned int idx, int value);
+
+    virtual void getTrims(Trims & trims);
+
+    virtual unsigned int getPhase() { return 0; }
+
+    virtual const char * getPhaseName(unsigned int phase) { return 0; }
+
+    virtual const char * getError();
+
+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual uint8_t getSensorInstance(uint16_t id, uint8_t defaultValue = 0) { return 0; };
+
+    virtual uint16_t getSensorRatio(uint16_t id) { return 0; };
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
+
+    virtual void setLuaStateReloadPermanentScripts() {};
+
+  protected:
+
+    Er9xInterface * er9xInterface;
+};
+
+#endif

companion/src/firmwares/ersky9x/ersky9xeeprom.cpp

@@ -1,23 +1,3 @@
-/*
- * 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 <algorithm>
 #include "helpers.h"
 #include "ersky9xeeprom.h"
@@ -75,7 +55,7 @@ t_Ersky9xTrainerData::t_Ersky9xTrainerData()
 t_Ersky9xTrainerData::operator TrainerData ()
 {
   TrainerData c9x;
-  for (int i=0; i<CPN_MAX_STICKS; i++) {
+  for (int i=0; i<NUM_STICKS; i++) {
     c9x.calib[i] = calib[i];
     c9x.mix[i] = mix[i];
   }
@@ -93,13 +73,13 @@ Ersky9xGeneral::operator GeneralSettings ()
   
   result.version = myVers;
   
-  for (int i=0; i<CPN_MAX_STICKSnPOTS; i++) {
+  for (int i=0; i<NUM_STICKSnPOTS; i++) {
     result.calibMid[i] = calibMid[i];
     result.calibSpanNeg[i] = calibSpanNeg[i];
     result.calibSpanPos[i] = calibSpanPos[i];
   }
 
-  result.currModelIndex = currModel;
+  result.currModel = currModel;
   result.contrast = contrast;
   result.vBatWarn = vBatWarn;
   result.txVoltageCalibration = txVoltageCalibration;
@@ -120,6 +100,7 @@ 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) {
@@ -142,6 +123,8 @@ Ersky9xGeneral::operator GeneralSettings ()
   result.preBeep = preBeep;
   result.flashBeep = flashBeep;
   result.splashMode = disableSplashScreen;
+  result.disablePotScroll=(disablePotScroll==1);
+  result.disableBG=(disableBG==1);
   result.templateSetup = templateSetup;
   result.PPM_Multiplier = PPM_Multiplier;
   getEEPROMString(result.ownerName, ownerName, sizeof(ownerName));
@@ -149,6 +132,7 @@ Ersky9xGeneral::operator GeneralSettings ()
   result.speakerPitch = speakerPitch;
   result.hapticStrength = hapticStrength - 3;
   result.speakerMode = speakerMode;
+  result.switchWarningStates = switchWarningStates;
   result.speakerVolume = volume;
   result.backlightBright = bright ;
   result.txCurrentCalibration = current_calib;
@@ -521,17 +505,17 @@ t_Ersky9xModelData_v10::operator ModelData ()
       c9x.moduleData[0].protocol = PULSES_PPM;
       break;
   }
-  c9x.moduleData[0].ppm.frameLength=ppmFrameLength;
+  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
   c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
   c9x.thrTrim = thrTrim;
   c9x.trimInc = trimInc-2;
-  c9x.moduleData[0].ppm.delay = 300 + 50 * ppmDelay;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
   c9x.customFn[0].func = FuncInstantTrim;
   if (trimSw) {
     c9x.customFn[0].swtch = er9xToSwitch(trimSw);
   }
   c9x.beepANACenter = beepANACenter;
-  c9x.moduleData[0].ppm.pulsePol = pulsePol;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
   c9x.extendedLimits = extendedLimits;
   c9x.swashRingData.elevatorWeight = swashInvertELE ? -100 : 100;
   c9x.swashRingData.aileronWeight = swashInvertAIL ? -100 : 100;
@@ -546,8 +530,8 @@ t_Ersky9xModelData_v10::operator ModelData ()
 
   // expoData
   int e = 0;
-  for (int ch = 0; ch < 4 && e < CPN_MAX_EXPOS; ch++) {
-    for (int dr = 0, pos = 0; dr < 3 && e < CPN_MAX_EXPOS; dr++, pos++) {
+  for (int ch = 0; ch < 4 && e < C9X_MAX_EXPOS; ch++) {
+    for (int dr = 0, pos = 0; dr < 3 && e < C9X_MAX_EXPOS; dr++, pos++) {
       if ((dr == 0 && !expoData[ch].drSw1) || (dr == 1 && !expoData[ch].drSw2))
         dr = 2;
       if (dr == 2 && !expoData[ch].expo[0][0][0] && !expoData[ch].expo[0][0][1] && !expoData[ch].expo[0][1][0] && !expoData[ch].expo[0][1][1])
@@ -570,7 +554,7 @@ t_Ersky9xModelData_v10::operator ModelData ()
       }
       else {
         c9x.expoData[e].mode = 2;
-        if (e < CPN_MAX_EXPOS - 1) {
+        if (e < C9X_MAX_EXPOS - 1) {
           c9x.expoData[e + 1].swtch = c9x.expoData[e].swtch;
           c9x.expoData[++e].chn = ch;
           c9x.expoData[e].mode = 1;
@@ -584,7 +568,7 @@ t_Ersky9xModelData_v10::operator ModelData ()
     }
   }
 
-  for (int i=0; i<CPN_MAX_STICKS; i++)
+  for (int i=0; i<NUM_STICKS; i++)
     c9x.flightModeData[0].trim[i] = trim[i];
 
   for (int i=0; i<ERSKY9X_MAX_CURVE5; i++) {
@@ -636,17 +620,17 @@ t_Ersky9xModelData_v11::operator ModelData ()
       c9x.moduleData[0].protocol = PULSES_PPM;
       break;
   }
-  c9x.moduleData[0].ppm.frameLength=ppmFrameLength;
+  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
   c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
   c9x.thrTrim = thrTrim;
   c9x.trimInc = trimInc-2;
-  c9x.moduleData[0].ppm.delay = 300 + 50 * ppmDelay;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
   c9x.customFn[0].func = FuncInstantTrim;
   if (trimSw) {
     c9x.customFn[0].swtch = er9xToSwitch(trimSw);
   }
   c9x.beepANACenter = beepANACenter;
-  c9x.moduleData[0].ppm.pulsePol = pulsePol;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
   c9x.extendedLimits = extendedLimits;
   c9x.swashRingData.elevatorWeight = swashInvertELE ? -100 : 100;
   c9x.swashRingData.aileronWeight = swashInvertAIL ? -100 : 100;
@@ -661,8 +645,8 @@ t_Ersky9xModelData_v11::operator ModelData ()
 
   // expoData
   int e = 0;
-  for (int ch = 0; ch < 4 && e < CPN_MAX_EXPOS; ch++) {
-    for (int dr = 0, pos = 0; dr < 3 && e < CPN_MAX_EXPOS; dr++, pos++) {
+  for (int ch = 0; ch < 4 && e < C9X_MAX_EXPOS; ch++) {
+    for (int dr = 0, pos = 0; dr < 3 && e < C9X_MAX_EXPOS; dr++, pos++) {
       if ((dr == 0 && !expoData[ch].drSw1) || (dr == 1 && !expoData[ch].drSw2))
         dr = 2;
       if (dr == 2 && !expoData[ch].expo[0][0][0] && !expoData[ch].expo[0][0][1] && !expoData[ch].expo[0][1][0] && !expoData[ch].expo[0][1][1])
@@ -685,7 +669,7 @@ t_Ersky9xModelData_v11::operator ModelData ()
       }
       else {
         c9x.expoData[e].mode = 2;
-        if (e < CPN_MAX_EXPOS - 1) {
+        if (e < C9X_MAX_EXPOS - 1) {
           c9x.expoData[e + 1].swtch = c9x.expoData[e].swtch;
           c9x.expoData[++e].chn = ch;
           c9x.expoData[e].mode = 1;
@@ -699,7 +683,7 @@ t_Ersky9xModelData_v11::operator ModelData ()
     }
   }
 
-  for (int i=0; i<CPN_MAX_STICKS; i++)
+  for (int i=0; i<NUM_STICKS; i++)
     c9x.flightModeData[0].trim[i] = trim[i];
 
   for (int i=0; i<ERSKY9X_MAX_CURVE5; i++) {

companion/src/firmwares/ersky9x/ersky9xeeprom.h

@@ -1,12 +1,7 @@
 /*
- * Copyright (C) OpenTX
+ * Author - Bertrand Songis <bsongis@gmail.com>
  *
- * 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
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,10 +11,10 @@
  * 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 _ERSKY9XEEPROM_H_
-#define _ERSKY9XEEPROM_H_
+#ifndef ersky9xeeprom_h
+#define ersky9xeeprom_h
 
 #include <inttypes.h>
 #include "eeprominterface.h"
@@ -45,7 +40,7 @@ extern RawSwitch getEr9xTimerMode(int mode);
 #define ERSKY9X_NUM_VOICE	         8
 #define ERSKY9X_MAX_GVARS	         7
 
-#define CPN_MAX_STICKSnPOTS 7  //number of sticks and pots
+#define NUM_STICKSnPOTS 7  //number of sticks and pots
 
 PACK(typedef struct t_Ersky9xTrainerMix {
   uint8_t srcChn:3; //0-7 = ch1-8
@@ -67,9 +62,9 @@ PACK(typedef struct t_Ersky9xTrainerData {
 
 PACK(typedef struct t_Ersky9xGeneral {
   uint8_t   myVers;
-  int16_t   calibMid[CPN_MAX_STICKSnPOTS];
-  int16_t   calibSpanNeg[CPN_MAX_STICKSnPOTS];
-  int16_t   calibSpanPos[CPN_MAX_STICKSnPOTS];
+  int16_t   calibMid[NUM_STICKSnPOTS];
+  int16_t   calibSpanNeg[NUM_STICKSnPOTS];
+  int16_t   calibSpanPos[NUM_STICKSnPOTS];
   uint16_t  chkSum;
   uint8_t   currModel; //0..15
   uint8_t   contrast;
@@ -148,7 +143,7 @@ PACK(typedef struct t_Ersky9xLimitData {
 #define MLTPX_REP  2
 
 PACK(typedef struct t_Ersky9xMixData_v10 {
-  uint8_t destCh;            //        1..CPN_MAX_CHNOUT
+  uint8_t destCh;            //        1..C9X_NUM_CHNOUT
   uint8_t srcRaw;            //
   int8_t  weight;
   int8_t  swtch;
@@ -170,7 +165,7 @@ PACK(typedef struct t_Ersky9xMixData_v10 {
 }) Ersky9xMixData_v10;
 
 PACK(typedef struct t_Ersky9xMixData_v11 {
-  uint8_t destCh;            //        1..CPN_MAX_CHNOUT
+  uint8_t destCh;            //        1..C9X_NUM_CHNOUT
   uint8_t srcRaw;            //
   int8_t  weight;
   int8_t  swtch;
@@ -433,4 +428,4 @@ PACK(typedef struct t_Ersky9xModelData_v11 {
   t_Ersky9xModelData_v11() { memset(this, 0, sizeof(t_Ersky9xModelData_v11)); }
 }) Ersky9xModelData_v11;
 
-#endif // _ERSKY9XEEPROM_H_
+#endif

companion/src/firmwares/ersky9x/ersky9xinterface.cpp

@@ -1,12 +1,7 @@
 /*
- * 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
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,13 +11,14 @@
  * 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 <iostream>
 #include "ersky9xinterface.h"
 #include "ersky9xeeprom.h"
-#include "rlefile.h"
-#include <iostream>
-#include <bitset>
+#include "simulator/ersky9xsimulator.h"
+#include "file.h"
 
 #define FILE_TYP_GENERAL 1
 #define FILE_TYP_MODEL   2
@@ -34,7 +30,7 @@
 #define FILE_TMP      (1+16)
 
 Ersky9xInterface::Ersky9xInterface():
-EEPROMInterface(Board::BOARD_SKY9X),
+EEPROMInterface(BOARD_SKY9X),
 efile(new RleFile())
 {
 }
@@ -49,6 +45,16 @@ const char * Ersky9xInterface::getName()
   return "Ersky9x";
 }
 
+const int Ersky9xInterface::getEEpromSize()
+{
+  return EESIZE_SKY9X;
+}
+
+const int Ersky9xInterface::getMaxModels()
+{
+  return 20;
+}
+
 inline void applyStickModeToModel(Ersky9xModelData_v10 & model, unsigned int mode)
 {
   for (int i=0; i<2; i++) {
@@ -113,77 +119,71 @@ inline void applyStickModeToModel(Ersky9xModelData_v11 & model, unsigned int mod
   model.swashCollectiveSource = applyStickMode(model.swashCollectiveSource, mode);
 }
 
-#if 0
 unsigned long Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  QDebug dbg = qDebug();
-  dbg.setAutoInsertSpaces(false);
-  dbg << "trying ersky9x xml import... ";
+  std::cout << "trying ersky9x xml import... ";
 
   std::bitset<NUM_ERRORS> errors;
 
   Ersky9xGeneral ersky9xGeneral;
   memset(&ersky9xGeneral,0,sizeof(ersky9xGeneral));
-  if(!loadRadioSettingsDataXML(&doc, &ersky9xGeneral)) {
+  if(!loadGeneralDataXML(&doc, &ersky9xGeneral)) {
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
   }
   else {
     radioData.generalSettings=ersky9xGeneral;
-    dbg << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
+    std::cout << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
   }
-  for(int i=0; i<getCapability(Models); i++) {
+  for(int i=0; i<getMaxModels(); i++) {
     if (ersky9xGeneral.myVers == 10) {
       if (!loadModelDataXML<Ersky9xModelData_v10>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
-        dbg << "ko";
+        std::cout << "ko\n";
         errors.set(UNKNOWN_ERROR);
         return errors.to_ulong();
       }
     }
     else {
       if (!loadModelDataXML<Ersky9xModelData_v11>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
-        dbg << "ko";
+        std::cout << "ko\n";
         errors.set(UNKNOWN_ERROR);
         return errors.to_ulong();
       }
     }
   }
-  dbg << "ok";
+  std::cout << "ok\n";
   errors.set(ALL_OK);
   return errors.to_ulong();
 }
-#endif
 
 unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
-  QDebug dbg = qDebug();
-  dbg.setAutoInsertSpaces(false);
-  dbg << "trying ersky9x import... ";
+  std::cout << "trying ersky9x import... ";
 
   std::bitset<NUM_ERRORS> errors;
 
-  if (size != Boards::getEEpromSize(Board::BOARD_SKY9X)) {
-    dbg << "wrong size";
+  if (size != EESIZE_SKY9X) {
+    std::cout << "wrong size\n";
     errors.set(WRONG_SIZE);
     return errors.to_ulong();
   }
 
-  if (!efile->EeFsOpen((uint8_t *)eeprom, size, Board::BOARD_SKY9X)) {
-    dbg << "wrong file system";
+  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_SKY9X)) {
+    std::cout << "wrong file system\n";
     errors.set(WRONG_FILE_SYSTEM);
     return errors.to_ulong();
   }
-
+    
   efile->openRd(FILE_GENERAL);
   Ersky9xGeneral ersky9xGeneral;
 
   if (efile->readRlc2((uint8_t*)&ersky9xGeneral, 1) != 1) {
-    dbg << "no";
+    std::cout << "no\n";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
   }
 
-  dbg << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
+  std::cout << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
 
   switch(ersky9xGeneral.myVers) {
     case 10:
@@ -191,26 +191,26 @@ unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom
     case 11:
       break;
     default:
-      dbg << "not ersky9x";
+      std::cout << "not ersky9x\n";
       errors.set(NOT_ERSKY9X);
       return errors.to_ulong();
   }
   efile->openRd(FILE_GENERAL);
   if (!efile->readRlc2((uint8_t*)&ersky9xGeneral, sizeof(Ersky9xGeneral))) {
-    dbg << "ko";
+    std::cout << "ko\n";
     errors.set(UNKNOWN_ERROR);
     return errors.to_ulong();
   }
   radioData.generalSettings = ersky9xGeneral;
-
-  for (int i=0; i<getCapability(Models); i++) {
+  
+  for (int i=0; i<getMaxModels(); 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);
+    size=efile->readRlc2(buffer, 4096);
     if (!size) {
       radioData.models[i].clear();
     }
@@ -226,21 +226,29 @@ unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom
         applyStickModeToModel(ersky9xModel, radioData.generalSettings.stickMode+1);
         radioData.models[i] = ersky9xModel;
       }
-    }
+    } 
   }
 
-  dbg << "ok";
+  std::cout << "ok\n";
   errors.set(ALL_OK);
   return errors.to_ulong();
 }
 
-unsigned long Ersky9xInterface::loadBackup(RadioData &radioData, const uint8_t *eeprom, int esize, int index)
+unsigned long Ersky9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
   std::bitset<NUM_ERRORS> errors;
   errors.set(UNKNOWN_ERROR);
   return errors.to_ulong();
 }
 
+int Ersky9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
+{
+  std::cout << "NO!\n";
+  // TODO an error
+
+  return 0;
+}
+
 int Ersky9xInterface::getSize(const ModelData & model)
 {
   return 0;
@@ -312,15 +320,15 @@ QDomElement Ersky9xInterface::getModelDataXML(QDomDocument * qdoc, Ersky9xModelD
   return md;
 }
 
-bool Ersky9xInterface::loadRadioSettingsDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen)
+bool Ersky9xInterface::loadGeneralDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen)
 {
-  // look for "GENERAL_DATA" tag
+  //look for "GENERAL_DATA" tag
   QDomElement gde = qdoc->elementsByTagName("GENERAL_DATA").at(0).toElement();
 
   if(gde.isNull()) // couldn't find
     return false;
 
-  // load cdata into tgen
+  //load cdata into tgen
   QDomNode n = gde.elementsByTagName("Data").at(0).firstChild();// get all children in Data
   while (!n.isNull()) {
     if (n.isCDATASection()) {
@@ -332,7 +340,7 @@ bool Ersky9xInterface::loadRadioSettingsDataXML(QDomDocument * qdoc, Ersky9xGene
     }
     n = n.nextSibling();
   }
-  // check version?
+  //check version?
   return true;
 }
 
@@ -342,11 +350,11 @@ bool Ersky9xInterface::loadModelDataXML(QDomDocument * qdoc, ModelData *model, i
   T ersky9xModel;
   memset(&ersky9xModel, 0, sizeof(ersky9xModel));
 
-  // look for MODEL_DATA with modelNum attribute.
+  //look for MODEL_DATA with modelNum attribute.
   //if modelNum = -1 then just pick the first one
   QDomNodeList ndl = qdoc->elementsByTagName("MODEL_DATA");
 
-  // cycle through nodes to find correct model number
+  //cycle through nodes to find correct model number
   QDomNode k = ndl.at(0);
   if (modelNum>=0) {
     while(!k.isNull()) {
@@ -360,7 +368,7 @@ bool Ersky9xInterface::loadModelDataXML(QDomDocument * qdoc, ModelData *model, i
   if (k.isNull()) // couldn't find
     return false;
 
-  // load cdata into tgen
+  //load cdata into tgen
   QDomNode n = k.toElement().elementsByTagName("Data").at(0).firstChild();// get all children in Data
   while (!n.isNull()) {
     if (n.isCDATASection()) {
@@ -377,13 +385,3 @@ bool Ersky9xInterface::loadModelDataXML(QDomDocument * qdoc, ModelData *model, i
   *model = ersky9xModel;
   return true;
 }
-
-int Ersky9xInterface::getCapability(Capability capability)
-{
-  switch (capability) {
-    case Models:
-      return 20;
-    default:
-      return 0;
-  }
-}

companion/src/firmwares/ersky9x/ersky9xinterface.h

@@ -1,12 +1,7 @@
 /*
- * 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
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,15 +11,13 @@
  * 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 _ERSKY9XINTERFACE_H_
-#define _ERSKY9XINTERFACE_H_
-
+#ifndef ersky9x_interface_h
+#define ersky9x_interface_h
 #include <QtXml>
 #include "eeprominterface.h"
 #include "ersky9xeeprom.h"
-
 class RleFile;
 
 class Ersky9xInterface : public EEPROMInterface
@@ -37,27 +30,27 @@ class Ersky9xInterface : public EEPROMInterface
 
     virtual const char * getName();
     
-    
+    virtual const int  getEEpromSize();
+
+    virtual const int getMaxModels();
+
     virtual unsigned long load(RadioData &, const uint8_t * eeprom, int size);
 
-    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)
-    {
-      return 0;
-    }
+    virtual unsigned long loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
 
     virtual int getSize(const ModelData &);
     
     virtual int getSize(const GeneralSettings & settings);
 
     virtual int isAvailable(PulsesProtocol proto, int port=0);
-    
-    virtual int getCapability(Capability capability);
 
   protected:
 
-    RleFile * efile;
+    RleFile *efile;
 
   private:
     void appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value);
@@ -70,11 +63,11 @@ class Ersky9xInterface : public EEPROMInterface
     
     QDomElement getModelDataXML(QDomDocument * qdoc, Ersky9xModelData_v11 * tmod, int modelNum, int mdver); //parse out data to XML format
     
-    bool loadRadioSettingsDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen); // get data from XML
+    bool loadGeneralDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen); // get data from XML
     
     template <class T>
     bool loadModelDataXML(QDomDocument * qdoc, ModelData * model, int modelNum, int stickMode); // get data from XML
 
 };
 
-#endif // _ERSKY9XINTERFACE_H_
+#endif

companion/src/firmwares/ersky9x/simulator/CMakeLists.txt

@@ -0,0 +1,15 @@
+set(ERSKY9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/ersky9x)
+add_custom_command(
+  OUTPUT ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${ERSKY9X_CHECKOUT_DIRECTORY}
+  COMMAND cd ${ERSKY9X_CHECKOUT_DIRECTORY} && svn checkout http://ersky9x.googlecode.com/svn/trunk/src@170 .
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp ${ERSKY9X_CHECKOUT_DIRECTORY}
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/ersky9x/ersky9xsimulator.cpp
+)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}
+)
+
+add_library(ersky9x-simulator ersky9xsimulator.cpp)

companion/src/firmwares/ersky9x/simulator/ersky9xsimulator.cpp

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

companion/src/firmwares/ersky9x/simulator/ersky9xsimulator.h

@@ -0,0 +1,70 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef ersky9x_simulator_h
+#define ersky9x_simulator_h
+
+#include "simulatorinterface.h"
+
+class RadioData;
+class Ersky9xInterface;
+
+class Ersky9xSimulator : public SimulatorInterface {
+
+  public:
+
+    Ersky9xSimulator(Ersky9xInterface *);
+
+    virtual void start(RadioData & radioData, bool tests);
+
+    virtual void stop();
+
+    virtual bool timer10ms();
+
+    virtual uint8_t * getLcd();
+
+    virtual bool lcdChanged(bool & lightEnable);
+
+    virtual void setValues(TxInputs &inputs);
+
+    virtual void getValues(TxOutputs &outputs);
+
+    virtual void setTrim(unsigned int idx, int value);
+
+    virtual void getTrims(Trims & trims);
+
+    virtual unsigned int getPhase() { return 0; }
+
+    virtual const char * getPhaseName(unsigned int phase) { return 0; }
+
+    virtual const char * getError();
+
+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual uint8_t getSensorInstance(uint16_t id, uint8_t defaultValue = 0) { return 0; };
+
+    virtual uint16_t getSensorRatio(uint16_t id) { return 0; };
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
+
+    virtual void setLuaStateReloadPermanentScripts() {};
+
+  protected:
+
+    Ersky9xInterface * ersky9xInterface;
+};
+
+#endif

companion/src/firmwares/gruvin9x/gruvin9xeeprom.cpp

@@ -0,0 +1,729 @@
+#include <stdlib.h>
+#include <algorithm>
+#include "helpers.h"
+#include "gruvin9xeeprom.h"
+#include <QObject>
+
+#define EEPROM_VER       106
+
+extern void getEEPROMZString(char *dst, const char *src, int size);
+
+RawSwitch gruvin9xToSwitch(int8_t sw)
+{
+  if (sw == 0)
+    return RawSwitch(SWITCH_TYPE_NONE);
+  else if (sw <= 9)
+    return RawSwitch(SWITCH_TYPE_SWITCH, sw);
+  else
+    return RawSwitch(SWITCH_TYPE_VIRTUAL, sw > 0 ? sw-9 : sw+9);
+}
+
+t_Gruvin9xTrainerMix_v103::operator TrainerMix()
+{
+  TrainerMix c9x;
+  c9x.src = srcChn;
+  c9x.swtch = gruvin9xToSwitch(swtch);
+  c9x.weight = (25 * studWeight) / 8;
+  c9x.mode = mode;
+  return c9x;
+}
+
+t_Gruvin9xTrainerMix_v104::operator TrainerMix()
+{
+  TrainerMix c9x;
+  c9x.src = srcChn;
+  c9x.weight = studWeight;
+  c9x.mode = mode;
+  return c9x;
+}
+
+t_Gruvin9xTrainerData_v103::operator TrainerData ()
+{
+  TrainerData c9x;
+  for (int i=0; i<NUM_STICKS; i++) {
+    c9x.calib[i] = calib[i];
+    c9x.mix[i] = mix[i];
+  }
+  return c9x;
+}
+
+t_Gruvin9xTrainerData_v104::operator TrainerData ()
+{
+  TrainerData c9x;
+  for (int i=0; i<NUM_STICKS; i++) {
+    c9x.calib[i] = calib[i];
+    c9x.mix[i] = mix[i];
+  }
+  return c9x;
+}
+
+Gruvin9xGeneral_v103::operator GeneralSettings ()
+{
+  GeneralSettings result;
+
+  for (int i=0; i<NUM_STICKS+BOARD_9X_NUM_POTS; i++) {
+    result.calibMid[i] = calibMid[i];
+    result.calibSpanNeg[i] = calibSpanNeg[i];
+    result.calibSpanPos[i] = calibSpanPos[i];
+  }
+
+  result.currModel = currModel;
+  result.contrast = contrast;
+  result.vBatWarn = vBatWarn;
+  result.txVoltageCalibration = txVoltageCalibration;
+
+  result.backlightMode = 0;
+  if (lightSw == 22) {
+    result.backlightMode = 4;
+  }
+  else if (lightAutoOff) {
+    result.backlightMode |= 1;
+    result.backlightDelay = lightAutoOff;
+  }
+
+  result.trainer = trainer;
+  result.view = view;
+  result.disableThrottleWarning = disableThrottleWarning;
+  result.switchWarning = switchWarning;
+
+  switch (beeperVal) {
+    case 0:
+      result.beeperMode = GeneralSettings::BEEPER_QUIET;
+      break;
+    case 1:
+      result.beeperMode = GeneralSettings::BEEPER_NOKEYS;
+      break;
+    default:
+      result.beeperMode = GeneralSettings::BEEPER_ALL;
+      result.beeperLength = beeperVal - 4;
+      break;
+  }
+
+  result.disableMemoryWarning = disableMemoryWarning;
+  result.disableAlarmWarning = disableAlarmWarning;
+  result.stickMode = stickMode;
+  result.inactivityTimer = inactivityTimer;
+  result.minuteBeep = minuteBeep;
+  result.preBeep = preBeep;
+  result.flashBeep = flashBeep;
+  result.splashMode = disableSplashScreen;
+  result.enableTelemetryAlarm = enableTelemetryAlarm;
+  result.templateSetup = templateSetup;
+  result.PPM_Multiplier = PPM_Multiplier;
+  // TODO frskyRssiAlarms[2];
+  return result;
+}
+
+Gruvin9xGeneral_v104::operator GeneralSettings ()
+{
+  GeneralSettings result;
+
+  for (int i=0; i<NUM_STICKS+BOARD_9X_NUM_POTS; i++) {
+    result.calibMid[i] = calibMid[i];
+    result.calibSpanNeg[i] = calibSpanNeg[i];
+    result.calibSpanPos[i] = calibSpanPos[i];
+  }
+
+  result.currModel = currModel;
+  result.contrast = contrast;
+  result.vBatWarn = vBatWarn;
+  result.txVoltageCalibration = txVoltageCalibration;
+
+  result.backlightMode = 0;
+  if (lightSw == 22) {
+    result.backlightMode = 4;
+  }
+  else if (lightAutoOff) {
+    result.backlightMode |= 1;
+    result.backlightDelay = lightAutoOff;
+  }
+
+  result.trainer = trainer;
+  result.view = view;
+  result.disableThrottleWarning = disableThrottleWarning;
+  result.switchWarning = switchWarning;
+  result.beeperMode = (GeneralSettings::BeeperMode)beeperVal;
+  result.disableMemoryWarning = disableMemoryWarning;
+  result.disableAlarmWarning = disableAlarmWarning;
+  result.stickMode = stickMode;
+  result.inactivityTimer = inactivityTimer;
+  result.minuteBeep = minuteBeep;
+  result.preBeep = preBeep;
+  result.flashBeep = flashBeep;
+  result.splashMode = disableSplashScreen;
+  result.enableTelemetryAlarm = enableTelemetryAlarm;
+  result.templateSetup = templateSetup;
+  result.PPM_Multiplier = PPM_Multiplier;
+  // TODO frskyRssiAlarms[2];
+  return result;
+}
+
+t_Gruvin9xExpoData::t_Gruvin9xExpoData()
+{
+  memset(this, 0, sizeof(t_Gruvin9xExpoData));
+}
+
+t_Gruvin9xExpoData::operator ExpoData ()
+{
+  ExpoData c9x;
+  c9x.mode = mode;
+  c9x.chn = chn;
+  c9x.swtch = gruvin9xToSwitch(swtch);
+  if (negPhase) {
+    c9x.flightModes= 1 << (phase -1);
+  } else if (phase==0) {
+    c9x.flightModes=0;
+  } else {
+    c9x.flightModes=63;
+    c9x.flightModes &= ~(1 << (phase -1));
+  }  
+  c9x.weight = weight;
+  if (expo) {
+    c9x.curve.type = CurveReference::CURVE_REF_EXPO;
+    c9x.curve.value = expo;
+  }
+  else if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
+  }
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
+  return c9x;
+}
+
+t_Gruvin9xLimitData::t_Gruvin9xLimitData()
+{
+  memset(this, 0, sizeof(t_Gruvin9xLimitData));
+}
+
+t_Gruvin9xLimitData::operator LimitData ()
+{
+  LimitData c9x;
+  c9x.min = 10*(min-100);
+  c9x.max = 10*(max+100);
+  c9x.revert = revert;
+  c9x.offset = offset;
+  return c9x;
+}
+
+t_Gruvin9xMixData::t_Gruvin9xMixData()
+{
+  memset(this, 0, sizeof(t_Gruvin9xMixData));
+}
+
+t_Gruvin9xMixData::operator MixData ()
+{
+  MixData c9x;
+  c9x.destCh = destCh;
+  c9x.weight = weight;
+  c9x.swtch = gruvin9xToSwitch(swtch);
+
+  if (srcRaw == 0) {
+    c9x.srcRaw = RawSource(SOURCE_TYPE_NONE);
+  }
+  else if (srcRaw <= 7) {
+    c9x.srcRaw = RawSource(SOURCE_TYPE_STICK, srcRaw-1);
+  }
+  else if (srcRaw == 8) {
+    c9x.srcRaw = RawSource(SOURCE_TYPE_MAX);
+  }
+  else if (srcRaw == 9) {
+    if (swtch < 0) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_SWITCH, -swtch - 1);
+      c9x.weight = -weight;
+    }
+    else {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_SWITCH, swtch - 1);
+    }
+    if (mltpx != MLTPX_REP)
+      c9x.swtch = RawSwitch(SWITCH_TYPE_NONE);
+  }
+  else if (srcRaw <= 12) {
+    c9x.srcRaw = RawSource(SOURCE_TYPE_CYC, srcRaw-10);
+  }
+  else if (srcRaw <= 20) {
+    c9x.srcRaw = RawSource(SOURCE_TYPE_PPM, srcRaw-13);
+  }
+  else {
+    c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-21);
+  }
+
+  c9x.delayUp = delayUp;
+  c9x.delayDown = delayDown;
+  c9x.speedUp = speedUp;
+  c9x.speedDown = speedDown;
+  c9x.carryTrim = carryTrim;
+  c9x.mltpx = (MltpxValue)mltpx;
+  c9x.mixWarn = mixWarn;
+  c9x.sOffset = sOffset;
+
+  if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
+  }
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
+
+  return c9x;
+}
+
+RawSource gruvin9xToSource(int8_t value)
+{
+  if (value == 0) {
+    return RawSource(SOURCE_TYPE_NONE);
+  }
+  else if (value <= 7) {
+    return RawSource(SOURCE_TYPE_STICK, value - 1);
+  }
+  else if (value == 8) {
+    return RawSource(SOURCE_TYPE_MAX);
+  }
+  else if (value == 9) {
+    return RawSource(SOURCE_TYPE_MAX);
+  }
+  else if (value <= 12) {
+    return RawSource(SOURCE_TYPE_CYC, value-10);
+  }
+  else if (value <= 20) {
+    return RawSource(SOURCE_TYPE_PPM, value-13);
+  }
+  else if (value <= 36) {
+    return RawSource(SOURCE_TYPE_CH, value-21);
+  }
+  else {
+    return RawSource(SOURCE_TYPE_TELEMETRY, value-36);
+  }
+}
+
+Gruvin9xLogicalSwitchData::operator LogicalSwitchData ()
+{
+  LogicalSwitchData c9x;
+  c9x.func = func;
+  c9x.val1 = v1;
+  c9x.val2 = v2;
+
+  if ((c9x.func >= LS_FN_VPOS && c9x.func <= LS_FN_ANEG) || c9x.func >= LS_FN_EQUAL) {
+    c9x.val1 = gruvin9xToSource(v1).toValue();
+  }
+
+  if (c9x.func >= LS_FN_EQUAL) {
+    c9x.val2 = gruvin9xToSource(v2).toValue();
+  }
+
+  if (c9x.func >= LS_FN_AND && c9x.func <= LS_FN_XOR) {
+    c9x.val1 = gruvin9xToSwitch(v1).toValue();
+    c9x.val2 = gruvin9xToSwitch(v2).toValue();
+  }
+
+  return c9x;
+}
+
+Gruvin9xCustomFunctionData::operator CustomFunctionData ()
+{
+  CustomFunctionData c9x;
+  c9x.swtch = gruvin9xToSwitch(swtch);
+  c9x.func = (AssignFunc)(func + G9X_NUM_CHNOUT);
+  return c9x;
+}
+
+t_Gruvin9xSwashRingData::t_Gruvin9xSwashRingData()
+{
+  memset(this, 0, sizeof(t_Gruvin9xSwashRingData));
+}
+
+t_Gruvin9xSwashRingData::operator SwashRingData ()
+{
+  SwashRingData c9x;
+  c9x.elevatorWeight = invertELE ? -100 : 100;
+  c9x.aileronWeight = invertAIL ? -100 : 100;
+  c9x.collectiveWeight = invertCOL ? -100 : 100;
+  c9x.type = type;
+  c9x.collectiveSource = gruvin9xToSource(collectiveSource);
+  c9x.value = value;
+  return c9x;
+}
+
+t_Gruvin9xFlightModeData_v102::operator FlightModeData ()
+{
+  FlightModeData c9x;
+  for (int i=0; i<NUM_STICKS; i++)
+    c9x.trim[i] = trim[i];
+  c9x.swtch = gruvin9xToSwitch(swtch);
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  c9x.fadeIn = fadeIn;
+  c9x.fadeOut = fadeOut;
+  return c9x;
+}
+
+t_Gruvin9xFlightModeData_v106::operator FlightModeData ()
+{
+  FlightModeData c9x;
+  for (int i=0; i<NUM_STICKS; i++)
+    c9x.trim[i] = (((int16_t)trim[i]) << 2) + ((trim_ext >> (2*i)) & 0x03);
+  c9x.swtch = gruvin9xToSwitch(swtch);
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  c9x.fadeIn = fadeIn;
+  c9x.fadeOut = fadeOut;
+  return c9x;
+}
+
+extern RawSwitch getEr9xTimerMode(int mode);
+
+t_Gruvin9xTimerData::operator TimerData ()
+{
+  TimerData c9x;
+  c9x.mode = getEr9xTimerMode(mode);
+  c9x.val = val;
+  return c9x;
+}
+
+t_Gruvin9xFrSkyChannelData::t_Gruvin9xFrSkyChannelData()
+{
+  memset(this, 0, sizeof(t_Gruvin9xFrSkyChannelData));
+}
+
+t_Gruvin9xFrSkyChannelData::operator FrSkyChannelData ()
+{
+  FrSkyChannelData c9x;
+  c9x.ratio = ratio;
+  c9x.alarms[0].value = alarms_value[0];
+  c9x.alarms[0].level =  alarms_level & 3;
+  c9x.alarms[0].greater = alarms_greater & 1;
+  c9x.alarms[1].value = alarms_value[1];
+  c9x.alarms[1].level =  (alarms_level >> 2) & 3;
+  c9x.alarms[1].greater = (alarms_greater >> 1) & 1;
+  c9x.type = type;
+  return c9x;
+}
+
+t_Gruvin9xFrSkyData::t_Gruvin9xFrSkyData()
+{
+  memset(this, 0, sizeof(t_Gruvin9xFrSkyData));
+}
+
+t_Gruvin9xFrSkyData::operator FrSkyData ()
+{
+  FrSkyData c9x;
+  c9x.channels[0] = channels[0];
+  c9x.channels[1] = channels[1];
+  return c9x;
+}
+
+t_Gruvin9xModelData_v102::operator ModelData ()
+{
+  ModelData c9x;
+  c9x.used = true;
+  getEEPROMString(c9x.name, name, sizeof(name));
+  c9x.timers[0] = timer1;
+  c9x.timers[1] = timer2;
+
+  switch(protocol) {
+    case 1:
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = PULSES_DSM2;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = PULSES_SILV_A;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = PULSES_SILV_B;
+      break;
+    case 5:
+      c9x.moduleData[0].protocol = PULSES_SILV_C;
+      break;
+    case 6:
+      c9x.moduleData[0].protocol = PULSES_CTP1009;
+      break;
+    default:
+      c9x.moduleData[0].protocol = PULSES_PPM;
+      break;
+  }
+  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
+  c9x.thrTrim = thrTrim;
+  c9x.trimInc = trimInc-2;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.beepANACenter = beepANACenter;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.extendedLimits = extendedLimits;
+  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++)
+    c9x.flightModeData[i] = flightModeData[i];
+  for (int i=0; i<G9X_MAX_MIXERS; i++)
+    c9x.mixData[i] = mixData[i];
+  for (int i=0; i<G9X_NUM_CHNOUT; i++)
+    c9x.limitData[i] = limitData[i];
+  for (int i=0; i<G9X_MAX_EXPOS; i++)
+    c9x.expoData[i] = expoData[i];
+
+  for (int i=0; i<G9X_MAX_CURVE5; i++) {
+    c9x.curves[i].count = 5;
+    for (int j = 0; j < 5; j++) {
+      c9x.curves[i].points[j].x = -100 + 50 * i;
+      c9x.curves[i].points[j].y = curves5[i][j];
+    }
+  }
+  for (int i=0; i<G9X_MAX_CURVE9; i++) {
+    c9x.curves[G9X_MAX_CURVE5 + i].count = 9;
+    for (int j = 0; j < 9; j++) {
+      c9x.curves[G9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
+      c9x.curves[G9X_MAX_CURVE5 + i].points[j].y = curves9[i][j];
+    }
+  }
+
+  for (int i=0; i<G9X_NUM_CSW; i++)
+    c9x.logicalSw[i] = logicalSw[i];
+  // for (int i=0; i<G9X_NUM_CHNOUT; i++)
+  //  c9x.safetySw[i] = safetySw[i];
+  c9x.swashRingData = swashR;
+  c9x.frsky = frsky;
+  return c9x;
+}
+
+t_Gruvin9xModelData_v103::operator ModelData ()
+{
+  ModelData c9x;
+  c9x.used = true;
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  c9x.timers[0] = timer1;
+  c9x.timers[1] = timer2;
+  switch(protocol) {
+    case 1:
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = PULSES_DSM2;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = PULSES_SILV_A;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = PULSES_SILV_B;
+      break;
+    case 5:
+      c9x.moduleData[0].protocol = PULSES_SILV_C;
+      break;
+    case 6:
+      c9x.moduleData[0].protocol = PULSES_CTP1009;
+      break;
+    default:
+      c9x.moduleData[0].protocol = PULSES_PPM;
+      break;
+  }
+  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
+  c9x.thrTrim = thrTrim;
+  c9x.trimInc = trimInc-2;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.beepANACenter = beepANACenter;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.extendedLimits = extendedLimits;
+  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++)
+    c9x.flightModeData[i] = flightModeData[i];
+  for (int i=0; i<G9X_MAX_MIXERS; i++)
+    c9x.mixData[i] = mixData[i];
+  for (int i=0; i<G9X_NUM_CHNOUT; i++)
+    c9x.limitData[i] = limitData[i];
+  for (int i=0; i<G9X_MAX_EXPOS; i++)
+    c9x.expoData[i] = expoData[i];
+
+  for (int i=0; i<G9X_MAX_CURVE5; i++) {
+    c9x.curves[i].count = 5;
+    for (int j = 0; j < 5; j++) {
+      c9x.curves[i].points[j].x = -100 + 50 * i;
+      c9x.curves[i].points[j].y = curves5[i][j];
+    }
+  }
+  for (int i=0; i<G9X_MAX_CURVE9; i++) {
+    c9x.curves[G9X_MAX_CURVE5 + i].count = 9;
+    for (int j = 0; j < 9; j++) {
+      c9x.curves[G9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
+      c9x.curves[G9X_MAX_CURVE5 + i].points[j].y = curves9[i][j];
+    }
+  }
+
+  for (int i=0; i<G9X_NUM_CSW; i++)
+    c9x.logicalSw[i] = logicalSw[i];
+  // for (int i=0; i<G9X_NUM_CHNOUT; i++)
+  //   c9x.safetySw[i] = safetySw[i];
+  c9x.swashRingData = swashR;
+  c9x.frsky = frsky;
+  return c9x;
+}
+
+t_Gruvin9xModelData_v105::operator ModelData ()
+{
+  ModelData c9x;
+  c9x.used = true;
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  c9x.timers[0] = timer1;
+  c9x.timers[1] = timer2;
+  switch(protocol) {
+    case 1:
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = PULSES_DSM2;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = PULSES_SILV_A;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = PULSES_SILV_B;
+      break;
+    case 5:
+      c9x.moduleData[0].protocol = PULSES_SILV_C;
+      break;
+    case 6:
+      c9x.moduleData[0].protocol = PULSES_CTP1009;
+      break;
+    default:
+      c9x.moduleData[0].protocol = PULSES_PPM;
+      break;
+  }
+  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
+  c9x.thrTrim = thrTrim;
+  c9x.trimInc = trimInc-2;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.beepANACenter = beepANACenter;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.extendedLimits = extendedLimits;
+  c9x.extendedTrims = extendedTrims;
+  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++) {
+    c9x.flightModeData[i] = flightModeData[i];
+    for (int j=0; j<NUM_STICKS; j++) {
+      if (flightModeData[i].trim[j] > 125) {
+        c9x.flightModeData[i].trimRef[j] = 0;
+        c9x.flightModeData[i].trim[j] = 0;
+      }
+      else if (flightModeData[i].trim[j] < -125) {
+        c9x.flightModeData[i].trimRef[j] = 129 + flightModeData[i].trim[j];
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
+      }
+      else {
+        c9x.flightModeData[i].trim[j] += subtrim[j];
+      }
+    }
+  }
+  for (int i=0; i<G9X_MAX_MIXERS; i++)
+    c9x.mixData[i] = mixData[i];
+  for (int i=0; i<G9X_NUM_CHNOUT; i++)
+    c9x.limitData[i] = limitData[i];
+  for (int i=0; i<G9X_MAX_EXPOS; i++)
+    c9x.expoData[i] = expoData[i];
+
+  for (int i=0; i<G9X_MAX_CURVE5; i++) {
+    c9x.curves[i].count = 5;
+    for (int j = 0; j < 5; j++) {
+      c9x.curves[i].points[j].x = -100 + 50 * i;
+      c9x.curves[i].points[j].y = curves5[i][j];
+    }
+  }
+  for (int i=0; i<G9X_MAX_CURVE9; i++) {
+    c9x.curves[G9X_MAX_CURVE5 + i].count = 9;
+    for (int j = 0; j < 9; j++) {
+      c9x.curves[G9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
+      c9x.curves[G9X_MAX_CURVE5 + i].points[j].y = curves9[i][j];
+    }
+  }
+
+  for (int i=0; i<G9X_NUM_CSW; i++)
+    c9x.logicalSw[i] = logicalSw[i];
+  for (int i=0; i<G9X_NUM_FSW; i++)
+    c9x.customFn[i] = customFn[i];
+  // for (int i=0; i<G9X_NUM_CHNOUT; i++)
+  //  c9x.safetySw[i] = safetySw[i];
+  c9x.swashRingData = swashR;
+  c9x.frsky = frsky;
+
+  return c9x;
+}
+
+t_Gruvin9xModelData_v106::operator ModelData ()
+{
+  ModelData c9x;
+  c9x.used = true;
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  c9x.timers[0] = timer1;
+  c9x.timers[1] = timer2;
+  switch(protocol) {
+    case 1:
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = PULSES_DSM2;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = PULSES_SILV_A;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = PULSES_SILV_B;
+      break;
+    case 5:
+      c9x.moduleData[0].protocol = PULSES_SILV_C;
+      break;
+    case 6:
+      c9x.moduleData[0].protocol = PULSES_CTP1009;
+      break;
+    default:
+      c9x.moduleData[0].protocol = PULSES_PPM;
+      break;
+  }
+  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
+  c9x.thrTrim = thrTrim;
+  c9x.trimInc = trimInc-2;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.beepANACenter = beepANACenter;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.extendedLimits = extendedLimits;
+  c9x.extendedTrims = extendedTrims;
+  for (int i=0; i<G9X_MAX_FLIGHT_MODES; i++) {
+    c9x.flightModeData[i] = flightModeData[i];
+    for (int j=0; j<NUM_STICKS; j++) {
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
+      }
+    }
+  }
+  for (int i=0; i<G9X_MAX_MIXERS; i++)
+    c9x.mixData[i] = mixData[i];
+  for (int i=0; i<G9X_NUM_CHNOUT; i++)
+    c9x.limitData[i] = limitData[i];
+  for (int i=0; i<G9X_MAX_EXPOS; i++)
+    c9x.expoData[i] = expoData[i];
+
+  for (int i=0; i<G9X_MAX_CURVE5; i++) {
+    c9x.curves[i].count = 5;
+    for (int j = 0; j < 5; j++) {
+      c9x.curves[i].points[j].x = -100 + 50 * i;
+      c9x.curves[i].points[j].y = curves5[i][j];
+    }
+  }
+  for (int i=0; i<G9X_MAX_CURVE9; i++) {
+    c9x.curves[G9X_MAX_CURVE5 + i].count = 9;
+    for (int j = 0; j < 9; j++) {
+      c9x.curves[G9X_MAX_CURVE5 + i].points[j].x = -100 + 25 * i;
+      c9x.curves[G9X_MAX_CURVE5 + i].points[j].y = curves9[i][j];
+    }
+  }
+
+  for (int i=0; i<G9X_NUM_CSW; i++)
+    c9x.logicalSw[i] = logicalSw[i];
+  for (int i=0; i<G9X_NUM_FSW; i++)
+    c9x.customFn[i] = customFn[i];
+  // for (int i=0; i<G9X_NUM_CHNOUT; i++)
+  //   c9x.safetySw[i] = safetySw[i];
+  c9x.swashRingData = swashR;
+  c9x.frsky = frsky;
+
+  return c9x;
+}
+

companion/src/firmwares/gruvin9x/gruvin9xeeprom.h

@@ -0,0 +1,421 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ *
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef gruvin9xeeprom_h
+#define gruvin9xeeprom_h
+
+#include <inttypes.h>
+#include "eeprominterface.h"
+#define GR9X_MAX_CSFUNC 13
+
+PACK(typedef struct t_Gruvin9xTrainerMix_v103 {
+  uint8_t srcChn:3; //0-7 = ch1-8
+  int8_t  swtch:5;
+  int8_t  studWeight:6;
+  uint8_t mode:2;   //off,add-mode,subst-mode
+
+  operator TrainerMix();
+  t_Gruvin9xTrainerMix_v103() { memset(this, 0, sizeof(t_Gruvin9xTrainerMix_v103)); }
+
+}) Gruvin9xTrainerMix_v103; //
+
+PACK(typedef struct t_Gruvin9xTrainerMix_v104 {
+  uint8_t srcChn:6; // 0-7 = ch1-8
+  uint8_t mode:2;   // off,add-mode,subst-mode
+  int8_t  studWeight;
+
+  operator TrainerMix();
+  t_Gruvin9xTrainerMix_v104() { memset(this, 0, sizeof(t_Gruvin9xTrainerMix_v104)); }
+}) Gruvin9xTrainerMix_v104; //
+
+PACK(typedef struct t_Gruvin9xTrainerData_v103 {
+  int16_t        calib[4];
+  Gruvin9xTrainerMix_v103     mix[4];
+
+  operator TrainerData();
+}) Gruvin9xTrainerData_v103;
+
+PACK(typedef struct t_Gruvin9xTrainerData_v104 {
+  int16_t        calib[4];
+  Gruvin9xTrainerMix_v104     mix[4];
+
+  operator TrainerData();
+  t_Gruvin9xTrainerData_v104() { memset(this, 0, sizeof(t_Gruvin9xTrainerData_v104)); }
+}) Gruvin9xTrainerData_v104;
+
+PACK(typedef struct t_Gruvin9xFrSkyRSSIAlarm {
+  uint8_t       level:2;
+  int8_t        value:6;
+}) Gruvin9xFrSkyRSSIAlarm;
+
+PACK(typedef struct t_Gruvin9xGeneral_v103 {
+  uint8_t   myVers;
+  int16_t   calibMid[7];
+  int16_t   calibSpanNeg[7];
+  int16_t   calibSpanPos[7];
+  uint16_t  chkSum;
+  uint8_t   currModel; //0..15
+  uint8_t   contrast;
+  uint8_t   vBatWarn;
+  int8_t    txVoltageCalibration;
+  int8_t    lightSw;
+  Gruvin9xTrainerData_v103 trainer;
+  uint8_t   view;      //index of subview in main scrren
+  uint8_t   disableThrottleWarning:1;
+  int8_t    switchWarning:2; // -1=down, 0=off, 1=up
+  uint8_t   beeperVal:3;
+  uint8_t   disableMemoryWarning:1;
+  uint8_t   disableAlarmWarning:1;
+  uint8_t   stickMode;
+  uint8_t   inactivityTimer;
+  uint8_t   throttleReversed:1;
+  uint8_t   minuteBeep:1;
+  uint8_t   preBeep:1;
+  uint8_t   flashBeep:1;
+  uint8_t   disableSplashScreen:1;
+  uint8_t   enableTelemetryAlarm:1;   // 0=no, 1=yes (Sound alarm when there's no telem. data coming in)
+  uint8_t   spare:2;
+  uint8_t   filterInput;
+  uint8_t   lightAutoOff;
+  uint8_t   templateSetup;  //RETA order according to chout_ar array
+  int8_t    PPM_Multiplier;
+  Gruvin9xFrSkyRSSIAlarm frskyRssiAlarms[2];
+
+  operator GeneralSettings();
+  t_Gruvin9xGeneral_v103() { memset(this, 0, sizeof(t_Gruvin9xGeneral_v103)); }
+}) Gruvin9xGeneral_v103;
+
+PACK(typedef struct t_Gruvin9xGeneral_v104 {
+  uint8_t   myVers;
+  int16_t   calibMid[7];
+  int16_t   calibSpanNeg[7];
+  int16_t   calibSpanPos[7];
+  uint16_t  chkSum;
+  uint8_t   currModel; //0..15
+  uint8_t   contrast;
+  uint8_t   vBatWarn;
+  int8_t    txVoltageCalibration;
+  int8_t    lightSw;
+  Gruvin9xTrainerData_v104 trainer;
+  uint8_t   view;      //index of subview in main scrren
+  uint8_t   disableThrottleWarning:1;
+  int8_t    switchWarning:2; // -1=down, 0=off, 1=up
+  uint8_t   beeperVal:3;
+  uint8_t   disableMemoryWarning:1;
+  uint8_t   disableAlarmWarning:1;
+  uint8_t   stickMode;
+  uint8_t   inactivityTimer;
+  uint8_t   throttleReversed:1;
+  uint8_t   minuteBeep:1;
+  uint8_t   preBeep:1;
+  uint8_t   flashBeep:1;
+  uint8_t   disableSplashScreen:1;
+  uint8_t   enableTelemetryAlarm:1;   // 0=no, 1=yes (Sound alarm when there's no telem. data coming in)
+  uint8_t   spare:2;
+  uint8_t   filterInput;
+  uint8_t   lightAutoOff;
+  uint8_t   templateSetup;  //RETA order according to chout_ar array
+  int8_t    PPM_Multiplier;
+  Gruvin9xFrSkyRSSIAlarm frskyRssiAlarms[2];
+
+  operator GeneralSettings();
+  t_Gruvin9xGeneral_v104() { memset(this, 0, sizeof(t_Gruvin9xGeneral_v104)); }
+}) Gruvin9xGeneral_v104;
+
+typedef Gruvin9xGeneral_v104 Gruvin9xGeneral;
+
+// eeprom modelspec
+
+PACK(typedef struct t_Gruvin9xExpoData {
+  uint8_t mode:2;         // 0=end, 1=pos, 2=neg, 3=both
+  uint8_t chn:2;
+  uint8_t curve:4;        // 0=no curve, 1-6=std curves, 7-10=CV1-CV4, 11-15=CV9-CV13
+  int8_t  swtch:5;
+  uint8_t phase:3;        // if negPhase is 0: 0=normal, 5=FP4    if negPhase is 1: 5=!FP4
+  uint8_t negPhase:1;
+  uint8_t weight:7;
+  int8_t  expo;
+
+  operator ExpoData();
+  t_Gruvin9xExpoData();
+}) Gruvin9xExpoData;
+
+PACK(typedef struct t_Gruvin9xLimitData {
+  int8_t  min;
+  int8_t  max;
+  bool    revert;
+  int16_t  offset;
+
+  operator LimitData();
+  t_Gruvin9xLimitData();
+}) Gruvin9xLimitData;
+
+#define MLTPX_ADD  0
+#define MLTPX_MUL  1
+#define MLTPX_REP  2
+
+PACK(typedef struct t_Gruvin9xMixData {
+  uint8_t destCh:5;          // 0, 1..C9X_NUM_CHNOUT
+  uint8_t mixWarn:3;         // mixer warning
+  uint8_t srcRaw;            //
+  int8_t  weight;
+  int8_t  swtch;
+  uint8_t curve;             // 0=symmetrisch, 1=no neg, 2=no pos
+  uint8_t delayUp:4;
+  uint8_t delayDown:4;
+  uint8_t speedUp:4;         // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown:4;       // 0 nichts
+  uint8_t carryTrim:1;
+  uint8_t mltpx:3;           // multiplex method 0=+ 1=* 2=replace
+  int8_t  phase:4;           // -5=!FP4, 0=normal, 5=FP4
+  int8_t  sOffset;
+
+  operator MixData();
+  t_Gruvin9xMixData();
+}) Gruvin9xMixData;
+
+PACK(typedef struct t_Gruvin9xLogicalSwitchData { // Custom Switches data
+  int8_t  v1; //input
+  int8_t  v2; //offset
+  uint8_t func;
+
+  operator LogicalSwitchData();
+  t_Gruvin9xLogicalSwitchData() { memset(this, 0, sizeof(t_Gruvin9xLogicalSwitchData)); }
+}) Gruvin9xLogicalSwitchData;
+
+PACK(typedef struct t_Gruvin9xSafetySwData { // Safety Switches data
+  int8_t  swtch;
+  int8_t  val;
+
+  t_Gruvin9xSafetySwData() { memset(this, 0, sizeof(t_Gruvin9xSafetySwData)); }
+}) Gruvin9xSafetySwData;
+
+PACK(typedef struct t_Gruvin9xCustomFunctionData { // Function Switches data
+  int8_t  swtch; // input
+  uint8_t func;
+
+  operator CustomFunctionData();
+  t_Gruvin9xCustomFunctionData() { memset(this, 0, sizeof(t_Gruvin9xCustomFunctionData)); }
+}) Gruvin9xCustomFunctionData;
+
+PACK(typedef struct t_Gruvin9xFrSkyChannelData {
+  uint16_t  ratio:12;           // (Maximum resistor divider input volts +/- calibration. 0 means channel not used.
+                                    // 0.01v steps from 0 to 40.95V. Ex. 6.60 Volts = 660. 40.95V = 4095
+  uint16_t  type:4;             // channel display unit (0=volts, 1=raw, 2-15=reserverd.)
+  uint8_t   alarms_value[2];    // raw sample values 0..255
+  uint8_t   alarms_level:4;     // two pairs of 2bits. none=0, yel=1, org=2, red=3
+  uint8_t   alarms_greater:2;   // two alarms, 1 bit each. 0=LT(<), 1=GT(>)
+  uint8_t   spare:2;
+  uint8_t   barMin;             // minimum for bar display (raw ADC value)
+  uint8_t   barMax;             // ditto for max display (would G:NOT usually = ratio)
+
+  operator FrSkyChannelData();
+  t_Gruvin9xFrSkyChannelData();
+}) Gruvin9xFrSkyChannelData;
+
+PACK(typedef struct t_Gruvin9xFrSkyData {
+  Gruvin9xFrSkyChannelData channels[2];
+
+  operator FrSkyData();
+  t_Gruvin9xFrSkyData();
+}) Gruvin9xFrSkyData;
+
+PACK(typedef struct t_Gruvin9xSwashRingData { // Swash Ring data
+  uint8_t   invertELE:1;
+  uint8_t   invertAIL:1;
+  uint8_t   invertCOL:1;
+  uint8_t   type:5;
+  uint8_t   collectiveSource;
+  uint8_t   value;
+
+  operator SwashRingData();
+  t_Gruvin9xSwashRingData();
+}) Gruvin9xSwashRingData;
+
+PACK(typedef struct t_Gruvin9xFlightModeData_v102 {
+  int8_t trim[4];     // -125..125 => trim value, 127 => use trim of phase 0, -128, -127, -126 => use trim of phases 1|2|3|4 instead
+  int8_t swtch;       // swtch of phase[0] is not used
+  char name[6];
+  uint8_t fadeIn:4;
+  uint8_t fadeOut:4;
+
+  operator FlightModeData();
+  t_Gruvin9xFlightModeData_v102() { memset(this, 0, sizeof(t_Gruvin9xFlightModeData_v102)); }
+}) Gruvin9xFlightModeData_v102;
+
+
+PACK(typedef struct t_Gruvin9xFlightModeData_v106 {
+  int8_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
+  int8_t trim_ext:8;  // 2 less significant extra bits per trim (10bits trims)
+  int8_t swtch;       // swtch of phase[0] is not used
+  char name[6];
+  uint8_t fadeIn:4;
+  uint8_t fadeOut:4;
+
+  operator FlightModeData();
+  t_Gruvin9xFlightModeData_v106() { memset(this, 0, sizeof(t_Gruvin9xFlightModeData_v106)); }
+}) Gruvin9xFlightModeData_v106;
+
+PACK(typedef struct t_Gruvin9xTimerData {
+  int8_t    mode:7;            // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw
+  uint8_t   dir:1;             // 0=>Count Down, 1=>Count Up
+  uint16_t  val;
+
+  operator TimerData();
+  t_Gruvin9xTimerData() { memset(this, 0, sizeof(t_Gruvin9xTimerData)); }
+}) Gruvin9xTimerData;
+
+#define G9X_MAX_FLIGHT_MODES 5
+#define G9X_MAX_MIXERS 32
+#define G9X_MAX_EXPOS  14
+#define G9X_MAX_CURVE5 8
+#define G9X_MAX_CURVE9 8
+
+#define G9X_NUM_CHNOUT   16 // number of real output channels CH1-CH16
+#define G9X_NUM_CSW      12 // number of custom switches
+#define G9X_NUM_FSW      12 // number of functions assigned to switches
+
+// TODO
+PACK(typedef struct t_Gruvin9xModelData_v102 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Gruvin9xTimerData timer1;
+  uint8_t   protocol:3;
+  int8_t    ppmNCH:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  uint8_t   thrExpo:1;            // Enable Throttle Expo
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   spare1:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Gruvin9xTimerData timer2;
+  Gruvin9xMixData   mixData[G9X_MAX_MIXERS];
+  Gruvin9xLimitData limitData[G9X_NUM_CHNOUT];
+  Gruvin9xExpoData  expoData[G9X_MAX_EXPOS];
+  int8_t    curves5[G9X_MAX_CURVE5][5];
+  int8_t    curves9[G9X_MAX_CURVE9][9];
+  Gruvin9xLogicalSwitchData  logicalSw[G9X_NUM_CSW];
+  Gruvin9xSafetySwData  safetySw[G9X_NUM_CHNOUT];
+  Gruvin9xSwashRingData swashR;
+  Gruvin9xFlightModeData_v102 flightModeData[G9X_MAX_FLIGHT_MODES];
+  Gruvin9xFrSkyData frsky;
+
+  operator ModelData();
+  t_Gruvin9xModelData_v102() { memset(this, 0, sizeof(t_Gruvin9xModelData_v102)); }
+
+}) Gruvin9xModelData_v102;
+
+PACK(typedef struct t_Gruvin9xModelData_v103 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Gruvin9xTimerData timer1;
+  uint8_t   protocol:3;
+  int8_t    ppmNCH:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  uint8_t   thrExpo:1;            // Enable Throttle Expo
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   spare1:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Gruvin9xTimerData timer2;
+  Gruvin9xMixData   mixData[G9X_MAX_MIXERS];
+  Gruvin9xLimitData limitData[G9X_NUM_CHNOUT];
+  Gruvin9xExpoData  expoData[G9X_MAX_EXPOS];
+  int8_t    curves5[G9X_MAX_CURVE5][5];
+  int8_t    curves9[G9X_MAX_CURVE9][9];
+  Gruvin9xLogicalSwitchData  logicalSw[G9X_NUM_CSW];
+  Gruvin9xSafetySwData  safetySw[G9X_NUM_CHNOUT];
+  Gruvin9xSwashRingData swashR;
+  Gruvin9xFlightModeData_v102 flightModeData[G9X_MAX_FLIGHT_MODES];
+  Gruvin9xFrSkyData frsky;
+
+  operator ModelData();
+  t_Gruvin9xModelData_v103() { memset(this, 0, sizeof(t_Gruvin9xModelData_v103)); }
+
+}) Gruvin9xModelData_v103;
+
+PACK(typedef struct t_Gruvin9xModelData_v105 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Gruvin9xTimerData timer1;
+  uint8_t   protocol:3;
+  int8_t    ppmNCH:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  uint8_t   thrExpo:1;            // Enable Throttle Expo
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   spare1:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Gruvin9xTimerData timer2;
+  Gruvin9xMixData   mixData[G9X_MAX_MIXERS];
+  Gruvin9xLimitData limitData[G9X_NUM_CHNOUT];
+  Gruvin9xExpoData  expoData[G9X_MAX_EXPOS];
+  int8_t    curves5[G9X_MAX_CURVE5][5];
+  int8_t    curves9[G9X_MAX_CURVE9][9];
+  Gruvin9xLogicalSwitchData  logicalSw[G9X_NUM_CSW];
+  Gruvin9xSafetySwData  safetySw[G9X_NUM_CHNOUT];
+  Gruvin9xCustomFunctionData    customFn[G9X_NUM_FSW];
+  Gruvin9xSwashRingData swashR;
+  Gruvin9xFlightModeData_v102 flightModeData[G9X_MAX_FLIGHT_MODES];
+  int16_t   subtrim[NUM_STICKS];
+  Gruvin9xFrSkyData frsky;
+
+  operator ModelData();
+  t_Gruvin9xModelData_v105() { memset(this, 0, sizeof(t_Gruvin9xModelData_v105)); }
+}) Gruvin9xModelData_v105;
+
+PACK(typedef struct t_Gruvin9xModelData_v106 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Gruvin9xTimerData timer1;
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   thrExpo:1;            // Enable Throttle Expo
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Gruvin9xTimerData timer2;
+  Gruvin9xMixData   mixData[G9X_MAX_MIXERS];
+  Gruvin9xLimitData limitData[G9X_NUM_CHNOUT];
+  Gruvin9xExpoData  expoData[G9X_MAX_EXPOS];
+  int8_t    curves5[G9X_MAX_CURVE5][5];
+  int8_t    curves9[G9X_MAX_CURVE9][9];
+  Gruvin9xLogicalSwitchData  logicalSw[G9X_NUM_CSW];
+  Gruvin9xSafetySwData  safetySw[G9X_NUM_CHNOUT];
+  Gruvin9xCustomFunctionData    customFn[G9X_NUM_FSW];
+  Gruvin9xSwashRingData swashR;
+  Gruvin9xFlightModeData_v106 flightModeData[G9X_MAX_FLIGHT_MODES];
+  Gruvin9xFrSkyData frsky;
+
+  operator ModelData();
+  t_Gruvin9xModelData_v106() { memset(this, 0, sizeof(t_Gruvin9xModelData_v106)); }
+}) Gruvin9xModelData_v106;
+
+typedef Gruvin9xModelData_v106 Gruvin9xModelData;
+
+#endif

companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp

@@ -0,0 +1,252 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <iostream>
+#include "gruvin9xinterface.h"
+#include "gruvin9xeeprom.h"
+#include "file.h"
+#include "appdata.h"
+
+#define FILE_TYP_GENERAL 1
+#define FILE_TYP_MODEL   2
+
+#define FILE_GENERAL   0
+#define FILE_MODEL(n) (1+n)
+
+Gruvin9xInterface::Gruvin9xInterface(BoardEnum board):
+EEPROMInterface(board),
+efile(new RleFile())
+{
+}
+
+Gruvin9xInterface::~Gruvin9xInterface()
+{
+  delete efile;
+}
+
+const char * Gruvin9xInterface::getName()
+{
+  if (board == BOARD_STOCK)
+    return "Gruvin9x";
+  else
+    return "Gruvin9x v4";
+}
+
+const int Gruvin9xInterface::getEEpromSize()
+{
+  if (board == BOARD_STOCK) {
+    QString avrMCU = g.mcu();
+    if (avrMCU==QString("m128")) {
+      return EESIZE_STOCK*2;
+    }
+    return EESIZE_STOCK;
+  } else {
+    return EESIZE_GRUVIN9X;
+  }
+}
+
+const int Gruvin9xInterface::getMaxModels()
+{
+  return 16;
+}
+
+template <class T>
+void Gruvin9xInterface::loadModel(ModelData &model, unsigned int stickMode, int version)
+{
+  T _model;
+  if ((version == 2 && efile->readRlc2((uint8_t*)&_model, sizeof(T))) ||
+      (version == 1 && efile->readRlc1((uint8_t*)&_model, sizeof(T)))) {
+    model = _model;
+    if (stickMode) {
+      applyStickModeToModel(model, stickMode);
+    }
+  }
+  else {
+    model.clear();
+  }
+}
+
+template <class T>
+bool Gruvin9xInterface::loadGeneral(GeneralSettings &settings, int version)
+{
+  T _settings;
+  if ((version == 2 && efile->readRlc2((uint8_t*)&_settings, sizeof(T))) ||
+      (version == 1 && efile->readRlc1((uint8_t*)&_settings, sizeof(T)))) {
+    settings = _settings;
+    return true;
+  }
+
+  std::cerr << "error when loading general settings";
+  return false;
+}
+
+unsigned long Gruvin9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+{
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
+}
+
+
+unsigned long Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+{
+  std::cout << "trying " << getName() << " import... ";
+
+  std::bitset<NUM_ERRORS> errors;
+
+  if (size != this->getEEpromSize()) {
+    std::cout << "wrong size\n";
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
+  }
+
+  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
+    std::cout << "wrong file system\n";
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
+  }
+
+  efile->openRd(FILE_GENERAL);
+
+  uint8_t version;
+  if (efile->readRlc2(&version, 1) != 1) {
+    std::cout << "no\n";
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
+  }
+
+  if (version == 0) {
+    efile->openRd(FILE_GENERAL);
+    if (efile->readRlc1(&version, 1) != 1) {
+      std::cout << "no\n";
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
+  }
+
+  std::cout << "version " << (unsigned int)version << " ";
+
+  switch(version) {
+    case 5:
+    case 100:
+    case 101:
+    case 102:
+    case 103:
+    case 104:
+    case 105:
+      // subtrims(16bits) + function switches added
+    case 106:
+      // trims(10bits), no subtrims
+      break;
+    default:
+      std::cout << "not gruvin9x\n";
+      errors.set(NOT_GRUVIN9X);
+      return errors.to_ulong();
+  }
+
+  efile->openRd(FILE_GENERAL);
+  if (version == 5) {
+    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings, 1)) {
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
+  }
+  else if (version < 104) {
+    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings)) {
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
+  }
+  else if (version <= 106) {
+    if (!loadGeneral<Gruvin9xGeneral_v104>(radioData.generalSettings)) {
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
+  }
+  else {
+    std::cout << "ko\n";
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
+  }
+  
+  for (int i=0; i<getMaxModels(); i++) {
+    efile->openRd(FILE_MODEL(i));
+    if (version == 5) {
+      loadModel<Gruvin9xModelData_v102>(radioData.models[i], radioData.generalSettings.stickMode+1, 1);
+    }
+    else if (version < 103) {
+      loadModel<Gruvin9xModelData_v102>(radioData.models[i], radioData.generalSettings.stickMode+1);
+    }
+    else if (version == 103) {
+      loadModel<Gruvin9xModelData_v103>(radioData.models[i], radioData.generalSettings.stickMode+1);
+    }
+    else if (version == 105) {
+      loadModel<Gruvin9xModelData_v105>(radioData.models[i], radioData.generalSettings.stickMode+1);
+    }
+    else if (version == 106) {
+      loadModel<Gruvin9xModelData_v106>(radioData.models[i], radioData.generalSettings.stickMode+1);
+    }
+    else {
+      std::cout << "ko\n";
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
+  }
+
+  std::cout << "ok\n";
+  errors.set(ALL_OK);
+  return errors.to_ulong();
+}
+
+unsigned long Gruvin9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+{
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
+}
+
+int Gruvin9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
+{
+  std::cout << "NO!\n";
+  // TODO an error
+
+  return 0;
+}
+
+int Gruvin9xInterface::getSize(const ModelData & model)
+{
+  return 0;
+}
+
+int Gruvin9xInterface::getSize(const GeneralSettings & settings)
+{
+  return 0;
+}
+
+int Gruvin9xInterface::isAvailable(PulsesProtocol proto, int port)
+{
+  switch (proto) {
+    case PULSES_PPM:
+    case PULSES_SILV_A:
+    case PULSES_SILV_B:
+    case PULSES_SILV_C:
+    case PULSES_CTP1009:
+    case PULSES_DSM2:
+      return 1;
+    default:
+      return 0;
+  }
+}

companion/src/firmwares/gruvin9x/gruvin9xinterface.h

@@ -0,0 +1,65 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ *
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef gruvin9x_interface_h
+#define gruvin9x_interface_h
+
+#include "eeprominterface.h"
+
+class RleFile;
+
+class Gruvin9xInterface : public EEPROMInterface
+{
+
+  public:
+
+    Gruvin9xInterface(BoardEnum board);
+
+    virtual ~Gruvin9xInterface();
+
+    virtual const char * getName();
+
+    virtual const int  getEEpromSize();
+
+    virtual const int getMaxModels();
+
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);
+
+
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom,int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
+
+    virtual int getSize(const ModelData &);
+
+    virtual int getSize(const GeneralSettings & settings);
+
+    virtual int isAvailable(PulsesProtocol proto, int port=0);
+
+  protected:
+
+    template <class T>
+    void loadModel(ModelData &model, unsigned int stickMode=0, int version=2);
+
+    template <class T>
+    bool loadGeneral(GeneralSettings &settings, int version=2);
+
+    RleFile *efile;
+
+};
+
+#endif

companion/src/firmwares/opentx/open9xGruvin9xeeprom.cpp

@@ -0,0 +1,838 @@
+#include <stdlib.h>
+#include <algorithm>
+#include "helpers.h"
+#include "open9xGruvin9xeeprom.h"
+#include <QObject>
+#include <QMessageBox>
+
+extern void getEEPROMZString(char *dst, const char *src, int size);
+extern RawSwitch open9xStockToSwitch(int8_t sw);
+
+t_Open9xGruvin9xFlightModeData_v207::operator FlightModeData ()
+{
+  FlightModeData c9x;
+  for (int i=0; i<NUM_STICKS; i++)
+    c9x.trim[i] = (((int16_t)trim[i]) << 2) + ((trim_ext >> (2*i)) & 0x03);
+  c9x.swtch = open9xStockToSwitch(swtch);
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  c9x.fadeIn = fadeIn;
+  c9x.fadeOut = fadeOut;
+  for (int i=0; i<2; i++)
+    c9x.rotaryEncoders[i] = rotaryEncoders[i];
+  return c9x;
+}
+
+t_Open9xGruvin9xFlightModeData_v208::operator FlightModeData ()
+{
+  FlightModeData c9x;
+  for (int i=0; i<NUM_STICKS; i++)
+    c9x.trim[i] = trim[i];
+  c9x.swtch = open9xStockToSwitch(swtch);
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  c9x.fadeIn = fadeIn;
+  c9x.fadeOut = fadeOut;
+  for (int i=0; i<2; i++)
+    c9x.rotaryEncoders[i] = rotaryEncoders[i];
+  return c9x;
+}
+
+t_Open9xGruvin9xMixData_v207::operator MixData ()
+{
+  MixData c9x;
+  if (srcRaw) {
+    c9x.destCh = destCh+1;
+    if (srcRaw == 0) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_NONE);
+    }
+    else if (srcRaw <= 7) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_STICK, srcRaw-1);
+    }
+    else if (srcRaw <= 9) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_ROTARY_ENCODER, srcRaw-8);
+    }
+    else if (srcRaw == 10) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_MAX);
+    }
+    /* else if (srcRaw == 11) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_3POS);
+    } */
+    else if (srcRaw <= 32) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_SWITCH, srcRaw-11);
+    }
+    else if (srcRaw <= 35) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_CYC, srcRaw-33);
+    }
+    else if (srcRaw <= 43) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_PPM, srcRaw-36);
+    }
+    else {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-44);
+    }
+    c9x.weight = weight;
+
+    if (differential) {
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, differential*2);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
+    c9x.swtch = open9xStockToSwitch(swtch);
+    c9x.delayUp = delayUp;
+    c9x.delayDown = delayDown;
+    c9x.speedUp = speedUp;
+    c9x.speedDown = speedDown;
+    c9x.carryTrim = carryTrim;
+    c9x.mltpx = (MltpxValue)mltpx;
+    c9x.mixWarn = mixWarn;
+
+    if (phase<0) {
+      c9x.flightModes= 1 << (-phase -1);
+    }
+    else if (phase==0) {
+      c9x.flightModes=0;
+    }
+    else {
+      c9x.flightModes=63;
+      c9x.flightModes &= ~(1 << (phase -1));
+    }
+    c9x.sOffset = sOffset;
+  }
+  return c9x;
+}
+
+t_Open9xGruvin9xMixData_v209::operator MixData ()
+{
+  MixData c9x;
+  if (srcRaw) {
+    c9x.destCh = destCh+1;
+    if (srcRaw == 0) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_NONE);
+    }
+    else if (srcRaw <= 7) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_STICK, srcRaw-1);
+    }
+    else if (srcRaw <= 9) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_ROTARY_ENCODER, srcRaw-8);
+    }
+    else if (srcRaw <= 13) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_TRIM, srcRaw-10);
+    }
+    else if (srcRaw == 14) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_MAX);
+    }
+    else if (srcRaw == 15) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_SWITCH, 0);
+    }
+    else if (srcRaw <= 36) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_SWITCH, srcRaw-15);
+    }
+    else if (srcRaw <= 39) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_CYC, srcRaw-37);
+    }
+    else if (srcRaw <= 47) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_PPM, srcRaw-40);
+    }
+    else {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-48);
+    }
+    c9x.weight = weight;
+
+    if (differential) {
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, differential*2);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
+    c9x.swtch = open9xStockToSwitch(swtch);
+    c9x.delayUp = delayUp;
+    c9x.delayDown = delayDown;
+    c9x.speedUp = speedUp;
+    c9x.speedDown = speedDown;
+    c9x.carryTrim = carryTrim;
+    c9x.mltpx = (MltpxValue)mltpx;
+    c9x.mixWarn = mixWarn;
+
+    if (phase<0) {
+      c9x.flightModes= 1 << (-phase -1);
+    }
+    else if (phase==0) {
+      c9x.flightModes=0;
+    }
+    else {
+      c9x.flightModes=63;
+      c9x.flightModes &= ~(1 << (phase -1));
+    }    
+    c9x.sOffset = sOffset;
+  }
+  return c9x;
+}
+
+t_Open9xGruvin9xMixData_v211::operator MixData ()
+{
+  MixData c9x;
+  if (srcRaw) {
+    c9x.destCh = destCh+1;
+    if (srcRaw == 0) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_NONE);
+    }
+    else if (srcRaw <= 7) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_STICK, srcRaw-1);
+    }
+    else if (srcRaw <= 9) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_ROTARY_ENCODER, srcRaw-8);
+    }
+    else if (srcRaw <= 13) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_TRIM, srcRaw-10);
+    }
+    else if (srcRaw == 14) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_MAX);
+    }
+    else if (srcRaw == 15) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_SWITCH, 0);
+    }
+    else if (srcRaw <= 36) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_SWITCH, srcRaw-15);
+    }
+    else if (srcRaw <= 39) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_CYC, srcRaw-37);
+    }
+    else if (srcRaw <= 47) {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_PPM, srcRaw-40);
+    }
+    else {
+      c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-48);
+    }
+    c9x.weight = weight;
+    c9x.swtch = open9xStockToSwitch(swtch);
+
+    if (curveMode==0) {
+      c9x.curve = CurveReference(CurveReference::CURVE_REF_DIFF, curveParam);
+    }
+    else {
+      // TODO c9x.curve = curve;
+    }
+
+    c9x.delayUp = delayUp;
+    c9x.delayDown = delayDown;
+    c9x.speedUp = speedUp;
+    c9x.speedDown = speedDown;
+    c9x.carryTrim = carryTrim;
+    c9x.noExpo = noExpo;
+    c9x.mltpx = (MltpxValue)mltpx;
+    c9x.mixWarn = mixWarn;
+    c9x.flightModes = phases;
+    c9x.sOffset = sOffset;
+  }
+  return c9x;
+}
+
+RawSource open9xV4207ToSource(int8_t value)
+{
+  if (value == 0) {
+    return RawSource(SOURCE_TYPE_NONE);
+  }
+  else if (value <= 7) {
+    return RawSource(SOURCE_TYPE_STICK, value - 1);
+  }
+  else if (value <= 9) {
+    return RawSource(SOURCE_TYPE_ROTARY_ENCODER, value - 8);
+  }
+  else if (value == 10) {
+    return RawSource(SOURCE_TYPE_MAX);
+  }
+  /* else if (value == 11) {
+    return RawSource(SOURCE_TYPE_3POS);
+  } */
+  else if (value <= 14) {
+    return RawSource(SOURCE_TYPE_CYC, value-12);
+  }
+  else if (value <= 22) {
+    return RawSource(SOURCE_TYPE_PPM, value-15);
+  }
+  else if (value <= 38) {
+    return RawSource(SOURCE_TYPE_CH, value-23);
+  }
+  else {
+    return RawSource(SOURCE_TYPE_TELEMETRY, value-38);
+  }
+}
+
+RawSource open9xV4209ToSource(int8_t value)
+{
+  if (value == 0) {
+    return RawSource(SOURCE_TYPE_NONE);
+  }
+  else if (value <= 7) {
+    return RawSource(SOURCE_TYPE_STICK, value - 1);
+  }
+  else if (value <= 9) {
+    return RawSource(SOURCE_TYPE_ROTARY_ENCODER, value - 8);
+  }
+  else if (value <= 13) {
+    return RawSource(SOURCE_TYPE_STICK, value - 10);
+  }
+  else if (value == 14) {
+    return RawSource(SOURCE_TYPE_MAX);
+  }
+  /* else if (value == 15) {
+    return RawSource(SOURCE_TYPE_3POS);
+  } */
+  else if (value <= 18) {
+    return RawSource(SOURCE_TYPE_CYC, value-16);
+  }
+  else if (value <= 26) {
+    return RawSource(SOURCE_TYPE_PPM, value-19);
+  }
+  else if (value <= 42) {
+    return RawSource(SOURCE_TYPE_CH, value-27);
+  }
+  else {
+    return RawSource(SOURCE_TYPE_TELEMETRY, value-42);
+  }
+}
+
+Open9xGruvin9xLogicalSwitchData_v207::operator LogicalSwitchData ()
+{
+  LogicalSwitchData c9x;
+  c9x.func = func;
+  c9x.val1 = v1;
+  c9x.val2 = v2;
+
+  if ((c9x.func >= LS_FN_VPOS && c9x.func <= LS_FN_ANEG) || c9x.func >= LS_FN_EQUAL) {
+    c9x.val1 = open9xV4207ToSource(v1).toValue();
+  }
+
+  if (c9x.func >= LS_FN_EQUAL) {
+    c9x.val2 = open9xV4207ToSource(v2).toValue();
+  }
+
+  if (c9x.func >= LS_FN_AND && c9x.func <= LS_FN_XOR) {
+    c9x.val1 = open9xStockToSwitch(v1).toValue();
+    c9x.val2 = open9xStockToSwitch(v2).toValue();
+  }
+
+  return c9x;
+}
+
+Open9xGruvin9xLogicalSwitchData_v209::operator LogicalSwitchData ()
+{
+  LogicalSwitchData c9x;
+  c9x.func = func;
+  c9x.val1 = v1;
+  c9x.val2 = v2;
+
+  if ((c9x.func >= LS_FN_VPOS && c9x.func <= LS_FN_ANEG) || c9x.func >= LS_FN_EQUAL) {
+    c9x.val1 = open9xV4209ToSource(v1).toValue();
+  }
+
+  if (c9x.func >= LS_FN_EQUAL && c9x.func <= LS_FN_ELESS) {
+    c9x.val2 = open9xV4209ToSource(v2).toValue();
+  }
+
+  if (c9x.func >= LS_FN_AND && c9x.func <= LS_FN_XOR) {
+    c9x.val1 = open9xStockToSwitch(v1).toValue();
+    c9x.val2 = open9xStockToSwitch(v2).toValue();
+  }
+
+  return c9x;
+}
+
+t_Open9xGruvin9xCustomFunctionData_v203::operator CustomFunctionData ()
+{
+  CustomFunctionData c9x;
+  c9x.swtch = open9xStockToSwitch(swtch);
+  if (func < 16) {
+    c9x.func = (AssignFunc)(func);
+    c9x.enabled=param & 0x01;
+    c9x.param = (param>>1)<<1;
+  }
+  else {
+    c9x.param = param;
+    if (func <= 20)
+      c9x.func = (AssignFunc)(func);
+    else if (func == 21)
+      c9x.func = FuncInstantTrim;
+    else if (func == 22)
+      c9x.func = FuncPlaySound;
+    else if (func == 23)
+      c9x.func = FuncPlayHaptic;
+    else if (func == 24)
+      c9x.func = FuncReset;
+    else if (func == 25)
+      c9x.func = FuncVario;
+    else if (func == 26)
+      c9x.func = FuncPlayPrompt;
+    else if (func == 27)
+      c9x.func = FuncPlayValue;
+    else if (func == 28)
+      c9x.func = FuncLogs;
+    else if (func == 29)
+      c9x.func = FuncBacklight;
+    else if (func >= 30 && func <= 34)
+      c9x.func = AssignFunc(FuncAdjustGV1 + func - 30);
+    else
+      c9x.clear();
+  }
+  return c9x;
+}
+
+t_Open9xGruvin9xCustomFunctionData_v210::operator CustomFunctionData ()
+{
+  CustomFunctionData c9x;
+  c9x.swtch = open9xStockToSwitch(swtch);
+  c9x.param = param;
+  if (func < 22) {
+    c9x.func = (AssignFunc)(func);
+    c9x.enabled = delay;
+  } else {
+    if (func == 22)
+      c9x.func = FuncPlaySound;
+    else if (func == 23)
+      c9x.func = FuncPlayHaptic;
+    else if (func == 24)
+      c9x.func = FuncReset;
+    else if (func == 25)
+      c9x.func = FuncVario;
+    else if (func == 26)
+      c9x.func = FuncPlayPrompt;
+    else if (func == 27)
+      c9x.func = FuncPlayValue;
+    else if (func == 28)
+      c9x.func = FuncLogs;
+    else
+      c9x.clear();
+  }
+  return c9x;
+}
+
+t_Open9xGruvin9xSwashRingData_v208::operator SwashRingData ()
+{
+  SwashRingData c9x;
+  c9x.elevatorWeight = invertELE ? -100 : 100;
+  c9x.aileronWeight = invertAIL ? -100 : 100;
+  c9x.collectiveWeight = invertCOL ? -100 : 100;
+  c9x.type = type;
+  c9x.collectiveSource = open9xV4207ToSource(collectiveSource);
+  c9x.value = value;
+  return c9x;
+}
+
+t_Open9xGruvin9xSwashRingData_v209::operator SwashRingData ()
+{
+  SwashRingData c9x;
+  c9x.elevatorWeight = invertELE ? -100 : 100;
+  c9x.aileronWeight = invertAIL ? -100 : 100;
+  c9x.collectiveWeight = invertCOL ? -100 : 100;
+  c9x.type = type;
+  c9x.collectiveSource = open9xV4209ToSource(collectiveSource);
+  c9x.value = value;
+  return c9x;
+}
+
+t_Open9xGruvin9xModelData_v207::operator ModelData ()
+{
+  ModelData c9x;
+  c9x.used = true;
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  for (int i=0; i<2; i++)
+    c9x.timers[i] = timers[i];
+  switch(protocol) {
+    case 1:
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = PULSES_DSM2;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = PULSES_PPM16;
+      break;
+    default:
+      c9x.moduleData[0].protocol = PULSES_PPM;
+      break;
+  }
+  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
+  c9x.thrTrim = thrTrim;
+  c9x.trimInc = trimInc - 2;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.beepANACenter = beepANACenter;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.extendedLimits = extendedLimits;
+  c9x.extendedTrims = extendedTrims;
+  for (int i=0; i<5; i++) {
+    c9x.flightModeData[i] = flightModeData[i];
+    for (int j=0; j<NUM_STICKS; j++) {
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
+      }
+    }
+  }
+  for (int i=0; i<32; i++)
+    c9x.mixData[i] = mixData[i];
+  for (int i=0; i<16; i++)
+    c9x.limitData[i] = limitData[i];
+  for (int i=0; i<14; i++)
+    c9x.expoData[i] = expoData[i];
+
+  for (int i=0; i<8; i++) {
+    c9x.curves[i].count = 5;
+    for (int j = 0; j < 5; j++) {
+      c9x.curves[i].points[j].x = -100 + 50 * i;
+      c9x.curves[i].points[j].y = curves5[i][j];
+    }
+  }
+  for (int i=0; i<8; i++) {
+    c9x.curves[8 + i].count = 9;
+    for (int j = 0; j < 9; j++) {
+      c9x.curves[8 + i].points[j].x = -100 + 25 * i;
+      c9x.curves[8 + i].points[j].y = curves9[i][j];
+    }
+  }
+
+  for (int i=0; i<12; i++)
+    c9x.logicalSw[i] = logicalSw[i];
+  for (int i=0; i<16; i++)
+    c9x.customFn[i] = customFn[i];
+  c9x.swashRingData = swashR;
+  c9x.frsky = frsky;
+  c9x.moduleData[0].ppmFrameLength = ppmFrameLength;
+  c9x.thrTraceSrc = thrTraceSrc;
+  c9x.moduleData[0].modelId = modelId;
+  return c9x;
+}
+
+t_Open9xGruvin9xModelData_v208::operator ModelData ()
+{
+  ModelData c9x;
+  c9x.used = true;
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  for (int i=0; i<2; i++)
+    c9x.timers[i] = timers[i];
+  switch(protocol) {
+    case 1:
+      c9x.moduleData[0].protocol = PULSES_PPM16;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = PULSES_DSM2;
+      break;
+    default:
+      c9x.moduleData[0].protocol = PULSES_PPM;
+      break;
+  }
+  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
+  c9x.thrTrim = thrTrim;
+  c9x.trimInc = trimInc - 2;
+  c9x.disableThrottleWarning=disableThrottleWarning;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.beepANACenter = beepANACenter;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.extendedLimits = extendedLimits;
+  c9x.extendedTrims = extendedTrims;
+  for (int i=0; i<5; i++) {
+    c9x.flightModeData[i] = flightModeData[i];
+    for (int j=0; j<NUM_STICKS; j++) {
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
+      }
+    }
+  }
+  for (int i=0; i<32; i++)
+    c9x.mixData[i] = mixData[i];
+  for (int i=0; i<16; i++)
+    c9x.limitData[i] = limitData[i];
+  for (int i=0; i<14; i++)
+    c9x.expoData[i] = expoData[i];
+  for (int i=0; i<8; i++) {
+    c9x.curves[i].count = 5;
+    for (int j = 0; j < 5; j++) {
+      c9x.curves[i].points[j].x = -100 + 50 * i;
+      c9x.curves[i].points[j].y = curves5[i][j];
+    }
+  }
+  for (int i=0; i<8; i++) {
+    c9x.curves[8 + i].count = 9;
+    for (int j = 0; j < 9; j++) {
+      c9x.curves[8 + i].points[j].x = -100 + 25 * i;
+      c9x.curves[8 + i].points[j].y = curves9[i][j];
+    }
+  }
+  for (int i=0; i<12; i++)
+    c9x.logicalSw[i] = logicalSw[i];
+  for (int i=0; i<16; i++)
+    c9x.customFn[i] = customFn[i];
+  c9x.swashRingData = swashR;
+  c9x.frsky = frsky;
+  c9x.frsky.varioSource = varioSource;
+  c9x.frsky.varioCenterMax = varioSpeedUpMin;
+  c9x.frsky.varioCenterMin = varioSpeedDownMin;
+  c9x.moduleData[0].ppmFrameLength = ppmFrameLength;
+  c9x.thrTraceSrc = thrTraceSrc;
+  c9x.moduleData[0].modelId = modelId;
+  for (int i=0; i<16; i++) {
+    c9x.limitData[i].ppmCenter = servoCenter[i];
+  }
+  return c9x;
+}
+
+t_Open9xGruvin9xModelData_v209::operator ModelData ()
+{
+  ModelData c9x;
+  c9x.used = true;
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  for (int i=0; i<2; i++)
+    c9x.timers[i] = timers[i];
+  switch(protocol) {
+    case 1:
+      c9x.moduleData[0].protocol = PULSES_PPM16;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = PULSES_DSM2;
+      break;
+    default:
+      c9x.moduleData[0].protocol = PULSES_PPM;
+      break;
+  }
+  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
+  c9x.thrTrim = thrTrim;
+  c9x.trimInc = trimInc - 2;
+  c9x.disableThrottleWarning=disableThrottleWarning;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.beepANACenter = beepANACenter;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.extendedLimits = extendedLimits;
+  c9x.extendedTrims = extendedTrims;
+  for (int i=0; i<5; i++) {
+    c9x.flightModeData[i] = flightModeData[i];
+    for (int j=0; j<NUM_STICKS; j++) {
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
+      }
+    }
+  }
+  for (int i=0; i<32; i++)
+    c9x.mixData[i] = mixData[i];
+  for (int i=0; i<16; i++)
+    c9x.limitData[i] = limitData[i];
+  for (int i=0; i<14; i++)
+    c9x.expoData[i] = expoData[i];
+  for (int i=0; i<8; i++) {
+    c9x.curves[i].count = 5;
+    for (int j = 0; j < 5; j++) {
+      c9x.curves[i].points[j].x = -100 + 50 * i;
+      c9x.curves[i].points[j].y = curves5[i][j];
+    }
+  }
+  for (int i=0; i<8; i++) {
+    c9x.curves[8 + i].count = 9;
+    for (int j = 0; j < 9; j++) {
+      c9x.curves[8 + i].points[j].x = -100 + 25 * i;
+      c9x.curves[8 + i].points[j].y = curves9[i][j];
+    }
+  }
+  for (int i=0; i<12; i++)
+    c9x.logicalSw[i] = logicalSw[i];
+  for (int i=0; i<16; i++)
+    c9x.customFn[i] = customFn[i];
+  c9x.swashRingData = swashR;
+  c9x.frsky = frsky;
+  c9x.frsky.varioSource = varioSource;
+  c9x.frsky.varioCenterMax = varioSpeedUpMin;
+  c9x.frsky.varioCenterMin = varioSpeedDownMin;
+  c9x.switchWarningStates = switchWarningStates;
+  c9x.moduleData[0].ppmFrameLength = ppmFrameLength;
+  c9x.thrTraceSrc = thrTraceSrc;
+  c9x.moduleData[0].modelId = modelId;
+  for (int i=0; i<16; i++) {
+    c9x.limitData[i].ppmCenter = servoCenter[i];
+  }
+  return c9x;
+}
+
+t_Open9xGruvin9xModelData_v210::operator ModelData ()
+{
+  ModelData c9x;
+  c9x.used = true;
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  for (int i=0; i<2; i++)
+    c9x.timers[i] = timers[i];
+  switch(protocol) {
+    case 1:
+      c9x.moduleData[0].protocol = PULSES_PPM16;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = PULSES_DSM2;
+      break;
+    default:
+      c9x.moduleData[0].protocol = PULSES_PPM;
+      break;
+  }
+  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
+  c9x.thrTrim = thrTrim;
+  c9x.trimInc = trimInc - 2;
+  c9x.disableThrottleWarning=disableThrottleWarning;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.beepANACenter = beepANACenter;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.extendedLimits = extendedLimits;
+  c9x.extendedTrims = extendedTrims;
+  for (int i=0; i<5; i++) {
+    c9x.flightModeData[i] = flightModeData[i];
+    for (int j=0; j<NUM_STICKS; j++) {
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
+      }
+    }
+  }
+  for (int i=0; i<32; i++)
+    c9x.mixData[i] = mixData[i];
+  for (int i=0; i<16; i++)
+    c9x.limitData[i] = limitData[i];
+  for (int i=0; i<14; i++)
+    c9x.expoData[i] = expoData[i];
+  for (int i=0; i<8; i++) {
+    CurveInfo crvinfo = curveinfo(this, i);
+    c9x.curves[i].type = (crvinfo.custom ? CurveData::CURVE_TYPE_CUSTOM : CurveData::CURVE_TYPE_STANDARD);
+    c9x.curves[i].count = crvinfo.points;
+    for (int j=0; j<crvinfo.points; j++)
+      c9x.curves[i].points[j].y = crvinfo.crv[j];
+    if (crvinfo.custom) {
+      c9x.curves[i].points[0].x = -100;
+      for (int j=1; j<crvinfo.points-1; j++)
+        c9x.curves[i].points[j].x = crvinfo.crv[crvinfo.points+j-1];
+      c9x.curves[i].points[crvinfo.points-1].x = +100;
+    }
+    else {
+      for (int j=0; j<crvinfo.points; j++)
+        c9x.curves[i].points[j].x = -100 + (200*i) / (crvinfo.points-1);
+    }
+  }
+  for (int i=0; i<12; i++)
+    c9x.logicalSw[i] = logicalSw[i];
+  for (int i=0; i<16; i++)
+    c9x.customFn[i] = customFn[i];
+  c9x.swashRingData = swashR;
+  c9x.frsky = frsky;
+  c9x.switchWarningStates = switchWarningStates;
+  c9x.moduleData[0].ppmFrameLength = ppmFrameLength;
+  c9x.thrTraceSrc = thrTraceSrc;
+  c9x.moduleData[0].modelId = modelId;
+  for (int i=0; i<16; i++) {
+    c9x.limitData[i].ppmCenter = servoCenter[i];
+  }
+
+  return c9x;
+}
+
+t_Open9xGruvin9xModelData_v211::operator ModelData ()
+{
+  ModelData c9x;
+  c9x.used = true;
+  getEEPROMZString(c9x.name, name, sizeof(name));
+  for (int i=0; i<2; i++) {
+    c9x.timers[i] = timers[i];
+    c9x.timers[i].persistent = timersXtra[i].remanent;
+    c9x.timers[i].val = timersXtra[i].value;
+  }
+  switch(protocol) {
+    case 1:
+      c9x.moduleData[0].protocol = PULSES_PPM16;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = PULSES_PPMSIM;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = PULSES_DSM2;
+      break;
+    default:
+      c9x.moduleData[0].protocol = PULSES_PPM;
+      break;
+  }
+  c9x.moduleData[0].channelsCount = 8 + (2 * ppmNCH);
+  c9x.thrTrim = thrTrim;
+  c9x.trimInc = trimInc - 2;
+  c9x.disableThrottleWarning=disableThrottleWarning;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.beepANACenter = beepANACenter;
+  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.extendedLimits = extendedLimits;
+  c9x.extendedTrims = extendedTrims;
+  for (int i=0; i<5; i++) {
+    c9x.flightModeData[i] = flightModeData[i];
+    for (int j=0; j<NUM_STICKS; j++) {
+      if (c9x.flightModeData[i].trim[j] > 500) {
+        c9x.flightModeData[i].trimRef[j] = c9x.flightModeData[i].trim[j] - 501;
+        if (c9x.flightModeData[i].trimRef[j] >= i)
+          c9x.flightModeData[i].trimRef[j] += 1;
+        c9x.flightModeData[i].trim[j] = 0;
+      }
+    }
+  }
+  for (int i=0; i<32; i++)
+    c9x.mixData[i] = mixData[i];
+  for (int i=0; i<16; i++)
+    c9x.limitData[i] = limitData[i];
+  for (int i=0; i<14; i++)
+    c9x.expoData[i] = expoData[i];
+  for (int i=0; i<8; i++) {
+    CurveInfo crvinfo = curveinfo(this, i);
+    c9x.curves[i].type = (crvinfo.custom ? CurveData::CURVE_TYPE_CUSTOM : CurveData::CURVE_TYPE_STANDARD);
+    c9x.curves[i].count = crvinfo.points;
+    for (int j=0; j<crvinfo.points; j++)
+      c9x.curves[i].points[j].y = crvinfo.crv[j];
+    if (crvinfo.custom) {
+      c9x.curves[i].points[0].x = -100;
+      for (int j=1; j<crvinfo.points-1; j++)
+        c9x.curves[i].points[j].x = crvinfo.crv[crvinfo.points+j-1];
+      c9x.curves[i].points[crvinfo.points-1].x = +100;
+    }
+    else {
+      for (int j=0; j<crvinfo.points; j++)
+        c9x.curves[i].points[j].x = -100 + (200*i) / (crvinfo.points-1);
+    }
+  }
+  for (int i=0; i<12; i++)
+    c9x.logicalSw[i] = logicalSw[i];
+  for (int i=0; i<16; i++)
+    c9x.customFn[i] = customFn[i];
+  c9x.swashRingData = swashR;
+  c9x.frsky = frsky;
+  c9x.switchWarningStates = switchWarningStates;
+  c9x.moduleData[0].ppmFrameLength = ppmFrameLength;
+  c9x.thrTraceSrc = thrTraceSrc;
+  c9x.moduleData[0].modelId = modelId;
+  return c9x;
+}

companion/src/firmwares/opentx/open9xGruvin9xeeprom.h

@@ -0,0 +1,365 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ *
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef open9xGruvin9xeeprom_h
+#define open9xGruvin9xeeprom_h
+
+#define O9X_V4_MAX_CSFUNCOLD 13
+#define O9X_V4_MAX_CSFUNC 15
+
+#include "open9xStockeeprom.h"
+
+PACK(typedef struct t_Open9xGruvin9xFlightModeData_v207 {
+  int8_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
+  int8_t trim_ext:8;  // 2 less significant extra bits per trim (10bits trims)
+  int8_t swtch;       // swtch of phase[0] is not used
+  char name[6];
+  uint8_t fadeIn:4;
+  uint8_t fadeOut:4;
+  int16_t rotaryEncoders[2];
+  operator FlightModeData();
+  t_Open9xGruvin9xFlightModeData_v207() { memset(this, 0, sizeof(t_Open9xGruvin9xFlightModeData_v207)); }
+}) Open9xGruvin9xFlightModeData_v207;
+
+PACK(typedef struct t_Open9xGruvin9xFlightModeData_v208 {
+  int16_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
+  int8_t swtch;       // swtch of phase[0] is not used
+  char name[6];
+  uint8_t fadeIn:4;
+  uint8_t fadeOut:4;
+  int16_t rotaryEncoders[2];
+  operator FlightModeData();
+  t_Open9xGruvin9xFlightModeData_v208() { memset(this, 0, sizeof(t_Open9xGruvin9xFlightModeData_v208)); }
+}) Open9xGruvin9xFlightModeData_v208;
+
+PACK(typedef struct t_Open9xGruvin9xMixData_v207 {
+  uint8_t destCh:4;          // 0, 1..C9X_NUM_CHNOUT
+  int8_t  phase:4;           // -5=!FP4, 0=normal, 5=FP4
+  int8_t  weight;
+  int8_t  swtch:6;
+  uint8_t mltpx:2;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  int8_t  curve:6;
+  uint8_t mixWarn:2;         // mixer warning
+  uint8_t delayUp:4;
+  uint8_t delayDown:4;
+  uint8_t speedUp:4;         // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown:4;       // 0 nichts
+  uint16_t srcRaw:7;         //
+  uint16_t differential:7;
+  uint16_t carryTrim:2;
+  int8_t  sOffset;
+
+ operator MixData();
+  t_Open9xGruvin9xMixData_v207() { memset(this, 0, sizeof(t_Open9xGruvin9xMixData_v207)); }
+}) Open9xGruvin9xMixData_v207;
+
+PACK(typedef struct t_Open9xGruvin9xMixData_v209 {
+  uint8_t destCh:4;          // 0, 1..C9X_NUM_CHNOUT
+  int8_t  phase:4;           // -5=!FP4, 0=normal, 5=FP4
+  int8_t  weight;
+  int8_t  swtch:6;
+  uint8_t mltpx:2;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  int8_t  curve:6;
+  uint8_t mixWarn:2;         // mixer warning
+  uint8_t delayUp:4;
+  uint8_t delayDown:4;
+  uint8_t speedUp:4;         // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown:4;       // 0 nichts
+  uint16_t srcRaw:6;         //
+  int16_t differential:7;
+  int16_t carryTrim:3;
+  int8_t  sOffset;
+
+ operator MixData();
+  t_Open9xGruvin9xMixData_v209() { memset(this, 0, sizeof(t_Open9xGruvin9xMixData_v209)); }
+}) Open9xGruvin9xMixData_v209;
+
+PACK(typedef struct t_Open9xGruvin9xMixData_v211 {
+  uint8_t destCh:4;          // 0, 1..C9X_NUM_CHNOUT
+  uint8_t curveMode:1;       // O=curve, 1=differential
+  uint8_t noExpo:1;
+  uint8_t spare:2;
+  int8_t  weight;
+  int8_t  swtch:6;
+  uint8_t mltpx:2;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  uint8_t phases:5;
+  int8_t  carryTrim:3;
+  uint8_t srcRaw:6;
+  uint8_t mixWarn:2;         // mixer warning
+  uint8_t delayUp:4;
+  uint8_t delayDown:4;
+  uint8_t speedUp:4;
+  uint8_t speedDown:4;
+  int8_t  curveParam;
+  int8_t  sOffset;
+
+ operator MixData();
+  t_Open9xGruvin9xMixData_v211() { memset(this, 0, sizeof(t_Open9xGruvin9xMixData_v211)); }
+}) Open9xGruvin9xMixData_v211;
+
+PACK(typedef struct t_Open9xGruvin9xLogicalSwitchData_v207 { // Custom Switches data
+  int8_t  v1; //input
+  int8_t  v2; //offset
+  uint8_t func;
+
+  operator LogicalSwitchData();
+  t_Open9xGruvin9xLogicalSwitchData_v207() { memset(this, 0, sizeof(t_Open9xGruvin9xLogicalSwitchData_v207)); }
+  int8_t fromSource(RawSource source);
+  RawSource toSource(int8_t value);
+}) Open9xGruvin9xLogicalSwitchData_v207;
+
+PACK(typedef struct t_Open9xGruvin9xLogicalSwitchData_v209 { // Custom Switches data
+  int8_t  v1; //input
+  int8_t  v2; //offset
+  uint8_t func;
+
+  operator LogicalSwitchData();
+  t_Open9xGruvin9xLogicalSwitchData_v209() { memset(this, 0, sizeof(t_Open9xGruvin9xLogicalSwitchData_v209)); }
+  int8_t fromSource(RawSource source);
+  RawSource toSource(int8_t value);
+}) Open9xGruvin9xLogicalSwitchData_v209;
+
+PACK(typedef struct t_Open9xGruvin9xCustomFunctionData_v203 { // Function Switches data
+  int8_t  swtch; // input
+  uint8_t func;
+  uint8_t param;
+
+  operator CustomFunctionData();
+  t_Open9xGruvin9xCustomFunctionData_v203() { memset(this, 0, sizeof(t_Open9xGruvin9xCustomFunctionData_v203)); }
+}) Open9xGruvin9xCustomFunctionData_v203;
+
+PACK(typedef struct t_Open9xGruvin9xCustomFunctionData_v210 { // Function Switches data
+  int8_t  swtch; // input
+  uint8_t func:5;
+  uint8_t delay:3;
+  uint8_t param;
+
+  operator CustomFunctionData();
+  t_Open9xGruvin9xCustomFunctionData_v210() { memset(this, 0, sizeof(t_Open9xGruvin9xCustomFunctionData_v210)); }
+}) Open9xGruvin9xCustomFunctionData_v210;
+
+PACK(typedef struct t_Open9xGruvin9xSwashRingData_v208 { // Swash Ring data
+  uint8_t   invertELE:1;
+  uint8_t   invertAIL:1;
+  uint8_t   invertCOL:1;
+  uint8_t   type:5;
+  uint8_t   collectiveSource;
+  uint8_t   value;
+
+  operator SwashRingData();
+  t_Open9xGruvin9xSwashRingData_v208() { memset(this, 0, sizeof(t_Open9xGruvin9xSwashRingData_v208)); }
+}) Open9xGruvin9xSwashRingData_v208;
+
+PACK(typedef struct t_Open9xGruvin9xSwashRingData_v209 { // Swash Ring data
+  uint8_t   invertELE:1;
+  uint8_t   invertAIL:1;
+  uint8_t   invertCOL:1;
+  uint8_t   type:5;
+  uint8_t   collectiveSource;
+  uint8_t   value;
+
+  operator SwashRingData();
+  t_Open9xGruvin9xSwashRingData_v209() { memset(this, 0, sizeof(t_Open9xGruvin9xSwashRingData_v209)); }
+}) Open9xGruvin9xSwashRingData_v209;
+
+PACK(typedef struct t_Open9xGruvin9xModelData_v207 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   spare1:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint16_t  beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xGruvin9xMixData_v207 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xGruvin9xLogicalSwitchData_v207  logicalSw[12];
+  Open9xCustomFunctionData_v203 customFn[16];
+  Open9xGruvin9xSwashRingData_v208 swashR;
+  Open9xGruvin9xFlightModeData_v207 flightModeData[5];
+  Open9xFrSkyData_v205 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  uint8_t   frskyLines[4];
+  uint16_t  frskyLinesXtra;
+
+  operator ModelData();
+  t_Open9xGruvin9xModelData_v207() { memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v207)); }
+}) Open9xGruvin9xModelData_v207;
+
+PACK(typedef struct t_Open9xGruvin9xModelData_v208 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint16_t  beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xGruvin9xMixData_v207 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xGruvin9xLogicalSwitchData_v207  logicalSw[12];
+  Open9xGruvin9xCustomFunctionData_v203 customFn[16];
+  Open9xGruvin9xSwashRingData_v208 swashR;
+  Open9xGruvin9xFlightModeData_v208 flightModeData[5];
+  Open9xFrSkyData_v208 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  uint8_t   frskyLines[4];
+  uint16_t  frskyLinesXtra;
+  int8_t    servoCenter[16];
+
+  uint8_t varioSource:3;
+  uint8_t varioSpeedUpMin:5;    // if increment in 0.2m/s = 3.0m/s max
+  uint8_t varioSpeedDownMin;
+
+  operator ModelData();
+  t_Open9xGruvin9xModelData_v208() { memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v208)); }
+}) Open9xGruvin9xModelData_v208;
+
+PACK(typedef struct t_Open9xGruvin9xModelData_v209 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint16_t  beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xGruvin9xMixData_v209 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xGruvin9xLogicalSwitchData_v209  logicalSw[12];
+  Open9xGruvin9xCustomFunctionData_v203 customFn[16];
+  Open9xGruvin9xSwashRingData_v209 swashR;
+  Open9xGruvin9xFlightModeData_v208 flightModeData[5];
+  Open9xFrSkyData_v208 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  uint8_t   frskyLines[4];
+  uint16_t  frskyLinesXtra;
+  int8_t    servoCenter[16];
+
+  uint8_t varioSource:3;
+  uint8_t varioSpeedUpMin:5;    // if increment in 0.2m/s = 3.0m/s max
+  uint8_t varioSpeedDownMin;
+  uint8_t switchWarningStates;
+
+  operator ModelData();
+  t_Open9xGruvin9xModelData_v209() { memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v209)); }
+}) Open9xGruvin9xModelData_v209;
+
+PACK(typedef struct t_Open9xGruvin9xModelData_v210 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint16_t  beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xGruvin9xMixData_v209 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves[8];
+  int8_t    points[112-8];
+  Open9xGruvin9xLogicalSwitchData_v209  logicalSw[12];
+  Open9xGruvin9xCustomFunctionData_v210 customFn[16];
+  Open9xGruvin9xSwashRingData_v209 swashR;
+  Open9xGruvin9xFlightModeData_v208 flightModeData[5];
+
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+
+  int8_t    servoCenter[16];
+
+  uint8_t switchWarningStates;
+
+  Open9xFrSkyData_v210 frsky;
+
+  operator ModelData();
+  t_Open9xGruvin9xModelData_v210() { memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v210)); }
+}) Open9xGruvin9xModelData_v210;
+
+PACK(typedef struct t_Open9xGruvin9xModelData_v211 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare1:1;
+  int8_t    ppmDelay;
+  uint16_t  beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xGruvin9xMixData_v211 mixData[32];
+  Open9xLimitData_v211 limitData[16];
+  Open9xExpoData_v211  expoData[14];
+  int8_t    curves[8];
+  int8_t    points[112-8];
+  Open9xGruvin9xLogicalSwitchData_v209  logicalSw[12];
+  Open9xGruvin9xCustomFunctionData_v210 customFn[16];
+  Open9xGruvin9xSwashRingData_v209 swashR;
+  Open9xGruvin9xFlightModeData_v208 flightModeData[5];
+
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  uint8_t switchWarningStates;
+
+  Open9xFrSkyData_v210 frsky;
+  Open9xTimerDataExtra timersXtra[2];
+
+  operator ModelData();
+  t_Open9xGruvin9xModelData_v211() { memset(this, 0, sizeof(t_Open9xGruvin9xModelData_v211)); }
+}) Open9xGruvin9xModelData_v211;
+
+#endif

companion/src/firmwares/opentx/open9xSky9xeeprom.h

@@ -0,0 +1,508 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ *
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef open9xSky9xeeprom_h
+#define open9xSky9xeeprom_h
+
+#include "open9xStockeeprom.h"
+
+PACK(typedef struct t_Open9xArmTimerData_v202 {
+  int8_t     mode;            // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw
+  uint16_t   val;
+
+  operator TimerData();
+  t_Open9xArmTimerData_v202() { memset(this, 0, sizeof(t_Open9xArmTimerData_v202)); }
+}) Open9xArmTimerData_v202;
+
+PACK(typedef struct t_Open9xArmExpoData_v208 {
+  uint8_t mode;           // 0=end, 1=pos, 2=neg, 3=both
+  uint8_t chn;
+  int8_t  curve;          // 0=no curve, 1-6=std curves, 7-10=CV1-CV4, 11-15=CV9-CV13
+  int8_t  swtch;
+  int8_t  phase;          // if negPhase is 0: 0=normal, 5=FP4    if negPhase is 1: 5=!FP4
+  uint8_t weight;
+  int8_t  expo;
+
+  operator ExpoData();
+  t_Open9xArmExpoData_v208() { memset(this, 0, sizeof(t_Open9xArmExpoData_v208)); }
+}) Open9xArmExpoData_v208;
+
+PACK(typedef struct t_Open9xArmExpoData_v210 {
+  uint8_t mode;           // 0=end, 1=pos, 2=neg, 3=both
+  uint8_t chn;
+  int8_t  curve;          // 0=no curve, 1-6=std curves, 7-10=CV1-CV4, 11-15=CV9-CV13
+  int8_t  swtch;
+  int8_t  phase;          // if negPhase is 0: 0=normal, 5=FP4    if negPhase is 1: 5=!FP4
+  uint8_t weight;
+  int8_t  expo;
+  char    name[6];
+  uint8_t spare[4];
+
+  operator ExpoData();
+  t_Open9xArmExpoData_v210() { memset(this, 0, sizeof(t_Open9xArmExpoData_v210)); }
+}) Open9xArmExpoData_v210;
+
+PACK(typedef struct t_Open9xArmExpoData_v212 {
+  uint8_t mode;         // 0=end, 1=pos, 2=neg, 3=both
+  uint8_t chn;
+  int8_t  swtch;
+  uint16_t phases;
+  int8_t  weight;
+  uint8_t curveMode;
+  char    name[6];
+  int8_t  curveParam;
+
+  operator ExpoData();
+  t_Open9xArmExpoData_v212() { memset(this, 0, sizeof(t_Open9xArmExpoData_v212)); }
+}) Open9xArmExpoData_v212;
+
+PACK(typedef struct t_Open9xArmMixData_v208 {
+  uint8_t destCh;          // 0, 1..C9X_NUM_CHNOUT
+  int8_t  phase;           // -5=!FP4, 0=normal, 5=FP4
+  int8_t  weight;
+  int8_t  swtch;
+  uint8_t mltpx;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  int8_t  curve;
+  uint8_t mixWarn;         // mixer warning
+  uint8_t delayUp;
+  uint8_t delayDown;
+  uint8_t speedUp;         // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown;       // 0 nichts
+  uint8_t srcRaw;         //
+  int8_t  differential;
+  uint8_t carryTrim;
+  int8_t  sOffset;
+
+ operator MixData();
+  t_Open9xArmMixData_v208() { memset(this, 0, sizeof(t_Open9xArmMixData_v208)); }
+}) Open9xArmMixData_v208;
+
+PACK(typedef struct t_Open9xArmMixData_v209 {
+  uint8_t destCh;          // 0, 1..C9X_NUM_CHNOUT
+  int8_t  phase;           // -5=!FP4, 0=normal, 5=FP4
+  int8_t  weight;
+  int8_t  swtch;
+  uint8_t mltpx;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  int8_t  curve;
+  uint8_t mixWarn;         // mixer warning
+  uint8_t delayUp;
+  uint8_t delayDown;
+  uint8_t speedUp;         // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown;       // 0 nichts
+  uint8_t srcRaw;         //
+  int8_t  differential;
+  int8_t  carryTrim;
+  int8_t  sOffset;
+
+ operator MixData();
+  t_Open9xArmMixData_v209() { memset(this, 0, sizeof(t_Open9xArmMixData_v209)); }
+}) Open9xArmMixData_v209;
+
+PACK(typedef struct t_Open9xArmMixData_v210 {
+  uint8_t destCh;          // 0, 1..C9X_NUM_CHNOUT
+  int8_t  phase;           // -5=!FP4, 0=normal, 5=FP4
+  int8_t  weight;
+  int8_t  swtch;
+  uint8_t mltpx;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  int8_t  curve;
+  uint8_t mixWarn;         // mixer warning
+  uint8_t delayUp;
+  uint8_t delayDown;
+  uint8_t speedUp;         // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown;       // 0 nichts
+  uint8_t srcRaw;         //
+  int8_t  differential;
+  int8_t  carryTrim;
+  int8_t  sOffset;
+  char    name[6];
+  uint8_t spare[4];
+
+ operator MixData();
+  t_Open9xArmMixData_v210() { memset(this, 0, sizeof(t_Open9xArmMixData_v210)); }
+}) Open9xArmMixData_v210;
+
+PACK(typedef struct t_Open9xArmMixData_v212 {
+  uint8_t  destCh;
+  uint16_t phases;
+  uint8_t curveMode:1;       // O=curve, 1=differential
+  uint8_t noExpo:1;
+  int8_t  carryTrim:3;
+  uint8_t mltpx:2;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  uint8_t spare:1;
+  int8_t  weight;
+  int8_t  swtch;
+  int8_t  curveParam;
+  uint8_t mixWarn;         // mixer warning
+  uint8_t delayUp;
+  uint8_t delayDown;
+  uint8_t speedUp;
+  uint8_t speedDown;
+  uint8_t srcRaw;
+  int8_t  sOffset;
+  char    name[6];
+
+ operator MixData();
+  t_Open9xArmMixData_v212() { memset(this, 0, sizeof(t_Open9xArmMixData_v212)); }
+}) Open9xArmMixData_v212;
+
+PACK(typedef struct t_Open9xArmFlightModeData_v208 {
+  int16_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
+  int8_t swtch;       // swtch of phase[0] is not used
+  char name[6];
+  uint8_t fadeIn:4;
+  uint8_t fadeOut:4;
+  operator FlightModeData();
+  t_Open9xArmFlightModeData_v208() { memset(this, 0, sizeof(t_Open9xArmFlightModeData_v208)); }
+}) Open9xArmFlightModeData_v208;
+
+PACK(typedef struct t_Open9xArmFlightModeData_v212 {
+  int16_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
+  int8_t swtch;       // swtch of phase[0] is not used
+  char name[6];
+  uint8_t fadeIn:4;
+  uint8_t fadeOut:4;
+  int16_t rotaryEncoders[1];
+  operator FlightModeData();
+  t_Open9xArmFlightModeData_v212() { memset(this, 0, sizeof(t_Open9xArmFlightModeData_v212)); }
+}) Open9xArmFlightModeData_v212;
+
+PACK(typedef struct t_Open9xArmLogicalSwitchData_v208 { // Custom Switches data
+  int8_t  v1; //input
+  int8_t  v2; //offset
+  uint8_t func;
+
+  operator LogicalSwitchData();
+  t_Open9xArmLogicalSwitchData_v208() { memset(this, 0, sizeof(t_Open9xArmLogicalSwitchData_v208)); }
+}) Open9xArmLogicalSwitchData_v208;
+
+PACK(typedef struct t_Open9xArmLogicalSwitchData_v209 { // Custom Switches data
+  int8_t  v1; //input
+  int8_t  v2; //offset
+  uint8_t func;
+
+  operator LogicalSwitchData();
+  t_Open9xArmLogicalSwitchData_v209() { memset(this, 0, sizeof(t_Open9xArmLogicalSwitchData_v209)); }
+}) Open9xArmLogicalSwitchData_v209;
+
+PACK(typedef struct t_Open9xArmLogicalSwitchData_v210 { // Custom Switches data
+  int8_t  v1; //input
+  int8_t  v2; //offset
+  uint8_t func;
+  uint8_t delay;
+  uint8_t duration;
+
+  operator LogicalSwitchData();
+  t_Open9xArmLogicalSwitchData_v210() { memset(this, 0, sizeof(t_Open9xArmLogicalSwitchData_v210)); }
+}) Open9xArmLogicalSwitchData_v210;
+
+PACK(typedef struct t_Open9xArmCustomFunctionData_v208 { // Function Switches data
+  int8_t  swtch; // input
+  uint8_t func;
+  uint8_t param;
+
+  operator CustomFunctionData();
+  t_Open9xArmCustomFunctionData_v208() { memset(this, 0, sizeof(t_Open9xArmCustomFunctionData_v208)); }
+}) Open9xArmCustomFunctionData_v208;
+
+PACK(typedef struct t_Open9xArmCustomFunctionData_v210 { // Function Switches data
+  int8_t  swtch; // input
+  uint8_t func;
+  char    param[6];
+
+  operator CustomFunctionData();
+  t_Open9xArmCustomFunctionData_v210() { memset(this, 0, sizeof(t_Open9xArmCustomFunctionData_v210)); }
+}) Open9xArmCustomFunctionData_v210;
+
+PACK(typedef struct t_Open9xArmCustomFunctionData_v211 { // Function Switches data
+  int8_t  swtch; // input
+  uint8_t func;
+  char    param[6];
+  uint8_t delay;
+  uint8_t spare;
+
+  operator CustomFunctionData();
+  t_Open9xArmCustomFunctionData_v211() { memset(this, 0, sizeof(t_Open9xArmCustomFunctionData_v211)); }
+}) Open9xArmCustomFunctionData_v211;
+
+PACK(typedef struct t_Open9xArmSwashRingData_v208 { // Swash Ring data
+  uint8_t   invertELE:1;
+  uint8_t   invertAIL:1;
+  uint8_t   invertCOL:1;
+  uint8_t   type:5;
+  uint8_t   collectiveSource;
+  uint8_t   value;
+
+  operator SwashRingData();
+  t_Open9xArmSwashRingData_v208() { memset(this, 0, sizeof(t_Open9xArmSwashRingData_v208)); }
+}) Open9xArmSwashRingData_v208;
+
+PACK(typedef struct t_Open9xArmSwashRingData_v209 { // Swash Ring data
+  uint8_t   invertELE:1;
+  uint8_t   invertAIL:1;
+  uint8_t   invertCOL:1;
+  uint8_t   type:5;
+  uint8_t   collectiveSource;
+  uint8_t   value;
+
+  operator SwashRingData();
+  t_Open9xArmSwashRingData_v209() { memset(this, 0, sizeof(t_Open9xArmSwashRingData_v209)); }
+}) Open9xArmSwashRingData_v209;
+
+PACK(typedef struct t_Open9xArmSwashRingData_v210 { // Swash Ring data
+  uint8_t   invertELE:1;
+  uint8_t   invertAIL:1;
+  uint8_t   invertCOL:1;
+  uint8_t   type:5;
+  uint8_t   collectiveSource;
+  uint8_t   value;
+
+  operator SwashRingData();
+  t_Open9xArmSwashRingData_v210() { memset(this, 0, sizeof(t_Open9xArmSwashRingData_v210)); }
+}) Open9xArmSwashRingData_v210;
+
+
+PACK(typedef struct t_Open9xArmFrSkyBarData_v210 {
+  uint8_t   source;
+  uint8_t   barMin;           // minimum for bar display
+  uint8_t   barMax;           // ditto for max display (would usually = ratio)
+}) Open9xArmFrSkyBarData_v210;
+
+PACK(typedef struct t_Open9xArmFrSkyData_v210 {
+  Open9xFrSkyChannelData_v208 channels[2];
+  uint8_t usrProto:2;            // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
+  uint8_t voltsSource:2;
+  uint8_t blades:2;
+  uint8_t currentSource:2;
+  Open9xArmFrSkyBarData_v210 bars[4];
+  Open9xFrSkyRSSIAlarm rssiAlarms[2];
+  uint8_t lines[4*2*2];
+  uint8_t spare[4];
+
+  operator FrSkyData();
+  t_Open9xArmFrSkyData_v210() { memset(this, 0, sizeof(t_Open9xArmFrSkyData_v210)); }
+}) Open9xArmFrSkyData_v210;
+
+PACK(typedef struct t_Open9xArmFrSkyData_v211 {
+  Open9xFrSkyChannelData_v208 channels[2];
+  Open9xFrSkyRSSIAlarm rssiAlarms[2];
+  uint8_t usrProto; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
+  uint8_t voltsSource;
+  uint8_t blades;   // How many blades for RPMs, 0=2 blades, 1=3 blades
+  uint8_t currentSource;
+  Open9xArmFrSkyBarData_v210 bars[4];
+  uint8_t lines[4*2*2];
+  uint8_t varioSource;
+  uint8_t varioSpeedUpMin;    // if increment in 0.2m/s = 3.0m/s max
+  uint8_t varioSpeedDownMin;
+  uint8_t spare[4];
+
+  operator FrSkyData();
+  t_Open9xArmFrSkyData_v211() { memset(this, 0, sizeof(t_Open9xArmFrSkyData_v211)); }
+}) Open9xArmFrSkyData_v211;
+
+PACK(typedef struct t_Open9xArmModelData_v208 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xArmTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint16_t  beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xArmMixData_v208 mixData[64];
+  Open9xLimitData_v201 limitData[32];
+  Open9xArmExpoData_v208  expoData[32];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xArmLogicalSwitchData_v208 logicalSw[32];
+  Open9xArmCustomFunctionData_v208 customFn[32];
+  Open9xArmSwashRingData_v208 swashR;
+  Open9xArmFlightModeData_v208 flightModeData[9];
+  Open9xFrSkyData_v208 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  uint8_t   frskyLines[4];
+  uint16_t  frskyLinesXtra;
+  int8_t    servoCenter[32];
+
+  uint8_t varioSource:3;
+  uint8_t varioSpeedUpMin:5;    // if increment in 0.2m/s = 3.0m/s max
+  uint8_t varioSpeedDownMin;
+
+  operator ModelData();
+  t_Open9xArmModelData_v208() { memset(this, 0, sizeof(t_Open9xArmModelData_v208)); }
+}) Open9xArmModelData_v208;
+
+PACK(typedef struct t_Open9xArmModelData_v209 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xArmTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint16_t  beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xArmMixData_v209 mixData[64];
+  Open9xLimitData_v201 limitData[32];
+  Open9xArmExpoData_v208  expoData[32];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xArmLogicalSwitchData_v209 logicalSw[32];
+  Open9xArmCustomFunctionData_v208 customFn[32];
+  Open9xArmSwashRingData_v209 swashR;
+  Open9xArmFlightModeData_v208 flightModeData[9];
+  Open9xFrSkyData_v208 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  uint8_t   frskyLines[4];
+  uint16_t  frskyLinesXtra;
+  int8_t    servoCenter[32];
+
+  uint8_t varioSource:3;
+  uint8_t varioSpeedUpMin:5;    // if increment in 0.2m/s = 3.0m/s max
+  uint8_t varioSpeedDownMin;
+  uint8_t switchWarningStates;
+
+  operator ModelData();
+  t_Open9xArmModelData_v209() { memset(this, 0, sizeof(t_Open9xArmModelData_v209)); }
+}) Open9xArmModelData_v209;
+
+PACK(typedef struct t_Open9xArmModelData_v210 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xArmTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint16_t  beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xArmMixData_v210 mixData[64];
+  Open9xLimitData_v201 limitData[32];
+  Open9xArmExpoData_v210  expoData[32];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xArmLogicalSwitchData_v210 logicalSw[32];
+  Open9xArmCustomFunctionData_v210 customFn[32];
+  Open9xArmSwashRingData_v209 swashR;
+  Open9xArmFlightModeData_v208 flightModeData[9];
+  Open9xArmFrSkyData_v210 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  int8_t    servoCenter[32];
+
+  uint8_t varioSource:3;
+  uint8_t varioSpeedUpMin:5;    // if increment in 0.2m/s = 3.0m/s max
+  uint8_t varioSpeedDownMin;
+  uint8_t switchWarningStates;
+
+  operator ModelData();
+  t_Open9xArmModelData_v210() { memset(this, 0, sizeof(t_Open9xArmModelData_v210)); }
+
+}) Open9xArmModelData_v210;
+
+PACK(typedef struct t_Open9xArmModelData_v211 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xArmTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint16_t  beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xArmMixData_v210 mixData[64];
+  Open9xLimitData_v201 limitData[32];
+  Open9xArmExpoData_v210  expoData[32];
+  int16_t   curves[16];
+  int8_t    points[512];
+  Open9xArmLogicalSwitchData_v210 logicalSw[32];
+  Open9xArmCustomFunctionData_v211 customFn[32];
+  Open9xArmSwashRingData_v209 swashR;
+  Open9xArmFlightModeData_v208 flightModeData[9];
+
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+
+  int8_t    servoCenter[32];
+
+  uint8_t switchWarningStates;
+
+  Open9xArmFrSkyData_v211 frsky;
+
+  operator ModelData();
+  t_Open9xArmModelData_v211() { memset(this, 0, sizeof(t_Open9xArmModelData_v211)); }
+}) Open9xArmModelData_v211;
+
+PACK(typedef struct t_Open9xArmModelData_v212 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xArmTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare1:1;
+  int8_t    ppmDelay;
+  uint16_t  beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xArmMixData_v212 mixData[64];
+  Open9xLimitData_v211 limitData[32];
+  Open9xArmExpoData_v212  expoData[32];
+  int16_t   curves[16];
+  int8_t    points[512];
+  Open9xArmLogicalSwitchData_v210 logicalSw[32];
+  Open9xArmCustomFunctionData_v211 customFn[32];
+  Open9xArmSwashRingData_v210 swashR;
+  Open9xArmFlightModeData_v212 flightModeData[9];
+
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  uint8_t switchWarningStates;
+
+  Open9xArmFrSkyData_v211 frsky;
+  Open9xTimerDataExtra timersXtra[2];
+  
+  operator ModelData();
+  t_Open9xArmModelData_v212() { memset(this, 0, sizeof(t_Open9xArmModelData_v212)); }
+}) Open9xArmModelData_v212;
+
+#endif

companion/src/firmwares/opentx/open9xStockeeprom.h

@@ -0,0 +1,805 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ *
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef open9xstockeeprom_h
+#define open9xstockeeprom_h
+
+#define O9X_MAX_CSFUNCOLD 13
+#define O9X_MAX_CSFUNC 15
+
+#include <inttypes.h>
+#include "eeprominterface.h"
+#include <qbytearray.h>
+
+int8_t open9xV4209FromSource(RawSource source);
+int8_t open9xStock209FromSource(RawSource source);
+RawSource open9xV4209ToSource(int8_t value);
+RawSource open9xStock209ToSource(int8_t value);
+int8_t open9xStockFromSwitch(const RawSwitch & sw);
+RawSwitch open9xStockToSwitch(int8_t sw);
+
+struct CurveInfo {
+  int8_t *crv;
+  uint8_t points;
+  bool custom;
+};
+
+template <class T>
+int8_t *curveaddress(T * model, uint8_t idx)
+{
+  return &model->points[idx==0 ? 0 : 5*idx+model->curves[idx-1]];
+}
+
+template <class T>
+extern CurveInfo curveinfo(T * model, uint8_t idx)
+{
+  CurveInfo result;
+  result.crv = curveaddress(model, idx);
+  int8_t *next = curveaddress(model, idx+1);
+  uint8_t size = next - result.crv;
+  if (size % 2 == 0) {
+    result.points = (size / 2) + 1;
+    result.custom = true;
+  }
+  else {
+    result.points = size;
+    result.custom = false;
+  }
+  return result;
+}
+
+PACK(typedef struct t_Open9xFrSkyRSSIAlarm {
+  uint8_t       level:2;
+  int8_t        value:6;
+  FrSkyRSSIAlarm get(int index);
+  t_Open9xFrSkyRSSIAlarm() { memset(this, 0, sizeof(t_Open9xFrSkyRSSIAlarm)); }
+}) Open9xFrSkyRSSIAlarm;
+
+PACK(typedef struct t_Open9xExpoData_v201 {
+  uint8_t mode:2;         // 0=end, 1=pos, 2=neg, 3=both
+  uint8_t chn:2;
+  uint8_t curve:4;        // 0=no curve, 1-6=std curves, 7-10=CV1-CV4, 11-15=CV9-CV13
+  int8_t  swtch:5;
+  uint8_t phase:3;        // if negPhase is 0: 0=normal, 5=FP4    if negPhase is 1: 5=!FP4
+  uint8_t negPhase:1;
+  uint8_t weight:7;
+  int8_t  expo;
+
+  operator ExpoData();
+  t_Open9xExpoData_v201() { memset(this, 0, sizeof(t_Open9xExpoData_v201)); }
+}) Open9xExpoData_v201;
+
+PACK(typedef struct t_Open9xExpoData_v211 {
+  uint8_t mode:2;         // 0=end, 1=pos, 2=neg, 3=both
+  int8_t  swtch:6;
+  uint8_t chn:2;
+  uint8_t phases:5;
+  uint8_t curveMode:1;
+  uint8_t weight;         // we have one bit spare here :)
+  int8_t  curveParam;
+
+  operator ExpoData();
+  t_Open9xExpoData_v211() { memset(this, 0, sizeof(t_Open9xExpoData_v211)); }
+}) Open9xExpoData_v211;
+
+PACK(typedef struct t_Open9xLimitData_v201 {
+  int8_t  min;
+  int8_t  max;
+  bool    revert;
+  int16_t  offset;
+
+  operator LimitData();
+  t_Open9xLimitData_v201() { memset(this, 0, sizeof(t_Open9xLimitData_v201)); }
+}) Open9xLimitData_v201;
+
+PACK(typedef struct t_Open9xLimitData_v211 {
+  int8_t  min;
+  int8_t  max;
+  int8_t  ppmCenter;
+  int16_t offset:14;
+  uint16_t symetrical:1;
+  uint16_t revert:1;
+
+  operator LimitData();
+  t_Open9xLimitData_v211() { memset(this, 0, sizeof(t_Open9xLimitData_v211)); }
+}) Open9xLimitData_v211;
+
+PACK(typedef struct t_Open9xMixData_v201 {
+  uint8_t destCh:5;          // 0, 1..C9X_NUM_CHNOUT
+  uint8_t mixWarn:3;         // mixer warning
+  uint8_t srcRaw;            //
+  int8_t  weight;
+  int8_t  swtch;
+  uint8_t curve;             // 0=symmetrisch, 1=no neg, 2=no pos
+  uint8_t delayUp:4;
+  uint8_t delayDown:4;
+  uint8_t speedUp:4;         // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown:4;       // 0 nichts
+  uint8_t carryTrim:1;
+  uint8_t mltpx:3;           // multiplex method 0=+ 1=* 2=replace
+  int8_t  phase:4;           // -5=!FP4, 0=normal, 5=FP4
+  int8_t  sOffset;
+
+  operator MixData();
+  t_Open9xMixData_v201() { memset(this, 0, sizeof(t_Open9xMixData_v201)); }
+}) Open9xMixData_v201;
+
+PACK(typedef struct t_Open9xMixData_v203 {
+  uint8_t destCh:5;          // 0, 1..C9X_NUM_CHNOUT
+  uint8_t mixWarn:3;         // mixer warning
+  uint8_t srcRaw;            //
+  int8_t  weight;
+  int8_t  swtch;
+  uint8_t curve;
+  uint8_t delayUp:4;
+  uint8_t delayDown:4;
+  uint8_t speedUp:4;         // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown:4;       // 0 nichts
+  uint8_t carryTrim:2;
+  uint8_t mltpx:2;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  int8_t  phase:4;           // -5=!FP4, 0=normal, 5=FP4
+  int8_t  sOffset;
+
+  operator MixData();
+  t_Open9xMixData_v203() { memset(this, 0, sizeof(t_Open9xMixData_v203)); }
+}) Open9xMixData_v203;
+
+PACK(typedef struct t_Open9xMixData_v205 {
+  uint8_t destCh:4;          // 0, 1..C9X_NUM_CHNOUT
+  int8_t  phase:4;           // -5=!FP4, 0=normal, 5=FP4
+  int8_t  weight;
+  int8_t  swtch:6;
+  uint8_t mltpx:2;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  int8_t  curve:6;
+  uint8_t mixWarn:2;         // mixer warning
+  uint8_t delayUp:4;
+  uint8_t delayDown:4;
+  uint8_t speedUp:4;         // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown:4;       // 0 nichts
+  uint16_t srcRaw:7;         //
+  int16_t differential:7;
+  uint16_t carryTrim:2;
+  int8_t  sOffset;
+
+ operator MixData();
+  t_Open9xMixData_v205() { memset(this, 0, sizeof(t_Open9xMixData_v205)); }
+}) Open9xMixData_v205;
+
+PACK(typedef struct t_Open9xMixData_v209 {
+  uint8_t destCh:4;          // 0, 1..C9X_NUM_CHNOUT
+  int8_t  phase:4;           // -5=!FP4, 0=normal, 5=FP4
+  int8_t  weight;
+  int8_t  swtch:6;
+  uint8_t mltpx:2;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  int8_t  curve:6;
+  uint8_t mixWarn:2;         // mixer warning
+  uint8_t delayUp:4;
+  uint8_t delayDown:4;
+  uint8_t speedUp:4;         // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown:4;       // 0 nichts
+  uint16_t srcRaw:6;
+  int16_t differential:7;
+  int16_t carryTrim:3;
+  int8_t  sOffset;
+
+ operator MixData();
+  t_Open9xMixData_v209() { memset(this, 0, sizeof(t_Open9xMixData_v209)); }
+}) Open9xMixData_v209;
+
+PACK(typedef struct t_Open9xMixData_v211 {
+  uint8_t destCh:4;          // 0, 1..C9X_NUM_CHNOUT
+  uint8_t curveMode:1;       // O=curve, 1=differential
+  uint8_t noExpo:1;
+  uint8_t spare:2;
+  int8_t  weight;
+  int8_t  swtch:6;
+  uint8_t mltpx:2;           // multiplex method: 0 means +=, 1 means *=, 2 means :=
+  uint8_t phases:5;
+  int8_t  carryTrim:3;
+  uint8_t srcRaw:6;
+  uint8_t mixWarn:2;         // mixer warning
+  uint8_t delayUp:4;
+  uint8_t delayDown:4;
+  uint8_t speedUp:4;
+  uint8_t speedDown:4;
+  int8_t  curveParam;
+  int8_t  sOffset;
+
+ operator MixData();
+  t_Open9xMixData_v211() { memset(this, 0, sizeof(t_Open9xMixData_v211)); }
+}) Open9xMixData_v211;
+
+PACK(typedef struct t_Open9xLogicalSwitchData_v208 { // Custom Switches data
+  int8_t  v1; //input
+  int8_t  v2; //offset
+  uint8_t func;
+
+  operator LogicalSwitchData();
+  t_Open9xLogicalSwitchData_v208() { memset(this, 0, sizeof(t_Open9xLogicalSwitchData_v208)); }
+  t_Open9xLogicalSwitchData_v208(LogicalSwitchData&);
+}) Open9xLogicalSwitchData_v208;
+
+PACK(typedef struct t_Open9xLogicalSwitchData_v209 { // Custom Switches data
+  int8_t  v1; //input
+  int8_t  v2; //offset
+  uint8_t func;
+
+  operator LogicalSwitchData();
+  t_Open9xLogicalSwitchData_v209() { memset(this, 0, sizeof(t_Open9xLogicalSwitchData_v209)); }
+}) Open9xLogicalSwitchData_v209;
+
+PACK(typedef struct t_Open9xSafetySwData { // Safety Switches data
+  int8_t  swtch;
+  int8_t  val;
+
+  t_Open9xSafetySwData() { memset(this, 0, sizeof(t_Open9xSafetySwData)); }
+}) Open9xSafetySwData;
+
+PACK(typedef struct t_Open9xCustomFunctionData_v201 { // Function Switches data
+  int8_t  swtch; // input
+  uint8_t func;
+
+  operator CustomFunctionData();
+  t_Open9xCustomFunctionData_v201() { memset(this, 0, sizeof(t_Open9xCustomFunctionData_v201)); }
+}) Open9xCustomFunctionData_v201;
+
+PACK(typedef struct t_Open9xCustomFunctionData_v203 { // Function Switches data
+  int8_t  swtch; // input
+  uint8_t func;
+  uint8_t param;
+
+  operator CustomFunctionData();
+  t_Open9xCustomFunctionData_v203() { memset(this, 0, sizeof(t_Open9xCustomFunctionData_v203)); }
+}) Open9xCustomFunctionData_v203;
+
+PACK(typedef struct t_Open9xCustomFunctionData_v210 { // Function Switches data
+  int8_t  swtch; // input
+  uint8_t func:5;
+  uint8_t delay:3;
+  uint8_t param;
+
+  operator CustomFunctionData();
+  t_Open9xCustomFunctionData_v210() { memset(this, 0, sizeof(t_Open9xCustomFunctionData_v210)); }
+}) Open9xCustomFunctionData_v210;
+
+PACK(typedef struct t_Open9xFrSkyChannelData_v201 {
+  uint8_t   ratio;              // 0.0 means not used, 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
+  uint8_t   type:4;             // channel unit (0=volts, ...)
+  int8_t    offset:4;           // calibration offset. Signed 0.1V steps. EG. -4 to substract 0.4V
+  uint8_t   alarms_value[2];    // 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
+  uint8_t   alarms_level:4;
+  uint8_t   alarms_greater:2;   // 0=LT(<), 1=GT(>)
+  uint8_t   spare:2;
+  uint8_t   barMin;             // minimum for bar display
+  uint8_t   barMax;             // ditto for max display (would usually = ratio)
+
+  operator FrSkyChannelData();
+  t_Open9xFrSkyChannelData_v201() { memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v201)); }
+}) Open9xFrSkyChannelData_v201;
+
+PACK(typedef struct t_Open9xFrSkyChannelData_v203 {
+  uint8_t   ratio;              // 0.0 means not used, 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
+  uint8_t   type;               // channel unit (0=volts, ...)
+  uint8_t   alarms_value[2];    // 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
+  uint8_t   alarms_level:4;
+  uint8_t   alarms_greater:2;   // 0=LT(<), 1=GT(>)
+  uint8_t   spare:2;
+  uint8_t   barMin:4;           // minimum for bar display
+  uint8_t   barMax:4;           // ditto for max display (would usually = ratio)
+  int8_t    offset;             // calibration offset. Signed 0.1V steps. EG. -4 to substract 0.4V
+
+  operator FrSkyChannelData();
+  t_Open9xFrSkyChannelData_v203() { memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v203)); }
+}) Open9xFrSkyChannelData_v203;
+
+PACK(typedef struct t_Open9xFrSkyChannelData_v204 {
+  uint8_t   ratio;              // 0.0 means not used, 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
+  uint8_t   type;               // channel unit (0=volts, ...)
+  uint8_t   alarms_value[2];    // 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
+  uint8_t   alarms_level:4;
+  uint8_t   alarms_greater:2;   // 0=LT(<), 1=GT(>)
+  uint8_t   multiplier:2;
+  int8_t    offset;             // calibration offset. Signed 0.1V steps. EG. -4 to substract 0.4V
+
+  operator FrSkyChannelData();
+  t_Open9xFrSkyChannelData_v204() { memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v204)); }
+}) Open9xFrSkyChannelData_v204;
+
+PACK(typedef struct t_Open9xFrSkyChannelData_v208 {
+  uint8_t   ratio;              // 0.0 means not used, 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
+  int16_t   offset:12;
+  uint16_t  type:4;             // channel unit (0=volts, ...)
+  uint8_t   alarms_value[2];    // 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
+  uint8_t   alarms_level:4;
+  uint8_t   alarms_greater:2;   // 0=LT(<), 1=GT(>)
+  uint8_t   multiplier:2;
+
+  operator FrSkyChannelData();
+  t_Open9xFrSkyChannelData_v208() { memset(this, 0, sizeof(t_Open9xFrSkyChannelData_v208)); }
+}) Open9xFrSkyChannelData_v208;
+
+PACK(typedef struct t_Open9xFrSkyData_v201 {
+  Open9xFrSkyChannelData_v201 channels[2];
+
+  operator FrSkyData();
+  t_Open9xFrSkyData_v201() { memset(this, 0, sizeof(t_Open9xFrSkyData_v201)); }
+}) Open9xFrSkyData_v201;
+
+PACK(typedef struct t_Open9xFrSkyData_v202 {
+  Open9xFrSkyChannelData_v201 channels[2];
+  uint8_t usrProto:2;  // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
+  uint8_t spare:6;
+
+  operator FrSkyData();
+  t_Open9xFrSkyData_v202() { memset(this, 0, sizeof(t_Open9xFrSkyData_v202)); }
+}) Open9xFrSkyData_v202;
+
+PACK(typedef struct t_Open9xFrSkyData_v203 {
+  Open9xFrSkyChannelData_v203 channels[2];
+  uint8_t usrProto;  // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
+
+  operator FrSkyData();
+  t_Open9xFrSkyData_v203() { memset(this, 0, sizeof(t_Open9xFrSkyData_v203)); }
+}) Open9xFrSkyData_v203;
+
+PACK(typedef struct t_Open9xFrSkyBarData_v204 {
+  uint16_t   source:4;
+  uint16_t   barMin:6;           // minimum for bar display
+  uint16_t   barMax:6;           // ditto for max display (would usually = ratio)
+
+  operator FrSkyBarData();
+  t_Open9xFrSkyBarData_v204() { memset(this, 0, sizeof(t_Open9xFrSkyBarData_v204)); }
+}) Open9xFrSkyBarData_v204;
+
+PACK(typedef struct t_Open9xFrSkyData_v204 {
+  Open9xFrSkyChannelData_v204 channels[2];
+  uint8_t usrProto:3;            // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
+  uint8_t imperial:1;
+  uint8_t blades:2;
+  uint8_t spare:2;
+  Open9xFrSkyBarData_v204 bars[4];
+
+  operator FrSkyData();
+  t_Open9xFrSkyData_v204() { memset(this, 0, sizeof(t_Open9xFrSkyData_v204)); }
+}) Open9xFrSkyData_v204;
+
+PACK(typedef struct t_Open9xFrSkyData_v205 {
+  Open9xFrSkyChannelData_v204 channels[2];
+  uint8_t usrProto:3;            // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
+  uint8_t imperial:1;
+  uint8_t blades:2;
+  uint8_t spare:2;
+  Open9xFrSkyBarData_v204 bars[4];
+  Open9xFrSkyRSSIAlarm rssiAlarms[2];
+
+  operator FrSkyData();
+  t_Open9xFrSkyData_v205() { memset(this, 0, sizeof(t_Open9xFrSkyData_v205)); }
+}) Open9xFrSkyData_v205;
+
+PACK(typedef struct t_Open9xFrSkyData_v208 {
+  Open9xFrSkyChannelData_v208 channels[2];
+  uint8_t usrProto:2;            // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
+  uint8_t voltsSource:2;
+  uint8_t blades:2;
+  uint8_t currentSource:2;
+  Open9xFrSkyBarData_v204 bars[4];
+  Open9xFrSkyRSSIAlarm rssiAlarms[2];
+
+  operator FrSkyData();
+  t_Open9xFrSkyData_v208() { memset(this, 0, sizeof(t_Open9xFrSkyData_v208)); }
+}) Open9xFrSkyData_v208;
+
+PACK(typedef struct t_Open9xFrSkyData_v210 {
+  Open9xFrSkyChannelData_v208 channels[2];
+  uint8_t usrProto:2; // Protocol in FrSky user data, 0=None, 1=FrSky hub, 2=WS HowHigh
+  uint8_t blades:2;   // How many blades for RPMs, 0=2 blades, 1=3 blades
+  uint8_t spare1:4;
+  uint8_t voltsSource:3;
+  uint8_t currentSource:3;
+  uint8_t spare2:2;
+  Open9xFrSkyBarData_v204 bars[4];
+  Open9xFrSkyRSSIAlarm rssiAlarms[2];
+  uint8_t   lines[4];
+  uint16_t  linesXtra;
+  uint8_t   varioSource:3;
+  uint8_t   varioSpeedUpMin:5;    // if increment in 0.2m/s = 3.0m/s max
+  uint8_t   varioSpeedDownMin;
+
+  operator FrSkyData();
+  t_Open9xFrSkyData_v210() { memset(this, 0, sizeof(t_Open9xFrSkyData_v210)); }
+}) Open9xFrSkyData_v210;
+
+PACK(typedef struct t_Open9xSwashRingData_v208 { // Swash Ring data
+  uint8_t   invertELE:1;
+  uint8_t   invertAIL:1;
+  uint8_t   invertCOL:1;
+  uint8_t   type:5;
+  uint8_t   collectiveSource;
+  uint8_t   value;
+
+  operator SwashRingData();
+  t_Open9xSwashRingData_v208() { memset(this, 0, sizeof(t_Open9xSwashRingData_v208)); }
+}) Open9xSwashRingData_v208;
+
+PACK(typedef struct t_Open9xSwashRingData_v209 { // Swash Ring data
+  uint8_t   invertELE:1;
+  uint8_t   invertAIL:1;
+  uint8_t   invertCOL:1;
+  uint8_t   type:5;
+  uint8_t   collectiveSource;
+  uint8_t   value;
+
+  operator SwashRingData();
+  t_Open9xSwashRingData_v209() { memset(this, 0, sizeof(t_Open9xSwashRingData_v209)); }
+}) Open9xSwashRingData_v209;
+
+PACK(typedef struct t_Open9xFlightModeData_v201 {
+  int8_t trim[4];     // -500..500 => trim value, 501 => use trim of phase 0, 502, 503, 504 => use trim of phases 1|2|3|4 instead
+  int8_t trim_ext:8;  // 2 less significant extra bits per trim (10bits trims)
+  int8_t swtch;       // swtch of phase[0] is not used
+  char name[6];
+  uint8_t fadeIn:4;
+  uint8_t fadeOut:4;
+
+  operator FlightModeData();
+  t_Open9xFlightModeData_v201() { memset(this, 0, sizeof(t_Open9xFlightModeData_v201)); }
+}) Open9xFlightModeData_v201;
+
+PACK(typedef struct t_Open9xTimerData_v201 {
+  int8_t    mode;            // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw
+  uint16_t  val:14;
+  uint16_t  persistent:1;
+  uint16_t  dir:1;          // 0=>Count Down, 1=>Count Up
+
+  operator TimerData();
+  t_Open9xTimerData_v201() { memset(this, 0, sizeof(t_Open9xTimerData_v201)); }
+}) Open9xTimerData_v201;
+
+PACK(typedef struct t_Open9xTimerData_v202 {
+  int8_t     mode;            // timer trigger source -> off, abs, stk, stk%, sw/!sw, !m_sw/!m_sw
+  uint16_t   val;
+
+  operator TimerData();
+  t_Open9xTimerData_v202() { memset(this, 0, sizeof(t_Open9xTimerData_v202)); }
+}) Open9xTimerData_v202;
+
+PACK(typedef struct t_Open9xTimerDataExtra {
+  uint16_t remanent:1;
+  uint16_t value:15;
+  t_Open9xTimerDataExtra() { memset(this, 0, sizeof(t_Open9xTimerDataExtra)); }
+}) Open9xTimerDataExtra;
+
+PACK(typedef struct t_Open9xModelData_v201 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v201 timer1;
+  uint8_t   protocol:3;
+  int8_t    ppmNCH:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  uint8_t   thrExpo:1;            // Enable Throttle Expo
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   spare1:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xTimerData_v201 timer2;
+  Open9xMixData_v201 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xLogicalSwitchData_v208  logicalSw[12];
+  Open9xSafetySwData  safetySw[16];
+  Open9xCustomFunctionData_v201 customFn[12];
+  Open9xSwashRingData_v208 swashR;
+  Open9xFlightModeData_v201 flightModeData[5];
+  Open9xFrSkyData_v201 frsky;
+
+  operator ModelData();
+  t_Open9xModelData_v201() { memset(this, 0, sizeof(t_Open9xModelData_v201)); }
+}) Open9xModelData_v201;
+
+PACK(typedef struct t_Open9xModelData_v202 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timer1;
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   spare1:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xTimerData_v202 timer2;
+  Open9xMixData_v201 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xLogicalSwitchData_v208  logicalSw[12];
+  Open9xSafetySwData  safetySw[16];
+  Open9xCustomFunctionData_v201 customFn[12];
+  Open9xSwashRingData_v208 swashR;
+  Open9xFlightModeData_v201 flightModeData[5];
+  Open9xFrSkyData_v202 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+
+  operator ModelData();
+  t_Open9xModelData_v202() { memset(this, 0, sizeof(t_Open9xModelData_v202)); }
+}) Open9xModelData_v202;
+
+PACK(typedef struct t_Open9xModelData_v203 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timer1;
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   spare1:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xTimerData_v202 timer2;
+  Open9xMixData_v203 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xLogicalSwitchData_v208 logicalSw[12];
+  Open9xCustomFunctionData_v203 customFn[16];
+  Open9xSwashRingData_v208 swashR;
+  Open9xFlightModeData_v201 flightModeData[5];
+  Open9xFrSkyData_v202 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+
+  operator ModelData();
+  t_Open9xModelData_v203() { memset(this, 0, sizeof(t_Open9xModelData_v203)); }
+}) Open9xModelData_v203;
+
+PACK(typedef struct t_Open9xModelData_v204 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timer1;
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   spare1:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xTimerData_v202 timer2;
+  Open9xMixData_v203 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xLogicalSwitchData_v208  logicalSw[12];
+  Open9xCustomFunctionData_v203 customFn[16];
+  Open9xSwashRingData_v208 swashR;
+  Open9xFlightModeData_v201 flightModeData[5];
+  Open9xFrSkyData_v204 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  Open9xFrSkyRSSIAlarm frskyRssiAlarms[2];
+
+  operator ModelData();
+  t_Open9xModelData_v204() { memset(this, 0, sizeof(t_Open9xModelData_v204)); }
+}) Open9xModelData_v204;
+
+PACK(typedef struct t_Open9xModelData_v205 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   spare1:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xMixData_v205 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xLogicalSwitchData_v208  logicalSw[12];
+  Open9xCustomFunctionData_v203 customFn[16];
+  Open9xSwashRingData_v208 swashR;
+  Open9xFlightModeData_v201 flightModeData[5];
+  Open9xFrSkyData_v205 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  uint8_t   frskyLines[4];
+  uint16_t  frskyLinesXtra;
+  int8_t    servoCenter[16];
+
+  operator ModelData();
+  t_Open9xModelData_v205() { memset(this, 0, sizeof(t_Open9xModelData_v205)); }
+}) Open9xModelData_v205;
+
+PACK(typedef struct t_Open9xModelData_v208 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xMixData_v205 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xLogicalSwitchData_v208  logicalSw[12];
+  Open9xCustomFunctionData_v203 customFn[16];
+  Open9xSwashRingData_v208 swashR;
+  Open9xFlightModeData_v201 flightModeData[5];
+  Open9xFrSkyData_v208 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  uint8_t   frskyLines[4];
+  uint16_t  frskyLinesXtra;
+  int8_t    servoCenter[16];
+
+  uint8_t varioSource:3;
+  uint8_t varioSpeedUpMin:5;    // if increment in 0.2m/s = 3.0m/s max
+  uint8_t varioSpeedDownMin;
+
+  operator ModelData();
+  t_Open9xModelData_v208() { memset(this, 0, sizeof(t_Open9xModelData_v208)); }
+}) Open9xModelData_v208;
+
+PACK(typedef struct t_Open9xModelData_v209 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xMixData_v209 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves5[8][5];
+  int8_t    curves9[8][9];
+  Open9xLogicalSwitchData_v209  logicalSw[12];
+  Open9xCustomFunctionData_v203 customFn[16];
+  Open9xSwashRingData_v209 swashR;
+  Open9xFlightModeData_v201 flightModeData[5];
+  Open9xFrSkyData_v208 frsky;
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+  uint8_t   frskyLines[4];
+  uint16_t  frskyLinesXtra;
+  int8_t    servoCenter[16];
+
+  uint8_t varioSource:3;
+  uint8_t varioSpeedUpMin:5;    // if increment in 0.2m/s = 3.0m/s max
+  uint8_t varioSpeedDownMin;
+  uint8_t switchWarningStates;
+
+  operator ModelData();
+  t_Open9xModelData_v209() { memset(this, 0, sizeof(t_Open9xModelData_v209)); }
+}) Open9xModelData_v209;
+
+PACK(typedef struct t_Open9xModelData_v210 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare2:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xMixData_v209 mixData[32];
+  Open9xLimitData_v201 limitData[16];
+  Open9xExpoData_v201  expoData[14];
+  int8_t    curves[8];
+  int8_t    points[112-8];
+  Open9xLogicalSwitchData_v209  logicalSw[12];
+  Open9xCustomFunctionData_v210 customFn[16];
+  Open9xSwashRingData_v209 swashR;
+  Open9xFlightModeData_v201 flightModeData[5];
+
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+
+  int8_t    servoCenter[16];
+
+  uint8_t switchWarningStates;
+
+  Open9xFrSkyData_v210 frsky;
+
+  operator ModelData();
+  t_Open9xModelData_v210() { memset(this, 0, sizeof(t_Open9xModelData_v210)); }
+}) Open9xModelData_v210;
+
+PACK(typedef struct t_Open9xModelData_v211 {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  Open9xTimerData_v202 timers[2];
+  uint8_t   protocol:3;
+  uint8_t   thrTrim:1;            // Enable Throttle Trim
+  int8_t    ppmNCH:4;
+  uint8_t   trimInc:3;            // Trim Increments
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   pulsePol:1;
+  uint8_t   extendedLimits:1;
+  uint8_t   extendedTrims:1;
+  uint8_t   spare1:1;
+  int8_t    ppmDelay;
+  uint8_t   beepANACenter;        // 1<<0->A1.. 1<<6->A7
+  Open9xMixData_v211 mixData[32];
+  Open9xLimitData_v211 limitData[16];
+  Open9xExpoData_v211  expoData[14];
+  int8_t    curves[8];
+  int8_t    points[112-8];
+  Open9xLogicalSwitchData_v209  logicalSw[12];
+  Open9xCustomFunctionData_v210 customFn[16];
+  Open9xSwashRingData_v209 swashR;
+  Open9xFlightModeData_v201 flightModeData[5];
+
+  int8_t    ppmFrameLength;       // 0=22.5ms  (10ms-30ms) 0.5msec increments
+  uint8_t   thrTraceSrc;
+  uint8_t   modelId;
+
+  uint8_t switchWarningStates;
+
+  Open9xFrSkyData_v210 frsky;
+
+  operator ModelData();
+  t_Open9xModelData_v211() { memset(this, 0, sizeof(t_Open9xModelData_v211)); }
+}) Open9xModelData_v211;
+
+#endif

companion/src/firmwares/opentx/opentxeeprom.h

@@ -1,12 +1,7 @@
 /*
- * Copyright (C) OpenTX
+ * Author - Bertrand Songis <bsongis@gmail.com>
  *
- * 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
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,10 +11,11 @@
  * 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 _OPENTXEEPROM_H_
-#define _OPENTXEEPROM_H_
+#ifndef open9xeeprom_h
+#define open9xeeprom_h
 
 #include <inttypes.h>
 #include "eeprominterface.h"
@@ -28,48 +24,35 @@
 
 #define GVARS_VARIANT                  0x0001
 #define FRSKY_VARIANT                  0x0002
+#define POS3_VARIANT                   0x0004
 #define MAVLINK_VARIANT                0x0008
 #define M128_VARIANT                   0x8000
 #define TARANIS_X9E_VARIANT            0x8000
-#define TARANIS_X7_VARIANT             0x4000
 
 #define SIMU_STOCK_VARIANTS            (GVARS_VARIANT|FRSKY_VARIANT)
 #define SIMU_M128_VARIANTS             (M128_VARIANT|SIMU_STOCK_VARIANTS)
 
 class OpenTxGeneralData: public TransformedField {
   public:
-    OpenTxGeneralData(GeneralSettings & generalData, Board::Type board, unsigned int version, unsigned int variant=0);
-
-    virtual const QString & getName() { return internalField.getName(); }
-
-    QStringList errors()
-    {
-      return _errors;
-    }
+    OpenTxGeneralData(GeneralSettings & generalData, BoardEnum board, unsigned int version, unsigned int variant=0);
 
   protected:
     virtual void beforeExport();
     virtual void afterImport();
 
-    virtual void setError(const QString & error)
-    {
-      qWarning() << error;
-      _errors << error;
-    }
-
     StructField internalField;
     GeneralSettings & generalData;
-    Board::Type board;
+    BoardEnum board;
     unsigned int version;
     int inputsCount;
     unsigned int chkSum;
-    QStringList _errors;
+    // unsigned int potsType[4];
 };
 
 class ProtocolsConversionTable: public ConversionTable
 {
   public:
-    ProtocolsConversionTable(Board::Type board)
+    ProtocolsConversionTable(BoardEnum board)
     {
       int val = 0;
       if (IS_ARM(board)) {
@@ -98,11 +81,8 @@ class ProtocolsConversionTable: public ConversionTable
         addConversion(PULSES_DSM2, val++);
         addConversion(PULSES_DSMX, val++);
       }
-      if (IS_ARM(board)) {
-        addConversion(PULSES_CROSSFIRE, val++);
-        addConversion(PULSES_MULTIMODULE, val++);
-        addConversion(PULSES_PXX_R9M, val++);
-        addConversion(PULSES_SBUS, val++);
+      if (IS_TARANIS(board)) {
+    	addConversion(PULSES_CROSSFIRE, val++);
       }
     }
 };
@@ -120,36 +100,26 @@ class ChannelsConversionTable: public ConversionTable
 
 class OpenTxModelData: public TransformedField {
   public:
-    OpenTxModelData(ModelData & modelData, Board::Type board, unsigned int version, unsigned int variant);
+    OpenTxModelData(ModelData & modelData, BoardEnum board, unsigned int version, unsigned int variant);
 
-    virtual const QString & getName() { return internalField.getName(); }
-
-    QStringList errors()
-    {
-      return _errors;
-    }
+    const char * getName() { return name; }
 
   protected:
     virtual void beforeExport();
     virtual void afterImport();
 
-    virtual void setError(const QString & error)
-    {
-      qWarning() << error;
-      _errors << error;
-    }
-
     StructField internalField;
     ModelData & modelData;
-    Board::Type board;
+    BoardEnum board;
     unsigned int version;
     unsigned int variant;
+
+  private:
     char name[256];
-    int subprotocols[CPN_MAX_MODULES+1/*trainer*/];
+    int subprotocols[C9X_NUM_MODULES+1/*trainer*/];
     ProtocolsConversionTable protocolsConversionTable;
     ChannelsConversionTable channelsConversionTable;
-    QStringList _errors;
 };
 
 void OpenTxEepromCleanup(void);
-#endif // _OPENTXEEPROM_H_
+#endif

companion/src/firmwares/opentx/opentxinterface.h

@@ -1,12 +1,7 @@
 /*
- * Copyright (C) OpenTX
+ * Author - Bertrand Songis <bsongis@gmail.com>
  *
- * 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
+ * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -16,36 +11,40 @@
  * 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 _OPENTXINTERFACE_H_
-#define _OPENTXINTERFACE_H_
+#ifndef opentx_interface_h
+#define opentx_interface_h
 
 #include "eeprominterface.h"
 
 class RleFile;
-class OpenTxFirmware;
 
 class OpenTxEepromInterface : public EEPROMInterface
 {
   public:
 
-    OpenTxEepromInterface(OpenTxFirmware * firmware);
+    OpenTxEepromInterface(BoardEnum board);
 
     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 const int getEEpromSize();
+
+    virtual const int getMaxModels();
+
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);
+
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
 
     virtual int getSize(const ModelData &);
 
     virtual int getSize(const GeneralSettings &);
-    
+
   protected:
 
     const char * getName();
@@ -53,42 +52,37 @@ 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);
+    template <class T>
+    bool loadModel(ModelData &model, uint8_t *data, int index, unsigned int stickMode=0);
 
-    void showErrors(const QString & title, const QStringList & errors);
-    
-    uint8_t getLastDataVersion(Board::Type board);
-    
-    RleFile * efile;
-    
-    OpenTxFirmware * firmware;
+    template <class T>
+    bool loadModelVariant(unsigned int index, ModelData &model, uint8_t *data, unsigned int version, unsigned int variant);
+
+    bool loadModel(uint8_t version, ModelData &model, uint8_t *data, int index, unsigned int variant, unsigned int stickMode=0);
+
+    template <class T>
+    bool saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant);
+
+    template <class T>
+    bool loadGeneral(GeneralSettings &settings, unsigned int version);
+
+    template <class T>
+    bool saveGeneral(GeneralSettings &settings, BoardEnum board, uint32_t version, uint32_t variant);
+
+    RleFile *efile;
 
 };
 
-class OpenTxFirmware: public Firmware
-{
+class OpenTxFirmware: public Firmware {
   public:
     OpenTxFirmware(const QString & id, OpenTxFirmware * parent):
-      Firmware(parent, id, parent->getName(), parent->getBoard())
+      Firmware(parent, id, parent->getName(), parent->getBoard(), parent->eepromInterface)
     {
-      setEEpromInterface(parent->getEEpromInterface());
     }
 
-    OpenTxFirmware(const QString & id, const QString & name, const Board::Type board):
-      Firmware(id, name, board)
+    OpenTxFirmware(const QString & id, const QString & name, const BoardEnum board):
+      Firmware(id, name, board, new OpenTxEepromInterface(board))
     {
       addLanguage("en");
       addLanguage("cz");
@@ -123,11 +117,9 @@ class OpenTxFirmware: public Firmware
 
     virtual QString getFirmwareUrl();
 
-    virtual int getCapability(Capability);
-    
-    virtual QString getAnalogInputName(unsigned int index);
-    
-    virtual QTime getMaxTimerStart();
+    virtual int getCapability(const Capability);
+
+    virtual bool isTelemetrySourceAvailable(int source);
 
     virtual int isAvailable(PulsesProtocol proto, int port=0);
 
@@ -140,12 +132,4 @@ class OpenTxFirmware: public Firmware
 void registerOpenTxFirmwares();
 void unregisterOpenTxFirmwares();
 
-extern QList<OpenTxEepromInterface *> opentxEEpromInterfaces;
-
-OpenTxEepromInterface * loadModelFromByteArray(ModelData & model, const QByteArray & data);
-OpenTxEepromInterface * loadRadioSettingsFromByteArray(GeneralSettings & settings, const QByteArray & data);
-
-bool writeModelToByteArray(const ModelData & model, QByteArray & data);
-bool writeRadioSettingsToByteArray(const GeneralSettings & settings, QByteArray & data);
-
-#endif // _OPENTXINTERFACE_H_
+#endif

companion/src/firmwares/th9x/simulator/CMakeLists.txt

@@ -0,0 +1,15 @@
+set(TH9X_CHECKOUT_DIRECTORY ${PROJECT_BINARY_DIR}/firmwares/th9x)
+add_custom_command(
+  OUTPUT ${TH9X_CHECKOUT_DIRECTORY}/th9xsimulator.cpp
+  COMMAND ${CMAKE_COMMAND} -E make_directory ${TH9X_CHECKOUT_DIRECTORY}
+  COMMAND cd ${TH9X_CHECKOUT_DIRECTORY} && svn checkout http://th9x.googlecode.com/svn/trunk/src@285 .
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/th9x/th9xsimulator.cpp ${TH9X_CHECKOUT_DIRECTORY}
+  DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/firmwares/th9x/th9xsimulator.cpp
+)
+
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}
+)
+
+add_library(th9x-simulator th9xsimulator.cpp)

companion/src/firmwares/th9x/simulator/th9xsimulator.cpp

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

companion/src/firmwares/th9x/simulator/th9xsimulator.h

@@ -0,0 +1,58 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef th9x_simulator_h
+#define th9x_simulator_h
+
+#include "simulatorinterface.h"
+
+class RadioData;
+class Th9xInterface;
+
+class Th9xSimulator : public SimulatorInterface {
+
+  public:
+
+    Th9xSimulator(Th9xInterface *);
+
+    virtual void start(RadioData & radioData, bool tests);
+
+    virtual void stop();
+
+    virtual bool timer10ms();
+
+    virtual uint8_t * getLcd();
+
+    virtual bool lcdChanged(bool & lightEnable);
+
+    virtual void setValues(TxInputs &inputs);
+
+    virtual void getValues(TxOutputs &outputs);
+
+    virtual void setTrim(unsigned int idx, int value);
+
+    virtual void getTrims(Trims & trims);
+
+    virtual unsigned int getPhase() { return 0; }
+
+    virtual const char * getError();
+
+  protected:
+
+    Th9xInterface * th9xInterface;
+};
+
+#endif

companion/src/firmwares/th9x/th9xeeprom.cpp

@@ -0,0 +1,322 @@
+#include <algorithm>
+#include "helpers.h"
+#include "th9xeeprom.h"
+
+RawSwitch th9xToSwitch(int8_t sw)
+{
+  if (sw == 0)
+    return RawSwitch(SWITCH_TYPE_NONE);
+  else if (sw <= 9)
+    return RawSwitch(SWITCH_TYPE_SWITCH, sw);
+  else
+    return RawSwitch(SWITCH_TYPE_VIRTUAL, sw > 0 ? sw-9 : sw+9);
+}
+
+t_Th9xTrainerMix::t_Th9xTrainerMix()
+{
+  memset(this, 0, sizeof(t_Th9xTrainerMix));
+}
+
+t_Th9xTrainerMix::operator TrainerMix()
+{
+  TrainerMix c9x;
+  c9x.src = srcChn;
+  c9x.swtch = th9xToSwitch(swtch);
+  c9x.weight = (25 * studWeight) / 8;
+  c9x.mode = mode;
+  return c9x;
+}
+
+t_Th9xTrainerData::t_Th9xTrainerData()
+{
+  memset(this, 0, sizeof(t_Th9xTrainerData));
+}
+
+t_Th9xTrainerData::operator TrainerData ()
+{
+  TrainerData c9x;
+  for (int i=0; i<NUM_STICKS; i++) {
+    c9x.calib[i] = calib[i];
+    c9x.mix[i] = mix[i];
+  }
+  return c9x;
+}
+
+t_Th9xGeneral::t_Th9xGeneral()
+{
+  memset(this, 0, sizeof(t_Th9xGeneral));
+}
+
+Th9xGeneral::operator GeneralSettings ()
+{
+  GeneralSettings result;
+  
+  result.version = myVers;
+  
+  for (int i=0; i<NUM_STICKSnPOTS; i++) {
+    result.calibMid[i] = calibMid[i];
+    result.calibSpanNeg[i] = calibSpanNeg[i];
+    result.calibSpanPos[i] = calibSpanPos[i];
+  }
+
+  result.currModel = currModel;
+  result.contrast = contrast;
+  result.vBatWarn = vBatWarn;
+  result.txVoltageCalibration = txVoltageCalibration;
+  // result.lightSw = th9xToSwitch(lightSw);
+  result.trainer = trainer;
+  result.view = view;
+  result.disableThrottleWarning = disableThrottleWarning;
+  result.switchWarning = disableSwitchWarning ? 0 : -1;
+  result.disableMemoryWarning = disableMemoryWarning;
+  switch (beeperVal) {
+    case 0:
+      result.beeperMode = GeneralSettings::BEEPER_QUIET;
+      break;
+    case 1:
+      result.beeperMode = GeneralSettings::BEEPER_NOKEYS;
+      break;
+    case 2:
+      result.beeperMode = GeneralSettings::BEEPER_ALL;
+      break;
+    case 3:
+      result.beeperMode = GeneralSettings::BEEPER_ALL;
+      result.beeperLength = 2;
+  }
+  result.stickMode = stickMode;
+  result.inactivityTimer = inactivityMin;
+  return result;
+}
+
+
+t_Th9xExpoData::t_Th9xExpoData()
+{
+  memset(this, 0, sizeof(t_Th9xExpoData));
+}
+
+t_Th9xExpoData::operator ExpoData ()
+{
+  ExpoData c9x;
+  if (exp5) {
+    c9x.curve.type = CurveReference::CURVE_REF_EXPO;
+    c9x.curve.value = exp5;
+  }
+  else if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
+  }
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
+  c9x.mode = mode3;
+  c9x.weight = weight6;
+  c9x.chn = chn;
+  c9x.swtch = th9xToSwitch(drSw);
+  return c9x;
+}
+
+t_Th9xLimitData::t_Th9xLimitData()
+{
+  memset(this, 0, sizeof(t_Th9xLimitData));
+}
+
+t_Th9xLimitData::operator LimitData ()
+{
+  LimitData c9x;
+  c9x.min = 10*(min-100);
+  c9x.max = 10*(max+100);
+  c9x.revert = revert;
+  c9x.offset = offset;
+  return c9x;
+}
+
+t_Th9xMixData::t_Th9xMixData()
+{
+  memset(this, 0, sizeof(t_Th9xMixData));
+}
+
+t_Th9xMixData::operator MixData ()
+{
+  MixData c9x;
+  c9x.destCh = destCh;
+  if (srcRaw < 7)
+    c9x.srcRaw = RawSource(SOURCE_TYPE_STICK, srcRaw);
+  else if (srcRaw < 10)
+    c9x.srcRaw = RawSource(SOURCE_TYPE_NONE); // TODO
+  else if (srcRaw == 10)
+    c9x.srcRaw = RawSource(SOURCE_TYPE_MAX);
+  else if (srcRaw == 11)
+    c9x.srcRaw = RawSource(SOURCE_TYPE_NONE); // TODO CUR
+  else if (srcRaw < 24)
+    c9x.srcRaw = RawSource(SOURCE_TYPE_CH, srcRaw-12);
+  else /* always true if (srcRaw < 32) */
+    c9x.srcRaw = RawSource(SOURCE_TYPE_PPM, srcRaw-24);
+  c9x.weight = weight;
+  c9x.swtch = th9xToSwitch(swtch);
+  if (curve > 6) {
+    c9x.curve.type = CurveReference::CURVE_REF_CUSTOM;
+    c9x.curve.value = curve - 6;
+  }
+  else if (curve > 0) {
+    c9x.curve.type = CurveReference::CURVE_REF_FUNC;
+    c9x.curve.value = curve;
+  }
+  c9x.speedUp = speedUp;
+  c9x.speedDown = speedDown;
+  c9x.mltpx = (MltpxValue)mixMode;
+  return c9x;
+}
+
+t_Th9xLogicalSwitchData::operator LogicalSwitchData ()
+{
+  LogicalSwitchData c9x;
+  c9x.func = opCmp;
+  c9x.val1 = val1;
+  c9x.val2 = val2;
+
+  if ((c9x.func >= LS_FN_VPOS && c9x.func <= LS_FN_ANEG) || c9x.func >= LS_FN_EQUAL) {
+    c9x.val1 = toSource(val1).toValue();
+  }
+
+  if (c9x.func >= LS_FN_EQUAL) {
+    c9x.val2 = toSource(val2).toValue();
+  }
+
+  if (c9x.func >= LS_FN_AND && c9x.func <= LS_FN_XOR) {
+    c9x.val1 = th9xToSwitch(val1).toValue();
+    c9x.val2 = th9xToSwitch(val2).toValue();
+  }
+
+  return c9x;
+}
+
+int8_t t_Th9xLogicalSwitchData::fromSource(RawSource source)
+{
+  int v1 = 0;
+  if (source.type == SOURCE_TYPE_STICK)
+    v1 = 1+source.index;
+  else if (source.type == SOURCE_TYPE_ROTARY_ENCODER) {
+    EEPROMWarnings.push_back(::QObject::tr("th9x on this board doesn't have Rotary Encoders"));
+    v1 = 5+source.index;
+  }
+  else if (source.type == SOURCE_TYPE_MAX)
+    v1 = 8;
+  /* else if (source.type == SOURCE_TYPE_3POS)
+    v1 = 9; */
+  else if (source.type == SOURCE_TYPE_CYC)
+    v1 = 10+source.index;
+  else if (source.type == SOURCE_TYPE_PPM)
+    v1 = 13+source.index;
+  else if (source.type == SOURCE_TYPE_CH)
+    v1 = 21+source.index;
+  else if (source.type == SOURCE_TYPE_TELEMETRY)
+    v1 = 36+source.index;
+  return v1;
+}
+
+RawSource t_Th9xLogicalSwitchData::toSource(int8_t value)
+{
+  if (value == 0) {
+    return RawSource(SOURCE_TYPE_NONE);
+  }
+  else if (value <= 7) {
+    return RawSource(SOURCE_TYPE_STICK, value - 1);
+  }
+  else if (value == 8) {
+    return RawSource(SOURCE_TYPE_MAX);
+  }
+  /* else if (value == 9) {
+    return RawSource(SOURCE_TYPE_3POS);
+  } */
+  else if (value <= 12) {
+    return RawSource(SOURCE_TYPE_CYC, value-10);
+  }
+  else if (value <= 20) {
+    return RawSource(SOURCE_TYPE_PPM, value-13);
+  }
+  else if (value <= 36) {
+    return RawSource(SOURCE_TYPE_CH, value-21);
+  }
+  else {
+    return RawSource(SOURCE_TYPE_TELEMETRY, value-36);
+  }
+}
+
+t_Th9xModelData::t_Th9xModelData()
+{
+  memset(this, 0, sizeof(t_Th9xModelData));
+}
+
+t_Th9xModelData::operator ModelData ()
+{
+  ModelData c9x;
+  c9x.used = true;
+  getEEPROMString(c9x.name, name, sizeof(name));
+  /*switch(tmrMode) {
+    case 1:
+      c9x.timers[0].mode = TMRMODE_ABS;
+      break;
+    case 2:
+      c9x.timers[0].mode = TMRMODE_THs;
+      break;
+    case 3:
+      c9x.timers[0].mode = TMRMODE_THp;
+      break;
+    default:
+      c9x.timers[0].mode = TMRMODE_OFF;
+      break;
+  }*/
+  // c9x.timers[0].dir = tmrDir;
+  c9x.timers[0].val = tmrVal;
+  /*c9x.protocol = (Protocol)protocol;
+  c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
+  c9x.thrTrim = thrTrim;
+  c9x.trimInc = trimInc;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.customFn[0].func = FuncTrims2Offsets;
+  if (trimSw) {
+    c9x.customFn[0].swtch = trimSw;
+  }
+  c9x.beepANACenter = beepANACenter;
+  c9x.pulsePol = pulsePol;
+  c9x.extendedLimits = extendedLimits;
+  c9x.swashRingData.invertELE = swashInvertELE;
+  c9x.swashRingData.invertAIL = swashInvertAIL;
+  c9x.swashRingData.invertCOL = swashInvertCOL;
+  c9x.swashRingData.type = swashType;
+  c9x.swashRingData.collectiveSource = swashCollectiveSource;
+  c9x.swashRingData.value = swashRingValue;*/
+  for (int i=0; i<TH9X_NUM_CHNOUT; i++)
+    c9x.limitData[i] = limitData[i];
+  for (int i=0; i<TH9X_MAX_EXPOS; i++)
+    c9x.expoData[i] = expoTab[i];
+  for (int i=0; i<TH9X_MAX_MIXERS; i++)
+    c9x.mixData[i] = mixData[i];
+  for (int i=0; i<NUM_STICKS; i++)
+    c9x.flightModeData[0].trim[i] = trimData[i].itrim;
+  for (int i=0; i<TH9X_MAX_CURVES3; i++) {
+    c9x.curves[i].count = 3;
+    for (int j=0; j<3; j++) {
+      c9x.curves[i].points[j].x = -100 + 100*i;
+      c9x.curves[i].points[j].y = curves3[i][j];
+    }
+  }
+  for (int i=0; i<TH9X_MAX_CURVES5; i++) {
+    c9x.curves[i+TH9X_MAX_CURVES3].count = 5;
+    for (int j=0; j<5; j++) {
+      c9x.curves[i+TH9X_MAX_CURVES3].points[j].x = -100 + 50*i;
+      c9x.curves[i+TH9X_MAX_CURVES3].points[j].y = curves5[i][j];
+    }
+  }
+  for (int i=0; i<TH9X_MAX_CURVES9; i++) {
+    c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].count = 5;
+    for (int j=0; j<9; j++) {
+      c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].points[j].x = -100 + 50*i;
+      c9x.curves[i+TH9X_MAX_CURVES3+TH9X_MAX_CURVES5].points[j].y = curves9[i][j];
+    }
+  }
+
+  return c9x;
+}
+

companion/src/firmwares/th9x/th9xeeprom.h

@@ -0,0 +1,182 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ *
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef th9xeeprom_h
+#define th9xeeprom_h
+
+#include <inttypes.h>
+#include "eeprominterface.h"
+
+//eeprom data
+#define TH9X_NUM_CHNOUT   8
+#define TH9X_MAX_EXPOS    15
+#define TH9X_MAX_MIXERS   25
+#define TH9X_MAX_SWITCHES 16
+#define TH9X_MAX_CURVES3  3
+#define TH9X_MAX_CURVES5  2
+#define TH9X_MAX_CURVES9  2
+#define TH9X_MAX_CSFUNC 13
+
+#define MDVERS      6
+
+#define TH9X_NUM_CSW         12 //number of custom switches
+#define NUM_STICKSnPOTS      7  //number of sticks and pots
+
+PACK(typedef struct t_Th9xTrainerMix {
+  uint8_t srcChn:3; //0-7 = ch1-8
+  int8_t  swtch:5;
+  int8_t  studWeight:6;
+  uint8_t mode:2;   // off, add-mode, subst-mode
+
+  operator TrainerMix();
+  t_Th9xTrainerMix();
+}) Th9xTrainerMix; //
+
+PACK(typedef struct t_Th9xTrainerData {
+  int16_t        calib[8];
+  Th9xTrainerMix mix[4];
+
+  operator TrainerData();
+  t_Th9xTrainerData();
+}) Th9xTrainerData;
+
+PACK(typedef struct t_Th9xGeneral {
+  uint8_t   myVers;
+  int16_t   calibMid[NUM_STICKSnPOTS];
+  int16_t   calibSpanNeg[NUM_STICKSnPOTS];
+  int16_t   calibSpanPos[NUM_STICKSnPOTS];
+  uint8_t   inactivityMin;    //ge150
+  uint8_t   iTrimSwitch:4;    //ge192
+  uint8_t   iTrimTme1:2;
+  uint8_t   iTrimTme2:2;
+  uint8_t   currModel; //0..15
+  uint8_t   contrast;
+  uint8_t   vBatWarn;
+  int8_t    txVoltageCalibration;
+  int8_t    lightSw;
+  Th9xTrainerData trainer;
+  uint8_t   adcFilt:2;
+  uint8_t   keySpeed:2;
+  uint8_t   thr0pos:4;
+  uint8_t   disableThrottleWarning:1;
+  uint8_t   disableSwitchWarning:1;
+  uint8_t   disableMemoryWarning:1;
+  uint8_t   beeperVal:2;
+  uint8_t   view:3;
+  uint8_t   stickMode:2;
+  uint8_t   naviMode:2;
+
+  operator GeneralSettings();
+  t_Th9xGeneral();
+}) Th9xGeneral;
+
+/*
+ * ModelData
+ */
+
+PACK(typedef struct t_Th9xExpoData {
+  int8_t  exp5:5;
+  uint8_t mode3:3; //0=end 1=pos 2=neg 3=both 4=trimNeg
+
+  int8_t  weight6:6;
+  uint8_t chn:2;  //
+
+  int8_t  drSw:5;
+  uint8_t curve:3; //
+
+  operator ExpoData();
+  t_Th9xExpoData();
+}) Th9xExpoData;
+
+
+PACK(typedef struct t_Th9xLimitData {
+  int8_t  min:7;
+  bool    scale:1;
+  int8_t  max:7;
+  bool    resv:1;
+  bool    revert:1;
+  int8_t  offset:7;
+
+  operator LimitData();
+  t_Th9xLimitData();
+}) Th9xLimitData;
+
+#define MLTPX_ADD  0
+#define MLTPX_MUL  1
+#define MLTPX_REP  2
+
+PACK(typedef struct t_Th9xMixData {
+  uint8_t destCh:4;     // 1..C9X_NUM_CHNOUT,X1-X4
+  uint8_t mixMode:2;    // + * =
+  uint8_t dmy1:2;       //
+
+  uint8_t srcRaw:5;     // S1-4,P1-3,max,cur,X1-X4,p1-3,T1-8  24
+  uint8_t switchMode:2; // switchMode oOff\tiNeg\tiNul\tiPos
+  uint8_t curveNeg:1;   // Cv cV
+
+  int8_t  weight;
+
+  int8_t  swtch:5;
+  uint8_t curve:3;      // 0=off 1..7=cv1..7
+
+  uint8_t speedUp:4;    // Servogeschwindigkeit aus Tabelle (10ms Cycle)
+  uint8_t speedDown:4;  // 0 nichts
+
+  operator MixData();
+  t_Th9xMixData();
+}) Th9xMixData;
+
+PACK(typedef struct t_Th9xLogicalSwitchData {
+  uint8_t sw:3;    // 0..7
+  uint8_t opCmp:2; // < & | ^
+  uint8_t opRes:3; // 0 => 1=> 0=> !=> & | ^
+  int8_t val1;
+  int8_t val2;
+
+  operator LogicalSwitchData();
+  t_Th9xLogicalSwitchData() { memset(this, 0, sizeof(t_Th9xLogicalSwitchData)); }
+  int8_t fromSource(RawSource source);
+  RawSource toSource(int8_t value);
+}) Th9xLogicalSwitchData;
+
+PACK(typedef struct t_Th9xTrimData {
+  int8_t  itrim:6; //trim index
+  uint8_t tmode:2;
+
+  t_Th9xTrimData() { }
+}) Th9xTrimData;
+
+PACK(typedef struct t_Th9xModelData {
+  char      name[10];             // 10 must be first for eeLoadModelName
+  uint8_t   mdVers;               // 1
+  uint8_t   tmrMode:3;            // 1
+  int8_t    tmrSw:5;              //
+  uint16_t  tmrVal;               // 2
+  uint8_t   protocol:5;           // 1
+  uint8_t   protocolPar:3;        //
+  char      res[3];               // 3
+  Th9xLimitData limitData[TH9X_NUM_CHNOUT];// 3*8
+  Th9xExpoData  expoTab[TH9X_MAX_EXPOS];      // 5*4 -> 3*15
+  Th9xMixData   mixData[TH9X_MAX_MIXERS];  //0 5*25
+  int8_t    curves3[TH9X_MAX_CURVES3][3];        // 9  new143
+  int8_t    curves5[TH9X_MAX_CURVES5][5];        // 10
+  int8_t    curves9[TH9X_MAX_CURVES9][9];        // 18
+  Th9xLogicalSwitchData switchTab[TH9X_MAX_SWITCHES];//
+  Th9xTrimData   trimData[NUM_STICKS];    // 3*4 -> 1*4
+  operator ModelData();
+  t_Th9xModelData();
+}) Th9xModelData;
+
+#endif

companion/src/firmwares/th9x/th9xinterface.cpp

@@ -0,0 +1,167 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <iostream>
+#include "th9xinterface.h"
+#include "th9xeeprom.h"
+#include "simulator/th9xsimulator.h"
+#include "file.h"
+#include "appdata.h"
+
+#define FILE_TYP_GENERAL 1
+#define FILE_TYP_MODEL   2
+
+#define FILE_GENERAL   0
+#define FILE_MODEL(n) (1+n)
+
+Th9xInterface::Th9xInterface():
+EEPROMInterface(BOARD_STOCK),
+efile(new RleFile())
+{
+}
+
+Th9xInterface::~Th9xInterface()
+{
+  delete efile;
+}
+
+const char * Th9xInterface::getName()
+{
+  return "Th9x";
+}
+
+const int Th9xInterface::getEEpromSize()
+{
+  QString avrMCU = g.mcu();
+  if (avrMCU==QString("m128")) {
+    return 2*EESIZE_STOCK;
+  }
+  return EESIZE_STOCK;
+}
+
+const int Th9xInterface::getMaxModels()
+{
+  return 16;
+}
+
+unsigned long Th9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+{
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
+}
+
+unsigned long Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+{
+  std::cout << "trying th9x import... ";
+
+  std::bitset<NUM_ERRORS> errors;
+
+  if (size != getEEpromSize()) {
+    std::cout << "wrong size\n";
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
+  }
+
+  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
+    std::cout << "wrong file system\n";
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
+  }
+    
+  efile->openRd(FILE_GENERAL);
+  Th9xGeneral th9xGeneral;
+
+  if (efile->readRlc2((uint8_t*)&th9xGeneral, 1) != 1) {
+    std::cout << "no\n";
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
+  }
+
+  std::cout << "version " << (unsigned int)th9xGeneral.myVers << " ";
+
+  switch(th9xGeneral.myVers) {
+    case 6:
+      break;
+    default:
+      std::cout << "not th9x\n";
+      errors.set(NOT_TH9X);
+      return errors.to_ulong();
+  }
+
+  efile->openRd(FILE_GENERAL);
+  int len = efile->readRlc2((uint8_t*)&th9xGeneral, sizeof(Th9xGeneral));
+  if (len != sizeof(Th9xGeneral)) {
+    std::cout << "not th9x\n";
+    errors.set(NOT_TH9X);
+    return errors.to_ulong();
+  }
+  radioData.generalSettings = th9xGeneral;
+  
+  for (int i=0; i<getMaxModels(); i++) {
+    Th9xModelData th9xModel;
+    efile->openRd(FILE_MODEL(i));
+    if (!efile->readRlc2((uint8_t*)&th9xModel, sizeof(Th9xModelData))) {
+      radioData.models[i].clear();
+    }
+    else {
+      radioData.models[i] = th9xModel;
+    } 
+  }
+
+  std::cout << "ok\n";
+  errors.set(ALL_OK);
+  return errors.to_ulong();
+}
+
+unsigned long Th9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+{
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
+}
+
+int Th9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
+{
+  std::cout << "NO!\n";
+  // TODO a warning
+
+  return 0;
+}
+
+int Th9xInterface::getSize(const ModelData & model)
+{
+  return 0;
+}
+
+int Th9xInterface::getSize(const GeneralSettings & settings)
+{
+  return 0;
+}
+
+int Th9xInterface::isAvailable(PulsesProtocol proto, int port)
+{
+  switch (proto) {
+    case PULSES_PPM:
+    case PULSES_SILV_A:
+    case PULSES_SILV_B:
+    case PULSES_SILV_C:
+    case PULSES_CTP1009:
+      return 1;
+    default:
+      return 0;
+  }
+}

companion/src/firmwares/th9x/th9xinterface.h

@@ -0,0 +1,57 @@
+/*
+ * Author - Bertrand Songis <bsongis@gmail.com>
+ * 
+ * Based on th9x -> http://code.google.com/p/th9x/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+#ifndef th9x_interface_h
+#define th9x_interface_h
+
+#include "eeprominterface.h"
+
+class RleFile;
+
+class Th9xInterface : public EEPROMInterface
+{
+  public:
+
+    Th9xInterface();
+
+    virtual ~Th9xInterface();
+
+    virtual const char * getName();
+
+    virtual const int getEEpromSize();
+
+    virtual const int getMaxModels();
+
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);
+
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
+
+    virtual int getSize(const ModelData &);
+
+    virtual int getSize(const GeneralSettings &);
+
+    virtual int isAvailable(PulsesProtocol proto, int port=0);
+
+  protected:
+
+    RleFile *efile;
+
+};
+
+#endif

companion/src/flasheepromdialog.cpp

@@ -1,31 +1,13 @@
-/*
- * 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 "flasheepromdialog.h"
 #include "ui_flasheepromdialog.h"
 #include "eeprominterface.h"
 #include "helpers.h"
-#include "storage.h"
+#include "firmwareinterface.h"
+#include "hexinterface.h"
 #include "appdata.h"
 #include "progressdialog.h"
 #include "radiointerface.h"
+#include "converteeprom.h"
 #include "splashlibrarydialog.h"
 
 FlashEEpromDialog::FlashEEpromDialog(QWidget *parent, const QString &filename):
@@ -48,6 +30,7 @@ radioData(new RadioData())
   if (backupPath.isEmpty() || !QDir(backupPath).exists()) {
     ui->backupBeforeWrite->setEnabled(false);
   }
+  updateUI();
 }
 
 FlashEEpromDialog::~FlashEEpromDialog()
@@ -55,16 +38,11 @@ FlashEEpromDialog::~FlashEEpromDialog()
   delete ui;
 }
 
-void FlashEEpromDialog::showEvent(QShowEvent *)
-{
-  updateUI();
-}
-
 void FlashEEpromDialog::updateUI()
 {
   // ui->burnButton->setEnabled(true);
   ui->eepromFilename->setText(eepromFilename);
-  if (!eepromFilename.isEmpty() && getEEpromVersion(eepromFilename) >= 0) {
+  if (getEEpromVersion(eepromFilename) >= 0) {
     ui->profileLabel->show();
     ui->patchCalibration->show();
     ui->patchHardwareSettings->show();
@@ -80,7 +58,7 @@ void FlashEEpromDialog::updateUI()
       ui->patchCalibration->show();
       ui->patchHardwareSettings->show();
       // TODO I hardcode the number of pots here, should be dependant on the board?
-      if (!((calib.length()==(CPN_MAX_STICKS+3)*12) && (trainercalib.length()==16))) {
+      if (!((calib.length()==(NUM_STICKS+3)*12) && (trainercalib.length()==16))) {
         ui->patchCalibration->setDisabled(true);
       }
       if (!((DisplaySet.length()==6) && (BeeperSet.length()==4) && (HapticSet.length()==6) && (SpeakerSet.length()==6))) {
@@ -102,24 +80,95 @@ void FlashEEpromDialog::updateUI()
 
 void FlashEEpromDialog::on_eepromLoad_clicked()
 {
-  QString filename = QFileDialog::getOpenFileName(this, tr("Choose Radio Backup file"), g.eepromDir(), EXTERNAL_EEPROM_FILES_FILTER);
+  QString filename = QFileDialog::getOpenFileName(this, tr("Choose Radio Backup file"), g.eepromDir(), tr(EXTERNAL_EEPROM_FILES_FILTER));
   if (!filename.isEmpty()) {
     eepromFilename = filename;
     updateUI();
   }
 }
 
-int FlashEEpromDialog::getEEpromVersion(const QString & filename)
+int FlashEEpromDialog::getEEpromVersion(const QString &filename)
 {
   int result = -1;
-  QSharedPointer<RadioData> radioData = QSharedPointer<RadioData>(new RadioData());
-  Storage storage(filename);
-  if (storage.load(*radioData)) {
-    result = radioData->generalSettings.version;
+  int eeprom_size = 0;
+
+  if (filename.isEmpty()) {
+    return -1;
+  }
+
+  QFile file(filename);
+  if (!file.exists()) {
+    QMessageBox::warning(this, tr("Error"), tr("Unable to find file %1!").arg(filename));
+    return -1;
+  }
+
+  QByteArray eeprom(EESIZE_MAX, 0);
+  int fileType = getFileType(filename);
+
+#if 0
+  if (fileType==FILE_TYPE_XML) {
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+      QMessageBox::critical(this, tr("Error"),tr("Error opening file %1:\n%2.").arg(filename).arg(file.errorString()));
+      return -1;
+    }
+    QTextStream inputStream(&file);
+    XmlInterface(inputStream).load(testData);
+  }
+  else
+#endif
+  if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) {
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        QMessageBox::warning(this, tr("Error"),tr("Error opening file %1:\n%2.").arg(filename).arg(file.errorString()));
+        return -1;
+    }
+    QDomDocument doc(ER9X_EEPROM_FILE_TYPE);
+    bool xmlOK = doc.setContent(&file);
+    if (xmlOK) {
+      RadioData * radioData = new RadioData();
+      std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEepromXml(*radioData, doc));
+      if (!errors.test(ALL_OK)) {
+        QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings File %1").arg(filename));
+      }
+      else {
+        result = radioData->generalSettings.version;
+      }
+      delete radioData;
+      return result;
+    }
+    file.reset();
+
+    QTextStream inputStream(&file);
+    if (fileType==FILE_TYPE_EEPE) {  // read EEPE file header
+      QString hline = inputStream.readLine();
+      if (hline!=EEPE_EEPROM_FILE_HEADER) {
+        QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings File %1").arg(filename));
+        return -1;
+      }
+    }
+    eeprom_size = HexInterface(inputStream).load((uint8_t *)eeprom.data(), EESIZE_MAX);
+  }
+  else if (fileType==FILE_TYPE_BIN) { //read binary
+    eeprom_size = file.size();
+    if (!file.open(QFile::ReadOnly)) {  //reading binary file   - TODO HEX support
+      QMessageBox::warning(this, tr("Error"), tr("Error opening file %1:\n%2.").arg(filename).arg(file.errorString()));
+      return -1;
+    }
+    int len = file.read(eeprom.data(), eeprom_size);
+    if (len != eeprom_size) {
+      QMessageBox::warning(this, tr("Error"), tr("Error reading file %1:\n%2.").arg(filename).arg(file.errorString()));
+      return -1;
+    }
+  }
+
+  RadioData * radioData = new RadioData();
+  std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEeprom(*radioData, (const uint8_t *)eeprom.data(), eeprom_size));
+  if (eeprom_size == 0 || !errors.test(ALL_OK)) {
+    QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings file %1").arg(filename));
   }
   else {
-    QMessageBox::warning(this, tr("Error"), storage.error());
+    result = radioData->generalSettings.version;
   }
+  delete radioData;
   return result;
 }
 
@@ -127,16 +176,16 @@ bool FlashEEpromDialog::patchCalibration()
 {
   QString calib = g.profile[g.id()].stickPotCalib();
   QString trainercalib = g.profile[g.id()].trainerCalib();
-  int potsnum = getBoardCapability(getCurrentBoard(), Board::Pots);
-  int8_t txVoltageCalibration = (int8_t) g.profile[g.id()].txVoltageCalibration();
-  int8_t txCurrentCalibration = (int8_t) g.profile[g.id()].txCurrentCalibration();
-  int8_t PPM_Multiplier = (int8_t) g.profile[g.id()].ppmMultiplier();
+  int potsnum=GetCurrentFirmware()->getCapability(Pots);
+  int8_t txVoltageCalibration=(int8_t) g.profile[g.id()].txVoltageCalibration();
+  int8_t txCurrentCalibration=(int8_t) g.profile[g.id()].txCurrentCalibration();
+  int8_t PPM_Multiplier=(int8_t) g.profile[g.id()].ppmMultiplier();
 
-  if ((calib.length()==(CPN_MAX_STICKS+potsnum)*12) && (trainercalib.length()==16)) {
+  if ((calib.length()==(NUM_STICKS+potsnum)*12) && (trainercalib.length()==16)) {
     QString Byte;
     int16_t byte16;
     bool ok;
-    for (int i=0; i<CPN_MAX_STICKS+potsnum; i++) {
+    for (int i=0; i<(NUM_STICKS+potsnum); i++) {
       Byte=calib.mid(i*12,4);
       byte16=(int16_t)Byte.toInt(&ok,16);
       if (ok)
@@ -227,9 +276,10 @@ void FlashEEpromDialog::on_burnButton_clicked()
   if (patch) {
     QString filename = generateProcessUniqueTempFileName("temp.bin");
     QFile file(filename);
-    uint8_t *eeprom = (uint8_t*)malloc(Boards::getEEpromSize(getCurrentBoard()));
-    int eeprom_size = getCurrentEEpromInterface()->save(eeprom, *radioData, 0, getCurrentFirmware()->getVariantNumber());
-    if (eeprom_size == 0) {
+    uint8_t *eeprom = (uint8_t*)malloc(GetEepromInterface()->getEEpromSize());
+    int eeprom_size = GetEepromInterface()->save(eeprom, *radioData, GetCurrentFirmware()->getVariantNumber());
+    if (!eeprom_size) {
+      QMessageBox::warning(this, tr("Error"), tr("Cannot write file %1:\n%2.").arg(filename).arg(file.errorString()));
       return;
     }
     if (!file.open(QIODevice::WriteOnly)) {
@@ -293,10 +343,9 @@ void FlashEEpromDialog::on_burnButton_clicked()
   }
 
   // and write...
-  bool result = writeEeprom(filename, progressDialog.progress());
-  if (!result && !progressDialog.isEmpty()) {
-    progressDialog.exec();
-  }
+  writeEeprom(filename, progressDialog.progress());
+
+  progressDialog.exec();
 }
 
 void FlashEEpromDialog::on_cancelButton_clicked()

companion/src/flasheepromdialog.h

@@ -1,29 +1,14 @@
-/*
- * 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 FLASHEEPROMDIALOG_H_
+#define FLASHEEPROMDIALOG_H_
 
-#ifndef _FLASHEEPROMDIALOG_H_
-#define _FLASHEEPROMDIALOG_H_
-
-#include <constants.h>
 #include <QtWidgets>
 
+#define ER9X_EEPROM_FILE_TYPE          "ER9X_EEPROM_FILE"
+#define EEPE_EEPROM_FILE_HEADER        "EEPE EEPROM FILE"
+#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;
@@ -51,7 +36,6 @@ protected:
   int getEEpromVersion(const QString &filename);
   bool patchCalibration();
   bool patchHardwareSettings();
-  virtual void showEvent(QShowEvent *);
 
 private:
   Ui::FlashEEpromDialog *ui;
@@ -59,4 +43,4 @@ private:
   RadioData *radioData;
 };
 
-#endif // _FLASHEEPROMDIALOG_H_
+#endif // FLASHEEPROMDIALOG_H_

companion/src/flashfirmwaredialog.cpp

@@ -1,35 +1,18 @@
-/*
- * 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 "flashfirmwaredialog.h"
 #include "ui_flashfirmwaredialog.h"
 #include "appdata.h"
+#include "converteeprom.h"
+#include "eeprominterface.h"
+#include "firmwareinterface.h"
 #include "process_flash.h"
 #include "helpers.h"
+#include "hexinterface.h"
 #include "progressdialog.h"
 #include "radiointerface.h"
 #include "progresswidget.h"
 #include "splashlibrarydialog.h"
-#include "storage.h"
 
-#if defined _MSC_VER || !defined __GNUC__
+#if defined WIN32 || !defined __GNUC__
   #include <windows.h>
   #define sleep(x) Sleep(x*1000)
 #else
@@ -54,7 +37,7 @@ fwName(g.profile[g.id()].fwName())
     ui->useProfileSplash->setDisabled(true);
   }
 
-  if (IS_STM32(getCurrentBoard())) {
+  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
     // No backup on Taranis ... could be done if in massstorage
     ui->backupEEprom->hide();
     ui->backupEEprom->setCheckState(Qt::Unchecked);
@@ -132,7 +115,7 @@ void FlashFirmwareDialog::updateUI()
   }
 
   if (!image.isNull()) {
-    ui->splash->setPixmap(makePixMap(image));
+    ui->splash->setPixmap(makePixMap(image, g.profile[g.id()].fwType()));
   }
 }
 
@@ -141,7 +124,7 @@ void FlashFirmwareDialog::on_firmwareLoad_clicked()
   QString fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER);
   if (!fileName.isEmpty()) {
     fwName = fileName;
-    if (!fwName.isEmpty() && !fwName.endsWith(".dfu") && !FirmwareInterface(fwName).isValid()) {
+    if (!fwName.isEmpty() && !FirmwareInterface(fwName).isValid()) {
       QMessageBox::warning(this, tr("Warning"), tr("%1 may not be a valid firmware file").arg(fwName));
     }
     updateUI();
@@ -220,7 +203,6 @@ void FlashFirmwareDialog::on_useLibrarySplash_clicked()
 void FlashFirmwareDialog::on_burnButton_clicked()
 {
   g.flashDir(QFileInfo(fwName).dir().absolutePath());
-  g.profile[g.id()].fwName(fwName);
   g.checkHardwareCompatibility(ui->checkHardwareCompatibility->isChecked());
   g.backupOnFlash(ui->backupEEprom->isChecked());
 
@@ -239,7 +221,7 @@ void FlashFirmwareDialog::on_burnButton_clicked()
     }
     // write the customized firmware
     QString tempFile;
-    if (getStorageType(fwName) == STORAGE_TYPE_HEX)
+    if (getFileType(fwName) == FILE_TYPE_HEX)
       tempFile = generateProcessUniqueTempFileName("flash.hex");
     else
       tempFile = generateProcessUniqueTempFileName("flash.bin");

companion/src/flashfirmwaredialog.h

@@ -1,31 +1,21 @@
-/*
- * 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 _FLASHFIRMWAREDIALOG_H_
-#define _FLASHFIRMWAREDIALOG_H_
+#ifndef FLASH_FIRMWARE_DIALOG_H
+#define FLASH_FIRMWARE_DIALOG_H
 
 #include <QtWidgets>
 #include "eeprominterface.h"
 #include "firmwareinterface.h"
 #include "xmlinterface.h"
 
+#define HEX_FILES_FILTER              "HEX files (*.hex);;"
+#define BIN_FILES_FILTER              "BIN files (*.bin);;"
+#define EEPE_FILES_FILTER             "EEPE EEPROM files (*.eepe);;"
+#define EEPROM_FILES_FILTER           "EEPE files (*.eepe *.bin *.hex);;" EEPE_FILES_FILTER BIN_FILES_FILTER HEX_FILES_FILTER
+#define FLASH_FILES_FILTER            "FLASH files (*.bin *.hex);;" BIN_FILES_FILTER HEX_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"
+
 namespace Ui
 {
   class FlashFirmwareDialog;
@@ -62,4 +52,4 @@ private:
   QString imageFile;
 };
 
-#endif // _FLASHFIRMWAREDIALOG_H_
+#endif // FLASH_FIRMWARE_DIALOG_H

companion/src/fusesdialog.cpp

@@ -1,23 +1,3 @@
-/*
- * 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 "fusesdialog.h"
 #include "ui_fusesdialog.h"
 #include "helpers.h"

companion/src/fusesdialog.h

@@ -1,25 +1,5 @@
-/*
- * 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 _FUSESDIALOG_H_
-#define _FUSESDIALOG_H_
+#ifndef FUSESDIALOG_H_
+#define FUSESDIALOG_H_
 
 #include <QDialog>
 
@@ -45,4 +25,4 @@ private:
 
 };
 
-#endif // _FUSESDIALOG_H_
+#endif // FUSESDIALOG_H_

companion/src/fusesdialog.ui

@@ -1,118 +1,118 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>FusesDialog</class>
- <widget class="QDialog" name="FusesDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>374</width>
-    <height>207</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Fuses</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="0" colspan="2">
-    <widget class="QPushButton" name="readFuses">
-     <property name="whatsThis">
-      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Reads the current fuses in the AVR controller.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Proper states for &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;AtMega 64 &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;:&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;EEPROM erase fuse not set: 0E, 81, FF&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;EEPROM erase fuse set: 0E, 89, FF&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Proper states for AtMega 2560 :&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;EEPROM erase fuse not set: D7, 11, FC&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;EEPROM erase fuse set: D7, 19, FC&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="text">
-      <string>Read Fuses</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QPushButton" name="resetFuses_EEprotect">
-     <property name="whatsThis">
-      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;&quot;&gt;Reset Fuses&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Fuses in the AVR tell it how to behave.  Pressing this button sets the fuses to the default parameters needed in the FW. These parameters are different for stock and 4.1 MB, please verify you selected the appropriate processor type in preferences.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;This button also sets the &amp;quot;EEPROM protect&amp;quot; Fuse.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;This prevents erasing of the EEPROM when the flash memory is written.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;&quot;&gt;WARNING&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Setting fuses can lead to problems and even a total lockout from your controller.  Do this only if you know what you are doing.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;When in doubt consult either the project's page or the 9xforum (http://9xforums.com/forum/)&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;If you do get locked out - google lookup for &amp;quot;dealing with Fuse Bricks&amp;quot;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="text">
-      <string>Reset Fuses
-EEPROM - PROTECT</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="resetFuses_EEdelete">
-     <property name="whatsThis">
-      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;&quot;&gt;Reset Fuses&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Fuses in the AVR tell it how to behave.  Pressing this button sets the fuses to the default parameters needed in the &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;FW. These parameters are different for stock and 4.1 MB, please verify you selected the appropriate processor type in preferences.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;This button also clears the &amp;quot;EEPROM protect&amp;quot; Fuse.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;This causes erasing of the EEPROM when the flash memory is written.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;&quot;&gt;WARNING&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Setting fuses can lead to problems and even a total lockout from your controller.  Do this only if you know what you are doing.&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;When in doubt consult either the project's page or the 9xforum (http://9xforums.com/forum/)&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;If you do get locked out - google lookup for &amp;quot;dealing with Fuse Bricks&amp;quot;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="text">
-      <string>Reset Fuses
-EEPROM - DELETE</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QLabel" name="label">
-     <property name="frameShape">
-      <enum>QFrame::Panel</enum>
-     </property>
-     <property name="frameShadow">
-      <enum>QFrame::Raised</enum>
-     </property>
-     <property name="lineWidth">
-      <number>2</number>
-     </property>
-     <property name="text">
-      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;WARNING&lt;/span&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Changing the fuses can mess up your radio.&lt;/p&gt;
-&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Proceed only if you know what you are doing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="companion.qrc"/>
- </resources>
- <connections/>
-</ui>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>FusesDialog</class>
+ <widget class="QDialog" name="FusesDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>374</width>
+    <height>207</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Fuses</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0" colspan="2">
+    <widget class="QPushButton" name="readFuses">
+     <property name="whatsThis">
+      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Reads the current fuses in the AVR controller.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Proper states for &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;AtMega 64 &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;:&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;EEPROM erase fuse not set: 0E, 81, FF&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;EEPROM erase fuse set: 0E, 89, FF&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Proper states for AtMega 2560 :&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;EEPROM erase fuse not set: D7, 11, FC&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;EEPROM erase fuse set: D7, 19, FC&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Read Fuses</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QPushButton" name="resetFuses_EEprotect">
+     <property name="whatsThis">
+      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;&quot;&gt;Reset Fuses&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Fuses in the AVR tell it how to behave.  Pressing this button sets the fuses to the default parameters needed in the FW. These parameters are different for stock and 4.1 MB, please verify you selected the appropriate processor type in preferences.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;This button also sets the &amp;quot;EEPROM protect&amp;quot; Fuse.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;This prevents erasing of the EEPROM when the flash memory is written.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;&quot;&gt;WARNING&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Setting fuses can lead to problems and even a total lockout from your controller.  Do this only if you know what you are doing.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;When in doubt consult either the project's page or the 9xforum (http://9xforums.com/forum/)&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;If you do get locked out - google lookup for &amp;quot;dealing with Fuse Bricks&amp;quot;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Reset Fuses
+EEPROM - PROTECT</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QPushButton" name="resetFuses_EEdelete">
+     <property name="whatsThis">
+      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;&quot;&gt;Reset Fuses&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Fuses in the AVR tell it how to behave.  Pressing this button sets the fuses to the default parameters needed in the &lt;/span&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;FW. These parameters are different for stock and 4.1 MB, please verify you selected the appropriate processor type in preferences.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;This button also clears the &amp;quot;EEPROM protect&amp;quot; Fuse.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;This causes erasing of the EEPROM when the flash memory is written.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt; font-weight:600; text-decoration: underline;&quot;&gt;WARNING&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Setting fuses can lead to problems and even a total lockout from your controller.  Do this only if you know what you are doing.&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;&lt;br /&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;When in doubt consult either the project's page or the 9xforum (http://9xforums.com/forum/)&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;If you do get locked out - google lookup for &amp;quot;dealing with Fuse Bricks&amp;quot;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+     <property name="text">
+      <string>Reset Fuses
+EEPROM - DELETE</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" colspan="2">
+    <widget class="QLabel" name="label">
+     <property name="frameShape">
+      <enum>QFrame::Panel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <property name="lineWidth">
+      <number>2</number>
+     </property>
+     <property name="text">
+      <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;WARNING&lt;/span&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Changing the fuses can mess up your radio.&lt;/p&gt;
+&lt;p align=&quot;center&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Proceed only if you know what you are doing.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="companion.qrc"/>
+ </resources>
+ <connections/>
+</ui>

companion/src/fwpreferencesdialog.cpp

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

companion/src/fwpreferencesdialog.h

@@ -1,25 +1,5 @@
-/*
- * 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 _FWPREFERENCESDIALOG_H_
-#define _FWPREFERENCESDIALOG_H_
+#ifndef FWPREFERENCESDIALOG_H
+#define FWPREFERENCESDIALOG_H
 
 #include <QDialog>
 #include <QCheckBox>
@@ -45,8 +25,8 @@ class FirmwarePreferencesDialog : public QDialog
 
   private slots:
     void on_fw_dnld_clicked();
-    void on_sd_dnld_clicked();
+    void on_voice_dnld_clicked();
     void on_checkFWUpdates_clicked();
 };
 
-#endif // _FWPREFERENCESDIALOG_H_
+#endif // FWPREFERENCESDIALOG_H

companion/src/fwpreferencesdialog.ui

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

companion/src/generaledit/CMakeLists.txt

@@ -1,32 +1,31 @@
-include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-
-set(generaledit_NAMES
-  generaledit
-  generalsetup
-  trainer
-  hardware
-)
-
-set(generaledit_SRCS
-  calibration.cpp
-)
-
-set(generaledit_HDRS
-  calibration.h
-)
-
-set(generaledit_UIS
-)
-
-foreach(name ${generaledit_NAMES})
-  set(generaledit_SRCS ${generaledit_SRCS} ${name}.cpp)
-  set(generaledit_HDRS ${generaledit_HDRS} ${name}.h)
-  set(generaledit_UIS  ${generaledit_UIS}  ${name}.ui)
-endforeach()
-
-qt5_wrap_ui(generaledit_SRCS ${generaledit_UIS})
-qt5_wrap_cpp(generaledit_SRCS ${generaledit_HDRS})
-
-add_library(generaledit ${generaledit_SRCS})
-qt5_use_modules(generaledit Widgets Xml Multimedia)
-target_link_libraries(generaledit PRIVATE ${CPN_COMMON_LIB})
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
+
+set(generaledit_NAMES
+  generaledit
+  generalsetup
+  trainer
+  hardware
+)
+
+set(generaledit_SRCS
+  calibration.cpp
+)
+
+set(generaledit_HDRS
+  calibration.h
+)
+
+set(generaledit_UIS
+)
+
+foreach(name ${generaledit_NAMES})
+  set(generaledit_SRCS ${generaledit_SRCS} ${name}.cpp)
+  set(generaledit_HDRS ${generaledit_HDRS} ${name}.h)
+  set(generaledit_UIS  ${generaledit_UIS}  ${name}.ui)
+endforeach()
+ 
+qt5_wrap_ui(generaledit_SRCS ${generaledit_UIS})
+qt5_wrap_cpp(generaledit_SRCS ${generaledit_HDRS})
+
+add_library(generaledit ${generaledit_SRCS})
+qt5_use_modules(generaledit Widgets Xml Multimedia)

companion/src/generaledit/calibration.cpp

@@ -1,23 +1,3 @@
-/*
- * 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 <QVBoxLayout>
 #include <QHeaderView>
 #include <QSpinBox>
@@ -41,15 +21,15 @@ CalibrationPanel::CalibrationPanel(QWidget * parent, GeneralSettings & generalSe
   tableWidget->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
   tableWidget->setStyleSheet("QTableWidget {background-color: transparent;}");
   QStringList headerLabels;
-  headerLabels << QObject::tr("Negative span") << QObject::tr("Mid value") << QObject::tr("Positive span");
+  headerLabels << QObject::tr("Negative span") << QObject::tr("Mid value") << QObject::tr("Positive span"); 
   tableWidget->setHorizontalHeaderLabels(headerLabels);
 
-  int rows = CPN_MAX_STICKS + getBoardCapability(getCurrentBoard(), Board::Pots) + getBoardCapability(getCurrentBoard(), Board::Sliders) + getBoardCapability(getCurrentBoard(), Board::MouseAnalogs);
+  int rows = NUM_STICKS + GetCurrentFirmware()->getCapability(Pots) + GetCurrentFirmware()->getCapability(Sliders);
   tableWidget->setRowCount(rows);
 
   for(int i = 0; i < rows; ++i) {
 
-    QTableWidgetItem *newItem = new QTableWidgetItem(firmware->getAnalogInputName(i));
+    QTableWidgetItem *newItem = new QTableWidgetItem(AnalogString(i));
     newItem->setTextAlignment(Qt::AlignLeft);
     tableWidget->setVerticalHeaderItem(i, newItem);
 
@@ -80,7 +60,7 @@ void CalibrationPanel::onCellChanged(int value)
     emit modified();
   }
 }
-
+    
 int CalibrationPanel::getCalibrationValue(int row, int column)
 {
   switch(column) {