Release notes updated

is cut otherwise)

.circleci/config.yml

@@ -1,69 +0,0 @@
-# Use the latest 2.1 version of CircleCI pipeline process engine.
-# See: https://circleci.com/docs/2.0/configuration-reference
-version: 2.1
-
-# Define a job to be invoked later in a workflow.
-# See: https://circleci.com/docs/2.0/configuration-reference/#jobs
-jobs:
-  build-elrsv2:
-    machine: true
-    steps:
-     - checkout
-     - run: docker run -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=NO GVARS=NO LUA_COMPILER=NO MULTIMODULE=NO DEBUG=NO PCBI6_ELRSV2=YES" -v $PWD:/opentx vitass/opentx-fw-build
-     - store_artifacts:
-        path: opentx-i6x-2.3.0.bin
-        destination: ./artifacts/opentx-i6x-elrsv2-<< pipeline.git.tag >>.bin
-  build-gvars:
-    machine: true
-    steps:
-      - checkout
-      - run: docker run -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=NO GVARS=YES LUA_COMPILER=NO MULTIMODULE=NO DEBUG=NO" -v $PWD:/opentx vitass/opentx-fw-build
-      - store_artifacts:
-          path: opentx-i6x-2.3.0.bin
-          destination: ./artifacts/opentx-i6x-gvars-<< pipeline.git.tag >>.bin
-  build-heli:
-    machine: true
-    steps:
-      - checkout
-      - run: docker run -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=YES GVARS=YES LUA_COMPILER=NO MULTIMODULE=NO DEBUG=NO" -v $PWD:/opentx vitass/opentx-fw-build
-      - store_artifacts:
-          path: opentx-i6x-2.3.0.bin
-          destination: ./artifacts/opentx-i6x-heli-<< pipeline.git.tag >>.bin
-  publish-github-release:
-    docker:
-      - image: cibuilds/github:0.13
-    steps:
-      - attach_workspace:
-          at: ./artifacts
-      - run:
-          name: "Publish Release on GitHub"
-          command: |
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete latest ./artifacts/
-# Invoke jobs via workflows
-# See: https://circleci.com/docs/2.0/configuration-reference/#workflows
-workflows:
-  openi6x-workflow:
-    jobs:
-      - build-elrsv2
-#          filters:
-#            branches:
-#              ignore: /.*/
-#            tags:
-#              only: /.*-release$/
-      - build-gvars
-#          filters:
-#            branches:
-#              ignore: /.*/
-#            tags:
-#              only: /.*-release$/
-      - build-heli
-#          filters:
-#            branches:
-#              ignore: /.*/
-#            tags:
-#              only: /.*-release$/
-      - publish-github-release:
-          requires:
-            - build-elrsv2
-            - build-gvars
-            - build-heli

.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

.github/ISSUE_TEMPLATE/bug.md

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

.github/ISSUE_TEMPLATE/help.md

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

.github/ISSUE_TEMPLATE/newfeature.md

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

.gitignore

@@ -1,22 +1,8 @@
-/.idea/
 /.*project
 /.settings
 /.autotools
-/*.user
-/*.user.*
-build*/
-cmake-build-*/
-/debian/
-/CMakeFiles/*
-radio/src/CmakeFiles/*
-/.vscode/
-*.cmake
-*.make
-*.marks
-/nbproject/
-*.bin
-/radio/src/CMakeFiles/firmware.dir/link.txt
-.push.settings.jsonc
-build.sh
-firm.sh
-flash.sh
+radio/src/bootloader/.dep/
+radio/src/bootloader/bootloader_ramBoot*
+*.lbm
+*.o
+/doc

.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,60 +0,0 @@
-sudo: required
-dist: trusty
-language: cpp
-compiler: gcc
-
-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
-    - 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=ARM9X
-    # - FLAVOR=AR9X
-    # - FLAVOR=SKY9X
-    # - FLAVOR=9XRPRO
-    - FLAVOR=X7
-    - FLAVOR=XLITE
-    - FLAVOR=X9
-    # - FLAVOR=X9D
-    # - FLAVOR=X9D+
-    # - FLAVOR=X9E
-    - FLAVOR=HORUS
-    # - FLAVOR=X10
-    # - FLAVOR=X12Sr10
-    # - FLAVOR=X12S
-
-before_install:
-  - sudo add-apt-repository ppa:ubuntu-sdk-team/ppa --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 apt-get update -qq
-  - pyenv uninstall -f 2.7.6 && pyenv install 3.5.4 && pyenv global 3.5.4
-  - pip install pillow
-
-install:
-  - sudo apt-get --yes --force-yes install curl libmpfr4 libmpc3 libfox-1.6-dev libgtest-dev
-  - sudo apt-get --yes --force-yes install gcc-arm-none-eabi
-      # Trying to build with gcc-arm 4.7 isn't working because it can't find the compiler, despite adding to PATH (in commit-tests.sh) by defining GCC_ARM above
-      # - wget --quiet https://launchpad.net/gcc-arm-embedded/4.7/4.7-2013-q3-update/+download/gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2
-      # - tar xjf gcc-arm-none-eabi-4_7-2013q3-20130916-linux.tar.bz2
-      # - mv gcc-arm-none-eabi-4_7-2013q3 /opt/gcc-arm-none-eabi
-  - sudo apt-get install --yes --force-yes -qq qt${QT_BASE}base qt${QT_BASE}multimedia qt${QT_BASE}svg qt${QT_BASE}tools; source /opt/qt${QT_BASE}/bin/qt${QT_BASE}-env.sh
-
-script:
-  - ./tools/commit-tests.sh

CMakeLists.txt

@@ -1,196 +0,0 @@
-project(OpenTX)
-
-set(VERSION_MAJOR "2")
-set(VERSION_MINOR "3")
-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 "0018")
-set(SDCARD_VERSION  ${VERSION_MAJOR}.${VERSION_MINOR}V${SDCARD_REVISION})
-
-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)
-
-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()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")  # regular Clang or AppleClang
-  set(CLANG TRUE)
-endif()
-
-option(DISABLE_COMPANION "Disable building companion and simulators" OFF)
-
-if(NOT DISABLE_COMPANION)  # FIXME cosmetics/style
-find_package(Qt5Core)
-find_package(Qt5Widgets)
-find_package(Qt5Xml)
-find_package(Qt5LinguistTools)
-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(MSVC)
-    list(APPEND APP_COMMON_DEFINES -D__STDC_LIMIT_MACROS)
-  endif()
-  if(APP_CUSTOM_DBG_HANDLER)
-    # provide full qDebug log context to our custom handler. This may also affect libsimulator, which is why it is here
-    list(APPEND APP_COMMON_DEFINES -DQT_MESSAGELOGCONTEXT)
-    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()
-endif(NOT DISABLE_COMPANION)
-
-# Check for a file that is typically left from a OpenTX 2.1 build and abort if found
-if (EXISTS ${RADIO_SRC_DIRECTORY}/stamp.h OR EXISTS ${RADIO_SRC_DIRECTORY}/translations/en.h)
-   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 AND NOT DISABLE_COMPANION)
-  add_subdirectory(${COMPANION_SRC_DIRECTORY})
-endif()

DONATIONS.txt

@@ -0,0 +1,595 @@
+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
+Michel Baily
+Zdenek Trojanek
+Martin Hotar
+[Devo] Stefan Grundevik
+[Devo] 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
+Aloft Hobbies
+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
+R. Scott Page
+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
+Jonathan Modellismo - jonathan.it
+André Lasseret
+Felipe Alexandre de Oliveira
+Brian Harris
+Philippe Herbots
+Rainer Nelte
+Franck Bernhard
+Erhard Werner
+Stig Jøran Moen
+Keith Hertzog
+Christophe Dauvergne
+Michel Baily
+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
+Aloft Hobbies - www.alofthobbies.com
+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
+Keith Hertzog
+Johan Moelich
+Timo Esser
+Dean Church (monthly)
+Brian Paddock (monthly)
+Jean Pierre Parisy
+Norbert Martsch
+Jean-Marie Guitard
+Mike Perkins
+Tilman Baumann (monthly)
+Fred Larssen
+Ari Aalto
+Robert Sams 
+Kirk Robertson
+John Koontz
+Jeffery Golias
+Paul Robinson
+Dave Matison
+Mike Matheny
+Pino Agostino
+Graham Boucher (monthly)
+Nelson Noura
+Joel Allamy
+Philip David Martin
+Sean Stephen
+Bruce Mackay
+Blake Spilman
+Timothy Pelletier
+Glen Roe (ShowMaster)
+Jan Van Ooteghem
+David Ankers - Special thanks here to the OpenPilot project!
+Lawrence Christensen (monthly)
+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
+Keith Hertzog
+Stéphane Fortas
+Peter Mitrik
+Thomas Majewski
+ANF King
+Henrik Hammarström
+Kenneth Lilja (monthly)
+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
+wsTech - http://wstech.de
+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
+Aviomotive - www.aviomotive.com
+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
+FrSky - www.frsky-rc.com (monthly)
+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
+Michel Baily
+John Grepps
+Anthony Burbidge
+Sherba Baine
+Gordon Evans
+Fred Figge
+Uwe Kuehn 
+David Beatty
+Aaron Stringer
+Alan J Wasserman
+Wolfgang Rauser
+Samuel Cook
+BoltRC - www.boltrc.com
+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
+Gordon Stahl
+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 
+Peter McHenry 
+Matthias Hase 
+Markus Wolf
+Andrew Fazio
+Stefan Künst
+Stephen Adams
+Arold Reinders
+Tauno Rautakorpi
+Frank Houvenaghel
+Aerial Tech Hobbies - www.aerialtechhobbies.com
+George Neusse
+Andreja Rusjakovski
+Axel Stöckle
+Mike Perkins
+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
+Heinrich Illig
+Portstate Pty Ltd
+Jens Hoffmann
+Ricardo Santos
+Jean-Francois Le Breton
+Michael Deasy
+Anindya Mukerjee
+Emay Toha
+Kamco Enterprises
+Peter Mueller
+Giovanni Trentini
+Cecil Porter
+Robert Canavan
+Greg Higginbottom
+Tim Walker
+Thos. O'Meara Photography 
+Spis Ltd/TurboNote
+Patricia Cox
+Matthew Lukes
+Sabine Witte
+Phillip Perry
+Beat Zurflueh
+Russell Stutzman
+Dietmar Drees
+Kenneth Ward
+Jens Lochmüller
+Anthony Witham
+Peter Hauke
+Arizona Action Photos
+Francis F Dale
+Willie Swanepoel
+Edward Hauser
+Adilson Oliveira
+Joseph Ordille
+Michael Shellim 
+Teddie Holmes
+Alexandre Rault
+Eric Albin
+Lukas Kliment
+Bernard Philippe
+Bernard Delpy
+Didier Klein
+Arnaldo Guedes
+Cyberauto Systems
+John Alsbrooks
+John Kearney
+Christopher Borden
+Marc Virgilio Ricci
+Frederick Davie
+Jürgen Enders
+Terrence Pitts
+Thomas Sandner
+Marco Coltorti
+Harald Wilczak
+Rodney Lorimor
+Richard Davis
+Stephen Palmer
+Michael Napolitan
+Joshua Bardwell
+Fred Dawson
+Jim Wagner
+Peter Johnson
+Fredrik Lewerth
+Arvin Stenersen
+Daniel Morgan
+Roy Nixon
+Joachim Blunck
+Karl-Heinz Gansel
+Monrovia Mountain Enterprises
+Alessandro Villa
+Jan-Åke Nilsson
+Matthias Rei
+DVR Solutions BV
+Bertrand Condevaux Lanloy
+Henri Mirra
+Aurélien Planiol
+Kevin Caldwell
+Andrew Garello
+Tomasz Maziarz
+Russell Flack
+Fernando Rimoldi
+Greg Reid
+Dietmar Drees
+Holger Landwehr
+Arno Loehdorf
+Boon Sripattha
+Patrik Åkerfeldt
+Alonzo Fretwell
+Renjith Chandrasekharan
+Ruben Gomez Hernandez
+Michael Gardner
+Judith Green
+Timo Ruppell
+John Lipscomb
+Norbert Wenke
+Erik Frieberg
+Raimo Ruotsalainen
+Brian Harris
+Sebastian Blüml 
+Efisio Maxia
+Jeff Theobald
+Anthony Rizzo
+Rodney Huddleston
+Dietmar Drees

README.md

@@ -1,52 +1,7 @@
-# FlySky i6x port of OpenTX
+##OpenTX Master Branch
 
-This is a port of OpenTX for the venerable Flysky I6X RC radio transmitter. You can find the latest build and some instructions and videos contributed by fellow early adopters in the [RCGroups thread](https://www.rcgroups.com/forums/showthread.php?3916435-FlySky-I6X-port-of-OpenTX)  
+You have found your way to the GitHub repository site for the OpenTX Master Branch. This code branch holds the source code for the latest stable release.    
 
-## Implemented features 
+The ongoing development is not done in this branch. It is performed in the branch called next.
 
-* AFHDS2A protocol
-* PPM out
-* CRSF working with ExpressLRS and Crossfire modules at rates from 115k to 3.75M bauds, CRSFshot enabled
-* Telemetry
-* Audio tones, alarms and vario custom implementation (Janek)
-* USB (To enable on standard cable: General Settings > USB Detect set to "Once") (Janek)
-  * Joystick mode (Janek)
-  * Mass Storage to backup/restore eeprom (Janek)
-* ExpressLRS V1.x configuration in model setup
- 
-## Users Telegram group
-
-https://t.me/otx_flysky_i6x
-
-## Navigation:
-
-| Key | Function |
-| --- | --- |
-| UP     | Hold for stats |                              
-| DOWN   | Hold for telemetry |                                  
-| OK     | Hold for Model menu |
-| CANCEL | EXIT. Hold for graceful shutdown (Needed to save timers) |                      
-| BIND   | Go RIGHT. Go to next PAGE. Hold for general menu. |
-| RIGHT POT | Scroll right or left |
-
-## ST-Link pinout
-
-![ST-Link pinout](https://raw.githubusercontent.com/marianomd/opentx/2.3_M0/doc/flysky/flysky-i6x%20st-link%20pinout%20small.png)
-
-## Linux instructions
-### Compile
-`docker run --rm -it -e "BOARD_NAME=I6X" -e "CMAKE_FLAGS=PCB=I6X HELI=NO GVARS=NO LUA_COMPILER=NO MULTIMODULE=NO DEBUG=YES" -v $PWD:/opentx vitass/opentx-fw-build`
-
-### Flash
-`sudo st-flash write <file_to_flash>.bin 0x08000000`
-
-### Debug tty:
-`sudo cat /dev/ttyUSB0 115200`
-
-## Contributors
-
-* Janek (@ajjjjjjjj) ongoing collaboration.
-* All the RF code was taken from the great KotelloRC's erfly6: Er9X for i6 and i6x. You can find his project here: https://bitbucket.org/KotelloRC/erfly6/src/master/
-* ADC code taken from OpenGround: https://github.com/fishpepper/OpenGround
-* This work is based on Jakub's (qba667) work and is forked from his repo.
-* All the contributors of OpenTX. 
+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,24 +0,0 @@
-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}
-      DEPENDS ${bitmap}
-    )
-    list(APPEND bitmaps_files ${target})
-  endforeach()
-  add_custom_target(${targetname} DEPENDS ${bitmaps_files})
-endmacro(add_bitmaps_target)
-
-macro(add_truetype_font_target radio name font size offset)
-  set(target ${RADIO_SRC_DIRECTORY}/fonts/${radio}/font_${name})
-  add_custom_target(ttf_${radio}_${name}
-    COMMAND ${PYTHON_EXECUTABLE} ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${offset} ${target}
-    WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
-  )
-  set(ttf_${radio}_fonts_targets ${ttf_${radio}_fonts_targets} ttf_${radio}_${name})
-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/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/Macros.cmake

@@ -1,75 +0,0 @@
-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}})
-  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)
-  endif(WIN32)
-endmacro(today)
-
-macro(now RESULT)
-  if(WIN32)
-    execute_process(COMMAND "cmd" " /C time /T" OUTPUT_VARIABLE ${RESULT})
-    string(REGEX REPLACE "(..):(..).*" "\\1:\\2:00" ${RESULT} ${${RESULT}})
-  elseif(UNIX)
-    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")
-    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()
-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 "/(clang-)?cl\\.exe$")
-    set(cpp_version ${CMAKE_CXX_COMPILER_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,271 +1,17 @@
-<h2>Version 2.2.1 / 2017-12-17</h2>
-
-Please see <a href=http://www.open-tx.org/2017/12/16/opentx-2.2.1>this page</a> for details.
-
-<h2>Version 2.2.0 / 2017-05-30</h2>
-
-Major release! Please see <a href=http://www.open-tx.org/2017/05/30/opentx-2.2.0>this page</a> for details.
-
-<h2>Version 2.1.9 / 2016-09-14</h2>
-
-<ul>
-<li>SD sync fixes (<a href=https://github.com/opentx/opentx/issues/3351>#3351</a>)</li>
-<li>Fixed: Telemetry mode "FrSky D (cable)" choice was missing for Taranis (<a href=https://github.com/opentx/opentx/issues/3372>#3372</a>)</li>
-<li>Show persistent option only for calculated sensors (<a href=https://github.com/opentx/opentx/issues/3454>#3454</a>)</li>
-<li>Fixed Flight mode clear command (<a href=https://github.com/opentx/opentx/issues/3214>#3214</a>)</li>
-<li>Fixed a problem with Rotary encoders linked to flight mode (could freeze Companion) (<a href=https://github.com/opentx/opentx/issues/3459>#3459</a>, <a href=https://github.com/opentx/opentx/issues/3470>#3470</a>)</li>
-<li>Telemetry simulator improvements: added fuel quantity sensor, increased RPM range (<a href=https://github.com/opentx/opentx/issues/3505>#3505</a>, <a href=https://github.com/opentx/opentx/issues/3506>#3506</a>)</li>
-<li>Implemented minimal support for the DYI Multimodule (<a href=https://github.com/opentx/opentx/issues/3526>#3526</a>)</li>
-<li>Fixed: GVar combo-box not being refreshed when GV check-box (re-)selected (<a href=https://github.com/opentx/opentx/issues/3518>#3518</a>)</li>
-<li>Fixed: Heli inversion not correctly shown/saved from Companion on Radios without virtual inputs (<a href=https://github.com/opentx/opentx/issues/3510>#3510</a>)</li>
-<li>Implemented print functions for the Heli setup screen (<a href=https://github.com/opentx/opentx/issues/3554>#3554</a>)</li>
-<li>Fixed: Flight modes linked trims display value (<a href=https://github.com/opentx/opentx/issues/3547>#3547</a>, <a href=https://github.com/opentx/opentx/issues/3568>#3568</a>)</li>
-<li>Fixed: New model global variables and rotary encoders initialisation (<a href=https://github.com/opentx/opentx/issues/3473>#3473</a>)</li>
-<li>Fixed: Prevent circular linked global variables and rotary encoders (<a href=https://github.com/opentx/opentx/issues/3472>#3472</a>)</li>
-<li>Fixed wrong log replay speed issue in Telemetry simulator (<a href=https://github.com/opentx/opentx/issues/3708>#3708</a>)</li>
-<li>Various texts and translations corrections</li>
-</ul>
-
-
-<h2>Version 2.1.8 / 2016-04-14</h2>
-
-<ul>
-<li>Telemetry Simulator sensor instance number fixed (<a href=https://github.com/opentx/opentx/issues/3207>#3207</a>)</li>
-<li>Fixed: Throttle Source combo-box was populated multiple times (<a href=https://github.com/opentx/opentx/issues/3222>#3222</a>)</li>
-<li>RTC option tool-tip corrected (<a href=https://github.com/opentx/opentx/issues/3225>#3225</a>)</li>
-<li>Fixed: Companion was looking for custom scripts at the wrong place (<a href=https://github.com/opentx/opentx/issues/3237>#3237</a>)</li>
-<li>Offset displayed in inputs screen (<a href=https://github.com/opentx/opentx/issues/3248>#3248</a>)</li>
-<li>Import/export handling was broken for Average formula telemetry sensors (<a href=https://github.com/opentx/opentx/issues/3262>#3262</a>)</li>
-<li>Fixed: Hardware Setup control types and names were not stored in profile (<a href=https://github.com/opentx/opentx/issues/3260>#3260</a>)</li>
-<li>Fixed voice language list (<a href=https://github.com/opentx/opentx/issues/3338>#3338</a>)</li>
-<li>Fixed data overflow in Special Functions Override Channel (<a href=https://github.com/opentx/opentx/issues/3347>#3347</a>)</li>
-<li>Fixed: Sync dialog new line problem (only present for some UI languages) (<a href=https://github.com/opentx/opentx/issues/3350>#3350</a>)</li>
-<li>Removed a few legacy timer limitations, fix non-working limit (<a href=https://github.com/opentx/opentx/issues/3301>#3301</a>)</li>
-<li>Default AVR fuse settings changed to disable JTAG interface (<a href=https://github.com/opentx/opentx/issues/3379>#3379</a>)</li>
-<li>Channel range fix (Start, Channels) in Model Settings, Setup page, int/ext module settings</li>
-<li>Use friendly GVAR names in dialogs (if available)  (<a href=https://github.com/opentx/opentx/issues/3353>#3353</a>)</li>
-<li>Various texts and translations corrections</li>
-</ul>
-
-
-<h2>Version 2.1.7 / 2016-01-04</h2>
-
-<ul>
-<li>Lua 'execute' failed in non-root directory (in Simulator) (<a href=https://github.com/opentx/opentx/issues/3024>#3024</a>)</li>
-<!-- this is disabled until the speed problem is fixed <li>Header line always visible in Outputs, Logical Switches and Special Functions (<a href=https://github.com/opentx/opentx/issues/2861>#2861</a>)</li> -->
-<li>LR12 changes: removed option for remote failsafe configuration, added in EU firmware variant</li>
-<li>Added Clear option to the flight mode context menu (right click on the Name label) (<a href=https://github.com/opentx/opentx/issues/3026>#3026</a>)</li>
-<li>New features for Telemetry Simulator: log replay, user friendly sensor values (<a href=https://github.com/opentx/opentx/issues/3124>#3124</a>)</li>
-<li>Added F7 key to reload LUA permanent scripts in radio simulator (<a href=https://github.com/opentx/opentx/issues/3141>#3141</a>)</li>
-<li>AR9X firmware flashing fall-back was wrong</li>
-<li>Command line options support added to standalone simulator (try "./simulator21 --help" on Linux and "simulator.exe /help" on Windows for usage) (<a href=https://github.com/opentx/opentx/issues/3160>#3160</a>)</li>
-<li>Various rounding problem fixed: Telemetry sensor Ratio parameter (<a href=https://github.com/opentx/opentx/issues/3117>#3117</a>),
-  Outputs Sub-trim, Min and Max values (<a href=https://github.com/opentx/opentx/issues/3156>#3156</a>)</li>
-<li>Fixed: telemetry sensors Ratio and Offset value increment/decrement step (<a href=https://github.com/opentx/opentx/issues/3121>#3121</a>)</li>
-<li>Hardware/Calibration tab split int two tabs (<a href=https://github.com/opentx/opentx/issues/2974>#2974</a>)</li>
-<li>Fixed Fahrenheit temperature conversion error (if PREC was not 0) (<a href=https://github.com/opentx/opentx/issues/3146>#3146</a>)</li>
-<li>Application Setting 'Enable automatic backup before writing firmware' was not saved (<a href=https://github.com/opentx/opentx/issues/3040>#3040</a>)</li>
-<li>Fixed RPM package problem on Fedora (<a href=https://github.com/opentx/opentx/issues/3130>#3130</a>)</li>
-<li>Fixed conversion errors when loading 2.0.x EEPE (<a href=https://github.com/opentx/opentx/issues/3177>#3177</a>)</li>
-<li>Various texts and translations corrections</li>
-</ul>
-
-
-<h2>Version 2.1.6 / 2015-11-11</h2>
-
-<ul>
-<li>Telemetry custom screen changes didn't emit modified signal (<a href=https://github.com/opentx/opentx/issues/3029>#3029</a>)</li>
-<li>Hide D8/LR12 when eu firmware option is selected</li>
-</ul>
-
-
-<h2>Version 2.1.5 / 2015-11-05</h2>
-
-Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrSky's release of OpenTX 2.1.4
-
-<ul>
-<li>Fixed: changing any setting on the telemetry panel does not set the file as being modified (<a href=https://github.com/opentx/opentx/issues/2875>#2875</a>)</li>
-<li>Print model fix for "Play value.... not on startup" (<a href=https://github.com/opentx/opentx/issues/2736>#2736</a>)</li>
-<li>Top LCD Timer could not be selected for X9E  (<a href=https://github.com/opentx/opentx/issues/2850>#2850</a>)</li>
-<li>More informative error/info messages when openin eepe files (<a href=https://github.com/opentx/opentx/issues/2778>#2778</a>)</li>
-<li>Print model fix for curves (<a href=https://github.com/opentx/opentx/issues/2896>#2896</a>)</li>
-<li>Added missing special functions (bind, range check, set failsafe) (<a href=https://github.com/opentx/opentx/issues/2753>#2753</a>)</li>
-<li>Some defaults missing when changing telemetry formula, update propagation issues (<a href=https://github.com/opentx/opentx/issues/2928>#2928</a>)</li>
-<li>Fixed wrong import of Logical switches from OpenTX 2.0.x version (<a href=https://github.com/opentx/opentx/issues/2942>#2942</a>)</li>
-<li>Fixed a problem with updates path on Windows (<a href=https://github.com/opentx/opentx/issues/2876>#2876</a>)</li>
-<li>Edge representation unified (changed from "no release" to "instant") (<a href=https://github.com/opentx/opentx/issues/2837>#2837</a>)</li>
-<li>Added channel names on failsafe sliders (<a href=https://github.com/opentx/opentx/issues/3021>#3021</a>)</li>
-<li>Corrected failsafe mapping when using Custom failsafe mode, D16 protocol and channel range different from from 1-8.
-  Users with such setups are advised to re-check their failsafe settings (<a href=https://github.com/opentx/opentx/issues/2975>#2975</a>)</li>
-<li>Various texts and translations corrections</li>
-<li>Various small bug-fixes: <a href=https://github.com/opentx/opentx/issues/2994>#2994</a>,
-                             <a href=https://github.com/opentx/opentx/issues/3016>#3016</a>,
-                             <a href=https://github.com/opentx/opentx/issues/3012>#3012</a>
-</li>
-</ul>
-
-
-<h2>Version 2.1.3 / 2015-09-09</h2>
-
-<ul>
-<li>Fix missing translations in inputs/mixes tabs, print and compare dialogs (<a href=https://github.com/opentx/opentx/issues/2847>#2847</a>)</li>
-</ul>
-
-
-<h2>Version 2.1.2 / 2015-09-07</h2>
-
-<ul>
-<li>Fixed: Lua model scripts outputs not working in a simulator (<a href=https://github.com/opentx/opentx/issues/2684>#2684</a>)</li>
-<li>Fixed a problem of Companion 2.1 trying to install into 2.0 path.
-    The effect will only be visible for the users that did not install any of the previous 2.1.x versions.
-    (<a href=https://github.com/opentx/opentx/issues/2645>#2645</a>)</li>
-<li>Added missing SDL libraries to MAC package  (<a href=https://github.com/opentx/opentx/issues/2678>#2678</a>)</li>
-<li>Added used channels check/warning in Wizard (<a href=https://github.com/opentx/opentx/issues/2091>#2091</a>)</li>
-<li>Model Print and Model Compare improvements and fixes (<a href=https://github.com/opentx/opentx/issues/2734>#2734</a>, <a href=https://github.com/opentx/opentx/issues/2737>#2737</a>, <a href=https://github.com/opentx/opentx/issues/2576>#2576</a>)</li>
-<li>Negative telemetry offset value was reset when writing back to radio (<a href=https://github.com/opentx/opentx/issues/2738>#2738</a>)</li>
-<li>Telemetry sensor names were not displayed (<a href=https://github.com/opentx/opentx/issues/2807>#2807</a>)</li>
-<li>Mixes multiplex representation now the same as on the radio (<a href=https://github.com/opentx/opentx/issues/2808>#2808</a>)</li>
-<li>Fixed language-related startup crash on Mac  (<a href=https://github.com/opentx/opentx/issues/2815>#2815</a>)</li>
-<li>Fixed issues with conversion from 2.0 (<a href=https://github.com/opentx/opentx/issues/2809>#2809</a>, <a href=https://github.com/opentx/opentx/issues/2800>#2800</a>)</li>
-<li>Fixed Throttle source export issue on X9E  (<a href=https://github.com/opentx/opentx/issues/2844>#2844</a>)</li>
-<li>Added support for the AR9X replacement board (prototype) for the Turnigy 9X radio, info <a href=http://www.rcgroups.com/forums/showthread.php?t=2479552>here</a></li>
-</ul>
-
-
-<h2>Version 2.1.1 / 2015-08-06</h2>
-<ul>
-<li>Vario source and center silent options were not saved(<a href=https://github.com/opentx/opentx/issues/2476>#2476</a>)</li>
-<li>DSM receiver numbers for external module were not converted from previous version EEPROM (<a href=https://github.com/opentx/opentx/issues/2474>#2474</a>)</li>
-<li>Precision incorrectly set for Calculated->Cells sensor (<a href=https://github.com/opentx/opentx/issues/2479>#2479</a>)</li>
-<li>Unit incorrectly set for Calculated->Cells sensor (<a href=https://github.com/opentx/opentx/issues/2485>#2485</a>)</li>
-<li>Fixed import/export of trim values (<a href=https://github.com/opentx/opentx/issues/2484>#2484</a>)</li>
-<li>Removed constant access to floppy disk (<a href=https://github.com/opentx/opentx/issues/2160>#2160</a>)</li>
-<li>Telemetry view script combo box list was empty (<a href=https://github.com/opentx/opentx/issues/2465>#2465</a>)</li>
-<li>Telemetry view bars ranges not transfered to radio (<a href=https://github.com/opentx/opentx/issues/2491>#2491</a>)</li>
-<li>Fixed Standalone simulator radio selection display problem (<a href=https://github.com/opentx/opentx/issues/2503>#2503</a>)</li>
-<li>Added missing simulation libraries and enabled side by side installation of Companion 2.0 and 2.1 on Linux (<a href=https://github.com/opentx/opentx/issues/2500>#2500</a>)</li>
-<li>Standalone simulator now remembers which radio was simulated in previous session (<a href=https://github.com/opentx/opentx/issues/2503>#2503</a>)</li>
-<li>Radio calibration value were not displayed (<a href=https://github.com/opentx/opentx/issues/2502>#2502</a>)</li>
-<li>Fixed Vario / Voltage / Current sources export problem</li>
-<li>Writing model settings to 9XR-PRO did not work (<a href=https://github.com/opentx/opentx/issues/2402>#2402</a>, <a href=https://github.com/opentx/opentx/issues/2517>#2517</a>)</li>
-<li>Model Print and Model Compare improvements</li>
-<li>Fixed Companion OSX version (<a href=https://github.com/opentx/opentx/issues/2549>#2549</a>)</li>
-<li>Firmware nightly builds are now downloadable from nightly builds of Companion (<a href=https://github.com/opentx/opentx/issues/2526>#2526</a>, <a href=https://github.com/opentx/opentx/issues/2634>#2634</a>)</li>
-<li>Fixed telemetry item lists (<a href=https://github.com/opentx/opentx/issues/2541>#2541</a>)</li>
-<li>Fixed missing pots P1..P3 for 9X (<a href=https://github.com/opentx/opentx/issues/2543>#2543</a>)</li>
-<li>Fixed "Invalid model and settings" error message when writing models and settings to the radio (<a href=https://github.com/opentx/opentx/issues/2544>#2544</a>)</li>
-<li>Global Functions fixes (<a href=https://github.com/opentx/opentx/issues/2558>#2558</a>)</li>
-<li>Export to Google Earth now working (only) with the new telemetry fields (GPS, GAlt and GSpd) (<a href=https://github.com/opentx/opentx/issues/2546>#2546</a>)</li>
-<li>Fixed unsuccessful writing of setting to the radio for 9XR PRO (<a href=https://github.com/opentx/opentx/issues/2605>#2605</a>)</li>
-<li>Fixed missing LUA script outputs in special function "Play Value" (<a href=https://github.com/opentx/opentx/issues/2649>#2649</a>)</li>
-<li>Various texts and translations corrections</li>
-<li>Various small bug-fixes</li>
-</ul>
-
-
-<h2>Version 2.1.0 / 2015-07-16</h2>
-<ul>
-<li>SD card synchronizaton tool</li>
-<li>Added session duraton information in Log Viewer</li>
-<li>Enabled <i>Mixers monitor</i> in Taranis simulator</li>
-<li>Better support for multi-axes in Log Viewer (<a href=https://github.com/opentx/opentx/issues/2267>#2267</a>)</li>
-<li>File path issue in Taranis simulator function <i>findTrueFileName()</i> on Windows (<a href=https://github.com/opentx/opentx/issues/2301>#2301</a>)</li>
-<li>Added simulator volume gain setting (<a href=https://github.com/opentx/opentx/issues/2260>#2260</a>)</li>
-<li>Added GPS glitch filtering and Latitude/Longitude position synchronization to Google Earth export (<a href=https://github.com/opentx/opentx/issues/2326>#2326</a>)</li>
-<li>Fixed a rare program crash when editing Input for 9X radio (<a href=https://github.com/opentx/opentx/issues/2420>#2420</a>)</li>
-<li>Fixed missing RSSI audio warnings if simulator was started multiple times (<a href=https://github.com/opentx/opentx/issues/2446>#2446</a>)</li>
-</ul>
-
-
-<h2>Version 2.0.17 / 2015-05-04</h2>
-<ul>
-<li>Simulator crash (<a href=https://github.com/opentx/opentx/issues/2253>#2253</a>)</li>
-</ul>
-
-
-<h2>Version 2.0.16 / 2015-05-03</h2>
-<ul>
-<li><i>nooverridech</i> firmware option was not working</li>
-<li>Fixed setting Expo from gvars for 9XR-Pro (<a href=https://github.com/opentx/opentx/issues/2040>#2040</a>)</li>
-<li>Added Mixers Monitor screen option <i>mixersmon</i> (<a href=https://github.com/opentx/opentx/issues/1945>#1945</a>)</li>
-<li>Added audio playing in simulator (<a href=https://github.com/opentx/opentx/issues/457>#457</a>)</li>
-<li>Fixed sorting of audio tracks (<a href=https://github.com/opentx/opentx/issues/2002>#2002</a>)</li>
-<li>Model wizard fixes (<a href=https://github.com/opentx/opentx/issues/2091>#2091</a>)</li>
-<li>GVAR names removed for 9x, radio doesn't support them (<a href=https://github.com/opentx/opentx/issues/2150>#2150</a>)</li>
-<li>Some LS sources didn't follow the Imperial units setting (<a href=https://github.com/opentx/opentx/issues/2180>#2180</a>)</li>
-<li>Added more fields to the telemetry simulator (<a href=https://github.com/opentx/opentx/issues/2171>#2171</a>)</li>
-<li>Log viewer improvements and massive speed increase (<a href=https://github.com/opentx/opentx/issues/1863>#1863</a>, <a href=https://github.com/opentx/opentx/issues/2163>#2163</a>)</li>
-<li>Added Battery meter range setting (<a href=https://github.com/opentx/opentx/issues/2195>#2195</a>)</li>
-<li>Improvements in Print and Compare dialogs (<a href=https://github.com/opentx/opentx/issues/2219>#2219</a>)</li>
-<li>Reset pots to the middle by right double clicking them in Simulator (<a href=https://github.com/opentx/opentx/issues/1939>#1939</a>)</li>
-<li>Minor fixes: <a href=https://github.com/opentx/opentx/issues/2153>#2153</a>,
-                 <a href=https://github.com/opentx/opentx/issues/2138>#2138</a>,
-                 <a href=https://github.com/opentx/opentx/issues/2090>#2090</a>,
-                 <a href=https://github.com/opentx/opentx/issues/2122>#2122</a>
-</li>
-</ul>
-
-
-<h2>Version 2.0.15 / 2015-01-13</h2>
-<ul>
-<li>Firmware was not written correctly on radio when compatibility warning check enabled</li>
-<li>Time format for Special Functions Set Timers</li>
-</ul>
-
-<h2>Version 2.0.14 / 2015-01-12</h2>
-<ul>
-<li>OpenTX Companion and Companion9x can now be installed side by side on Linux</li>
-<li>Improved TAB order in dialogs</li>
-<li>Special Function <i>Start Logs</i> renamed to more appropriate <i>SD Logs</i></li>
-<li>Improvements for MAC build</li>
-<li>Fixes to Google Earth logs export</li>
-<li>Firmware compatibility warning check added when flashing new firmware to radio</li>
-<li>Fixed issue with Telemetry Type setting on 9XR-PRO</li>
-<li>Added Telemetry simulator</li>
-<li>Added Trainer simulator</li>
-<li>Added Debug Output window</li>
-<li>Various texts and translations corrections</li>
-<li>Various small bug-fixes</li>
-<li>More reliable method of writing EEPROM.BIN and FIRMWARE.BIN to radio</li>
-<li>Fixed issue with Edge function INSTANT for V1>2s</li>
-<li>Fixed buffer overflow in Joystick code</li>
-</ul>
-
-<h2>Version 2.0.13 / 2014-11-20</h2>
-<ul>
-<li>Too many curves shown on non ARM boards</li>
-<li>Fixed vario limits</li>
-<li>Fixes in compare dialog</li>
-<li>Fixed receiver number range</li>
-<li>Virtual inputs not selectable in SF Volume and heli Collective Source</li>
-<li>Joystick calibration crash after channel assignment</li>
-<li>Gvar import error for limits</li>
-<li>Companion shows too many curve types in input/mixer for 9x</li>
-<li>NOT curves removed from inputs (for non ARM platforms)</li>
-<li>Companion again builds on OS X (Mac)</li>
-<li>Companion simulator Lua crash on OS X 64bit (Mac)</li>
-<li>Companion didn't take care of PlayScript functions</li>
-</ul>
-
-<h2>Version 2.0.12 / 2014-09-15</h2>
-<ul>
-<li>Typos & Translations updated</li>
-</ul>
-
-<h2>Version 2.0.11 / 2014-09-10</h2>
+<h2>Version 2.0.11</h2>
 <ul>
 <li>Limits EEPROM export was broken (all boards except Taranis)</li>
 <li>Fix issue when a GVAR was used as Offset</li>
 </ul>
 
-<h2>Version 2.0.10 / 2014-09-08</h2>
+<h2>Version 2.0.10</h2>
 <ul>
 <li>Taranis is now the default board in General Settings</li>
 <li>GVARS allowed in Limits min/max/offset</li>
 <li>Limits displayed in us when ppmus option selected
 </ul>
 
-<h2>Version 2.0.8 / 2014-07-23</h2>
+<h2>Version 2.0.8</h2>
 <ul>
 <li>Compare dialog bugfixes</li>
 <li>Curve index correctly resetted when type changed</li>
@@ -301,13 +47,13 @@ Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrS
 <ul>
 <li>Sound should be ok on all platforms</li>
 <li>Min/Max reviewed in Logical switches (for the whole telemetry)</li>
-<li>Various bug fixes</li>
+<li>Various bug fixes</li> 
 </ul>
 
 <h2>Version 2.0.3</h2>
 <ul>
 <li>EEPROM import bug on AdjustGVAR function</li>
-<li>Timers correctly displayed in logical switches tab</li>
+<li>Timers correctly displayed in logical switches tab</li> 
 </ul>
 
 <h2>Version 2.0.2</h2>
@@ -481,4 +227,4 @@ Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrS
 <li>Try to reduce modeledit window form MAC</li>
 <li>Wrong init of RF-Module data</li>
 <li>Read flash from TX didn't worked for Taranis</li>
-</ul>
+</ul>

companion/src/CMakeLists.txt

@@ -1,258 +1,176 @@
-set(SIMULATOR_INSTALL_PREFIX "" CACHE STRING "Alternative simulator library search path")
+PROJECT( companion )
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "(Linux|FreeBSD)")
-  set(C9X_NAME_SUFFIX ${VERSION_MAJOR}${VERSION_MINOR})
-  set(COMPANION_NAME "companion${C9X_NAME_SUFFIX}")
-  set(SIMULATOR_NAME "simulator${C9X_NAME_SUFFIX}")
-  if (NOT ${SIMULATOR_INSTALL_PREFIX} STREQUAL "")
-    set(SIMULATOR_LIB_PATH ${SIMULATOR_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
-  else()
-    set(SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
-  endif()
-  message(STATUS "Simulators library search path: " ${SIMULATOR_LIB_PATH})
-  set(SIMULATOR_LIB_INSTALL_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
-else()
-  set(COMPANION_NAME "companion")
-  set(SIMULATOR_NAME "simulator")
-endif()
+SET( C9X_VERSION_MAJOR "2" )
+SET( C9X_VERSION_MINOR "0" )
+SET( C9X_VERSION_REVISION "11" )
+SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION} )
 
-# 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}")
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
 
-# 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")
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
-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)
+MESSAGE( STATUS "Looking for XercesC " )
+FIND_PACKAGE(XercesC)
+IF ( XERCESC_FOUND )
+    INCLUDE_DIRECTORIES( ${XERCESC_INCLUDE_DIR} )
+    SET(LidarFormat_LIBRAIRIES ${LidarFormat_LIBRAIRIES} ${XERCESC_LIBRARIES})
+ELSE()
+    MESSAGE( FATAL_ERROR "XercesC not found! Please set XercesC path ..." )
+ENDIF()
 
-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()
+MESSAGE( STATUS "Looking for Xsd " )
+FIND_PACKAGE(Xsd)
+IF ( XSD_FOUND )
+    INCLUDE_DIRECTORIES( ${XSD_INCLUDE_DIR} )
+    MESSAGE("XSD Include Path: " ${XSD_INCLUDE_DIR} )
+ELSE()
+    MESSAGE( FATAL_ERROR "XSD not found! Please set XSD path ..." )
+ENDIF()
 
-option(TABLE_LAYOUT "Use QTableWidget for grid layouts") # Disabled by default
-if(TABLE_LAYOUT)
-  add_definitions(-DTABLE_LAYOUT)
-  message(STATUS "Using QTableWidget")
-endif()
+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 )
+ELSE()
+    MESSAGE( "SDL not found! Joysticks support will be disabled" )
+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()
+FIND_PACKAGE(Qt4 4.8.4 REQUIRED)
+SET( QT_USE_QTNETWORK True )
+SET( QT_USE_QTXML True )
+INCLUDE( ${QT_USE_FILE} )
 
-if(SDL_FOUND)
-  include_directories(${SDL_INCLUDE_DIR})
-  add_definitions(-DJOYSTICKS)
-endif()
+MESSAGE( STATUS "Looking for PHONON " )
+FIND_PACKAGE(Phonon)
+IF ( PHONON_FOUND )
+    INCLUDE_DIRECTORIES( ${PHONO_INCLUDE_DIR} )
+    MESSAGE("PHONON Include Path: " ${PHONON_INCLUDE_DIR} )
+    ADD_DEFINITIONS( -DPHONON )
+ELSE()
+    MESSAGE( "PHONON not found!" )
+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()
-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()
-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)
-    if(NOT CLANG)
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /LD /MP")
-    endif()
-    if(NOT WIN_USE_CONSOLE)
-      set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,5.01")  # is this even needed?
-    endif()
-  elseif(MINGW)
-    get_filename_component(MINGW_DIR ${CMAKE_CXX_COMPILER} DIRECTORY)
-    # struct packing breaks on MinGW w/out -mno-ms-bitfields: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991 & http://stackoverflow.com/questions/24015852/struct-packing-and-alignment-with-mingw
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mno-ms-bitfields")
-  endif()
-else()
-  set(PTHREAD_LIBRARY pthread)
-  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
-
-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
+ADD_CUSTOM_COMMAND(
+  COMMAND ${XSDCXX_EXECUTABLE} cxx-tree --root-element-all --generate-serialization --output-dir ${PROJECT_BINARY_DIR}/ ${PROJECT_SOURCE_DIR}/radio.xsd
+  OUTPUT ${PROJECT_BINARY_DIR}/radio.hxx ${PROJECT_BINARY_DIR}/radio.cxx
+  DEPENDS ${PROJECT_SOURCE_DIR}/radio.xsd
 )
 
-############# 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)
+IF( MSVC )
+  SET(CMAKE_CXX_FLAGS "/EHsc /LD")
+  INCLUDE_DIRECTORIES( ${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes)
+  LINK_DIRECTORIES( C:/Programs/pthreads/Pre-built.2/lib/ )
+  SET( PTHREAD_LIBRARY pthreadVC2.lib )
+ELSE( )
+  SET( PTHREAD_LIBRARY pthread )
+  ADD_DEFINITIONS( -Wall )
+  LINK_DIRECTORIES( /usr/local/lib )
+ENDIF( )
 
-############# Translations ###############
+set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src)
+set(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/simulation)
+set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR})
 
-### Generate .qm files and assemble resource (qrc) file.
+add_custom_command(
+  OUTPUT ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
+  COMMAND make lbm
+  DEPENDS ${RADIO_SRC_DIRECTORY}/bitmaps/sticks_4x1.xbm
+  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
+)
 
-# 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_custom_command(
+  OUTPUT ${RADIO_SRC_DIRECTORY}/translations/en.h
+  COMMAND make tra
+  DEPENDS ${RADIO_SRC_DIRECTORY}/translations/en.h.txt
+  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
+)
 
-# 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()
+add_custom_command(
+  OUTPUT ${RADIO_SRC_DIRECTORY}/lua_exports.inc
+  COMMAND make lua_exports.cpp
+  DEPENDS ${RADIO_SRC_DIRECTORY}/myeeprom.h
+  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
+)
 
-set(TRANSLATIONS_QRC "${CMAKE_CURRENT_BINARY_DIR}/translations.qrc")
+include_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${PROJECT_SOURCE_DIR}/../..
+  ${SIMU_SRC_DIRECTORY}
+  ${RADIO_SRC_DIRECTORY}
+  ${RADIO_SRC_DIRECTORY}/fonts/std
+  ${RADIO_SRC_DIRECTORY}/lua/src
+  ${XSD_INCLUDE_DIR}
+)
 
-# 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 ###############
+add_subdirectory(modeledit)
+add_subdirectory(simulation)
 
 set(common_SRCS
-  appdebugmessagehandler.cpp
-  customdebug.cpp
-  helpers.cpp
-  translations.cpp
-  modeledit/node.cpp  # used in simulator
-  modeledit/edge.cpp  # used by node
-  )
+  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
+  ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
+  ${RADIO_SRC_DIRECTORY}/translations/en.h
+  ${RADIO_SRC_DIRECTORY}/lua_exports.inc
+  firmwares/opentx/opentxeeprom.cpp
+  firmwares/opentx/open9xStockeeprom.cpp
+  firmwares/opentx/open9xGruvin9xeeprom.cpp
+  firmwares/opentx/open9xSky9xeeprom.cpp
+  firmwares/opentx/opentxinterface.cpp
+  firmwares/opentx/opentxTaranisSimulator.cpp
+  firmwares/opentx/opentxSky9xsimulator.cpp
+  firmwares/opentx/opentxGruvin9xsimulator.cpp
+  firmwares/opentx/opentxM128simulator.cpp
+  firmwares/opentx/opentxM64simulator.cpp
+  file.cpp
+  appdata.cpp
+)
 
-set(common_MOC_HDRS
-  appdebugmessagehandler.h
-  helpers.h
-  modeledit/node.h
-  )
+qt4_wrap_cpp(common_SRCS)
 
-set(common_RESOURCES
-  companion.qrc
-  ${TRANSLATIONS_QRC}
-  )
-
-qt5_wrap_cpp(common_SRCS ${common_MOC_HDRS})
-qt5_add_resources(common_RCC ${common_RESOURCES})
-
-add_library(common ${common_SRCS} ${common_RCC})
-
-target_link_libraries(common
-  firmwares
-  storage
-  simulation
-  maxLibQtWidgets
-  Qt5::Core
-  Qt5::Xml
-  Qt5::Widgets
-  ${PTHREAD_LIBRARY}
-  ${SDL_LIBRARY}
-  ${WIN_LINK_LIBRARIES}
-  )
-
-set(CPN_COMMON_LIB common)
-
-############# Supporting libraries ###############
-
-add_subdirectory(datamodels)
-add_subdirectory(firmwares)
-add_subdirectory(shared)
-add_subdirectory(modeledit)
-add_subdirectory(generaledit)
-add_subdirectory(simulation)
-add_subdirectory(storage)
-add_subdirectory(thirdparty/qcustomplot)
-add_subdirectory(thirdparty/maxlibqt/src/widgets)
-
-############# Companion ###############
+add_library(common ${common_SRCS})
 
 set(companion_SRCS
-  helpers_html.cpp
+  hexinterface.cpp
+  flashinterface.cpp
+  # xmlinterface.cpp
+  # ${PROJECT_BINARY_DIR}/radio.cxx
+  helpers.cpp
   mdichild.cpp
+  generaledit.cpp
   modelslist.cpp
+  mountlist.cpp 
+  avroutputdialog.cpp
   apppreferencesdialog.cpp
   fwpreferencesdialog.cpp
   burnconfigdialog.cpp
-  multimodelprinter.cpp
   comparedialog.cpp
-  creditsdialog.cpp
-  releasenotesdialog.cpp
-  releasenotesfirmwaredialog.cpp
+  contributorsdialog.cpp
   customizesplashdialog.cpp
-  radiointerface.cpp
-  progresswidget.cpp
-  progressdialog.cpp
-  process_copy.cpp
-  process_flash.cpp
-  process_sync.cpp
-  flashfirmwaredialog.cpp
-  flasheepromdialog.cpp
+  burndialog.cpp
   printdialog.cpp
-  modelprinter.cpp
   fusesdialog.cpp
   logsdialog.cpp
   downloaddialog.cpp
-  splashlibrarydialog.cpp
+  splashlibrary.cpp
   mainwindow.cpp
   companion.cpp
   radionotfound.cpp
+  qcustomplot.cpp
   wizarddata.cpp
   wizarddialog.cpp
-  styleeditdialog.cpp
-  dialogs/filesyncdialog.cpp         # TODO move to own lib with other dialogs
-  )
+)
 
 set(companion_MOC_HDRS
+  avroutputdialog.h
   apppreferencesdialog.h
   fwpreferencesdialog.h
   burnconfigdialog.h
@@ -260,34 +178,26 @@ set(companion_MOC_HDRS
   printdialog.h
   fusesdialog.h
   logsdialog.h
-  creditsdialog.h
-  releasenotesdialog.h
-  releasenotesfirmwaredialog.h
+  contributorsdialog.h
   customizesplashdialog.h
-  splashlibrarydialog.h
+  splashlibrary.h
   splashlabel.h
-  progresswidget.h
-  progressdialog.h
-  process_copy.h
-  process_flash.h
-  process_sync.h
-  flashfirmwaredialog.h
-  flasheepromdialog.h
+  burndialog.h
   downloaddialog.h
+  generaledit.h
+  modelslist.h
   mdichild.h
   mainwindow.h
   radionotfound.h
+  qcustomplot.h
+  qautocombobox.h
+  helpers.h
   wizarddialog.h
-  modelprinter.h
-  multimodelprinter.h
-  modelslist.h
-  styleeditdialog.h
-  helpers_html.h
-  dialogs/filesyncdialog.h
-  )
-
+)
+     
 set(companion_UIS
   mdichild.ui
+  avroutputdialog.ui
   comparedialog.ui
   fusesdialog.ui
   logsdialog.ui
@@ -295,292 +205,265 @@ set(companion_UIS
   fwpreferencesdialog.ui
   burnconfigdialog.ui
   downloaddialog.ui
+  generaledit.ui
   printdialog.ui
-  htmldialog.ui
+  contributorsdialog.ui
   customizesplashdialog.ui
-  splashlibrarydialog.ui
-  progresswidget.ui
-  progressdialog.ui
-  flashfirmwaredialog.ui
-  flasheepromdialog.ui
+  splashlibrary.ui
+  burndialog.ui
   radionotfound.ui
-  styleeditdialog.ui
-  )
+)
+
+set(companion_RCS
+  companion.qrc
+  ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
+)
+
+MACRO (TODAY RESULT)
+    IF (WIN32)
+        EXECUTE_PROCESS(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT})
+        string(REGEX REPLACE "(..)/(..)/(....).*" "\\1.\\2.\\3" ${RESULT} ${${RESULT}})
+    ELSEIF(UNIX)
+        EXECUTE_PROCESS(COMMAND "date" "+%d/%m/%Y" OUTPUT_VARIABLE ${RESULT})
+        string(REGEX REPLACE "(..)/(..)/(....).*" "\\1.\\2.\\3" ${RESULT} ${${RESULT}})
+    ELSE (WIN32)
+        MESSAGE(SEND_ERROR "date not implemented")
+        SET(${RESULT} 00.00.0000)
+    ENDIF (WIN32)
+ENDMACRO (TODAY)
+
+MACRO (NOW RESULT)
+    IF (WIN32)
+        EXECUTE_PROCESS(COMMAND "cmd" " /C time /T" OUTPUT_VARIABLE ${RESULT})
+        string(REGEX REPLACE "(..):(..).*" "\\1:\\2:00" ${RESULT} ${${RESULT}})
+    ELSEIF(UNIX)
+        EXECUTE_PROCESS(COMMAND "date" "+%H:%M:%S" OUTPUT_VARIABLE ${RESULT})
+        string(REGEX REPLACE "(..):(..):(..).*" "\\1:\\2:\\3" ${RESULT} ${${RESULT}})
+    ELSE (WIN32)
+        MESSAGE(SEND_ERROR "time not implemented")
+        SET(${RESULT} 00:00:00)
+    ENDIF (WIN32)
+ENDMACRO (NOW)
+
+TODAY(DATE)
+NOW(TIME)
+
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc @ONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/firmwares/opentx/stamp-opentx.h.in ${CMAKE_CURRENT_BINARY_DIR}/stamp-opentx.h @ONLY)
+
+IF( WIN32 )
+  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 it sv cs fi nl)
+FOREACH( language ${LANGUAGES} )
+  SET( companion_TS ${companion_TS} translations/companion_${language}.ts )
+ENDFOREACH( language )
+
+set( companion_SRCS ${companion_SRCS}  )
+QT4_WRAP_UI( companion_SRCS ${companion_UIS} )
+QT4_WRAP_CPP( companion_SRCS ${companion_MOC_HDRS} )
+QT4_ADD_TRANSLATION( companion_QM ${companion_TS}  )
+QT4_ADD_RESOURCES( companion_SRCS ${companion_RCS} )
+
+ADD_DEFINITIONS( -DQT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}" )
+
+IF( APPLE )
+    ADD_EXECUTABLE( ${PROJECT_NAME} MACOSX_BUNDLE ${companion_SRCS} ${companion_QM} )
+    # OS X compiler no longer automatically includes /Library/Frameworks in search path
+    SET( CMAKE_EXE_LINKER_FLAGS -F/Library/Frameworks )
+ELSE( )
+    ADD_EXECUTABLE( ${PROJECT_NAME} WIN32 ${companion_SRCS} ${companion_QM} )
+ENDIF( )
+
+TARGET_LINK_LIBRARIES( ${PROJECT_NAME} modeledit simulation common ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} )
+
+############# Standalone simu ###############
+
+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
+)
+
+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
+)
+
+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
+)
+
+set(simu_SRCS
+  ${TH9X_CHECKOUT_DIRECTORY}/th9xsimulator.cpp
+  ${ER9X_CHECKOUT_DIRECTORY}/er9xsimulator.cpp
+  ${ERSKY9X_CHECKOUT_DIRECTORY}/ersky9xsimulator.cpp
+  ${RADIO_SRC_DIRECTORY}/bitmaps/sticks.lbm
+  ${RADIO_SRC_DIRECTORY}/translations/en.h
+  ${RADIO_SRC_DIRECTORY}/lua_exports.inc
+  modeledit/node.cpp
+  modeledit/edge.cpp # TODO not needed
+  simulator.cpp
+)
+
+set(simu_MOC_HDRS
+  modeledit/node.h
+)
+
+set( simu_SRCS ${simu_SRCS} )
+qt4_wrap_cpp(simu_SRCS ${simu_MOC_HDRS} )
+qt4_add_resources(simu_SRCS companion.qrc) # TODO not needed
 
 if(WIN32)
-  set(icon_RC images/winicons/icon.rc)
+  set(simu_SRCS ${simu_SRCS} icon.rc)
 endif()
 
-qt5_wrap_ui(companion_SRCS ${companion_UIS})
-qt5_wrap_cpp(companion_SRCS ${companion_MOC_HDRS})
-
-add_executable(${COMPANION_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${companion_SRCS} ${icon_RC})
-target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit qcustomplot shared ${CPN_COMMON_LIB})
-
-PrintTargetReport("${COMPANION_NAME}")
-
-############# Standalone simulator ###############
-
-set(simu_SRCS simulator.cpp )
-
-add_executable(${SIMULATOR_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${simu_SRCS} ${icon_RC})
-target_link_libraries(${SIMULATOR_NAME} PRIVATE ${CPN_COMMON_LIB})
-
-############# 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
-endif()
-if(SIMU_TARGET)
-  get_property(current_plugin TARGET opentx-${FLAVOUR}-simulator PROPERTY LOCATION)
-  list(APPEND simulator_plugins "${current_plugin}")
+if(APPLE)
+  add_executable(simulator MACOSX_BUNDLE ${simu_SRCS})
+else()
+  add_executable(simulator WIN32 ${simu_SRCS})
 endif()
 
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-
-  message(STATUS "install " ${CMAKE_BINARY_DIR} " to " ${CMAKE_INSTALL_PREFIX}/bin)
-  install(TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-  install(TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-  install(FILES ${simulator_plugins} DESTINATION "${SIMULATOR_LIB_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")
-
-elseif(WIN32)
-
-  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 license.txt)
-    foreach(tmpfile ${INSTALL_TEMP_FILES})
-      install(FILES "${COMPANION_SRC_DIRECTORY}/../targets/windows/${tmpfile}" DESTINATION ${INSTALL_DESTINATION})
-    endforeach()
-  endif()  # WIN_DO_FULL_INSTALL
-
-  # Qt dlls (using windeployqt)
-  ## Qt translations are already packaged into our custom qrc. Also don't need software rendering engines.
-  set(wdqtopts --no-translations --no-opengl-sw --no-system-d3d-compiler --no-angle)
-  if(CMAKE_BUILD_TYPE STREQUAL "Release")
-    set(wdqtopts ${wdqtopts} --release)  # release builds aren't always properly detected with mingw
-  endif()
-  if(MSVC)
-    set(wdqtopts ${wdqtopts} --no-compiler-runtime)  # --compiler-runtime includes vcredist_x86, but we just copy the required DLLs manually
-  endif()
-  set(wdqtopts ${wdqtopts} -dir "${INSTALL_DESTINATION}" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${COMPANION_NAME}.exe" "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${SIMULATOR_NAME}.exe")
-  # Add installer command to execute windeployqt
-  install(CODE "execute_process(COMMAND \"${QT_BIN_DIR}/windeployqt.exe\" ${wdqtopts})")
-
-  # SDL dll
-  if(SDL_FOUND AND 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, set SDL_LIBRARY_PATH manually.")
-  endif()
-
-  # libeay (SSL) dlls  (used by QtNetwork) -- not strictly required but avoids possible issues with downloads and Qt warnings.
-  file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" WIN_PROGRAM_FILES)
-  find_path(EAY_LIB_DIR libeay32.dll HINTS
-    "${WIN_PROGRAM_FILES}/OpenSSL" "${WIN_PROGRAM_FILES}/OpenSSL-Win32"
-    "C:/OpenSSL/" "C:/OpenSSL-Win32/"
-    "${WIN_EXTRA_LIBS_PATH}" "${WIN_EXTRA_LIBS_PATH}/OpenSSL" "${WIN_EXTRA_LIBS_PATH}/OpenSSL-Win32"
-    "${MINGW_DIR}/../opt/bin"
-    "${PYTHON_DIRECTORY}/lib/site-packages/PyQt4"
-    PATH_SUFFIXES bin
-    DOC "Path to libeay32.dll and ssleay32.dll (OpenSSL)"
-  )
-  if (EAY_LIB_DIR)
-    install(FILES "${EAY_LIB_DIR}/libeay32.dll" "${EAY_LIB_DIR}/ssleay32.dll" DESTINATION ${INSTALL_DESTINATION} OPTIONAL)
-  else()
-    message(WARNING "Installer: SSL libs not found, set EAY_LIB_DIR manually.")
-  endif()
-
-  # C++/system dlls, depends on compiler
-  if(MSVC)
-    file(TO_CMAKE_PATH "$ENV{windir}/SysWOW64" WIN_SYSDIR)    # This would be "system32" for a 64-bit build or on x86... but how to tell?
-    if (NOT EXISTS "${WIN_SYSDIR}")
-      file(TO_CMAKE_PATH "$ENV{windir}/system32" WIN_SYSDIR)  # Must be 32-bit Windows.
-    endif()
-    install(FILES "${WIN_SYSDIR}/msvcp140.dll" "${WIN_SYSDIR}/vcruntime140.dll" DESTINATION ${INSTALL_DESTINATION} OPTIONAL)
-    if(WIN_PTHREAD_DLL)
-      install(FILES "${WIN_PTHREAD_DLL}" DESTINATION ${INSTALL_DESTINATION})
-    endif()
-  endif()
-
-endif() # WIN32 install
+if(SDL_FOUND)
+  target_link_libraries(simulator simulation common ${QT_LIBRARIES} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})
+else()
+  target_link_libraries(simulator simulation common ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})
+endif()
 
 ############# Packaging ####################
 
-# Create Windows installer with NSIS
-if(WIN32)
+IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+    INSTALL( FILES companion.desktop DESTINATION share/applications )
+    INSTALL( FILES images/linuxicons/16x16/companion.png    DESTINATION /usr/share/icons/hicolor/16x16/apps )
+    INSTALL( FILES images/linuxicons/22x22/companion.png    DESTINATION /usr/share/icons/hicolor/22x22/apps )
+    INSTALL( FILES images/linuxicons/24x24/companion.png    DESTINATION /usr/share/icons/hicolor/24x24/apps )
+    INSTALL( FILES images/linuxicons/32x32/companion.png    DESTINATION /usr/share/icons/hicolor/32x32/apps )
+    INSTALL( FILES images/linuxicons/48x48/companion.png    DESTINATION /usr/share/icons/hicolor/48x48/apps )
+    INSTALL( FILES images/linuxicons/128x128/companion.png  DESTINATION /usr/share/icons/hicolor/128x128/apps )
+    INSTALL( FILES images/linuxicons/256x256/companion.png  DESTINATION /usr/share/icons/hicolor/256x256/apps )
+    INSTALL( FILES images/linuxicons/512x512/companion.png  DESTINATION /usr/share/icons/hicolor/512x512/apps )
+    INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps )
+    INSTALL( FILES ../targets/linux/45-taranis.rules DESTINATION /etc/udev/rules.d/ )
+    # Linux specific code
+    SET(OperatingSystem "Linux")
+ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${QT_BINARY_DIR} )
+ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
-  find_program(NSIS_EXE makensis.exe PATHS
+IF( WIN32 )
+  IF( MSVC )
+    SET( NSI_IN_FILE companion-vs.nsi.in )  
+  ELSE( )
+    SET( NSI_IN_FILE companion-msys.nsi.in )
+  ENDIF( )
+
+  SET( SYSDIR "$ENV{windir}/system32" )  
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion.nsi @ONLY)     
+
+  FIND_PROGRAM(NSIS_EXE makensis.exe PATHS
     "C:/Program Files/NSIS"
-    "C:/Program Files (x86)/NSIS"
+    "C:/Program Files (x86)/NSIS"    
     "C:/Programs/NSIS"
-    "${WIN_EXTRA_LIBS_PATH}/NSIS"
   )
+  
+  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companionInstall.exe
+                     COMMAND "${NSIS_EXE}" ARGS companion.nsi
+                     DEPENDS ${PROJECT_NAME} simulator ${PROJECT_BINARY_DIR}/companion.nsi
+                     COMMENT "Windows NSIS Installer")
 
-  if (NSIS_EXE)
-    file(TO_NATIVE_PATH "${INSTALL_DESTINATION}" NSIS_DISTRO)  # all files in here will be included in installer
-    set(NSI_FILE "${PROJECT_BINARY_DIR}/companion/companion.nsi")
-    configure_file("${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/companion.nsi.in" "${NSI_FILE}" @ONLY)
+  ADD_CUSTOM_TARGET( installer
+    DEPENDS ${PROJECT_BINARY_DIR}/companionInstall.exe
+    SOURCES ${PROJECT_BINARY_DIR}/companion.nsi
+  )
+ENDIF( )
 
-    add_custom_target(installer
-      # The 'install' target prepares all the distro files, make sure it has been executed first.
-      COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target install
-      COMMAND "${NSIS_EXE}" "${NSI_FILE}"
-      DEPENDS "${NSI_FILE}"
-      COMMENT "Building Windows NSIS installer..."
-    )
-  endif()
+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 ALL 
+                     COMMAND mkdir -p companion.app/Contents/Frameworks
+                     COMMAND mkdir -p companion.app/Contents/Resources
+                     COMMAND mkdir -p companion.app/Contents/translations                     
+                     COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
+                     #COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/lib* companion.app/Contents/Frameworks
+                     #COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/libcrypto.1.0.0.dylib companion.app/Contents/Frameworks
+                     COMMAND rsync -r --exclude=.svn  ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/
+                     COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
+                     COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
+                     WORKING_DIRECTORY ${WORK_DIR}
+                     DEPENDS ${PROJECT_NAME} )
 
-endif()
+                        
+  ADD_CUSTOM_TARGET( makedmg
+                     COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
+                     WORKING_DIRECTORY ${WORK_DIR}
+                     DEPENDS addframeworks )
 
-set(CPACK_PACKAGE_NAME "companion${C9X_NAME_SUFFIX}")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTX open source firmware")
+ENDIF( )
+
+ADD_CUSTOM_TARGET( stamp
+                   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/version.h ${CMAKE_SOURCE_DIR}/../companion.stamp 
+                   DEPENDS ${CMAKE_BINARY_DIR}/version.h )
+
+IF(WIN32)
+  ADD_CUSTOM_TARGET( translations
+                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                   COMMAND lupdate ${CMAKE_SOURCE_DIR} -ts ${companion_TS} )
+ELSE( )
+  ADD_CUSTOM_TARGET( translations
+                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+                   COMMAND lupdate-qt4 ${CMAKE_SOURCE_DIR} -ts ${companion_TS} )
+ENDIF( )
+
+SET(CPACK_PACKAGE_NAME "COMPANION")
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
 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")
+  SET(CPACK_GENERATOR "DEB")
   execute_process(
     COMMAND ${DPKG_PROGRAM} --print-architecture
     OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}_${VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-  set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Bertrand Songis <bsongis-nosp@m-gmail.com>")
-  set(CPACK_DEBIAN_PACKAGE_VERSION ${VERSION})
-  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}")
+  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}_${C9X_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+  SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Romolo Manfredini <romolo.manfredini-nosp@m-gmail.com>")
+  SET(CPACK_DEBIAN_PACKAGE_VERSION ${C9X_VERSION})
+  SET(CPACK_DEBIAN_PACKAGE_VERSION_MAJOR ${C9X_VERSION_MAJOR})
+  SET(CPACK_DEBIAN_PACKAGE_VERSION_MINOR ${C9X_VERSION_MINOR})
+  SET(CPACK_DEBIAN_ARCHITECTURE $(CMAKE_SYSTEM_PROCESSOR))
+  SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
 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")
-endif(DPKG_PROGRAM)
+  SET(CPACK_GENERATOR "RPM")
+  SET(CPACK_RPM_PACKAGE_VERSION ${C9X_VERSION})
+  SET(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
+  SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}-${C9X_VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
+endif(DPKG_PROGRAM) 
 
-include(CPack)
+INCLUDE(CPack)

companion/src/appdata.cpp

@@ -0,0 +1,698 @@
+/*
+ * Author - Kjell Kernen
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * 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 "appdata.h"
+
+// Global data and storage object
+AppData g;
+
+// ** CompStoreObj class********************
+void CompStoreObj::clear (const QString tag1, const QString tag2, const QString tag3)
+{
+    QSettings settings(PRODUCT, COMPANY);
+    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();
+    }
+}
+
+void CompStoreObj::store(const QByteArray newArray, QByteArray &array, const QString tag, const QString group1, const QString group2 )
+{
+    QSettings settings(PRODUCT, COMPANY);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
+
+    settings.setValue(tag, newArray);
+    array = newArray;
+
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
+}
+
+void CompStoreObj::store(const QStringList newSList, QStringList &stringList, const QString tag, const QString group1, const QString group2 )
+{
+    QSettings settings(PRODUCT, COMPANY);
+    if (!group1.isEmpty()) settings.beginGroup(group1);
+    if (!group2.isEmpty()) settings.beginGroup(group2);
+
+    settings.setValue(tag, newSList);
+    stringList = newSList;
+
+    if (!group1.isEmpty()) settings.endGroup();
+    if (!group2.isEmpty()) settings.endGroup();
+}
+
+void CompStoreObj::store(const QString newString, QString &string, const QString tag, const QString group1, const QString group2 )
+{
+    QSettings settings(PRODUCT, COMPANY);
+    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();
+}
+
+void CompStoreObj::store(const bool newTruth, bool &truth, const QString tag, const QString group1, const QString group2 )
+{
+    QSettings settings(PRODUCT, COMPANY);
+    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(PRODUCT, COMPANY);
+    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(PRODUCT, COMPANY);
+    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(PRODUCT, COMPANY);
+    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(PRODUCT, COMPANY);
+    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(PRODUCT, COMPANY);
+    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(PRODUCT, COMPANY);
+    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, "", "FwRevisions" );
+    return result.toInt();
+}
+
+void FwRevision::set( const QString fwType, const int fwRevision )
+{
+    QString tempString = QString("%1").arg(fwRevision);
+    store( tempString, tempString, fwType, "FwRevisions" );
+}
+
+void FwRevision::remove( const QString tag )
+{
+    clear( "FwRevisions", tag );
+}
+
+// ** JStickData class********************
+// Get declarations
+int JStickData::stick_axe() { return _stickAxe; }
+int JStickData::stick_min() { return _stickMin; }
+int JStickData::stick_med() { return _stickMed; }
+int JStickData::stick_max() { return _stickMax; }
+int JStickData::stick_inv() { return _stickInv; }
+
+// Set declarations
+void JStickData::stick_axe(const int it) { store( it, _stickAxe, QString("stick%1_axe").arg(index), "JsCalibration" );}
+void JStickData::stick_min(const int it) { store( it, _stickMin, QString("stick%1_min").arg(index), "JsCalibration" );}
+void JStickData::stick_med(const int it) { store( it, _stickMed, QString("stick%1_med").arg(index), "JsCalibration" );}
+void JStickData::stick_max(const int it) { store( it, _stickMax, QString("stick%1_max").arg(index), "JsCalibration" );}
+void JStickData::stick_inv(const int it) { store( it, _stickInv, QString("stick%1_inv").arg(index), "JsCalibration" );}
+
+// Constructor
+JStickData::JStickData()
+{
+    index = -1;
+}
+
+void JStickData::remove()
+{
+    // Remove all JStickData values from settings file
+    QSettings settings(PRODUCT, COMPANY);
+    settings.beginGroup( "JsCalibration" );
+    settings.remove( QString( "stick%1_axe").arg(index) );
+    settings.remove( QString( "stick%1_min").arg(index) );
+    settings.remove( QString( "stick%1_med").arg(index) );
+    settings.remove( QString( "stick%1_max").arg(index) );
+    settings.remove( QString( "stick%1_inv").arg(index) );
+    settings.endGroup();
+
+    // Reset all JStickData variables to initial values
+    init(index);
+}
+
+bool JStickData::existsOnDisk()
+{
+    QSettings settings(PRODUCT, COMPANY);
+    settings.beginGroup("JsCalibration");
+    int axe = settings.value( QString("stick%1_axe").arg(index), -1 ).toInt();
+    settings.endGroup();
+
+    return (axe > -1);
+}
+
+void JStickData::init(int newIndex)
+{
+    index = newIndex;
+    _stickAxe = -1;
+    _stickMin = -32767;
+    _stickMed = 0;
+    _stickMax = 0;
+    _stickInv = 0;
+
+    // Do not write empty joystick calibrations to disk.
+    if ( !existsOnDisk() )
+        return;
+
+    flush();
+}
+
+void JStickData::flush()
+{
+    getset( _stickAxe, QString("stick%1_axe").arg(index), -1,     "JsCalibration" );
+    getset( _stickMin, QString("stick%1_min").arg(index), -32767, "JsCalibration" );
+    getset( _stickMed, QString("stick%1_med").arg(index),  0,     "JsCalibration" );
+    getset( _stickMax, QString("stick%1_max").arg(index),  0,     "JsCalibration" );
+    getset( _stickInv, QString("stick%1_inv").arg(index),  0,     "JsCalibration" );
+}
+
+// ** Profile class********************
+// Get declarations
+QString Profile::fwName()        const { return _fwName;        }
+QString Profile::fwType()        const { return _fwType;        }
+QString Profile::name()          const { return _name;          }
+QString Profile::sdPath()        const { return _sdPath;        }
+QString Profile::splashFile()    const { return _splashFile;    }
+bool    Profile::burnFirmware()  const { return _burnFirmware;  }
+bool    Profile::renameFwFiles() const { return _renameFwFiles; }
+int     Profile::channelOrder()  const { return _channelOrder;  }
+int     Profile::defaultMode()   const { return _defaultMode;   }
+
+QString Profile::beeper()        const { return _beeper;        }
+QString Profile::countryCode()   const { return _countryCode;   }
+QString Profile::display()       const { return _display;       }
+QString Profile::haptic()        const { return _haptic;        }
+QString Profile::speaker()       const { return _speaker;       }
+QString Profile::stickPotCalib() const { return _stickPotCalib; }
+QString Profile::timeStamp()     const { return _timeStamp;     }
+QString Profile::trainerCalib()  const { return _trainerCalib;  }
+int     Profile::currentCalib()  const { return _currentCalib;  }
+int     Profile::gsStickMode()   const { return _gsStickMode;   }
+int     Profile::ppmMultiplier() const { return _ppmMultiplier; }
+int     Profile::vBatCalib()     const { return _vBatCalib;     }
+int     Profile::vBatWarn()      const { return _vBatWarn;      }
+
+// Set declarations
+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::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::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::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::currentCalib  (const int     x) { store(x, _currentCalib,  "currentCalib"          ,"Profiles", QString("profile%1").arg(index));}
+void Profile::gsStickMode   (const int     x) { store(x, _gsStickMode,   "GSStickMode"           ,"Profiles", QString("profile%1").arg(index));}
+void Profile::ppmMultiplier (const int     x) { store(x, _ppmMultiplier, "PPM_Multiplier"        ,"Profiles", QString("profile%1").arg(index));}
+void Profile::vBatCalib     (const int     x) { store(x, _vBatCalib,     "VbatCalib"             ,"Profiles", QString("profile%1").arg(index));}
+void Profile::vBatWarn      (const int     x) { store(x, _vBatWarn,      "vBatWarn"              ,"Profiles", QString("profile%1").arg(index));}
+
+// Constructor
+Profile::Profile()
+{
+    index = -1;
+}
+
+// The default copy operator can not be used since the index variable would be destroyed 
+Profile& Profile::operator=(const Profile& rhs)
+{
+    name         ( rhs.name()          );
+    fwName       ( rhs.fwName()        );
+    fwType       ( rhs.fwType()        );
+    sdPath       ( rhs.sdPath()        );
+    splashFile   ( rhs.splashFile()    );
+    burnFirmware ( rhs.burnFirmware()  );
+    renameFwFiles( rhs.renameFwFiles() );
+    channelOrder ( rhs.channelOrder()  );
+    defaultMode  ( rhs.defaultMode()   );
+    beeper       ( rhs.beeper()        );
+    countryCode  ( rhs.countryCode()   );
+    display      ( rhs.display()       );
+    haptic       ( rhs.haptic()        );
+    speaker      ( rhs.speaker()       );
+    stickPotCalib( rhs.stickPotCalib() );
+    trainerCalib ( rhs.trainerCalib()  );
+    currentCalib ( rhs.currentCalib()  );
+    gsStickMode  ( rhs.gsStickMode()   );
+    ppmMultiplier( rhs.ppmMultiplier() );
+    vBatCalib    ( rhs.vBatCalib()     );
+    vBatWarn     ( rhs.vBatWarn()      );
+
+    return *this;
+}
+
+void Profile::remove()
+{
+    // Remove all profile values from settings file
+    QSettings settings(PRODUCT, COMPANY);
+    settings.beginGroup("Profiles");
+    settings.remove(QString("profile%1").arg(index));
+    settings.endGroup();
+
+    // Reset all profile variables to initial values
+    init(index);
+}
+
+bool Profile::existsOnDisk()
+{
+    QSettings settings(PRODUCT, COMPANY);
+    settings.beginGroup("Profiles");
+    settings.beginGroup(QString("profile%1").arg(index));
+    QStringList keyList = settings.allKeys();
+    settings.endGroup();
+    settings.endGroup();
+
+    return (keyList.length() > 0);
+}
+
+void Profile::initFwVariables()
+{
+    _beeper =        "";
+    _countryCode =   "";
+    _display =       "";
+    _haptic =        "";
+    _speaker =       "";
+    _stickPotCalib = "";
+    _timeStamp =     "";
+    _trainerCalib =  "";
+
+    _currentCalib =  0;
+    _gsStickMode =   0;
+    _ppmMultiplier = 0;
+    _vBatCalib =     0;
+    _vBatWarn =      0;
+}
+
+void Profile::init(int newIndex)
+{
+    index = newIndex;
+
+    _fwName =        "";
+    _fwType =        "";
+    _name =          "";
+    _sdPath =        "";
+    _splashFile =    "";
+    _burnFirmware =  false;
+    _renameFwFiles = false;
+    _channelOrder =  0;
+    _defaultMode =   1;
+
+    initFwVariables();
+
+    // Do not write empty profiles to disk except the default (0) profile.
+    if ( index > 0 && !existsOnDisk())
+        return;
+
+    flush();
+}
+
+void Profile::flush()
+{
+    // Load and store all variables. Use default values if setting values are missing
+    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( _splashFile,    "SplashFileName"        ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _burnFirmware,  "burnFirmware"          ,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", 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( _currentCalib,  "currentCalib"          ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _gsStickMode,   "GSStickMode"           ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _ppmMultiplier, "PPM_Multiplier"        ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _vBatCalib,     "VbatCalib"             ,0      ,"Profiles", QString("profile%1").arg(index));
+    getset( _vBatWarn,      "vBatWarn"              ,0      ,"Profiles", QString("profile%1").arg(index));
+}
+
+
+// ** AppData class********************
+
+// Get declarations
+QStringList AppData::recentFiles() { return _recentFiles;     }
+QByteArray AppData::mainWinGeo()   { return _mainWinGeo;      }
+QByteArray AppData::mainWinState() { return _mainWinState;    }
+QByteArray AppData::modelEditGeo() { return _modelEditGeo;    }
+
+QString AppData::armMcu()          { return _armMcu;          }
+QString AppData::avrArguments()    { return _avrArguments;    }
+QString AppData::avrPort()         { return _avrPort;         }
+QString AppData::avrdudeLocation() { return _avrdudeLocation; }
+QString AppData::dfuArguments()    { return _dfuArguments;    }
+QString AppData::dfuLocation()     { return _dfuLocation;     }
+QString AppData::locale()          { return _locale;          }
+QString AppData::mcu()             { return _mcu;             }
+QString AppData::programmer()      { return _programmer;      }
+QString AppData::sambaLocation()   { return _sambaLocation;   }
+QString AppData::sambaPort()       { return _sambaPort;       }
+
+QString AppData::backupDir()       { return _backupDir;       }
+QString AppData::gePath()          { return _gePath;          }
+QString AppData::eepromDir()       { return _eepromDir;       }
+QString AppData::flashDir()        { return _flashDir;        }
+QString AppData::imagesDir()       { return _imagesDir;       }
+QString AppData::logDir()          { return _logDir;          }
+QString AppData::libDir()          { return _libDir;          }
+QString AppData::snapshotDir()     { return _snapshotDir;     }
+QString AppData::updatesDir()      { return _updatesDir;      }
+
+bool AppData::enableBackup()       { return _enableBackup;    }
+bool AppData::backupOnFlash()      { return _backupOnFlash;   }
+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;   }
+int AppData::generalEditTab()      { return _generalEditTab;  }
+int AppData::iconSize()            { return _iconSize;        }
+int AppData::historySize()         { return _historySize;     }
+int AppData::jsCtrl()              { return _jsCtrl;          }
+int AppData::id()                  { return _id;              }
+int AppData::theme()               { return _theme;           }
+int AppData::warningId()           { return _warningId;       }
+
+// Set declarations
+void AppData::recentFiles     (const QStringList x) { store(x, _recentFiles,     "recentFileList"          );}
+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::armMcu          (const QString     x) { store(x, _armMcu,          "arm_mcu"                 );}
+void AppData::avrArguments    (const QString     x) { store(x, _avrArguments,    "avr_arguments"           );}
+void AppData::avrPort         (const QString     x) { store(x, _avrPort,         "avr_port"                );}
+void AppData::avrdudeLocation (const QString     x) { store(x, _avrdudeLocation, "avrdudeLocation"         );}
+void AppData::dfuArguments    (const QString     x) { store(x, _dfuArguments,    "dfu_arguments"           );}
+void AppData::dfuLocation     (const QString     x) { store(x, _dfuLocation,     "dfu_location"            );}
+void AppData::locale          (const QString     x) { store(x, _locale,          "locale"                  );}
+void AppData::mcu             (const QString     x) { store(x, _mcu,             "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::backupDir       (const QString     x) { store(x, _backupDir,       "backupPath"              );}
+void AppData::gePath          (const QString     x) { store(x, _gePath,          "gePath"                  );}
+void AppData::eepromDir       (const QString     x) { store(x, _eepromDir,       "lastDir"                 );}
+void AppData::flashDir        (const QString     x) { store(x, _flashDir,        "lastFlashDir"            );}
+void AppData::imagesDir       (const QString     x) { store(x, _imagesDir,       "lastImagesDir"           );}
+void AppData::logDir          (const QString     x) { store(x, _logDir,          "lastLogDir"              );}
+void AppData::libDir          (const QString     x) { store(x, _libDir,          "libraryPath"             );}
+void AppData::snapshotDir     (const QString     x) { store(x, _snapshotDir,     "snapshotpath"            );}
+void AppData::updatesDir      (const QString     x) { store(x, _updatesDir,      "lastUpdatesDir"          );}
+
+void AppData::enableBackup    (const bool        x) { store(x, _enableBackup,    "backupEnable"            );}
+void AppData::backupOnFlash   (const bool        x) { store(x, _backupOnFlash,   "backupOnFlash"           );}
+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"                );}
+void AppData::generalEditTab  (const int         x) { store(x, _generalEditTab,  "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"               );}
+
+// Constructor
+AppData::AppData()
+{
+    //Initialize the profiles
+    for (int i=0; i<MAX_PROFILES; i++)
+        profile[i].init( i );
+
+    //Initialize the joysticks
+    for (int i=0; i<MAX_JOYSTICKS; i++)
+        joystick[i].init( i );
+
+    // Import settings from companion9x, but only do it one time.
+    QSettings c9x_settings("companion9x", "companion9x");
+    QSettings settings(PRODUCT, COMPANY);
+    if (profile[0].name().isEmpty() )
+    {
+        // 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"        ,"20" ); // This is a version marker. Will be used to upgrade the settings later on.
+
+    getset( _recentFiles,     "recentFileList"          ,"" );
+    getset( _mainWinGeo,      "mainWindowGeometry"      ,"" );
+    getset( _mainWinState,    "mainWindowState"         ,"" );
+    getset( _modelEditGeo,    "modelEditGeometry"       ,"" );
+
+    getset( _armMcu,          "arm_mcu"                 ,"at91sam3s4-9x" );
+    getset( _avrArguments,    "avr_arguments"           ,"" );
+    getset( _avrPort,         "avr_port"                ,"" );
+    getset( _avrdudeLocation, "avrdudeLocation"        ,"" );
+    getset( _dfuArguments,    "dfu_arguments"           ,"-a 0" );
+    getset( _dfuLocation,     "dfu_location"            ,"" );
+    getset( _locale,          "locale"                  ,"" );
+    getset( _mcu,             "mcu"                     ,"m64" );
+    getset( _programmer,      "programmer"              ,"usbasp" );
+    getset( _sambaLocation,   "samba_location"          ,"" );
+    getset( _sambaPort,       "samba_port"              ,"\\USBserial\\COM23" );
+
+    getset( _backupDir,       "backupPath"              ,"" );
+    getset( _gePath,          "gePath"                  ,"" );
+    getset( _eepromDir,       "lastDir"                 ,"" );
+    getset( _flashDir,        "lastFlashDir"            ,"" );
+    getset( _imagesDir,       "lastImagesDir"           ,"" );
+    getset( _logDir,          "lastLogDir"              ,"" );
+    getset( _libDir,          "libraryPath"             ,"" );
+    getset( _snapshotDir,     "snapshotpath"            ,"" );
+    getset( _updatesDir,      "lastUpdatesDir"          ,"" );
+
+    getset( _enableBackup,    "backupEnable"            ,false );
+    getset( _backupOnFlash,   "backupOnFlash"           ,true  );
+    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( _backLight,       "backLight"               ,0  );
+    getset( _embedSplashes,   "embedded_splashes"       ,0  );
+    getset( _fwServerFails,   "fwserver"                ,0  );
+    getset( _generalEditTab,  "generalEditTab"          ,0  );
+    getset( _iconSize,        "icon_size"               ,2  );
+    getset( _jsCtrl,          "js_ctrl"                 ,0  );
+    getset( _historySize,     "history_size"            ,10 );
+    getset( _id,              "profileId"               ,0  );
+    getset( _theme,           "theme"                   ,1  );
+    getset( _warningId,       "warningId"               ,0  );
+}

companion/src/appdata.h

@@ -0,0 +1,359 @@
+/*
+ * Author - Kjell Kernen
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ */
+
+// All temporary and permanent global variables are defined here to make 
+// initialization and storage safe and visible.
+// Do not access variables in QSettings directly, it is not type safe!
+
+
+#ifndef COMPANION_APPDATA_H
+#define COMPANION_APPDATA_H
+#include <QByteArray>
+#include <QStringList>
+#include <QString>
+#include <QSettings>
+
+#define COMPANY "OpenTX Companion"
+#define PRODUCT "OpenTX"
+
+#define MAX_PROFILES 15
+#define MAX_JOYSTICKS 8
+
+class CompStoreObj
+{
+  public:
+    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="" );
+
+    // 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
+{
+  public:
+    int get( const QString);
+    void set( const QString, const int );
+    void remove( const QString );
+};
+
+class JStickData: protected CompStoreObj
+{
+  private:
+    int index;
+
+    int _stickAxe;
+    int _stickMin;
+    int _stickMed;
+    int _stickMax;
+    int _stickInv;
+
+  public:
+    // All the get definitions
+    int stick_axe();
+    int stick_min();
+    int stick_med();
+    int stick_max();
+    int stick_inv();
+
+    // All the set definitions
+    void stick_axe(const int);
+    void stick_min(const int);
+    void stick_med(const int);
+    void stick_max(const int);
+    void stick_inv(const int);
+
+    JStickData();
+    void remove();
+    bool existsOnDisk();
+    void init(int index);
+    void flush();
+};
+
+class Profile: protected CompStoreObj
+{
+  private:
+    // Class Internal Variable
+    int index;
+
+    // Application Variables
+    QString _fwName;
+    QString _fwType;
+    QString _name;
+    QString _sdPath;
+    QString _splashFile;
+    bool    _burnFirmware;
+    bool    _renameFwFiles;
+    int     _channelOrder;
+    int     _defaultMode;
+
+    // Firmware Variables
+    QString _beeper;
+    QString _countryCode;
+    QString _display;
+    QString _haptic;
+    QString _speaker;
+    QString _stickPotCalib;
+    QString _timeStamp;
+    QString _trainerCalib;
+    int     _currentCalib;
+    int     _gsStickMode;
+    int     _ppmMultiplier;
+    int     _vBatCalib;
+    int     _vBatWarn;
+
+  public:
+    // All the get definitions
+    QString fwName() const;
+    QString fwType() const;
+    QString name() const;
+    QString sdPath() const;
+    QString splashFile() const;
+    bool    burnFirmware() const;
+    bool    renameFwFiles() const;
+    int     channelOrder() const;
+    int     defaultMode() const;
+
+    QString beeper() const;
+    QString countryCode() const;
+    QString display() const;
+    QString haptic() const;
+    QString speaker() const;
+    QString stickPotCalib() const;
+    QString timeStamp() const;
+    QString trainerCalib() const;
+    int     currentCalib() const;
+    int     gsStickMode() const;
+    int     ppmMultiplier() const;
+    int     vBatCalib() const;
+    int     vBatWarn() const;
+
+    // All the set definitions
+    void name          (const QString);
+    void fwName        (const QString);
+    void fwType        (const QString);
+    void sdPath        (const QString);
+    void splashFile    (const QString);
+    void burnFirmware  (const bool);
+    void renameFwFiles (const bool);
+    void channelOrder  (const int);
+    void defaultMode   (const int);
+
+    void beeper        (const QString);
+    void countryCode   (const QString);
+    void display       (const QString);
+    void haptic        (const QString);
+    void speaker       (const QString);
+    void stickPotCalib (const QString);
+    void timeStamp     (const QString);
+    void trainerCalib  (const QString);
+    void currentCalib  (const int);
+    void gsStickMode   (const int);
+    void ppmMultiplier (const int);
+    void vBatCalib     (const int);
+    void vBatWarn      (const int);
+
+    Profile();
+    Profile& operator=(const Profile&);
+    void remove();
+    bool existsOnDisk();
+    void init(int newIndex);
+    void initFwVariables();
+    void flush();
+};
+
+class AppData: protected CompStoreObj
+{
+  // All the global variables
+  public:
+    Profile    profile[MAX_PROFILES];
+    JStickData joystick[MAX_JOYSTICKS];
+    FwRevision fwRev;
+
+  private:
+    QStringList _recentFiles;
+    QByteArray _mainWinGeo;
+    QByteArray _mainWinState;
+    QByteArray _modelEditGeo;
+
+    QString _armMcu;
+    QString _avrArguments;
+    QString _avrPort;
+    QString _avrdudeLocation;
+    QString _dfuArguments;
+    QString _dfuLocation;
+    QString _locale;
+    QString _mcu;
+    QString _programmer;
+    QString _sambaLocation;
+    QString _sambaPort;
+
+    QString _backupDir;
+    QString _gePath;
+    QString _eepromDir;
+    QString _flashDir;
+    QString _imagesDir;
+    QString _logDir;
+    QString _libDir;
+    QString _snapshotDir;
+    QString _updatesDir;
+
+    bool _enableBackup;
+    bool _backupOnFlash;
+    bool _maximized;
+    bool _jsSupport;
+    bool _showSplash;
+    bool _snapToClpbrd;
+    bool _autoCheckApp;
+    bool _autoCheckFw;
+    bool _simuSW;
+    bool _useWizard;
+
+    int _backLight;
+    int _embedSplashes;
+    int _fwServerFails;
+    int _generalEditTab;
+    int _iconSize;
+    int _jsCtrl;
+    int _historySize;
+    int _id;
+    int _theme;
+    int _warningId;
+
+  public:
+    // All the get definitions
+    QStringList recentFiles();
+    QByteArray mainWinGeo();
+    QByteArray mainWinState();
+    QByteArray modelEditGeo();
+
+    QString armMcu();
+    QString avrArguments();
+    QString avrPort();
+    QString avrdudeLocation();
+    QString dfuArguments();
+    QString dfuLocation();
+    QString lastFw();  
+    QString locale();
+    QString mcu();
+    QString programmer();
+    QString sambaLocation();
+    QString sambaPort();
+
+    QString backupDir();
+    QString gePath();
+    QString eepromDir();
+    QString flashDir();
+    QString imagesDir();
+    QString logDir();
+    QString libDir();
+    QString snapshotDir();
+    QString updatesDir();
+
+    bool enableBackup();
+    bool backupOnFlash();
+    bool jsSupport();
+    bool maximized();
+    bool showSplash();
+    bool snapToClpbrd();
+    bool autoCheckApp();
+    bool autoCheckFw();
+    bool simuSW();
+    bool useWizard();
+
+    int backLight();
+    int embedSplashes();
+    int fwServerFails();
+    int generalEditTab();
+    int iconSize();
+    int historySize();
+    int jsCtrl();
+    int id();
+    int theme();
+    int warningId();
+
+    // All the set definitions
+    void recentFiles     (const QStringList x);
+    void mainWinGeo      (const QByteArray);
+    void mainWinState    (const QByteArray);
+    void modelEditGeo    (const QByteArray);
+
+    void armMcu          (const QString);
+    void avrArguments    (const QString);
+    void avrPort         (const QString);
+    void avrdudeLocation (const QString);
+    void dfuArguments    (const QString);
+    void dfuLocation     (const QString);
+    void lastFw          (const QString);
+    void locale          (const QString);
+    void mcu             (const QString);
+    void programmer      (const QString);
+    void sambaLocation   (const QString);
+    void sambaPort       (const QString);
+
+    void backupDir       (const QString);
+    void gePath          (const QString);
+    void eepromDir       (const QString);
+    void flashDir        (const QString);
+    void imagesDir       (const QString);
+    void logDir          (const QString);
+    void libDir          (const QString);
+    void snapshotDir     (const QString);
+    void updatesDir      (const QString);
+
+    void enableBackup    (const bool);
+    void backupOnFlash   (const bool);
+    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);
+    void generalEditTab  (const int);
+    void iconSize        (const int);
+    void historySize     (const int);
+    void jsCtrl          (const int);
+    void modelEditTab    (const int);
+    void id              (const int);
+    void theme           (const int);
+    void warningId       (const int);
+
+    // Constructor
+    AppData();
+};
+
+extern AppData g;
+
+#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,49 +1,29 @@
-/*
- * 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"
-#include "storage.h"
-#if defined(JOYSTICKS)
+#include "flashinterface.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),
-  updateLock(false),
-  mainWinHasDirtyChild(false)
+  ui(new Ui::AppPreferencesDialog)
 {
   ui->setupUi(this);
+  updateLock=false;
   setWindowIcon(CompanionIcon("apppreferences.png"));
 
   initSettings();
-  connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(onBaseFirmwareChanged()));
-  connect(ui->opt_appDebugLog, &QCheckBox::toggled, this, &AppPreferencesDialog::toggleAppLogSettings);
-  connect(ui->opt_fwTraceLog, &QCheckBox::toggled, this, &AppPreferencesDialog::toggleAppLogSettings);
+  connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
+  connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
 
-#if !defined(JOYSTICKS)
+#ifndef JOYSTICKS
   ui->joystickCB->hide();
   ui->joystickCB->setDisabled(true);
   ui->joystickcalButton->hide();
@@ -59,98 +39,54 @@ AppPreferencesDialog::~AppPreferencesDialog()
   delete ui;
 }
 
-void AppPreferencesDialog::setMainWinHasDirtyChild(bool value)
+void AppPreferencesDialog::writeValues()
 {
-  mainWinHasDirtyChild = value;
-}
-
-void AppPreferencesDialog::accept()
-{
-  Profile & profile = g.currentProfile();
-
-  g.autoCheckApp(ui->autoCheckCompanion->isChecked());
-  g.OpenTxBranch(AppData::DownloadBranchType(ui->OpenTxBranch->currentIndex()));
-  g.autoCheckFw(ui->autoCheckFirmware->isChecked());
+  g.autoCheckApp(ui->startupCheck_companion9x->isChecked());
+  g.autoCheckFw(ui->startupCheck_fw->isChecked());
   g.showSplash(ui->showSplash->isChecked());
   g.simuSW(ui->simuSW->isChecked());
-  g.removeModelSlots(ui->opt_removeBlankSlots->isChecked());
-  g.newModelAction(ui->opt_newMdl_useWizard->isChecked() ? AppData::MODEL_ACT_WIZARD : ui->opt_newMdl_useEditor->isChecked() ? AppData::MODEL_ACT_EDITOR : AppData::MODEL_ACT_NONE);
+  g.useWizard(ui->modelWizard_CB->isChecked());
   g.historySize(ui->historySize->value());
   g.backLight(ui->backLightColor->currentIndex());
-  profile.volumeGain(round(ui->volumeGain->value() * 10.0));
   g.libDir(ui->libraryPath->text());
   g.gePath(ui->ge_lineedit->text());
   g.embedSplashes(ui->splashincludeCB->currentIndex());
   g.enableBackup(ui->backupEnable->isChecked());
 
-  g.appDebugLog(ui->opt_appDebugLog->isChecked());
-  g.fwTraceLog(ui->opt_fwTraceLog->isChecked());
-  g.appLogsDir(ui->appLogsDir->text());
-
   if (ui->joystickChkB ->isChecked() && ui->joystickCB->isEnabled()) {
-    g.jsSupport(ui->joystickChkB ->isChecked());
+    g.jsSupport(ui->joystickChkB ->isChecked());  
     g.jsCtrl(ui->joystickCB ->currentIndex());
   }
   else {
     g.jsSupport(false);
     g.jsCtrl(0);
   }
-  profile.channelOrder(ui->channelorderCB->currentIndex());
-  profile.defaultMode(ui->stickmodeCB->currentIndex());
-  profile.renameFwFiles(ui->renameFirmware->isChecked());
-  profile.burnFirmware(ui->burnFirmware->isChecked());
-  profile.sdPath(ui->sdPath->text());
-  profile.pBackupDir(ui->profilebackupPath->text());
-  profile.penableBackup(ui->pbackupEnable->isChecked());
-  profile.splashFile(ui->SplashFileName->text());
+  g.profile[g.id()].channelOrder(ui->channelorderCB->currentIndex());
+  g.profile[g.id()].defaultMode(ui->stickmodeCB->currentIndex());
+  g.profile[g.id()].renameFwFiles(ui->renameFirmware->isChecked());
+  g.profile[g.id()].burnFirmware(ui->burnFirmware->isChecked());
+  g.profile[g.id()].sdPath(ui->sdPath->text());
+  g.profile[g.id()].splashFile(ui->SplashFileName->text());
 
   // The profile name may NEVER be empty
   if (ui->profileNameLE->text().isEmpty())
-    profile.name(tr("My Radio"));
+    g.profile[g.id()].name(tr("My Radio"));
   else
-    profile.name(ui->profileNameLE->text());
+    g.profile[g.id()].name(ui->profileNameLE->text());
 
-  bool fwchange = false;
-  Firmware * newFw = getFirmwareVariant();  // always !null
   // If a new fw type has been choosen, several things need to reset
-  if (Firmware::getCurrentVariant()->getId() != newFw->getId()) {
-    // check if we're going to be converting to a new radio type and there are unsaved files in the main window
-    if (mainWinHasDirtyChild && !Boards::isBoardCompatible(Firmware::getCurrentVariant()->getBoard(), newFw->getBoard())) {
-      QString q = tr("<p><b>You cannot switch Radio Type or change Build Options while there are unsaved file changes. What do you wish to do?</b></p> <ul>" \
-                     "<li><i>Save All</i> - Save any open file(s) before saving Settings.<li>" \
-                     "<li><i>Reset</i> - Revert to the previous Radio Type and Build Options before saving Settings.</li>" \
-                     "<li><i>Cancel</i> - Return to the Settings editor dialog.</li></ul>");
-      int resp = QMessageBox::question(this, windowTitle(), q, (QMessageBox::SaveAll | QMessageBox::Reset | QMessageBox::Cancel), QMessageBox::Cancel);
-      if (resp == QMessageBox::SaveAll) {
-        // signal main window to save files, need to do this before the fw actually changes
-        emit firmwareProfileAboutToChange();
-      }
-      else if (resp == QMessageBox::Reset) {
-        // bail out early before saving the radio type & firmware options
-        QDialog::accept();
-        return;
-      }
-      else {
-        // we do not accept the dialog close
-        return;
-      }
-    }
-    Firmware::setCurrentVariant(newFw);
-    profile.fwName("");
-    profile.resetFwVariables();
-    profile.fwType(newFw->getId());
-    fwchange = true;
+  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);
   }
-
-  QDialog::accept();
-
-  if (fwchange)
-    emit firmwareProfileChanged();  // important to do this after the accepted() signal
 }
 
 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);
@@ -160,43 +96,26 @@ void AppPreferencesDialog::on_snapshotPathButton_clicked()
 
 void AppPreferencesDialog::initSettings()
 {
-  const Profile & profile = g.currentProfile();
-
   ui->snapshotClipboardCKB->setChecked(g.snapToClpbrd());
-  ui->burnFirmware->setChecked(profile.burnFirmware());
+  ui->burnFirmware->setChecked(g.profile[g.id()].burnFirmware());
   ui->snapshotPath->setText(g.snapshotDir());
   ui->snapshotPath->setReadOnly(true);
   if (ui->snapshotClipboardCKB->isChecked()) {
     ui->snapshotPath->setDisabled(true);
     ui->snapshotPathButton->setDisabled(true);
   }
-
-#if !defined(ALLOW_NIGHTLY_BUILDS)
-  // remove nightly version option entirely unless it's the current one (because user might have nightly version also installed)
-  if (g.OpenTxBranch() != AppData::BRANCH_NIGHTLY_UNSTABLE)
-    ui->OpenTxBranch->removeItem(2);
-  // if it's already selected, add a warning message
-  else
-    ui->updatesLayout->addWidget(new QLabel("<font color='red'>" % tr("Note: Nightly builds are not available in this version, Release/RC update channel will be used.") % "</font>", this));
-#endif
-  ui->OpenTxBranch->setCurrentIndex(g.OpenTxBranch());
-
-  ui->autoCheckCompanion->setChecked(g.autoCheckApp());
-  ui->autoCheckFirmware->setChecked(g.autoCheckFw());
+  ui->startupCheck_companion9x->setChecked(g.autoCheckApp());
+  ui->startupCheck_fw->setChecked(g.autoCheckFw());
   ui->showSplash->setChecked(g.showSplash());
   ui->historySize->setValue(g.historySize());
   ui->backLightColor->setCurrentIndex(g.backLight());
-  ui->volumeGain->setValue(profile.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() == AppData::MODEL_ACT_NONE);
-  ui->opt_newMdl_useWizard->setChecked(g.newModelAction() == AppData::MODEL_ACT_WIZARD);
-  ui->opt_newMdl_useEditor->setChecked(g.newModelAction() == AppData::MODEL_ACT_EDITOR);
+  ui->modelWizard_CB->setChecked(g.useWizard());
   ui->libraryPath->setText(g.libDir());
   ui->ge_lineedit->setText(g.gePath());
 
@@ -205,22 +124,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;
@@ -246,33 +158,23 @@ void AppPreferencesDialog::initSettings()
     ui->joystickCB->setDisabled(true);
     ui->joystickcalButton->setDisabled(true);
   }
-#endif
-  //  Profile Tab Inits
-  ui->channelorderCB->setCurrentIndex(profile.channelOrder());
-  ui->stickmodeCB->setCurrentIndex(profile.defaultMode());
-  ui->renameFirmware->setChecked(profile.renameFwFiles());
-  ui->sdPath->setText(profile.sdPath());
-  if (!profile.pBackupDir().isEmpty()) {
-    if (QDir(profile.pBackupDir()).exists()) {
-      ui->profilebackupPath->setText(profile.pBackupDir());
-      ui->pbackupEnable->setEnabled(true);
-      ui->pbackupEnable->setChecked(profile.penableBackup());
-    } else {
-      ui->pbackupEnable->setDisabled(true);
-    }
-  }
-  else {
-      ui->pbackupEnable->setDisabled(true);
-  }
+#endif  
+//  Profile Tab Inits  
+  ui->channelorderCB->setCurrentIndex(g.profile[g.id()].channelOrder());
+  ui->stickmodeCB->setCurrentIndex(g.profile[g.id()].defaultMode());
+  ui->renameFirmware->setChecked(g.profile[g.id()].renameFwFiles());
+  ui->sdPath->setText(g.profile[g.id()].sdPath());
+  ui->profileNameLE->setText(g.profile[g.id()].name());
+  ui->SplashFileName->setText(g.profile[g.id()].splashFile());
 
-  ui->profileNameLE->setText(profile.name());
+  displayImage( g.profile[g.id()].splashFile() );
 
   QString hwSettings;
-  if (profile.stickPotCalib() == "" ) {
+  if (g.profile[g.id()].stickPotCalib() == "" ) {
     hwSettings = tr("EMPTY: No radio settings stored in profile");
   }
   else  {
-    QString str = profile.timeStamp();
+    QString str = g.profile[g.id()].timeStamp();
     if (str.isEmpty())
       hwSettings = tr("AVAILABLE: Radio settings of unknown age");
     else
@@ -280,15 +182,16 @@ void AppPreferencesDialog::initSettings()
   }
   ui->lblGeneralSettings->setText(hwSettings);
 
-  QString currType = QStringList(profile.fwType().split('-').mid(0, 2)).join('-');
-  foreach(Firmware * firmware, Firmware::getRegisteredFirmwares()) {
+  FirmwareInterface * current_firmware = GetCurrentFirmware();
+
+  foreach(FirmwareInterface * 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);
     }
   }
-
-  onBaseFirmwareChanged();
+  
+  baseFirmwareChanged();
 }
 
 void AppPreferencesDialog::on_libraryPathButton_clicked()
@@ -321,26 +224,8 @@ void AppPreferencesDialog::on_backupPathButton_clicked()
   if (!fileName.isEmpty()) {
     g.backupDir(fileName);
     ui->backupPath->setText(fileName);
-    ui->backupEnable->setEnabled(true);
-  }
-}
-
-void AppPreferencesDialog::on_ProfilebackupPathButton_clicked()
-{
-  QString fileName = QFileDialog::getExistingDirectory(this,tr("Select your Models and Settings backup folder"), g.backupDir());
-  if (!fileName.isEmpty()) {
-    ui->profilebackupPath->setText(fileName);
-    ui->pbackupEnable->setEnabled(true);
-  }
-}
-
-
-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);
   }
+  ui->backupEnable->setEnabled(true);
 }
 
 void AppPreferencesDialog::on_ge_pathButton_clicked()
@@ -350,8 +235,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;
@@ -388,26 +273,41 @@ void AppPreferencesDialog::on_joystickcalButton_clicked() {
 
 void AppPreferencesDialog::on_sdPathButton_clicked()
 {
-  QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), g.currentProfile().sdPath());
+  QString fileName = QFileDialog::getExistingDirectory(this,tr("Select the folder replicating your SD structure"), g.profile[g.id()].sdPath());
   if (!fileName.isEmpty()) {
     ui->sdPath->setText(fileName);
   }
 }
 
-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;
 }
 
@@ -423,7 +323,7 @@ void AppPreferencesDialog::on_SplashSelect_clicked()
 
   if (!fileName.isEmpty()){
     g.imagesDir(QFileInfo(fileName).dir().absolutePath());
-
+   
     displayImage(fileName);
     ui->SplashFileName->setText(fileName);
   }
@@ -435,126 +335,149 @@ void AppPreferencesDialog::on_clearImageButton_clicked()
   ui->SplashFileName->clear();
 }
 
-void AppPreferencesDialog::onBaseFirmwareChanged()
+
+void AppPreferencesDialog::showVoice(bool show)
 {
-  populateFirmwareOptions(getBaseFirmware());
+  ui->voiceLabel->setVisible(show);
+  ui->voiceCombo->setVisible(show);
+  QTimer::singleShot(0, this, SLOT(shrink()));
 }
 
-Firmware *AppPreferencesDialog::getBaseFirmware() const
+void AppPreferencesDialog::baseFirmwareChanged()
 {
-  return Firmware::getFirmwareForId(ui->downloadVerCB->currentData().toString());
-}
+  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
 
-Firmware * AppPreferencesDialog::getFirmwareVariant() const
-{
-  QString id = ui->downloadVerCB->currentData().toString();
-
-  foreach(QCheckBox *cb, optionsCheckBoxes.values()) {
-    if (cb->isChecked())
-      id += "-" + cb->text();
-  }
-
-  if (ui->langCombo->count())
-    id += "-" + ui->langCombo->currentText();
-
-  return Firmware::getFirmwareForId(id);
-}
-
-void AppPreferencesDialog::onFirmwareOptionChanged(bool state)
-{
-  QCheckBox *cb = qobject_cast<QCheckBox*>(sender());
-  if (!(cb && state))
-    return;
-
-  // This de-selects any mutually exlusive options (that is, members of the same QList<Option> list).
-  const Firmware::OptionsList & fwOpts = getBaseFirmware()->optionGroups();
-  for (const Firmware::OptionsGroup & optGrp : fwOpts) {
-    for (const Firmware::Option & opt : optGrp) {
-      if (cb->text() == opt.name) {
-        QCheckBox *ocb = nullptr;
-        foreach(const Firmware::Option & other, optGrp)
-          if (other.name != opt.name && (ocb = optionsCheckBoxes.value(other.name, nullptr)))
-            ocb->setChecked(false);
-        return;
-      }
+  foreach(FirmwareInterface * firmware, firmwares) {
+    if (firmware->getId() == selected_firmware) {
+      populateFirmwareOptions(firmware);
+      break;
     }
   }
 }
 
-void AppPreferencesDialog::toggleAppLogSettings()
+FirmwareInterface * AppPreferencesDialog::getFirmwareVariant()
 {
-  bool vis = (ui->opt_appDebugLog->isChecked() || ui->opt_fwTraceLog->isChecked());
-  ui->appLogsDir->setVisible(vis);
-  ui->lbl_appLogsDir->setVisible(vis);
-  ui->btn_appLogsDir->setVisible(vis);
+  QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
+
+  foreach(FirmwareInterface * firmware, firmwares) {
+    QString id = firmware->getId();
+    if (id == selected_firmware) {
+      foreach(QCheckBox *cb, optionsCheckBoxes) {
+        if (cb->isChecked()) {
+          id += QString("-") + cb->text();
+        }
+      }
+
+      if (voice && voice->isChecked()) {
+        id += QString("-tts") + ui->voiceCombo->currentText();
+      }
+
+      if (ui->langCombo->count()) {
+        id += QString("-") + ui->langCombo->currentText();
+      }
+
+      return GetFirmware(id);
+    }
+  }
+
+  // Should never occur...
+  return default_firmware_variant;
 }
 
-void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware)
+void AppPreferencesDialog::firmwareOptionChanged(bool state)
 {
-  const Firmware * baseFw = firmware->getFirmwareBase();
-  QStringList currVariant = Firmware::getCurrentVariant()->getId().split('-');
-  const QString currLang = ui->langCombo->count() ? ui->langCombo->currentText() : currVariant.last();
+  QCheckBox *cb = qobject_cast<QCheckBox*>(sender());
+  if (cb == voice) {
+    showVoice(voice->isChecked());
+  }
+  FirmwareInterface * firmware=NULL;
+  if (cb && state) {
+    QVariant selected_firmware = ui->downloadVerCB->itemData(ui->downloadVerCB->currentIndex());
+    foreach(firmware, firmwares) {
+      if (firmware->getId() == selected_firmware) {
+        foreach(QList<Option> opts, firmware->opts) {
+          foreach(Option opt, opts) {
+            if (cb->text() == opt.name) {
+              foreach(Option other, opts) {
+                if (other.name != opt.name) {
+                  foreach(QCheckBox *ocb, optionsCheckBoxes) {
+                    if (ocb->text() == other.name) {
+                      ocb->setChecked(false);
+                    }
+                  }
+                }
+              }
+              return;
+            }
+          }
+        }
+      }
+    }
+  } 
+}
+
+void AppPreferencesDialog::populateFirmwareOptions(const FirmwareInterface * firmware)
+{
+  const FirmwareInterface * parent = firmware->getFirmwareBase();
 
   updateLock = true;
 
+  QString id = current_firmware_variant->getId();
   ui->langCombo->clear();
-  for (const char *lang : baseFw->languageList()) {
+  foreach(const char *lang, parent->languages) {
     ui->langCombo->addItem(lang);
-    if (currLang == lang) {
+    if (id.endsWith(lang)) {
       ui->langCombo->setCurrentIndex(ui->langCombo->count() - 1);
     }
   }
 
-  if (optionsCheckBoxes.size()) {
-    currVariant.clear();
-    QMutableMapIterator<QString, QCheckBox *> it(optionsCheckBoxes);
-    while (it.hasNext()) {
-      it.next();
-      QCheckBox * cb = it.value();
-      if (cb->isChecked())
-        currVariant.append(it.key());    // keep previous selections
-      ui->optionsLayout->removeWidget(cb);
-      cb->deleteLater();
-      it.remove();
-    }
-  }
+  voice = NULL; // we will search for a voice checkbox
 
   int index = 0;
-  QWidget * prevFocus = ui->langCombo;
-  for (const Firmware::OptionsGroup &optGrp : baseFw->optionGroups()) {
-    for (const Firmware::Option &opt : optGrp) {
-      QCheckBox * cb = new QCheckBox(ui->profileTab);
-      cb->setText(opt.name);
-      cb->setToolTip(opt.tooltip);
-      cb->setChecked(currVariant.contains(opt.name));
-      ui->optionsLayout->addWidget(cb, index / 4, index % 4);
-      QWidget::setTabOrder(prevFocus, cb);
-      // connect to duplicates check handler if this option is part of a group
-      if (optGrp.size() > 1)
-        connect(cb, &QCheckBox::toggled, this, &AppPreferencesDialog::onFirmwareOptionChanged);
-      optionsCheckBoxes.insert(opt.name, cb);
-      prevFocus = cb;
-      ++index;
+  foreach(QList<Option> opts, parent->opts) {
+    foreach(Option opt, opts) {
+      if (index >= optionsCheckBoxes.size()) {
+        QCheckBox * checkbox = new QCheckBox(ui->profileTab);
+        ui->optionsLayout->addWidget(checkbox, optionsCheckBoxes.count()/5, optionsCheckBoxes.count()%5, 1, 1);
+        optionsCheckBoxes.push_back(checkbox);
+        connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
+      }
+
+      QCheckBox *cb = optionsCheckBoxes.at(index++);
+      if (cb) {
+        cb->show();
+        cb->setText(opt.name);
+        cb->setToolTip(opt.tooltip);
+        cb->setCheckState(id.contains(opt.name) ? Qt::Checked : Qt::Unchecked);
+        if (opt.name == QString("voice")) {
+          voice = cb;
+        }
+      }
     }
   }
 
-  // TODO: Remove once splash replacement supported on Horus
-  // NOTE: 480x272 image causes issues on screens <800px high, needs a solution like scrolling once reinstated
-  if (IS_HORUS(baseFw->getBoard())) {
-    ui->widget_splashImage->hide();
-    ui->SplashFileName->setText("");
-  }
-  else {
-    ui->widget_splashImage->show();
-    ui->SplashFileName->setText(g.currentProfile().splashFile());
-    displayImage(g.currentProfile().splashFile());
+  for (; index<optionsCheckBoxes.size(); index++) {
+    QCheckBox *cb = optionsCheckBoxes.at(index);
+    cb->hide();
+    cb->setCheckState(Qt::Unchecked);
   }
 
+  ui->voiceCombo->clear();
+  foreach(const char *lang, parent->ttslanguages) {
+    ui->voiceCombo->addItem(lang);
+    if (id.contains(QString("-tts%1").arg(lang))) {
+      ui->voiceCombo->setCurrentIndex(ui->voiceCombo->count() - 1);
+    }
+  }
+
+  showVoice(voice && voice->isChecked());
+
   updateLock = false;
-  QTimer::singleShot(50, this, &AppPreferencesDialog::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,53 +16,48 @@ class AppPreferencesDialog : public QDialog
     Q_OBJECT
 
   public:
-    explicit AppPreferencesDialog(QWidget * parent = 0);
+    explicit AppPreferencesDialog(QWidget *parent = 0);
     ~AppPreferencesDialog();
+    Joystick *joystick;
 
-    Joystick * joystick;
+  private:
+    QList<QCheckBox *> optionsCheckBoxes;
+    bool updateLock;
+    void showVoice(bool);
+    void showVoice();
+    void hideVoice();
+    void populateLocale();
+    void populateFirmwareOptions(const FirmwareInterface *);
+    FirmwareInterface * getFirmwareVariant();
+    QCheckBox * voice;
 
-  public slots:
-    void accept() Q_DECL_OVERRIDE;
-    void setMainWinHasDirtyChild(bool value);
-
-  signals:
-    void firmwareProfileChanged();
-    void firmwareProfileAboutToChange(bool saveFiles = true);
+    Ui::AppPreferencesDialog *ui;
+    void initSettings();
+    bool displayImage( QString fileName );
+    void loadProfileString(QString profile, QString label);
+    void loadFromProfile();
 
   protected slots:
-    void shrink();
-    void onBaseFirmwareChanged();
-    void onFirmwareOptionChanged(bool state);
-    void toggleAppLogSettings();
+    void shrink();  
+    void baseFirmwareChanged();
+    void firmwareOptionChanged(bool state);
 
+    void writeValues();
     void on_libraryPathButton_clicked();
     void on_snapshotPathButton_clicked();
     void on_snapshotClipboardCKB_clicked();
     void on_backupPathButton_clicked();
-    void on_ProfilebackupPathButton_clicked();
     void on_ge_pathButton_clicked();
 
     void on_sdPathButton_clicked();
+    void on_removeProfileButton_clicked();
     void on_SplashSelect_clicked();
     void on_clearImageButton_clicked();
-    void on_btn_appLogsDir_clicked();
 
-#if defined(JOYSTICKS)
+#ifdef JOYSTICKS
     void on_joystickChkB_clicked();
     void on_joystickcalButton_clicked();
 #endif
-
-  private:
-    void initSettings();
-    void populateFirmwareOptions(const Firmware *);
-    Firmware * getBaseFirmware() const;
-    Firmware * getFirmwareVariant() const;
-    bool displayImage(const QString & fileName);
-
-    Ui::AppPreferencesDialog *ui;
-    QMap<QString, QCheckBox *> optionsCheckBoxes;
-    bool updateLock;
-    bool mainWinHasDirtyChild;
 };
 
-#endif // _APPPREFERENCESDIALOG_H_
+#endif // APPPREFERENCESDIALOG_H

companion/src/avroutputdialog.cpp

@@ -0,0 +1,504 @@
+#include "avroutputdialog.h"
+#include "ui_avroutputdialog.h"
+#include <QtGui>
+#include "eeprominterface.h"
+#include "flashinterface.h"
+
+#if defined WIN32 || !defined __GNUC__
+#include <Windows.h>
+#include <WinBase.h>
+#include <tlhelp32.h>
+#define sleep(x) Sleep(x*1000)
+#else
+#include <unistd.h>
+#include "mountlist.h"
+#endif
+
+avrOutputDialog::avrOutputDialog(QWidget *parent, QString prog, QStringList arg, QString wTitle, int closeBehaviour, bool displayDetails) :
+    QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+    ui(new Ui::avrOutputDialog),
+    kill_timer(NULL),
+    hasErrors(false)
+{
+    ui->setupUi(this);
+
+#ifdef __APPLE__
+    QFont newFont("Courier", 13);
+    ui->plainTextEdit->setFont(newFont);
+    ui->plainTextEdit->setAttribute(Qt::WA_MacNormalSize);
+#endif
+#if defined WIN32 || !defined __GNUC__
+    QFont newFont("Courier", 9);
+    ui->plainTextEdit->setFont(newFont);
+#endif
+
+    cmdLine = prog;
+    closeOpt = closeBehaviour;
+    if (cmdLine.isEmpty()) {
+      if (arg.count()<2) {
+        closeOpt = AVR_DIALOG_FORCE_CLOSE;
+        QTimer::singleShot(0, this, SLOT(forceClose()));                
+      }
+      else {
+        sourceFile=arg.at(0);
+        destFile=arg.at(1);
+        if (!displayDetails) {
+          ui->plainTextEdit->hide();
+          QTimer::singleShot(0, this, SLOT(shrink()));
+        } else {
+            ui->checkBox->setChecked(true);
+        }
+        ui->progressBar->setMaximum(127);
+        QTimer::singleShot(500, this, SLOT(doCopy()));
+      }
+    }
+    else {
+      if (wTitle.isEmpty())
+        setWindowTitle(getProgrammer() + " " + tr("result"));
+      else
+        setWindowTitle(getProgrammer() + " - " + wTitle);
+      QFile exec;
+      winTitle=wTitle;
+      if (!(exec.exists(prog))) {
+        QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("executable not found"));
+        closeOpt = AVR_DIALOG_FORCE_CLOSE;
+        QTimer::singleShot(0, this, SLOT(forceClose()));
+      }
+      else {
+        foreach(QString str, arg) cmdLine.append(" " + str);
+        lfuse = 0;
+        hfuse = 0;
+        efuse = 0;
+        phase=0;
+        currLine.clear();
+        if (!displayDetails) {
+          ui->plainTextEdit->hide();
+          QTimer::singleShot(0, this, SLOT(shrink()));
+        }
+        else {
+          ui->checkBox->setChecked(true);
+        }
+        process = new QProcess(this);
+        connect(process,SIGNAL(readyReadStandardError()), this, SLOT(doAddTextStdErr()));
+        connect(process,SIGNAL(started()),this,SLOT(doProcessStarted()));
+        connect(process,SIGNAL(readyReadStandardOutput()),this,SLOT(doAddTextStdOut()));
+        connect(process,SIGNAL(finished(int)),this,SLOT(doFinished(int)));
+
+  #if !__GNUC__
+        kill_timer = new QTimer(this);
+        connect(kill_timer, SIGNAL(timeout()), this, SLOT(killTimerElapsed()));
+        kill_timer->start(2000);
+  #endif
+
+        process->start(prog,arg);
+      }
+    }
+}
+
+# if !__GNUC__
+BOOL KillProcessByName(char *szProcessToKill){
+        HANDLE hProcessSnap;
+        HANDLE hProcess;
+        PROCESSENTRY32 pe32;
+        DWORD dwPriorityClass;
+
+        hProcessSnap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);  // Takes a snapshot of all the processes
+
+        if(hProcessSnap == INVALID_HANDLE_VALUE){
+                return( FALSE );
+        }
+
+        pe32.dwSize = sizeof(PROCESSENTRY32);
+
+        if(!Process32First(hProcessSnap, &pe32)){
+                CloseHandle(hProcessSnap);
+                return( FALSE );
+        }
+
+        do{
+                if(!strcmp(pe32.szExeFile,szProcessToKill)){    //  checks if process at current position has the name of to be killed app
+                        hProcess = OpenProcess(PROCESS_TERMINATE,0, pe32.th32ProcessID);  // gets handle to process
+                        TerminateProcess(hProcess,0);   // Terminate process by handle
+                        CloseHandle(hProcess);  // close the handle
+                }
+        }while(Process32Next(hProcessSnap,&pe32));  // gets next member of snapshot
+
+        CloseHandle(hProcessSnap);  // closes the snapshot handle
+        return( TRUE );
+}
+#endif
+
+void avrOutputDialog::doCopy() 
+{
+  char buf[BLKSIZE];
+
+  QFile source(sourceFile);
+  int blocks = (source.size() + BLKSIZE - 1) / BLKSIZE;
+  ui->progressBar->setMaximum(blocks-1);
+
+  if (source.open(QIODevice::ReadOnly)) {
+    QFile dest(destFile);
+    if (dest.open(QIODevice::WriteOnly)) {
+      addText(tr("Writing file: "));
+      for (int i=0; i<blocks; i++) {
+        int read = source.read(buf, BLKSIZE);
+        if (dest.write(buf, read) == read) {
+          dest.flush();
+          ui->progressBar->setValue(i);
+          if ((i%2) != 0)
+            addText("#");
+        }
+        else {
+          QMessageBox::warning(this, tr("Error"), tr("Write error"));
+          break;
+        }
+      }
+      dest.close();
+    }
+    else {
+      QMessageBox::warning(this, tr("Error"),tr("Cannot write destination") + ": " + dest.fileName() + ", " + tr("reason") + ": " + dest.errorString());
+    }
+  }
+  else {
+    QMessageBox::warning(this, tr("Error"),tr("Cannot open source file") + ": " + source.fileName() + ", " + tr("reason") + ": " + source.errorString());
+  }
+
+  source.close();
+  doFinished(0);
+}
+
+void avrOutputDialog::killTimerElapsed()
+{
+  delete kill_timer;
+  kill_timer = NULL;
+# if !__GNUC__
+  KillProcessByName("tasklist.exe");
+#endif
+}
+
+avrOutputDialog::~avrOutputDialog()
+{
+    delete ui;
+    delete kill_timer;
+}
+
+void avrOutputDialog::runAgain(QString prog, QStringList arg, int closeBehaviour)
+{
+    cmdLine = prog;
+    foreach(QString str, arg) cmdLine.append(" " + str);
+    closeOpt = closeBehaviour;
+    currLine.clear();
+    process->start(prog,arg);
+}
+
+void avrOutputDialog::waitForFinish()
+{
+    process->waitForFinished();
+}
+
+void avrOutputDialog::addText(const QString &text)
+{
+  QTextCursor cursor(ui->plainTextEdit->textCursor());
+
+  // is the scrollbar at the end?
+  bool atEnd = (ui->plainTextEdit->verticalScrollBar()->value() == ui->plainTextEdit->verticalScrollBar()->maximum());
+
+  cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor, 1);
+  cursor.insertText(text);
+
+  if (atEnd) {
+    ui->plainTextEdit->verticalScrollBar()->triggerAction(QAbstractSlider::SliderToMaximum);
+  }
+}
+
+void avrOutputDialog::doAddTextStdOut()
+{
+    QByteArray data = process->readAllStandardOutput();
+    QString text = QString(data);
+    QString temp;
+    int nlPos, pos, size;
+
+    addText(text);
+
+    currStdLine.append(text);
+    if (currStdLine.contains("size = ")) {
+      pos = currStdLine.lastIndexOf("size = ");
+      temp = currStdLine.mid(pos+7);
+      pos = temp.lastIndexOf("\n");
+      size = temp.left(pos).toInt();
+      ui->progressBar->setMaximum(size/2048);
+    }
+    if (currStdLine.contains("\n")) {
+      nlPos = currStdLine.lastIndexOf("\n");
+      currStdLine = currStdLine.mid(nlPos+1);
+    }
+    if (!currStdLine.isEmpty()) {
+      if (currStdLine.at(0) == QChar('.')) {
+        pos = currStdLine.lastIndexOf(".");
+        ui->progressBar->setValue(pos);
+      }
+      else if (currStdLine.startsWith("Starting upload: [")) {
+        pos = (currStdLine.lastIndexOf("#")-19)/(MAX_FSIZE/204800.0);
+        ui->progressBar->setValue(pos);
+      }
+    }
+
+    if (text.contains("Complete ")) {
+#if !__GNUC__
+      delete kill_timer;
+      kill_timer = NULL;
+#endif
+      int start = text.indexOf("Complete ");
+      int end = text.indexOf("%");
+      if (start > 0) {
+        start += 9;
+        int value = text.mid(start, end-start).toInt();
+        ui->progressBar->setValue(value);
+      }
+    }
+
+    if (text.contains(":010000")) {
+      //contains fuse info
+      QStringList stl = text.split(":01000000");
+      foreach (QString t, stl) {
+        bool ok = false;
+        if (!lfuse)        lfuse = t.left(2).toInt(&ok,16);
+        if (!hfuse && !ok) hfuse = t.left(2).toInt(&ok,16);
+        if (!efuse && !ok) efuse = t.left(2).toInt(&ok,16);
+      }
+    }
+
+    if (text.contains("-E-")) {
+      hasErrors = true;
+    }
+
+}
+
+QString avrOutputDialog::getProgrammer()
+{
+  EEPROMInterface *eepromInterface = GetEepromInterface();
+  if (IS_TARANIS(eepromInterface->getBoard())) {
+    return "DFU Util";
+  }
+  else if IS_SKY9X(eepromInterface->getBoard()) {
+    return "SAM-BA";
+  }
+  else {
+    return "AVRDUDE";
+  }
+}
+
+void avrOutputDialog::errorWizard()
+{
+  QString output=ui->plainTextEdit->toPlainText();
+  if (output.contains("avrdude: Expected signature for")) { // wrong signature
+    int pos=output.indexOf("avrdude: Device signature = ");
+    bool fwexist=false;
+    QString DeviceStr="Unknown";
+    QString FwStr="";
+
+    if (pos>0) {
+      QString DeviceId=output.mid(pos+28,8);
+      if (DeviceId=="0x1e9602") {
+        DeviceStr="Atmega 64";
+        FwStr="\n"+tr("ie: OpenTX for 9X board or OpenTX for 9XR board");
+        fwexist=true;
+      }
+      else if (DeviceId=="0x1e9702") {
+        DeviceStr="Atmega 128";
+        FwStr="\n"+tr("ie: OpenTX for M128 / 9X board or OpenTX for 9XR board with M128 chip");
+        fwexist=true;
+      }
+      else if (DeviceId=="0x1e9703") {
+        DeviceStr="Atmega 1280";
+      }
+      else if (DeviceId=="0x1e9704") {
+        DeviceStr="Atmega 1281";
+      }
+      else if (DeviceId=="0x1e9801") {
+        DeviceStr="Atmega 2560";
+        FwStr="\n"+tr("ie: OpenTX for Gruvin9X  board");
+        fwexist=true;
+      }
+      else if (DeviceId=="0x1e9802") {
+        DeviceStr="Atmega 2561";
+      }
+    }
+    if (fwexist==false) {
+      QMessageBox::warning(this, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease check advanced burn options to set the correct cpu type.").arg(DeviceStr));
+    }
+    else {
+      FirmwareInterface *firmware = GetCurrentFirmware();
+      QMessageBox::warning(this, "Companion - Tip of the day", tr("Your radio uses a %1 CPU!!!\n\nPlease select an appropriate firmware type to program it.").arg(DeviceStr)+FwStr+tr("\nYou are currently using:\n %1").arg(firmware->getName()));
+    }
+  }
+}
+
+void avrOutputDialog::doAddTextStdErr()
+{
+    int nlPos;
+    int pbvalue;
+    QString avrphase;
+    QByteArray data = process->readAllStandardError();
+    QString text = QString(data);
+
+    currLine.append(text);
+    if (currLine.contains("#")) {
+        avrphase = currLine.left(1).toLower();
+        if (avrphase=="w") {
+            ui->progressBar->setStyleSheet("QProgressBar  {text-align: center;} QProgressBar::chunk { background-color: #ff0000; text-align:center;}:");
+            phase=1;
+            if(winTitle.isEmpty())
+                setWindowTitle(getProgrammer() + " - " + tr("Writing"));
+            else
+                setWindowTitle(getProgrammer() + " - " + winTitle + " - " + tr("Writing"));
+            pbvalue=currLine.count("#")*2;
+            ui->progressBar->setValue(pbvalue);
+        }
+        else if (avrphase=="r") {
+            if (phase==0) {
+                ui->progressBar->setStyleSheet("QProgressBar  {text-align: center;} QProgressBar::chunk { background-color: #00ff00; text-align:center;}:");
+                if(winTitle.isEmpty())
+                    setWindowTitle(getProgrammer() + " - " + tr("Reading"));
+                else
+                    setWindowTitle(getProgrammer() + " - " + winTitle + " - " + tr("Reading"));
+            }
+            else {
+                ui->progressBar->setStyleSheet("QProgressBar  {text-align: center;} QProgressBar::chunk { background-color: #0000ff; text-align:center;}:");
+                phase=2;
+                if(winTitle.isEmpty())
+                    setWindowTitle(getProgrammer() + " - " + tr("Verifying"));
+                else
+                    setWindowTitle(getProgrammer() + " - " + winTitle + " - " + tr("Verifying"));
+            }
+            pbvalue=currLine.count("#")*2;
+            ui->progressBar->setValue(pbvalue);
+        }
+    }
+
+    if (currLine.contains("\n")) {
+      nlPos = currLine.lastIndexOf("\n");
+      currLine = currLine.mid(nlPos+1);
+    }
+
+    if (text.contains("-E-") && !text.contains("-E- No receive file name")) {
+      hasErrors = true;
+    }
+
+    addText(text);
+}
+
+#define HLINE_SEPARATOR "================================================================================="
+
+void avrOutputDialog::doFinished(int code=0)
+{
+    addText("\n" HLINE_SEPARATOR);
+    if (code==1 && getProgrammer()=="SAM-BA")
+      code=0;
+    
+    if (code) {
+      ui->checkBox->setChecked(true);
+      addText("\n" + getProgrammer() + " " + tr("done - exit code %1").arg(code));
+    }
+    else if (hasErrors) {
+      ui->checkBox->setChecked(true);
+      addText("\n" + getProgrammer() + " " + tr("done with errors"));
+    }
+    else if (!cmdLine.isEmpty()) {
+      addText("\n" + getProgrammer() + " " + tr("done - SUCCESSFUL"));
+    }
+    else {
+      addText(tr("done - SUCCESSFUL"));
+    }
+    addText("\n" HLINE_SEPARATOR "\n");
+
+    if(lfuse || hfuse || efuse) {
+      addReadFuses();
+    }
+    
+    switch(closeOpt)
+    {
+      case AVR_DIALOG_CLOSE_IF_SUCCESSFUL:
+        if (!hasErrors && !code) accept();
+        if (code) {
+          errorWizard();
+        }
+        break;
+      case AVR_DIALOG_FORCE_CLOSE:
+        if (hasErrors || code)
+          reject();
+        else
+          accept();
+        break;
+
+      case AVR_DIALOG_SHOW_DONE:
+        if (hasErrors || code) {
+          if (!cmdLine.isEmpty()) {
+            if (getProgrammer()!="AVRDUDE") {
+              QMessageBox::critical(this, "Companion", getProgrammer() + " " + tr("did not finish correctly"));
+            }
+            else {
+              int res = QMessageBox::question(this, "Companion",getProgrammer() + " " + tr("did not finish correctly!\nDo you want some help ?"),QMessageBox::Yes | QMessageBox::No);
+              if (res != QMessageBox::No) {
+                errorWizard();
+              }
+            }
+          }
+          else {
+            QMessageBox::critical(this, "Companion", tr("Copy did not finish correctly"));
+          }
+            // reject();
+        }
+        else {
+          if (!cmdLine.isEmpty()) {
+            ui->progressBar->setValue(ui->progressBar->maximum());
+            QMessageBox::information(this, "Companion", getProgrammer() + " " + tr("finished correctly"));
+            accept();
+          }
+          else {
+            QMessageBox::information(this, "Companion", tr("Copy finished correctly"));
+            accept();            
+          }
+        }
+        break;
+
+    default: //AVR_DIALOG_KEEP_OPEN
+      break;
+    }
+}
+
+void avrOutputDialog::doProcessStarted()
+{
+    addText(HLINE_SEPARATOR "\n");
+    addText(tr("Started") + " " + getProgrammer() + "\n");
+    addText(cmdLine);
+    addText("\n" HLINE_SEPARATOR "\n");
+}
+
+void avrOutputDialog::addReadFuses()
+{
+    addText(HLINE_SEPARATOR "\n");
+    addText(tr("FUSES: Low=%1 High=%2 Ext=%3").arg(lfuse,2,16,QChar('0')).arg(hfuse,2,16,QChar('0')).arg(efuse,2,16,QChar('0')));
+    addText("\n" HLINE_SEPARATOR "\n");
+}
+
+void avrOutputDialog::on_checkBox_toggled(bool checked)
+{
+    if (checked) {
+      ui->plainTextEdit->show();
+    }
+    else {
+      ui->plainTextEdit->hide();
+      QTimer::singleShot(0, this, SLOT(shrink()));
+    }
+}
+
+void avrOutputDialog::shrink()
+{
+    resize(0,0);
+}
+
+void avrOutputDialog::forceClose()
+{
+    accept();
+}

companion/src/avroutputdialog.h

@@ -0,0 +1,65 @@
+#ifndef AVROUTPUTDIALOG_H
+#define AVROUTPUTDIALOG_H
+
+#include <QDialog>
+#include <QtGui>
+
+#define AVR_DIALOG_CLOSE_IF_SUCCESSFUL 0x00
+#define AVR_DIALOG_KEEP_OPEN           0x01
+#define AVR_DIALOG_FORCE_CLOSE         0x02
+#define AVR_DIALOG_SHOW_DONE           0x04
+#define READBUF 65536
+#define BLKSIZE 512
+
+
+namespace Ui {
+    class avrOutputDialog;
+}
+
+class avrOutputDialog : public QDialog
+{
+    Q_OBJECT
+
+  public:
+    explicit avrOutputDialog(QWidget *parent, QString prog, QStringList arg, QString wTitle, int closeBehaviour=AVR_DIALOG_CLOSE_IF_SUCCESSFUL, bool displayDetails=false);
+    ~avrOutputDialog();
+
+    void addText(const QString &text);
+    void runAgain(QString prog, QStringList arg, int closeBehaviour=AVR_DIALOG_CLOSE_IF_SUCCESSFUL);
+    void waitForFinish();
+    void addReadFuses();
+
+  protected slots:
+    void doAddTextStdOut();
+    void doAddTextStdErr();
+    void doProcessStarted();
+    void doCopy();
+    void doFinished(int code);
+    void on_checkBox_toggled(bool checked);
+    void shrink();
+    void forceClose();
+    void killTimerElapsed();
+    void errorWizard();
+
+  private:
+    QString getProgrammer();
+    Ui::avrOutputDialog *ui;
+
+    QProcess *process;
+    QTimer *kill_timer;
+    QString cmdLine;
+    int closeOpt;
+    quint8 lfuse;
+    quint8 hfuse;
+    quint8 efuse;
+    QString currLine;
+    QString currStdLine;
+    int phase;
+    QString winTitle;
+    bool hasErrors;
+    QString sourceFile;
+    QString destFile;
+    
+};
+
+#endif // AVROUTPUTDIALOG_H

companion/src/avroutputdialog.ui

@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>avrOutputDialog</class>
+ <widget class="QDialog" name="avrOutputDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>700</width>
+    <height>348</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>700</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="companion.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QProgressBar" name="progressBar">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>480</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="value">
+        <number>0</number>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QCheckBox" name="checkBox">
+       <property name="text">
+        <string>Show Details</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="QPlainTextEdit" name="plainTextEdit">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>312</height>
+      </size>
+     </property>
+     <property name="font">
+      <font>
+       <family>Courier</family>
+       <pointsize>10</pointsize>
+      </font>
+     </property>
+     <property name="verticalScrollBarPolicy">
+      <enum>Qt::ScrollBarAlwaysOn</enum>
+     </property>
+     <property name="lineWrapMode">
+      <enum>QPlainTextEdit::WidgetWidth</enum>
+     </property>
+     <property name="readOnly">
+      <bool>true</bool>
+     </property>
+     <property name="plainText">
+      <string/>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextSelectableByMouse</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="companion.qrc"/>
+ </resources>
+ <connections/>
+</ui>

companion/src/burnconfigdialog.cpp

@@ -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.
- */
-
 #include "burnconfigdialog.h"
 #include "ui_burnconfigdialog.h"
+#include "avroutputdialog.h"
 #include "eeprominterface.h"
 #include "helpers.h"
 #include "appdata.h"
-#include "progressdialog.h"
-#include "process_flash.h"
+#include <QtGui>
 
-#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();
@@ -57,10 +37,10 @@ burnConfigDialog::burnConfigDialog(QWidget *parent) :
       ui->label_sb1->hide();
       ui->label_sb3->hide();
       ui->samba_location->hide();
-      ui->samba_port->hide();
+      ui->samba_port->hide();      
       ui->sb_browse->hide();
     }
-    else if (IS_SKY9X(board)) {
+    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";
@@ -160,7 +123,7 @@ void burnConfigDialog::getSettings()
     sambaPort = g.sambaPort();
 
     ui->avrdude_location->setText(getAVRDUDE());
-    ui->avrArgs->setText(avrArgs.join(" "));
+    ui->avrArgs->setText(getAVRArgs().join(" "));
 
     ui->samba_location->setText(getSAMBA());
     ui->samba_port->setText(getSambaPort());
@@ -181,7 +144,7 @@ void burnConfigDialog::getSettings()
       ui->pushButton_3->setEnabled(true);
     } else {
       ui->pushButton_3->setDisabled(true);
-    }
+    }    
 }
 
 void burnConfigDialog::putSettings()
@@ -322,53 +285,146 @@ void burnConfigDialog::on_dfuArgs_editingFinished()
     dfuArgs = ui->dfuArgs->text().split(" ", QString::SkipEmptyParts);
 }
 
-void burnConfigDialog::listAvrdudeProgrammers()
+void burnConfigDialog::listProgrammers()
 {
-  ProgressDialog progressDialog(this, tr("List available programmers"), CompanionIcon("list.png"), true);
-  FlashProcess flashProcess(ui->avrdude_location->text(), QStringList() << "-c?", progressDialog.progress());
-  flashProcess.run();
+    QStringList arguments;
+    arguments << "-c?";
+    avrOutputDialog *ad = new avrOutputDialog(this, ui->avrdude_location->text(), arguments, "List available programmers", AVR_DIALOG_KEEP_OPEN, TRUE);
+    ad->setWindowIcon(CompanionIcon("list.png"));
+    ad->show();
+    delete ad;
 }
 
-// TODO choose better name when no merge in progress....
 void burnConfigDialog::on_pushButton_3_clicked()
 {
-  listAvrdudeProgrammers();
+    listProgrammers();
 }
 
-// TODO choose better name when no merge in progress....
+
+
 void burnConfigDialog::on_pushButton_4_clicked()
 {
-  ProgressDialog progressDialog(this, tr("Avrdude help"), CompanionIcon("configure.png"), true);
-  FlashProcess flashProcess(ui->avrdude_location->text(), QStringList() << "-?", progressDialog.progress());
-  flashProcess.run();
+    QStringList arguments;
+    arguments << "-?";
+
+    avrOutputDialog *ad = new avrOutputDialog(this, ui->avrdude_location->text(), arguments, "Show help", AVR_DIALOG_KEEP_OPEN,TRUE);
+    ad->setWindowIcon(CompanionIcon("configure.png"));
+    ad->show();
+    delete ad;
+}
+
+
+void burnConfigDialog::readFuses()
+{
+    QStringList args   = avrArgs;
+    if(!avrPort.isEmpty()) args << "-P" << avrPort;
+
+    QStringList str;
+    str << "-U" << "lfuse:r:-:i" << "-U" << "hfuse:r:-:i" << "-U" << "efuse:r:-:i";
+
+    QStringList arguments;
+    arguments << "-c" << avrProgrammer << "-p" << avrMCU << args << str;
+
+    avrOutputDialog *ad = new avrOutputDialog(this, avrLoc, arguments, "Read Fuses",AVR_DIALOG_KEEP_OPEN,TRUE);
+    ad->setWindowIcon(CompanionIcon("fuses.png"));
+    ad->show();
+    delete ad;
+}
+
+void burnConfigDialog::restFuses(bool eeProtect)
+{
+    //fuses
+    //avrdude -c usbasp -p m64 -U lfuse:w:<0x0E>:m
+    //avrdude -c usbasp -p m64 -U hfuse:w:<0x89>:m  0x81 for eeprom protection
+    //avrdude -c usbasp -p m64 -U efuse:w:<0xFF>:m
+
+    QMessageBox::StandardButton ret = QMessageBox::No;
+    ret = QMessageBox::warning(this, tr("Companion"),
+                               tr("<b><u>WARNING!</u></b><br>This will reset the fuses of  %1 to the factory settings.<br>Writing fuses can mess up your radio.<br>Do this only if you are sure they are wrong!<br>Are you sure you want to continue?").arg(avrMCU),
+                               QMessageBox::Yes | QMessageBox::No);
+    if (ret == QMessageBox::Yes)
+    {
+        QStringList args   = avrArgs;
+        if(!avrPort.isEmpty()) args << "-P" << avrPort;
+        QStringList str;
+        if (avrMCU=="m2560") {
+          args << "-B8";
+          QString erStr = eeProtect ? "hfuse:w:0x11:m" : "hfuse:w:0x19:m";
+          str << "-U" << "lfuse:w:0xD7:m" << "-U" << erStr << "-U" << "efuse:w:0xFC:m";
+          //use hfuse = 0x81 to prevent eeprom being erased with every flashing          
+        }
+        else {
+          QString lfuses;
+          QString tempFile = generateProcessUniqueTempFileName("ftemp.bin");
+          QStringList argread;
+          argread << "-c" << avrProgrammer << "-p" << avrMCU << args  <<"-U" << "lfuse:r:"+tempFile+":r" ;
+          avrOutputDialog *ad = new avrOutputDialog(this, avrLoc, argread, "Reset Fuses",AVR_DIALOG_CLOSE_IF_SUCCESSFUL,FALSE);
+          ad->setWindowIcon(CompanionIcon("fuses.png"));
+          ad->exec();
+          delete ad;
+          QFile file(tempFile);
+          if (file.exists() && file.size()==1) {
+            file.open(QIODevice::ReadOnly);
+            char bin_flash[1];
+            file.read(bin_flash, 1);
+            if (bin_flash[0]==0x0E) {
+              lfuses="lfuse:w:0x0E:m";
+            }
+            else {
+              lfuses="lfuse:w:0x3F:m";
+            } 
+            file.close();
+            qunlink(tempFile);
+          }
+          else {
+            lfuses="lfuse:w:0x3F:m";
+          }
+          
+          QString erStr = eeProtect ? "hfuse:w:0x81:m" : "hfuse:w:0x89:m";
+          str << "-U" << lfuses << "-U" << erStr << "-U" << "efuse:w:0xFF:m";
+          //use hfuse = 0x81 to prevent eeprom being erased with every flashing
+        }
+        QStringList arguments;
+        if (avrMCU=="m2560") {
+          arguments << "-c" << avrProgrammer << "-p" << avrMCU << args << "-u" << str;
+        }
+        else {
+          arguments << "-c" << avrProgrammer << "-p" << avrMCU << args << "-B" << "100" << "-u" << str;          
+        }
+        avrOutputDialog *ad = new avrOutputDialog(this, avrLoc, arguments, "Reset Fuses",AVR_DIALOG_KEEP_OPEN,TRUE);
+        ad->setWindowIcon(CompanionIcon("fuses.png"));
+        ad->show();
+        delete ad;
+    }
+
 }
 
 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();
     }
     else {
       ui->label_av3->show();
       ui->avrdude_mcu->show();
-      QMessageBox::warning(this, CPN_STR_APP_NAME,
+      QMessageBox::warning(this, tr("Companion"),
         tr("<b><u>WARNING!</u></b><br>Normally CPU type is automatically selected according to the chosen firmware.<br>If you change the CPU type the resulting eeprom could be inconsistent."),
         QMessageBox::Ok);
     }
   }
   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 +439,7 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
 
 void burnConfigDialog::shrink()
 {
-  resize(0, 0);
+  resize(0,0);
 }
 
 

companion/src/burnconfigdialog.h

@@ -1,27 +1,8 @@
-/*
- * 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>
+#include <QDialog>
+#include <QtGui>
 
 #define MEM_TYPE_EEPROM 1
 #define MEM_TYPE_FLASH  2
@@ -42,7 +23,7 @@ public:
     QString getAVRDUDE() {return avrLoc;}
     QString getSAMBA() {return sambaLoc;}
     QString getDFU() {return dfuLoc;}
-    QStringList getAvrdudeArgs();
+    QStringList getAVRArgs() {return avrArgs;}
     QStringList getDFUArgs() {return dfuArgs;}
     QString getProgrammer() {return avrProgrammer;}
     QString getMCU() {return avrMCU;}
@@ -50,7 +31,9 @@ public:
     QString getPort() {return avrPort;}
     QString getSambaPort() {return sambaPort;}
 
-    void listAvrdudeProgrammers();
+    void listProgrammers();
+    void restFuses(bool eeProtect);
+    void readFuses();
 
 private:
     Ui::burnConfigDialog *ui;
@@ -90,4 +73,4 @@ private slots:
     void putSettings();
 };
 
-#endif // _BURNCONFIGDIALOG_H_
+#endif // BURNCONFIGDIALOG_H

companion/src/burnconfigdialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>531</width>
-    <height>422</height>
+    <height>335</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -817,14 +817,6 @@ Please only use this if you know what you are doing.  There are no error checks
   <tabstop>avrdude_port</tabstop>
   <tabstop>avrArgs</tabstop>
   <tabstop>pushButton_4</tabstop>
-  <tabstop>samba_location</tabstop>
-  <tabstop>sb_browse</tabstop>
-  <tabstop>arm_mcu</tabstop>
-  <tabstop>samba_port</tabstop>
-  <tabstop>dfu_location</tabstop>
-  <tabstop>dfu_browse</tabstop>
-  <tabstop>dfuArgs</tabstop>
-  <tabstop>advCtrChkB</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>

companion/src/burndialog.cpp

@@ -0,0 +1,615 @@
+#include "burndialog.h"
+#include "ui_burndialog.h"
+
+#include <QtGui>
+#include "eeprominterface.h"
+#include "helpers.h"
+#include "splashlibrary.h"
+#include "flashinterface.h"
+#include "hexinterface.h"
+#include "appdata.h"
+
+// Type 1 = Burn EEPROM, Type 2= Burn Flash
+burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * backupEE, QString DocName):
+  QDialog(parent),
+  ui(new Ui::burnDialog),
+  hexfileName(fileName),
+  backup(backupEE),
+  hexType(Type)
+{
+  ui->setupUi(this);
+  setWindowIcon(CompanionIcon("write_flash.png"));
+
+  if (!g.profile[g.id()].splashFile().isEmpty()){
+    imageSource=PROFILE;
+    imageFile=g.profile[g.id()].splashFile();
+  }
+  else {
+    ui->useProfileImageCB->setDisabled(true);
+    imageSource=FIRMWARE;
+    imageFile="";
+  }
+  ui->SplashFrame->hide();
+  ui->FramFWInfo->hide();
+  ui->EEbackupCB->hide();
+  ui->EEbackupCB->setCheckState(*backup ? Qt::Checked : Qt::Unchecked);
+  if (Type == FLASH_FILE_TYPE ) {
+    ui->EEpromCB->hide();
+    ui->profile_label->hide();
+    ui->patchcalib_CB->hide();
+    ui->patchhw_CB->hide();
+    setWindowTitle(tr("Write firmware to Radio"));
+    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+      ui->EEbackupCB->hide();
+    }
+  }
+  else {
+    ui->FlashLoadButton->setText(tr("Browse for file"));
+    ui->profile_label->hide();
+    ui->patchcalib_CB->hide();
+    ui->patchhw_CB->hide();
+    ui->EEpromCB->hide();
+    ui->BurnFlashButton->setDisabled(true);
+    ui->FWFileName->clear();
+    ui->DateField->clear();
+    ui->versionField->clear();
+    ui->ModField->clear();
+    ui->FramFWInfo->hide();
+    ui->SplashFrame->hide();
+    ui->BurnFlashButton->setDisabled(true);
+    ui->EEbackupCB->hide();
+    if (DocName.isEmpty()) {
+      setWindowTitle(tr("Write Backup to Radio"));
+    }
+    else {
+      setWindowTitle(tr("Write Backup from %1 to Radio").arg(DocName));
+    }
+    ui->profile_label->setText(tr("Current profile")+QString(": ")+g.profile[g.id()].name());
+  }
+  if (!hexfileName->isEmpty()) {
+    ui->FWFileName->setText(*hexfileName);
+    if (Type==FLASH_FILE_TYPE) {
+      checkFw(*hexfileName);
+    }
+    else {
+      burnraw=false;
+      if (checkeEprom(*hexfileName)) {
+        QString Name = g.profile[g.id()].name();
+        QString calib = g.profile[g.id()].stickPotCalib();
+        QString trainercalib = g.profile[g.id()].trainerCalib();
+        QString DisplaySet = g.profile[g.id()].display();
+        QString BeeperSet = g.profile[g.id()].beeper();
+        QString HapticSet = g.profile[g.id()].haptic();
+        QString SpeakerSet = g.profile[g.id()].speaker();
+        if (!Name.isEmpty()) {
+          ui->profile_label->show();
+          ui->patchcalib_CB->show();
+          ui->patchhw_CB->show();
+          // TODO I hardcode the number of pots here, should be dependant on the board?
+          if (!((calib.length()==(NUM_STICKS+3)*12) && (trainercalib.length()==16))) {
+            ui->patchcalib_CB->setDisabled(true);
+          }
+          if (!((DisplaySet.length()==6) && (BeeperSet.length()==4) && (HapticSet.length()==6) && (SpeakerSet.length()==6))) {
+            ui->patchhw_CB->setDisabled(true);
+          }
+        }
+        else {
+          ui->profile_label->hide();
+        }
+        if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
+          ui->EEpromCB->show();
+        }
+        else {
+          ui->EEpromCB->setChecked(false);
+        }
+        ui->BurnFlashButton->setEnabled(true);
+      }
+    }
+    ui->FWFileName->hide();
+    ui->FlashLoadButton->hide();   
+    hexfileName->clear();
+  }
+  else if (Type==FLASH_FILE_TYPE) {
+    QString FileName = g.profile[g.id()].fwName();
+    QFile file(FileName);
+    if (file.exists()) {
+      checkFw(FileName);
+    }
+  }
+  updateUI();
+  resize(0, 0);
+}
+
+burnDialog::~burnDialog()
+{
+  delete ui;
+}
+
+void burnDialog::on_FlashLoadButton_clicked()
+{
+  QString fileName;
+
+  ui->BurnFlashButton->setDisabled(true);
+  ui->FWFileName->clear();
+  ui->DateField->clear();
+  ui->versionField->clear();
+  ui->ModField->clear();
+  ui->FramFWInfo->hide();
+  ui->SplashFrame->hide();
+  ui->BurnFlashButton->setDisabled(true);
+  ui->EEbackupCB->hide();
+  QTimer::singleShot(0, this, SLOT(shrink()));
+  if (hexType==FLASH_FILE_TYPE) {
+    fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER);
+    if(fileName.isEmpty())
+      return;
+    checkFw(fileName);
+  }
+  else {
+    QString fileName = QFileDialog::getOpenFileName(this,tr("Choose Radio Backup file"), g.eepromDir(), tr(EXTERNAL_EEPROM_FILES_FILTER));
+    if (checkeEprom(fileName)) {
+      if (burnraw==false) {
+        ui->BurnFlashButton->setEnabled(true);
+        ui->profile_label->show();
+        ui->patchcalib_CB->show();
+        ui->patchhw_CB->show();
+        if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
+          ui->EEpromCB->show();
+        }
+        else {
+          ui->EEpromCB->setChecked(false);
+        }
+      }
+      else {
+        ui->BurnFlashButton->setEnabled(true);
+        ui->profile_label->hide();
+        ui->patchcalib_CB->setChecked(false);
+        ui->patchhw_CB->setChecked(false);
+        ui->patchhw_CB->hide();
+        ui->patchcalib_CB->hide();        
+      }
+      QTimer::singleShot(0, this, SLOT(shrink()));
+    }
+  }
+  updateUI();
+}
+
+void burnDialog::checkFw(QString fileName)
+{
+  if (fileName.isEmpty()) {
+    return;
+  }
+
+  if (!IS_TARANIS(GetEepromInterface()->getBoard())) {
+    ui->EEbackupCB->show();
+  }
+  else {
+    ui->EEbackupCB->setChecked(false);
+    *backup=false;
+  }
+  ui->FWFileName->setText(fileName);
+  FlashInterface flash(fileName);
+  if (flash.isValid()) {
+    ui->FramFWInfo->show();
+    ui->DateField->setText(flash.getDate() + " " + flash.getTime());
+    ui->versionField->setText(flash.getVersion());
+    ui->ModField->setText(flash.getEEpromId());
+
+    ui->SplashFrame->hide();
+    if (flash.hasSplash()) {
+      ui->SplashFrame->show();
+      ui->imageLabel->setFixedSize(flash.getSplashWidth(), flash.getSplashHeight());
+    }
+  }
+  else {
+    QMessageBox::warning(this, tr("Warning"), tr("%1 may not be a valid firmware file").arg(fileName));
+  }  
+  ui->BurnFlashButton->setEnabled(true);
+  QTimer::singleShot(0, this, SLOT(shrink()));
+  g.flashDir( QFileInfo(fileName).dir().absolutePath() );
+}
+
+bool burnDialog::checkeEprom(QString fileName)
+{
+  if (fileName.isEmpty()) {
+    return false;
+  }
+  QFile file(fileName);
+  if (!file.exists()) {
+    QMessageBox::critical(this, tr("Error"), tr("Unable to find file %1!").arg(fileName));
+    return false;
+  }
+  burnraw=false;
+  int fileType = getFileType(fileName);
+#if 0
+  if (fileType==FILE_TYPE_XML) {
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {  //reading HEX TEXT file
+      QMessageBox::critical(this, tr("Error"),tr("Error opening file %1:\n%2.").arg(fileName).arg(file.errorString()));
+      return false;
+    }
+    QTextStream inputStream(&file);
+    XmlInterface(inputStream).load(radioData);
+  }
+  else
+#endif
+  if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { //read HEX file
+    if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {  //reading HEX TEXT file
+        QMessageBox::critical(this, tr("Error"),tr("Error opening file %1:\n%2.").arg(fileName).arg(file.errorString()));
+        return false;
+    }        
+    QDomDocument doc(ER9X_EEPROM_FILE_TYPE);
+    bool xmlOK = doc.setContent(&file);
+    if(xmlOK) {
+      if (!LoadEepromXml(radioData, doc)){
+        return false;
+      }
+    }
+    file.reset();
+      
+    QTextStream inputStream(&file);
+    if (fileType==FILE_TYPE_EEPE) {  // read EEPE file header
+      QString hline = inputStream.readLine();
+      if (hline!=EEPE_EEPROM_FILE_HEADER) {
+        file.close();
+        return false;
+      }
+    }
+    uint8_t eeprom[EESIZE_RLC_MAX];
+    int eeprom_size = HexInterface(inputStream).load(eeprom, EESIZE_RLC_MAX);
+    if (!eeprom_size) {
+      int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
+      if (res == QMessageBox::No) {
+        return false;
+      }
+      burnraw=true;
+      ui->FWFileName->setText(fileName);
+      return true;
+    }
+    file.close();
+    if (!LoadEeprom(radioData, eeprom, eeprom_size)) {
+      int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
+      if (res == QMessageBox::No) {
+        return false;
+      }
+      burnraw=true;
+      ui->FWFileName->setText(fileName);
+      return true;
+    }
+  }
+  else if (fileType==FILE_TYPE_BIN) { //read binary
+    int eeprom_size = file.size();
+    if (!file.open(QFile::ReadOnly)) {  //reading binary file   - TODO HEX support
+        QMessageBox::critical(this, tr("Error"),tr("Error opening file %1:\n%2.").arg(fileName).arg(file.errorString()));
+        return false;
+    }
+    uint8_t *eeprom = (uint8_t *)malloc(eeprom_size);
+    memset(eeprom, 0, eeprom_size);
+    long result = file.read((char*)eeprom, eeprom_size);
+    file.close();
+    if (result != eeprom_size) {
+        QMessageBox::critical(this, tr("Error"),tr("Error reading file %1:\n%2.").arg(fileName).arg(file.errorString()));
+        return false;
+    }
+    if (!LoadEeprom(radioData, eeprom, eeprom_size)) {
+      int res = QMessageBox::question(this, "Companion",tr("Invalid binary Models and Settings File %1, Proceed anyway ?").arg(fileName),QMessageBox::Yes | QMessageBox::No);
+      if (res == QMessageBox::No) {
+        return false;
+      }
+      burnraw=true;
+    }
+  }
+  ui->FWFileName->setText(fileName);
+  return true;
+}
+
+void burnDialog::displaySplash()
+{
+  QImage image;
+  if (imageSource == FIRMWARE){
+    FlashInterface flash(ui->FWFileName->text());
+    image = flash.getSplash();
+  }
+  else {
+    image.load(imageFile);
+  }
+  if (image.isNull()) {
+    return;
+  }
+  ui->imageLabel->setPixmap( makePixMap( image, g.profile[g.id()].fwType()));
+}
+
+void burnDialog::updateUI()
+{
+  if (hexType==EEPROM_FILE_TYPE)
+    return;
+
+  ui->useProfileImageCB->setChecked( imageSource == PROFILE );
+  ui->useFwImageCB->setChecked( imageSource == FIRMWARE );
+  ui->useLibraryImageCB->setChecked( imageSource == LIBRARY );
+  ui->useAnotherImageCB->setChecked( imageSource == ANOTHER );
+  
+  displaySplash();
+}
+
+void burnDialog::on_useFwImageCB_clicked()
+{
+  QString fileName = ui->FWFileName->text();
+  FlashInterface flash(fileName);
+  if (!flash.isValid()) {
+    QMessageBox::critical(this, tr("Error"), tr( "The firmware file is not valid." ));
+  }
+  else {
+    if (!flash.hasSplash()) {
+      QMessageBox::critical(this, tr("Error"), tr( "There is no start screen image in the firmware file." ));
+    }
+    else{
+      imageSource = FIRMWARE;
+      imageFile = fileName;
+    }
+  }
+  updateUI();
+}
+
+void burnDialog::on_useProfileImageCB_clicked()
+{
+  QString fileName = g.profile[g.id()].splashFile();
+  if (!fileName.isEmpty()){
+    QImage image(fileName);
+    if (image.isNull()) {
+      QMessageBox::critical(this, tr("Error"), tr("Profile image %1 is invalid.").arg(fileName));
+    }
+    else {
+      imageSource = PROFILE;
+      imageFile = fileName;
+    }
+  }
+  updateUI();
+}
+
+void burnDialog::on_useAnotherImageCB_clicked()
+{
+  QString supportedImageFormats;
+  for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) {
+    supportedImageFormats += QLatin1String(" *.") + QImageReader::supportedImageFormats()[formatIndex];
+  }
+  QString fileName = QFileDialog::getOpenFileName(this, tr("Open image file to use as radio start screen"), g.imagesDir(), tr("Images (%1)").arg(supportedImageFormats));
+  if (!fileName.isEmpty()){
+    g.imagesDir( QFileInfo(fileName).dir().absolutePath() );
+    QImage image(fileName);
+    if (image.isNull()) {
+      QMessageBox::critical(this, tr("Error"), tr("Image could not be loaded from %1").arg(fileName));
+    }
+    else{
+      imageSource = ANOTHER;
+      imageFile = fileName;
+    }  
+  }
+  updateUI();
+}
+
+void burnDialog::on_useLibraryImageCB_clicked()
+{
+  QString fileName;
+  splashLibrary *ld = new splashLibrary(this,&fileName);
+  ld->exec();
+  if (!fileName.isEmpty()) {
+    QImage image(fileName);
+    if (image.isNull()) {
+      QMessageBox::critical(this, tr("Error"), tr("The library image could not be loaded"));
+    }
+    else{
+      imageSource = LIBRARY;
+      imageFile = fileName;
+    }
+  }
+  updateUI();
+}
+
+void burnDialog::on_BurnFlashButton_clicked()
+{
+  if (hexType==FLASH_FILE_TYPE) {
+    QString fileName=ui->FWFileName->text();
+    if (!fileName.isEmpty()) {
+      g.flashDir( QFileInfo(fileName).dir().absolutePath() );
+      if (!ui->useFwImageCB->isChecked()) {
+        const QPixmap * pixmap = ui->imageLabel->pixmap();
+        QImage image;
+        if (pixmap) {
+          image = pixmap->toImage().scaled(ui->imageLabel->width(), ui->imageLabel->height());
+        }
+        if (!image.isNull()) {
+          QString tempFile;
+          if (getFileType(fileName) == FILE_TYPE_HEX)
+            tempFile = generateProcessUniqueTempFileName("flash.hex");
+          else
+            tempFile = generateProcessUniqueTempFileName("flash.bin");
+          FlashInterface flash(fileName);
+          flash.setSplash(image);
+          if (flash.saveFlash(tempFile) > 0) {
+            hexfileName->clear();
+            hexfileName->append(tempFile);
+          }
+          else {
+            hexfileName->clear();
+            QMessageBox::critical(this, tr("Warning"), tr("Cannot save customized firmware"));
+          }
+        }
+        else {
+          hexfileName->clear();
+          QMessageBox::critical(this, tr("Warning"), tr("Custom image not found"));
+        }
+      }
+      else {
+        hexfileName->clear();
+        hexfileName->append(fileName);
+      }
+    }
+    else {
+      QMessageBox::critical(this, tr("Warning"), tr("No firmware selected"));
+      hexfileName->clear();     
+    }
+  }
+
+  if (hexType==EEPROM_FILE_TYPE) {
+    QString calib = g.profile[g.id()].stickPotCalib();
+    QString trainercalib = g.profile[g.id()].trainerCalib();
+    int potsnum=GetCurrentFirmware()->getCapability(Pots);
+    int8_t vBatCalib=(int8_t) g.profile[g.id()].vBatCalib();
+    int8_t currentCalib=(int8_t) g.profile[g.id()].currentCalib();
+    int8_t PPM_Multiplier=(int8_t) g.profile[g.id()].ppmMultiplier();
+    uint8_t GSStickMode=(uint8_t) g.profile[g.id()].gsStickMode();
+    uint8_t vBatWarn=(uint8_t) g.profile[g.id()].vBatWarn();
+    
+    QString DisplaySet= g.profile[g.id()].display();
+    QString BeeperSet= g.profile[g.id()].beeper();
+    QString HapticSet= g.profile[g.id()].haptic();
+    QString SpeakerSet= g.profile[g.id()].speaker();
+    bool patch=false;
+    if (ui->patchcalib_CB->isChecked()) {
+      if ((calib.length()==(NUM_STICKS+potsnum)*12) && (trainercalib.length()==16)) {
+        QString Byte;
+        int16_t byte16;
+        bool ok;
+        for (int i=0; i<(NUM_STICKS+potsnum); i++) {
+          Byte=calib.mid(i*12,4);
+          byte16=(int16_t)Byte.toInt(&ok,16);
+          if (ok)
+            radioData.generalSettings.calibMid[i]=byte16;
+          Byte=calib.mid(4+i*12,4);
+          byte16=(int16_t)Byte.toInt(&ok,16);
+          if (ok)
+            radioData.generalSettings.calibSpanNeg[i]=byte16;
+          Byte=calib.mid(8+i*12,4);
+          byte16=(int16_t)Byte.toInt(&ok,16);
+          if (ok)
+            radioData.generalSettings.calibSpanPos[i]=byte16;
+        }
+        for (int i=0; i<4; i++) {
+          Byte=trainercalib.mid(i*4,4);
+          byte16=(int16_t)Byte.toInt(&ok,16);
+          if (ok)
+            radioData.generalSettings.trainer.calib[i]=byte16;
+        }
+        radioData.generalSettings.currentCalib=currentCalib;
+        radioData.generalSettings.vBatCalib=vBatCalib;
+        radioData.generalSettings.PPM_Multiplier=PPM_Multiplier;
+        patch=true;
+      }
+      else {
+        QMessageBox::critical(this, tr("Warning"), tr("Wrong radio calibration data in profile, Settings not patched"));
+      }
+    }
+    if (ui->patchhw_CB->isChecked()) {
+      if ((DisplaySet.length()==6) && (BeeperSet.length()==4) && (HapticSet.length()==6) && (SpeakerSet.length()==6)) {
+        radioData.generalSettings.vBatWarn=vBatWarn;
+        radioData.generalSettings.stickMode=GSStickMode;
+        uint8_t byte8u;
+        int8_t byte8;
+        bool ok;
+        byte8=(int8_t)DisplaySet.mid(0,2).toInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.optrexDisplay=(byte8==1 ? true : false);
+        byte8u=(uint8_t)DisplaySet.mid(2,2).toUInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.contrast=byte8u;
+
+        byte8u=(uint8_t)DisplaySet.mid(4,2).toUInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.backlightBright=byte8u;
+
+        byte8u=(uint8_t)BeeperSet.mid(0,2).toUInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.beeperMode=(BeeperMode)byte8u;
+
+        byte8=(int8_t)BeeperSet.mid(2,2).toInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.beeperLength=byte8;
+
+        byte8u=(uint8_t)HapticSet.mid(0,2).toUInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.hapticMode=(BeeperMode)byte8u;
+
+        byte8u=(uint8_t)HapticSet.mid(2,2).toUInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.hapticStrength=byte8u;
+
+        byte8=(int8_t)HapticSet.mid(4,2).toInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.hapticLength=byte8;
+
+        byte8u=(uint8_t)SpeakerSet.mid(0,2).toUInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.speakerMode=byte8u;
+
+        byte8u=(uint8_t)SpeakerSet.mid(2,2).toUInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.speakerPitch=byte8u;
+
+        byte8u=(uint8_t)SpeakerSet.mid(4,2).toUInt(&ok,16);
+        if (ok)
+          radioData.generalSettings.speakerVolume=byte8u;
+        patch=true;
+      }
+      else {
+        QMessageBox::critical(this, tr("Warning"), tr("Wrong radio setting data in profile, Settings not patched"));
+      }
+    
+      if (patch) {
+        QString fileName = generateProcessUniqueTempFileName("temp.bin");
+        QFile file(fileName);
+
+        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()));
+          hexfileName->clear();
+        }
+
+        if (!file.open(QIODevice::WriteOnly)) {
+          QMessageBox::warning(this, tr("Error"),tr("Cannot write file %1:\n%2.").arg(fileName).arg(file.errorString()));
+          hexfileName->clear();
+        }
+
+        QTextStream outputStream(&file);
+
+        long result = file.write((char*)eeprom, eeprom_size);
+        if (result != eeprom_size) {
+          QMessageBox::warning(this, tr("Error"),tr("Error writing file %1:\n%2.").arg(fileName).arg(file.errorString()));
+        }
+
+        hexfileName->clear();
+        hexfileName->append(fileName);
+      }
+      else {
+        hexfileName->clear();
+        hexfileName->append(ui->FWFileName->text());        
+      }
+    }
+    else {
+      hexfileName->clear();
+      hexfileName->append(ui->FWFileName->text());        
+    }
+  }
+  this->close();
+}
+
+void burnDialog::on_cancelButton_clicked()
+{
+  hexfileName->clear();     
+  this->close();  
+}
+
+void burnDialog::on_EEpromCB_toggled(bool checked)
+{
+  *backup = ui->EEpromCB->isChecked();
+}
+
+void burnDialog::shrink()
+{
+    resize(0,0);
+}
+
+void burnDialog::on_EEbackupCB_clicked()
+{
+  *backup = ui->EEbackupCB->isChecked();
+}

companion/src/burndialog.h

@@ -0,0 +1,66 @@
+#ifndef BURNDIALOG_H
+#define BURNDIALOG_H
+
+#include <QtGui>
+#include <QDialog>
+#include "eeprominterface.h"
+#include "flashinterface.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"
+#define EEPROM_FILE_TYPE 1
+#define FLASH_FILE_TYPE 2
+
+
+namespace Ui
+{
+  class burnDialog;
+}
+
+class burnDialog : public QDialog
+{
+  Q_OBJECT
+
+public:
+  explicit burnDialog(QWidget *parent = 0, int Type = 2, QString * fileName = NULL, bool * backupEE=NULL, QString docname="");
+  ~burnDialog();
+
+private slots:
+  void on_FlashLoadButton_clicked();
+  void on_BurnFlashButton_clicked();
+  void on_cancelButton_clicked();
+  void on_EEbackupCB_clicked();
+  void on_EEpromCB_toggled(bool checked);  
+  bool checkeEprom(QString fileName);
+  void on_useProfileImageCB_clicked();
+  void on_useFwImageCB_clicked();
+  void on_useLibraryImageCB_clicked();
+  void on_useAnotherImageCB_clicked();
+
+  void checkFw(QString fileName);
+  void displaySplash();
+  void updateUI();
+  void shrink();
+
+
+private:
+  Ui::burnDialog *ui;
+  QString * hexfileName;
+  bool * backup;
+  int hexType;
+  RadioData radioData;
+  bool burnraw;
+  enum ImageSource {FIRMWARE, PROFILE, LIBRARY, ANOTHER};
+  ImageSource imageSource;
+  QString imageFile;
+};
+
+#endif // BURNDIALOG_H

companion/src/burndialog.ui

@@ -0,0 +1,379 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>burnDialog</class>
+ <widget class="QDialog" name="burnDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>399</width>
+    <height>564</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Customize Splash</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="companion.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_7">
+   <item row="2" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item>
+      <spacer name="hs2">
+       <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>
+      <widget class="QPushButton" name="cancelButton">
+       <property name="minimumSize">
+        <size>
+         <width>90</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Cancel</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="BurnFlashButton">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>90</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>Write to TX</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="0">
+    <layout class="QGridLayout" name="gridLayout_4">
+     <item row="5" column="0">
+      <widget class="QCheckBox" name="patchcalib_CB">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Modify calibration parameters using settings from current profile&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string>Patch calibration setting from profile</string>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="0">
+      <widget class="QCheckBox" name="patchhw_CB">
+       <property name="toolTip">
+        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Modify HW parameters using settings from current profile&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+       </property>
+       <property name="text">
+        <string>Patch HW setting from profile</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QFrame" name="FramFWInfo">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_5">
+        <item row="3" column="0">
+         <widget class="QLabel" name="dateLabel">
+          <property name="text">
+           <string>Date &amp; Time</string>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLineEdit" name="versionField">
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="0">
+         <widget class="QLabel" name="buildLabel">
+          <property name="text">
+           <string>Variant</string>
+          </property>
+         </widget>
+        </item>
+        <item row="2" column="1">
+         <widget class="QLineEdit" name="ModField">
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="versionLabel">
+          <property name="text">
+           <string>Version</string>
+          </property>
+         </widget>
+        </item>
+        <item row="3" column="1">
+         <widget class="QLineEdit" name="DateField">
+          <property name="readOnly">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_2">
+       <item>
+        <widget class="QLineEdit" name="FWFileName">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>250</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="readOnly">
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="FlashLoadButton">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Browse for file</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="7" column="0">
+      <widget class="QCheckBox" name="EEpromCB">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Allows Companion to write to older version of the firmware</string>
+       </property>
+       <property name="text">
+        <string>Check Firmware compatibility</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QCheckBox" name="EEbackupCB">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="text">
+        <string>Backup and restore Models and Settings</string>
+       </property>
+       <property name="tristate">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="profile_label">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Current Profile</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QFrame" name="SplashFrame">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="frameShape">
+        <enum>QFrame::StyledPanel</enum>
+       </property>
+       <property name="frameShadow">
+        <enum>QFrame::Raised</enum>
+       </property>
+       <layout class="QGridLayout" name="gridLayout">
+        <item row="0" column="0">
+         <layout class="QGridLayout" name="SplashLayout" rowstretch="0,0,0,0,0,0,0">
+          <item row="0" column="1" rowspan="7">
+           <layout class="QGridLayout" name="gridLayout_2" rowstretch="0">
+            <item row="0" column="0">
+             <widget class="QLabel" name="imageLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="minimumSize">
+               <size>
+                <width>128</width>
+                <height>64</height>
+               </size>
+              </property>
+              <property name="maximumSize">
+               <size>
+                <width>214</width>
+                <height>66</height>
+               </size>
+              </property>
+              <property name="frameShape">
+               <enum>QFrame::Panel</enum>
+              </property>
+              <property name="frameShadow">
+               <enum>QFrame::Plain</enum>
+              </property>
+              <property name="lineWidth">
+               <number>0</number>
+              </property>
+              <property name="text">
+               <string/>
+              </property>
+              <property name="scaledContents">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+          <item row="2" column="0">
+           <widget class="QCheckBox" name="useFwImageCB">
+            <property name="text">
+             <string>Use firmware start screen</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QCheckBox" name="useAnotherImageCB">
+            <property name="text">
+             <string>Use another start screen</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QCheckBox" name="useProfileImageCB">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Use profile start screen</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QCheckBox" name="useLibraryImageCB">
+            <property name="text">
+             <string>Use library start screen</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>BurnFlashButton</tabstop>
+  <tabstop>FWFileName</tabstop>
+  <tabstop>FlashLoadButton</tabstop>
+  <tabstop>versionField</tabstop>
+  <tabstop>ModField</tabstop>
+  <tabstop>useProfileImageCB</tabstop>
+  <tabstop>useFwImageCB</tabstop>
+  <tabstop>useLibraryImageCB</tabstop>
+  <tabstop>useAnotherImageCB</tabstop>
+  <tabstop>EEbackupCB</tabstop>
+  <tabstop>patchcalib_CB</tabstop>
+  <tabstop>patchhw_CB</tabstop>
+  <tabstop>EEpromCB</tabstop>
+  <tabstop>cancelButton</tabstop>
+ </tabstops>
+ <resources>
+  <include location="companion.qrc"/>
+ </resources>
+ <connections/>
+</ui>

companion/src/cmake/FindSdl.cmake

@@ -0,0 +1,165 @@
+# - 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
+    )
+  # 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
+    C:/Programs/SDL/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)

companion/src/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
 )

companion/src/cmake/FindXsd.cmake

@@ -1,54 +1,52 @@
-# Locate Xsd from code synthesis include paths and binary
-# Xsd can be found at http://codesynthesis.com/products/xsd/
-# Written by Frederic Heem, frederic.heem _at_ telsey.it
-
-# This module defines
-# XSD_INCLUDE_DIR, where to find elements.hxx, etc.
-# XSD_EXECUTABLE, where is the xsd compiler
-# XSD_FOUND, If false, don't try to use xsd
-
-FIND_PATH( XSD_INCLUDE_DIR xsd/cxx/parser/elements.hxx
+# Locate Xsd from code synthesis include paths and binary
+# Xsd can be found at http://codesynthesis.com/products/xsd/
+# Written by Frederic Heem, frederic.heem _at_ telsey.it
+
+# This module defines
+# XSD_INCLUDE_DIR, where to find elements.hxx, etc.
+# XSD_EXECUTABLE, where is the xsd compiler
+# XSD_FOUND, If false, don't try to use xsd
+
+FIND_PATH( XSD_INCLUDE_DIR xsd/cxx/parser/elements.hxx
   "/opt/local/xsd-3.3.0-i686-macosx/libxsd"
-  "C:/Programs/xsd-3.3.0/libxsd"
-  "C:/Program Files/CodeSynthesis XSD 3.2/include"
-  "C:/mingw/xsd-3.3.0-i686-windows/libxsd"
-  $ENV{XSDDIR}/include
-  $ENV{CODESYNTH}/include
-  /usr/local/include /usr/include
-  $ENV{XSDDIR}/libxsd
-)
-
-IF( WIN32 )
-  SET( XSDCXX_FILENAME1 xsd-cxx.exe )
-ELSE( )
-  SET( XSDCXX_FILENAME1 xsdcxx )
-  SET( XSDCXX_FILENAME2 xsd )
-ENDIF( )
-
-FIND_PROGRAM( XSDCXX_EXECUTABLE
-  NAMES
-    ${XSDCXX_FILENAME1} ${XSDCXX_FILENAME2}
+  "C:/Programs/xsd-3.3.0/libxsd"
+  "C:/Program Files/CodeSynthesis XSD 3.2/include"
+  "C:/mingw/xsd-3.3.0-i686-windows/libxsd"
+  $ENV{XSDDIR}/include
+  $ENV{CODESYNTH}/include
+  /usr/local/include /usr/include  
+)
+
+IF( WIN32 )
+  SET( XSDCXX_FILENAME1 xsd-cxx.exe )
+ELSE( )
+  SET( XSDCXX_FILENAME1 xsdcxx )
+  SET( XSDCXX_FILENAME2 xsd )
+ENDIF( )
+
+FIND_PROGRAM( XSDCXX_EXECUTABLE
+  NAMES
+    ${XSDCXX_FILENAME1} ${XSDCXX_FILENAME2}
   PATHS
-    "/opt/local/xsd-3.3.0-i686-macosx/bin"
-    "C:/Programs/xsd-3.3.0/bin"
-    "C:/mingw/xsd-3.3.0-i686-windows/bin"
-    "C:/Program Files/CodeSynthesis XSD 3.2/bin"
-    $ENV{XSDDIR}/bin
-    /usr/local/bin
-    /usr/bin
-    $ENV{XSDDIR}/xsd
-)
-
-MESSAGE(STATUS ${XSDCXX_EXECUTABLE})
-
-# if the include and the program are found then we have it
-IF( XSD_INCLUDE_DIR )
-  IF( XSDCXX_EXECUTABLE )
-    SET( XSD_FOUND "YES" )
-  ENDIF( XSDCXX_EXECUTABLE )
-ENDIF( XSD_INCLUDE_DIR )
-
-MARK_AS_ADVANCED(
-  XSD_INCLUDE_DIR
-  XSDCXX_EXECUTABLE
-)
+    "/opt/local/xsd-3.3.0-i686-macosx/bin"
+    "C:/Programs/xsd-3.3.0/bin"
+    "C:/mingw/xsd-3.3.0-i686-windows/bin"  
+    "C:/Program Files/CodeSynthesis XSD 3.2/bin"
+    $ENV{XSDDIR}/bin
+    /usr/local/bin
+    /usr/bin
+)
+
+MESSAGE(STATUS ${XSDCXX_EXECUTABLE})
+      
+# if the include and the program are found then we have it
+IF( XSD_INCLUDE_DIR )
+  IF( XSDCXX_EXECUTABLE )
+    SET( XSD_FOUND "YES" )
+  ENDIF( XSDCXX_EXECUTABLE )
+ENDIF( XSD_INCLUDE_DIR )
+
+MARK_AS_ADVANCED(
+  XSD_INCLUDE_DIR
+  XSDCXX_EXECUTABLE
+)

companion/src/companion.cpp

@@ -1,285 +1,137 @@
-/*
- * 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 <QMessageBox>
-#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 "simulatorinterface.h"
-#include "storage.h"
-#include "translations.h"
-#include "helpers.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
-
-void importError()
-{
-  QMessageBox::critical(nullptr, CPN_STR_APP_NAME, QCoreApplication::translate("Companion", "The saved settings could not be imported, please try again or continue with current settings."), QMessageBox::Ok, 0);
-}
-
-void checkSettingsImport(bool force = false)
-{
-  QString previousVersion;
-  bool found;
-  if (!(found = g.findPreviousVersionSettings(&previousVersion))) {
-    found = QDir(CPN_SETTINGS_BACKUP_DIR).entryList(QStringList({"*.ini"}), QDir::Files).size() > 0;
-  }
-  if (!found && !force)
-    return;
-
-  const QString impFileBtn = QCoreApplication::translate("Companion", "Import from File");
-  const QString impPrevBtn = QCoreApplication::translate("Companion", "Import from v%1").arg(previousVersion);
-  const QString impNoneBtn = QCoreApplication::translate("Companion", "Do not import");
-
-  QString msg;
-  if (previousVersion.isEmpty()) {
-    if (found)
-      msg = QCoreApplication::translate("Companion", "We have found possible Companion settings backup file(s).\nDo you want to import settings from a file?");
-    else
-      msg = QCoreApplication::translate("Companion", "Import settings from a file, or start with current values.");
-  }
-  else {
-    msg = QCoreApplication::translate("Companion", "We have found existing settings for Companion version: %1.\nDo you want to import them?\n\n" \
-                                                   "If you have a settings backup file, you may import that instead.").arg(previousVersion);
-  }
-
-  const int ret = QMessageBox::question(nullptr, CPN_STR_APP_NAME, msg, impNoneBtn, impFileBtn, (previousVersion.isEmpty() ? QString() : impPrevBtn), 0, 0);
-  if (!ret)
-    return;
-
-  // Import from previous version
-  if (ret == 2) {
-    if (!g.importSettings(previousVersion)) {
-      // very unlikely, but just in case of unexpected error, restart the import
-      importError();
-      checkSettingsImport();
-    }
-    return;
-  }
-
-  // Import from file
-  bool err = false;
-  QString impFile = CPN_SETTINGS_BACKUP_DIR;
-  impFile = QFileDialog::getOpenFileName(nullptr, QCoreApplication::translate("Companion", "Select %1:").arg(CPN_STR_APP_SETTINGS_FILES), impFile, CPN_STR_APP_SETTINGS_FILTER);
-
-  if (!impFile.isEmpty() && QFileInfo(impFile).isReadable()) {
-    QSettings fromSettings(impFile, QSettings::IniFormat);
-    if (g.importSettings(&fromSettings)) {
-      return;
-    }
-    else {
-      importError();
-      err = true;
-    }
-  }
-  // Restart the import prompt if user cancelled the file select dialog but we do have previous settings, or if we had a file import error.
-  if (err || !previousVersion.isEmpty())
-    checkSettingsImport();
-}
-
-void printHelpText()
-{
-  printf(qPrintable(QString(APP_COMPANION % " v%s\n\n")), VERSION);
-  const char tmpl[] = "  %s \t %s\n";
-  printf(tmpl, "--export",   QCoreApplication::translate("Companion", "Save application settings to file...").toUtf8().constData());
-  printf(tmpl, "--import",   QCoreApplication::translate("Companion", "Load application settings from file or previous version...").toUtf8().constData());
-  printf(tmpl, "--defaults", QCoreApplication::translate("Companion", "Reset ALL application settings to default and remove radio profiles...").toUtf8().constData());
-  printf(tmpl, "--quit  ",   QCoreApplication::translate("Companion", "Exit before settings initialization and application startup.").toUtf8().constData());
-  printf(tmpl, "--version",  QCoreApplication::translate("Companion", "Print version number and exit.").toUtf8().constData());
-  printf(tmpl, "--help|-h",  QCoreApplication::translate("Companion", "Print this help text.").toUtf8().constData());
-  fflush(stdout);
-}
-
-int main(int argc, char *argv[])
-{
-#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);
-
-  const QStringList args(QApplication::arguments());
-
-  if (args.contains("--help") || args.contains("-h") || args.contains("/?")) {
-    printHelpText();
-    exit(0);
-  }
-
-  if (args.contains("--version")) {
-    printf("%s\n", VERSION);
-    fflush(stdout);
-    exit(0);
-  }
-
-  Q_INIT_RESOURCE(companion);
-
-  if (AppDebugMessageHandler::instance())
-    AppDebugMessageHandler::instance()->installAppMessageHandler();
-
-  CustomDebug::setFilterRules();
-
-  // handle settings export/import/reset via CLI
-
-  bool doExport = args.contains("--export");
-  bool doImport = args.contains("--import");
-  bool doReset = args.contains("--defaults");
-
-  if (doExport)
-    Helpers::exportAppSettings();
-
-  if (doReset) {
-    char ok;
-    printf("%s [Y/N] ", QCoreApplication::translate("Companion", "Reset ALL application settings to default values and remove radio profiles, are you sure?").toUtf8().constData());
-    std::cin >> ok;
-    if (ok != 'Y' && ok != 'y')
-      exit(0);
-    if (!doExport) {
-      printf("%s [Y/N] ", QCoreApplication::translate("Companion", "Would you like to perform a backup first?").toUtf8().constData());
-      std::cin >> ok;
-      if (ok == 'Y' || ok == 'y')
-        Helpers::exportAppSettings();
-    }
-    g.resetAllSettings();
-    g.storeAllSettings();
-    std::cout << QCoreApplication::translate("Companion", "Application settings were reset and saved.").toUtf8().constData() << std::endl;
-  }
-
-  if (doImport)
-    checkSettingsImport(true);
-
-  // give option to quit before settings init
-  if (args.contains("--quit"))
-    exit(0);
-
-  // end CLI handling
-
-  if (!doImport && g.isFirstUse())
-    checkSettingsImport(false);
-
-  g.init();
-
-  QFile dbgLog;
-  if (AppDebugMessageHandler::instance() && g.appDebugLog() && !g.appLogsDir().isEmpty() && QDir().mkpath(g.appLogsDir())) {
-    QString fn = g.appLogsDir() % "/CompanionDebug_" % QDateTime::currentDateTime().toString("yy-MM-dd_HH-mm-ss") % ".log";
-    dbgLog.setFileName(fn);
-    if (dbgLog.open(QIODevice::WriteOnly | QIODevice::Text)) {
-      AppDebugMessageHandler::instance()->addOutputDevice(&dbgLog);
-    }
-  }
-
-#ifdef __APPLE__
-  app.setStyle(new MyProxyStyle);
-#endif
-
-  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();
-
-  Profile & profile = g.currentProfile();
-  if (profile.fwType().isEmpty()){
-    profile.fwType(Firmware::getDefaultVariant()->getId());
-    profile.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>
+#include "mainwindow.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);
+
+#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"));
+  
+    RegisterEepromInterfaces();
+    registerOpenTxFirmwares();
+
+  if (g.profile[g.id()].fwType().isEmpty()){
+    g.profile[g.id()].fwType(default_firmware_variant->getId());
+    g.profile[g.id()].fwName("");
+  }
+
+  QString splashScreen;
+  if ( g.profile[g.id()].fwType().contains("taranis"))     splashScreen = ":/images/splasht.png";
+  else if ( g.profile[g.id()].fwType().contains("9xrpro")) splashScreen = ":/images/splashp.png";
+  else if ( g.profile[g.id()].fwType().contains("9xr"))    splashScreen = ":/images/splashr.png";
+  else  splashScreen = ":/images/splash.png";
+
+  QPixmap pixmap = QPixmap(splashScreen);
+  QSplashScreen *splash = new QSplashScreen(pixmap);
+
+  current_firmware_variant = GetFirmware(g.profile[g.id()].fwType());
+
+  MainWindow *mainWin = new MainWindow();
+  if (g.showSplash()) {
+    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;
+
+  UnregisterFirmwares();
+  UnregisterEepromInterfaces();
+
+  return result;
+}

companion/src/companion.desktop

@@ -1,11 +1,11 @@
 [Desktop Entry]
 Type=Application
 Encoding=UTF-8
-Name=Companion @VERSION@
+Name=Companion
 GenericName=Transmitter Companion App
 Comment=The Ultimate Transmitter Companion
-Icon=@COMPANION_NAME@
-Exec='@COMPANION_NAME@'
+Icon=companion
+Exec='companion'
 Terminal=false
 StartupNotify=false
 Categories=Application

companion/src/companion.qrc

@@ -1,153 +1,65 @@
-<!DOCTYPE RCC><RCC version="1.0">
+<RCC>
   <qresource prefix="/">
     <file>images/customize.png</file>
-    <file alias="icon.png">images/icon.png</file>
+    <file>icon.png</file>
     <file>../../CREDITS.txt</file>
+    <file>../../DONATIONS.txt</file>
     <file>../releasenotes.txt</file>
+    <file>images/9xdb.png</file>
+    <file>images/9xdl.png</file>
+    <file>images/9xdr.png</file>
+    <file>images/9xdt.png</file>
+    <file>images/9xdb-bl.png</file>
+    <file>images/9xdl-bl.png</file>
+    <file>images/9xdr-bl.png</file>
+    <file>images/9xdt-bl.png</file>
+    <file>images/9xdb-gr.png</file>
+    <file>images/9xdl-gr.png</file>
+    <file>images/9xdr-gr.png</file>
+    <file>images/9xdt-gr.png</file>
+    <file>images/9xdb-or.png</file>
+    <file>images/9xdl-or.png</file>
+    <file>images/9xdr-or.png</file>
+    <file>images/9xdt-or.png</file>
+    <file>images/9xdb-yl.png</file>
+    <file>images/9xdl-yl.png</file>
+    <file>images/9xdr-yl.png</file>
+    <file>images/9xdt-yl.png</file>
+    <file>images/9xdb-rd.png</file>
+    <file>images/9xdl-rd.png</file>
+    <file>images/9xdr-rd.png</file>
+    <file>images/9xdt-rd.png</file>
+    <file>images/9xmenu.png</file>
+    <file>images/9xmenumenu.png</file>
+    <file>images/9xmenuexit.png</file>
+    <file>images/9xcurs.png</file>
+    <file>images/9xcursup.png</file>
+    <file>images/9xcursplus.png</file>
+    <file>images/9xcursmin.png</file>
+    <file>images/9xcursdown.png</file>
+    <file>images/9xcursphoto.png</file>
     <file>images/screenshot.png</file>
     <file>images/splash.png</file>
+    <file>images/splashp.png</file>
+    <file>images/splashr.png</file>
+    <file>images/splasht.png</file>
     <file>images/companion-title.png</file>
     <file>images/maps.png</file>
     <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/9X/9xdb.png</file>
-    <file>images/simulator/9X/9xdl.png</file>
-    <file>images/simulator/9X/9xdr.png</file>
-    <file>images/simulator/9X/9xdt.png</file>
-    <file>images/simulator/9X/9xdb-bl.png</file>
-    <file>images/simulator/9X/9xdl-bl.png</file>
-    <file>images/simulator/9X/9xdr-bl.png</file>
-    <file>images/simulator/9X/9xdt-bl.png</file>
-    <file>images/simulator/9X/9xdb-gr.png</file>
-    <file>images/simulator/9X/9xdl-gr.png</file>
-    <file>images/simulator/9X/9xdr-gr.png</file>
-    <file>images/simulator/9X/9xdt-gr.png</file>
-    <file>images/simulator/9X/9xdb-or.png</file>
-    <file>images/simulator/9X/9xdl-or.png</file>
-    <file>images/simulator/9X/9xdr-or.png</file>
-    <file>images/simulator/9X/9xdt-or.png</file>
-    <file>images/simulator/9X/9xdb-yl.png</file>
-    <file>images/simulator/9X/9xdl-yl.png</file>
-    <file>images/simulator/9X/9xdr-yl.png</file>
-    <file>images/simulator/9X/9xdt-yl.png</file>
-    <file>images/simulator/9X/9xdb-rd.png</file>
-    <file>images/simulator/9X/9xdl-rd.png</file>
-    <file>images/simulator/9X/9xdr-rd.png</file>
-    <file>images/simulator/9X/9xdt-rd.png</file>
-    <file>images/simulator/9X/9xmenu.png</file>
-    <file>images/simulator/9X/9xmenumenu.png</file>
-    <file>images/simulator/9X/9xmenuexit.png</file>
-    <file>images/simulator/9X/9xcurs.png</file>
-    <file>images/simulator/9X/9xcursup.png</file>
-    <file>images/simulator/9X/9xcursplus.png</file>
-    <file>images/simulator/9X/9xcursmin.png</file>
-    <file>images/simulator/9X/9xcursdown.png</file>
-    <file>images/simulator/9X/9xcursphoto.png</file>
-    <file>images/simulator/Taranis/x9b0.png</file>
-    <file>images/simulator/Taranis/x9l0.png</file>
-    <file>images/simulator/Taranis/x9l1.png</file>
-    <file>images/simulator/Taranis/x9l2.png</file>
-    <file>images/simulator/Taranis/x9l3.png</file>
-    <file>images/simulator/Taranis/x9l4.png</file>
-    <file>images/simulator/Taranis/x9r0.png</file>
-    <file>images/simulator/Taranis/x9r1.png</file>
-    <file>images/simulator/Taranis/x9r2.png</file>
-    <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/simulator/XLITE/bottom.png</file>
-    <file>images/simulator/XLITE/left.png</file>
-    <file>images/simulator/XLITE/left_scrnshot.png</file>
-    <file>images/simulator/XLITE/right.png</file>
-    <file>images/simulator/XLITE/right_ent.png</file>
-    <file>images/simulator/XLITE/top.png</file>
-    <file>images/simulator/XLITE/right_exit.png</file>
-    <file>images/simulator/XLITE/right_shift.png</file>
-    <file>images/simulator/XLITE/right_right.png</file>
-    <file>images/simulator/XLITE/right_left.png</file>
-    <file>images/simulator/XLITE/right_up.png</file>
-    <file>images/simulator/XLITE/right_down.png</file>
+    <file>images/x9b0.png</file>
+    <file>images/x9l0.png</file>
+    <file>images/x9l1.png</file>
+    <file>images/x9l2.png</file>
+    <file>images/x9l3.png</file>
+    <file>images/x9l4.png</file>
+    <file>images/x9r0.png</file>
+    <file>images/x9r1.png</file>
+    <file>images/x9r2.png</file>
+    <file>images/x9r3.png</file>
+    <file>images/x9s0.png</file>
+    <file>images/x9t0.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> 
@@ -188,8 +100,6 @@
     <file>images/library/00018.png</file>
     <file>images/library/00019.png</file>
     <file>images/library/00020.png</file>
-    <file>images/library/00021.png</file>
-    <file>images/library/00022.png</file>
     <file>images/library/00050.png</file>
     <file>images/library/00051.png</file>
     <file>images/library/00052.png</file>
@@ -245,9 +155,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/default/modelprt.css</file>
     <file>themes/monochrome/16/paintbrush.png</file>
     <file>themes/monochrome/16/open.png</file>
     <file>themes/monochrome/16/edit.png</file>
@@ -291,7 +198,6 @@
     <file>themes/monochrome/16/contributors.png</file>
     <file>themes/monochrome/16/stop.png</file>
     <file>themes/monochrome/16/write_eeprom.png</file>
-    <file>themes/monochrome/16/sdsync.png</file>
     <file>themes/monochrome/24/paintbrush.png</file>
     <file>themes/monochrome/24/open.png</file>
     <file>themes/monochrome/24/edit.png</file>
@@ -335,7 +241,6 @@
     <file>themes/monochrome/24/contributors.png</file>
     <file>themes/monochrome/24/stop.png</file>
     <file>themes/monochrome/24/write_eeprom.png</file>
-    <file>themes/monochrome/24/sdsync.png</file>
     <file>themes/monochrome/32/paintbrush.png</file>
     <file>themes/monochrome/32/open.png</file>
     <file>themes/monochrome/32/edit.png</file>
@@ -379,7 +284,6 @@
     <file>themes/monochrome/32/contributors.png</file>
     <file>themes/monochrome/32/stop.png</file>
     <file>themes/monochrome/32/write_eeprom.png</file>
-    <file>themes/monochrome/32/sdsync.png</file>
     <file>themes/monochrome/48/paintbrush.png</file>
     <file>themes/monochrome/48/open.png</file>
     <file>themes/monochrome/48/edit.png</file>
@@ -423,7 +327,6 @@
     <file>themes/monochrome/48/contributors.png</file>
     <file>themes/monochrome/48/stop.png</file>
     <file>themes/monochrome/48/write_eeprom.png</file>
-    <file>themes/monochrome/48/sdsync.png</file>
     <file>themes/classic/16/paintbrush.png</file>
     <file>themes/classic/16/open.png</file>
     <file>themes/classic/16/edit.png</file>
@@ -467,7 +370,6 @@
     <file>themes/classic/16/contributors.png</file>
     <file>themes/classic/16/stop.png</file>
     <file>themes/classic/16/write_eeprom.png</file>
-    <file>themes/classic/16/sdsync.png</file>
     <file>themes/classic/24/paintbrush.png</file>
     <file>themes/classic/24/open.png</file>
     <file>themes/classic/24/edit.png</file>
@@ -511,7 +413,6 @@
     <file>themes/classic/24/contributors.png</file>
     <file>themes/classic/24/stop.png</file>
     <file>themes/classic/24/write_eeprom.png</file>
-    <file>themes/classic/24/sdsync.png</file>
     <file>themes/classic/32/paintbrush.png</file>
     <file>themes/classic/32/open.png</file>
     <file>themes/classic/32/edit.png</file>
@@ -555,7 +456,6 @@
     <file>themes/classic/32/contributors.png</file>
     <file>themes/classic/32/stop.png</file>
     <file>themes/classic/32/write_eeprom.png</file>
-    <file>themes/classic/32/sdsync.png</file>
     <file>themes/classic/48/paintbrush.png</file>
     <file>themes/classic/48/open.png</file>
     <file>themes/classic/48/edit.png</file>
@@ -599,7 +499,6 @@
     <file>themes/classic/48/contributors.png</file>
     <file>themes/classic/48/stop.png</file>
     <file>themes/classic/48/write_eeprom.png</file>
-    <file>themes/classic/48/sdsync.png</file>
     <file>themes/monoblue/16/paintbrush.png</file>
     <file>themes/monoblue/16/open.png</file>
     <file>themes/monoblue/16/edit.png</file>
@@ -643,7 +542,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>
@@ -687,7 +585,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>
@@ -731,7 +628,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>
@@ -775,7 +671,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>
@@ -819,7 +714,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>
@@ -863,7 +757,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>
@@ -907,7 +800,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>
@@ -951,7 +843,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>
@@ -995,7 +886,6 @@
     <file>themes/yerico/16/contributors.png</file>
     <file>themes/yerico/16/stop.png</file>
     <file>themes/yerico/16/write_eeprom.png</file>
-    <file>themes/yerico/16/sdsync.png</file>
     <file>themes/yerico/24/paintbrush.png</file>
     <file>themes/yerico/24/open.png</file>
     <file>themes/yerico/24/edit.png</file>
@@ -1039,7 +929,6 @@
     <file>themes/yerico/24/contributors.png</file>
     <file>themes/yerico/24/stop.png</file>
     <file>themes/yerico/24/write_eeprom.png</file>
-    <file>themes/yerico/24/sdsync.png</file>
     <file>themes/yerico/32/paintbrush.png</file>
     <file>themes/yerico/32/open.png</file>
     <file>themes/yerico/32/edit.png</file>
@@ -1083,7 +972,6 @@
     <file>themes/yerico/32/contributors.png</file>
     <file>themes/yerico/32/stop.png</file>
     <file>themes/yerico/32/write_eeprom.png</file>
-    <file>themes/yerico/32/sdsync.png</file>
     <file>themes/yerico/48/paintbrush.png</file>
     <file>themes/yerico/48/open.png</file>
     <file>themes/yerico/48/edit.png</file>
@@ -1127,6 +1015,5 @@
     <file>themes/yerico/48/contributors.png</file>
     <file>themes/yerico/48/stop.png</file>
     <file>themes/yerico/48/write_eeprom.png</file>
-    <file>themes/yerico/48/sdsync.png</file>    
   </qresource>
 </RCC>

companion/src/comparedialog.h

@@ -1,67 +1,94 @@
-/*
- * 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();
-    void on_styleButton_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 <QDialog>
+#include <QtGui>
+#include <QDir>
+#include "eeprominterface.h"
+
+namespace Ui {
+  class CompareDialog;
+}
+
+class CompareDialog : public QDialog
+{
+    Q_OBJECT
+
+  public:
+    CompareDialog(QWidget *parent);
+    ~CompareDialog();
+
+  protected:
+    GeneralSettings * settings;
+    ModelData * g_model1;
+    ModelData * g_model2;
+    ModelData * modeltemp;
+    int model1;
+    int model2;
+  
+  private:
+    void  closeEvent(QCloseEvent *event);
+    Ui::CompareDialog *ui;
+    QString doTC(const QString s, const QString color, bool bold);
+    QString doTR(const QString s, const QString color, bool bold);
+    QString doTL(const QString s, const QString color, bool bold);
+    QString fv(const QString name, const QString value,const QString color);
+    template<class T> QString getColor1(T val1, T val2) {
+      if (val1!=val2)
+        return "green";
+      else
+        return "grey";
+    }
+    template<class T> QString getColor2(T val1, T val2) {
+      if (val1!=val2)
+        return "red";
+      else
+        return "grey";
+    }
+    QString getColor1(char * val1, char * val2) {
+      if (strcmp(val1,val2)!=0)
+        return "green";
+      else
+        return "grey";
+    }
+    QString getColor2(char * val1, char * val2) {
+      if (strcmp(val1,val2)!=0)
+        return "red";
+      else
+        return "grey";
+    }
+
+    int ModelHasExpo(ExpoData * ExpoArray, ExpoData expo, bool * expoused);
+    bool ChannelHasExpo(ExpoData * expoArray, uint8_t destCh);
+    int ModelHasMix(MixData * mixArray, MixData mix, bool * mixused);
+    bool ChannelHasMix(MixData * mixArray, uint8_t destCh);
+    
+    QTextEdit * te;
+    QString curvefile5;
+    QString curvefile9;
+    QDir *qd;
+    
+private slots:
+    void on_printButton_clicked();
+    void on_printFileButton_clicked();
+    
+protected:
+    void dropEvent(QDropEvent *event);
+    void dragMoveEvent(QDragMoveEvent *event);
+    void dragEnterEvent(QDragEnterEvent *event);
+    void dragLeaveEvent(QDragLeaveEvent *event);
+    void printDiff();
+    void printSetup();
+    void printPhases();
+    void printLimits();
+    void printExpos();
+    void printMixers();
+    void printCurves();
+    void printGvars();
+    void printSwitches();
+    void printSafetySwitches();
+    void printFSwitches();
+    void printFrSky();
+};
+
+#endif // COMPAREDIALOG_H

companion/src/comparedialog.ui

@@ -29,25 +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>
-       <property name="wordWrap">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">
@@ -68,13 +106,6 @@
        </property>
       </widget>
      </item>
-     <item>
-      <widget class="QPushButton" name="styleButton">
-       <property name="text">
-        <string>Style</string>
-       </property>
-      </widget>
-     </item>
      <item>
       <widget class="QPushButton" name="printButton">
        <property name="text">
@@ -91,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,83 +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 _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_APP_NAME               QCoreApplication::translate("Companion", "OpenTX Companion")
-#define CPN_STR_TTL_INFO               QCoreApplication::translate("Companion", "Information")        // shared Title Case words, eg. for a window title or section heading
-#define CPN_STR_TTL_WARNING            QCoreApplication::translate("Companion", "Warning")
-#define CPN_STR_TTL_ERROR              QCoreApplication::translate("Companion", "Error")
-#define CPN_STR_TTL_CONFIRM            QCoreApplication::translate("Companion", "Please Confirm")
-
-#define CPN_STR_FILES                  QCoreApplication::translate("Companion", "files")
-#define CPN_STR_RAD_MOD_SETTINGS       QCoreApplication::translate("Companion", "Radio and Models settings")
-#define HEX_FILES_FILTER               "HEX " % CPN_STR_FILES % " (*.hex);;"
-#define BIN_FILES_FILTER               "BIN " % CPN_STR_FILES % " (*.bin);;"
-#define DFU_FILES_FILTER               "DFU " % CPN_STR_FILES % " (*.dfu);;"
-#define EEPE_FILES_FILTER              "EEPE " % CPN_STR_FILES % " (*.eepe);;"
-#define OTX_FILES_FILTER               "OpenTX " % CPN_STR_FILES % " (*.otx);;"
-#define EEPROM_FILES_FILTER            CPN_STR_RAD_MOD_SETTINGS % " " % CPN_STR_FILES % " (*.otx *.eepe *.bin *.hex);;" % OTX_FILES_FILTER % EEPE_FILES_FILTER % BIN_FILES_FILTER % HEX_FILES_FILTER
-#define FLASH_FILES_FILTER             "FLASH " % CPN_STR_FILES % " (*.bin *.hex *.dfu);;" % BIN_FILES_FILTER % HEX_FILES_FILTER % DFU_FILES_FILTER
-#define EXTERNAL_EEPROM_FILES_FILTER   "EEPROM " % CPN_STR_FILES % " (*.bin *.hex);;" % BIN_FILES_FILTER % HEX_FILES_FILTER
-#define ER9X_EEPROM_FILE_TYPE          "ER9X_EEPROM_FILE"
-#define EEPE_EEPROM_FILE_HEADER        "EEPE EEPROM FILE"
-#define EEPE_MODEL_FILE_HEADER         "EEPE MODEL FILE"
-
-#define CPN_STR_APP_SETTINGS           QCoreApplication::translate("Companion", "Application Settings")
-#define CPN_STR_APP_SETTINGS_FILES     CPN_STR_APP_SETTINGS % " " % CPN_STR_FILES
-#define CPN_STR_APP_SETTINGS_FILTER    CPN_STR_APP_SETTINGS_FILES % " (*.ini)"
-
-#define CPN_STR_UNKNOWN_ITEM           "???"
-
-#define CPN_STR_SW_INDICATOR_UP        QCoreApplication::translate("RawSwitch", "\xE2\x86\x91")  // Switch up position indicator: Up arrow, or similar.
-#define CPN_STR_SW_INDICATOR_DN        QCoreApplication::translate("RawSwitch", "\xE2\x86\x93")  // Switch down position indicator: Down arrow, or similar.
-#define CPN_STR_SW_INDICATOR_NEUT      QCoreApplication::translate("RawSwitch", "-")             // Switch neutral (middle) position indicator.
-#define CPN_STR_SW_INDICATOR_REV       QCoreApplication::translate("RawSwitch", "!")             // Switch reversed logic (NOT) indicator.
-
-#endif // _CONSTANTS_H_

companion/src/contributorsdialog.cpp

@@ -0,0 +1,132 @@
+#include "contributorsdialog.h"
+#include "ui_contributorsdialog.h"
+#include <QtGui>
+#include "helpers.h"
+
+contributorsDialog::contributorsDialog(QWidget *parent, int contest, QString rnurl) :
+    QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+    ui(new Ui::contributorsDialog)
+{
+    ui->setupUi(this);
+    switch (contest) {
+      case 0:
+      {
+        this->setWindowIcon(CompanionIcon("contributors.png"));
+        QFile file(":/DONATIONS.txt");
+        QString str;
+        str.append("<html><head>");
+        str.append("<style type=\"text/css\">\n");
+        str.append(".mycss\n{\nfont-weight:normal;\ncolor:#000000;vertical-align: top;font-size:10px;text-align:left;font-family:arial, helvetica, sans-serif;\n}\n");
+        str.append(".mycssb\n{\nfont-weight:bold;\ncolor:#C00000;vertical-align: top;font-size:10px;text-align:left;font-family:arial, helvetica, sans-serif;\n}\n");
+        str.append(".myhead\n{\nfont-weight:bold;\ncolor:#000000;font-size:14px;text-align:left;font-family:arial, helvetica, sans-serif;\n}\n");
+        str.append("</style>\n</head><body class=\"mycss\"><table width=\"100%\" border=0 cellspacing=0 cellpadding=2>");
+        str.append("<tr><td class=\"myhead\">"+tr("People who have contributed to this project")+"</td></tr>");
+        str.append("</table>");
+        str.append("<table width=\"100%\" border=0 cellspacing=0 cellpadding=2>");
+        if (file.open(QIODevice::ReadOnly | QIODevice::Text)) {
+          int columns=6;
+          float cwidth=100.0/columns;
+          while (!file.atEnd()) {
+            str.append("<tr>");
+            for (int i=0; i<columns; i++) {
+              str.append(QString("<td width=\"%1%\" ").arg(cwidth));
+              if (!file.atEnd()) {
+                QByteArray line = file.readLine();
+                if (line.contains("monthly") || line.contains("mensual")) {
+                  str.append("class=\"mycssb\">");
+                } else {
+                  str.append("class=\"mycss\">");
+                }
+                str.append(line.trimmed()+"</td>");
+              } else {
+                str.append("class=\"mycss\">&nbsp;</td>");
+              }
+            }
+            str.append("</tr>");
+          }
+        }
+        str.append("</table>");
+        QFile file2(":/CREDITS.txt");
+        str.append("<table width=\"100%\" border=0 cellspacing=0 cellpadding=2>");
+        str.append("<tr><td class=\"mycss\">&nbsp;</td></tr>");
+        str.append("<tr><td class=\"myhead\">"+tr("Coders")+"</td></tr>");
+        str.append("</table>");
+        str.append("<table width=\"100%\" border=0 cellspacing=0 cellpadding=2>");
+        if(file2.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
+          while (!file2.atEnd()) {
+            str.append("<tr>");
+            for (int i=0; i<3; i++) {
+              str.append("<td width=\"33.33%\" class=\"mycss\">");
+              if (!file2.atEnd()) {
+                QByteArray line = file2.readLine();
+                str.append(line.trimmed());
+              } else {
+                str.append("&nbsp;");
+              }
+              str.append("</td>");
+            }
+            str.append("</tr>");
+          }
+        }
+        str.append("<tr><td class=\"mycss\">&nbsp;</td></tr>");
+        str.append("<tr><td colspan=3 class=\"mycss\">" + tr("Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)") + "<br/></td></tr>");
+        str.append("<tr><td colspan=3 class=\"mycss\">" + tr("Thank you all !!!") + "</td></tr>");
+        str.append("</table>");
+        str.append("</body></html>");        
+        ui->textEditor->setHtml(str);
+        ui->textEditor->scroll(0, 0);
+        setWindowTitle(tr("Contributors"));
+        break;
+      }
+      
+      case 1:
+      {
+        this->setWindowIcon(CompanionIcon("changelog.png"));
+        QFile file(":/releasenotes.txt");
+        if(file.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
+          ui->textEditor->setHtml(file.readAll());
+        }
+        ui->textEditor->scroll(0,0);
+        setWindowTitle(tr("Companion Release Notes"));
+        break;
+      }
+
+      case 2:
+      {
+        if (!rnurl.isEmpty()) {
+          this->setWindowIcon(CompanionIcon("changelog.png"));
+          this->setWindowTitle(tr("OpenTX Release Notes"));
+          manager = new QNetworkAccessManager(this);
+          connect(manager, SIGNAL(finished(QNetworkReply*)), this, SLOT(replyFinished(QNetworkReply*)));
+          QUrl url(rnurl);
+          QNetworkRequest request(url);
+          request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
+          manager->get(request);
+        }
+        else {
+          QTimer::singleShot(0, this, SLOT(forceClose()));                
+        }
+        break;
+      }
+    }
+}
+
+void contributorsDialog::showEvent ( QShowEvent * )
+{
+    ui->textEditor->scroll(0, 0);
+}
+
+contributorsDialog::~contributorsDialog()
+{
+    delete ui;
+}
+
+void contributorsDialog::replyFinished(QNetworkReply * reply)
+{
+    ui->textEditor->setHtml(reply->readAll());
+}
+
+void contributorsDialog::forceClose()
+{
+    accept();;
+}

companion/src/contributorsdialog.h

@@ -0,0 +1,31 @@
+#ifndef CONTRIBUTORSDIALOG_H
+#define CONTRIBUTORSDIALOG_H
+
+#include <QDialog>
+#include "eeprominterface.h"
+#include "downloaddialog.h"
+
+namespace Ui {
+    class contributorsDialog;
+}
+
+class contributorsDialog : public QDialog
+{
+    Q_OBJECT
+public:
+    explicit contributorsDialog(QWidget *parent = 0, int contest = 0, QString rnurl = QString() );
+    ~contributorsDialog();
+
+private:
+    Ui::contributorsDialog *ui;
+    QNetworkAccessManager *manager;
+
+    void showEvent ( QShowEvent * );
+
+private slots:
+    void forceClose();
+    void replyFinished(QNetworkReply * reply);   
+    
+};
+
+#endif // CONTRIBUTORSDIALOG_H

companion/src/contributorsdialog.ui

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>HtmlDialog</class>
- <widget class="QDialog" name="HtmlDialog">
+ <class>contributorsDialog</class>
+ <widget class="QDialog" name="contributorsDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -15,7 +15,7 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0">
-    <widget class="QTextBrowser" name="textEditor">
+    <widget class="QTextEdit" name="textEditor">
      <property name="readOnly">
       <bool>true</bool>
      </property>

companion/src/creditsdialog.cpp

@@ -1,135 +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 "creditsdialog.h"
-#include "ui_htmldialog.h"
-#include "helpers.h"
-#include <QFile>
-
-CreditsDialog::CreditsDialog(QWidget * parent):
-  QDialog(parent),
-  ui(new Ui::HtmlDialog)
-{
-  ui->setupUi(this);
-
-  setWindowTitle(tr("OpenTX Contributors"));
-  setWindowIcon(CompanionIcon("contributors.png"));
-
-  QString str = "<html>" \
-                "<head>" \
-                "  <style type=\"text/css\">" \
-                "    .normal { font-weight:normal;color:#000000;vertical-align:top;font-size:10px;text-align:left;font-family:arial,helvetica,sans-serif; }" \
-                "    .bold { font-weight:bold;color:#C00000;vertical-align:top;font-size:10px;text-align:left;font-family:arial,helvetica,sans-serif; }" \
-                "    .title { font-weight:bold;color:#000000;font-size:14px;text-align:left;font-family:arial,helvetica,sans-serif; }" \
-                "  </style>" \
-                "</head>"
-                "<body class=\"normal\">";
-
-  foreach(CreditsSection section, readCredits()) {
-    str.append(formatTable(sectionTitle(section.title), section.names, 3));
-  }
-
-  str.append("<table><tr><td class=\"normal\">&nbsp;</td></tr>" \
-             "  <tr><td class=\"normal\">" + tr("Honors go to Rafal Tomczak (RadioClone), Thomas Husterer (th9x) and Erez Raviv (er9x and eePe)") + "<br/></td></tr>" \
-             "</table>");
-
-#if 0
-  QFile blacklist(":/BLACKLIST.txt");
-  if (blacklist.open(QIODevice::ReadOnly | QIODevice::Text)) {
-    QStringList names;
-    names << blacklist.readAll();
-    str.append(formatTable(tr("OpenTX Blacklist"), names, 1));
-  }
-#endif
-
-  str.append("</body></html>");
-  ui->textEditor->setHtml(str);
-  ui->textEditor->scroll(0, 0);
-  ui->textEditor->setOpenExternalLinks(true);
-}
-
-CreditsDialog::~CreditsDialog()
-{
-  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)
-{
-  const float cwidth = 100.0 / columns;
-  QString str = "<table width=\"100%\" border=0 cellspacing=0 cellpadding=2>" \
-                "  <tr><td class=\"normal\">&nbsp;</td></tr>" \
-                "  <tr><td class=\"title\">" + title + "</td></tr>" \
-                "</table>";
-
-  str.append("<table width=\"100%\" border=0 cellspacing=0 cellpadding=2>");
-
-  int column = 0;
-  foreach(QString name, names) {
-    if (column == 0) {
-      str.append("<tr>");
-    }
-    QString trclass = name.contains("monthly") ? "bold" : "normal";
-    str.append(QString("<td width=\"%1%\" class=\"%2\">%3</td>").arg(cwidth).arg(trclass).arg(name.trimmed().replace("monthly", tr("monthly"))));
-    if (++column == columns) {
-      str.append("</tr>");
-      column = 0;
-    }
-  }
-
-  if (column != 0) {
-    str.append("</tr>");
-  }
-
-  str.append("</table>");
-  return str;
-}

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 +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 _CUSTOMDEBUG_H_
-#define _CUSTOMDEBUG_H_
-
-#include <QLoggingCategory>
-
-// Controls the generation of debug output for EEPROM import
-Q_DECLARE_LOGGING_CATEGORY(eepromImport)  // "eeprom.import"
-
-// Controls the generation of debug output of SimulatorLoader class
-Q_DECLARE_LOGGING_CATEGORY(simulatorInterfaceLoader)  // "simulator.interface.loader"
-
-class CustomDebug
-{
-  public:
-    static void setFilterRules();
-};
-
-#endif // _CUSTOMDEBUG_H_

companion/src/customizesplashdialog.cpp

@@ -1,30 +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.
- */
-
 #include "customizesplashdialog.h"
 #include "ui_customizesplashdialog.h"
-#include "flashfirmwaredialog.h"
+
+#include <QtGui>
 #include "appdata.h"
 #include "helpers.h"
-#include "firmwareinterface.h"
-#include "splashlibrarydialog.h"
+#include "burndialog.h"
+#include "splashlibrary.h"
+#include "flashinterface.h"
 
 //*** Side Class ***
 
@@ -49,11 +31,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,49 +43,52 @@ bool Side::displayImage(QString fileName, Source pictSource)
     return false;
 
   // Determine which picture format to use
-  if (pictSource == FW) {
-    FirmwareInterface firmware(fileName);
-    if (!firmware.hasSplash())
+  if (pictSource == FW ){
+    FlashInterface flash(fileName);
+    if (!flash.hasSplash())
       return false;
     else
-      image = firmware.getSplash();
-    *format = (firmware.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X);
+      image = flash.getSplash();
+    *format = (flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X);
   }
   else {
     image.load(fileName);
     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(CustomizeSplashDialog::tr("FW: %1").arg(fileName));
-      *saveToFileName = fileName;
-      *source = FW;
-      break;
-    case PICT:
-      fileNameEdit->setText(CustomizeSplashDialog::tr("Pict: %1").arg(fileName));
-      *saveToFileName = fileName;
-      *source = PICT;
-      break;
-    case PROFILE:
-      fileNameEdit->setText(CustomizeSplashDialog::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);
@@ -120,12 +105,12 @@ bool Side::saveImage()
 {
   if (*source == FW )
   {
-    FirmwareInterface firmware(*saveToFileName);
-    if (!firmware.hasSplash()) {
+    FlashInterface flash(*saveToFileName);
+    if (!flash.hasSplash()) {
       return false;
     }
-    QImage image = imageLabel->pixmap()->toImage().scaled(firmware.getSplashWidth(), firmware.getSplashHeight());
-    if (firmware.setSplash(image) && (firmware.save(*saveToFileName) > 0)) {
+    QImage image = imageLabel->pixmap()->toImage().scaled(flash.getSplashWidth(), flash.getSplashHeight());
+    if (flash.setSplash(image) && (flash.saveFlash(*saveToFileName) > 0)) {
       g.flashDir( QFileInfo(*saveToFileName).dir().absolutePath() );
     }
     else {
@@ -150,15 +135,17 @@ 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"));
   ui->leftLibraryButton->setIcon(CompanionIcon("library.png"));
   ui->rightLibraryButton->setIcon(CompanionIcon("library.png"));
-
+  
   left.imageLabel =  ui->leftImageLabel;
   right.imageLabel = ui->rightImageLabel;
   left.fileNameEdit =  ui->leftFileNameEdit;
@@ -169,7 +156,7 @@ CustomizeSplashDialog::CustomizeSplashDialog(QWidget *parent) :
   right.libraryButton = ui->rightLibraryButton;
   left.invertButton = ui->leftInvertButton;
   right.invertButton = ui->rightInvertButton;
-
+  
   left.loadFwButton =  ui->leftLoadFwButton;
   right.loadFwButton =  ui->rightLoadFwButton;
   left.loadPictButton =  ui->leftLoadPictButton;
@@ -183,36 +170,36 @@ CustomizeSplashDialog::CustomizeSplashDialog(QWidget *parent) :
   resize(0,0);
 }
 
-CustomizeSplashDialog::~CustomizeSplashDialog()
+customizeSplashDialog::~customizeSplashDialog()
 {
   delete ui;
 }
 
-void CustomizeSplashDialog::on_copyRightToLeftButton_clicked() {
+void customizeSplashDialog::on_copyRightToLeftButton_clicked() {
   left.copyImage(right);
 }
-void CustomizeSplashDialog::on_copyLeftToRightButton_clicked() {
+void customizeSplashDialog::on_copyLeftToRightButton_clicked() {
 right.copyImage(left);
 }
 
 
-void CustomizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);}
-void CustomizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);}
-void CustomizeSplashDialog::loadFirmware(Side side)
+void customizeSplashDialog::on_leftLoadFwButton_clicked() {loadFirmware(left);}
+void customizeSplashDialog::on_rightLoadFwButton_clicked() {loadFirmware(right);}
+void customizeSplashDialog::loadFirmware(Side side)
 {
   QString fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER);
   if (!fileName.isEmpty()) {
     if (!side.displayImage( fileName, FW ))
-      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("Can not load embedded image from firmware file %1.").arg(fileName));
+      QMessageBox::critical(this, tr("Error"), tr("Can not load embedded image from firmware file %1.").arg(fileName));
     else
     g.flashDir( QFileInfo(fileName).dir().absolutePath() );
   }
   side.markSourceButton();
 }
 
-void CustomizeSplashDialog::on_leftLoadPictButton_clicked() {loadPicture(left);}
-void CustomizeSplashDialog::on_rightLoadPictButton_clicked() {loadPicture(right);}
-void CustomizeSplashDialog::loadPicture(Side side)
+void customizeSplashDialog::on_leftLoadPictButton_clicked() {loadPicture(left);}
+void customizeSplashDialog::on_rightLoadPictButton_clicked() {loadPicture(right);}
+void customizeSplashDialog::loadPicture(Side side)
 {
   QString supportedImageFormats;
   for (int formatIndex = 0; formatIndex < QImageReader::supportedImageFormats().count(); formatIndex++) {
@@ -223,42 +210,42 @@ void CustomizeSplashDialog::loadPicture(Side side)
 
   if (!fileName.isEmpty()) {
     if (!side.displayImage( fileName, PICT ))
-      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("Cannot load the image file %1.").arg(fileName));
+      QMessageBox::critical(this, tr("Error"), tr("Cannot load the image file %1.").arg(fileName));
     else
       g.imagesDir( QFileInfo(fileName).dir().absolutePath() );
   }
   side.markSourceButton();
 }
 
-void CustomizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);}
-void CustomizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);}
-void CustomizeSplashDialog::loadProfile(Side side)
+void customizeSplashDialog::on_leftLoadProfileButton_clicked() {loadProfile(left);}
+void customizeSplashDialog::on_rightLoadProfileButton_clicked() {loadProfile(right);}
+void customizeSplashDialog::loadProfile(Side side)
 {
   QString fileName=g.profile[g.id()].splashFile();
 
   if (!fileName.isEmpty()) {
     if (!side.displayImage( fileName, PROFILE ))
-      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("Cannot load profile image %1.").arg(fileName));
+      QMessageBox::critical(this, tr("Error"), tr("Cannot load profile image %1.").arg(fileName));
   }
   side.markSourceButton();
 }
 
-void CustomizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);}
-void CustomizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);}
-void CustomizeSplashDialog::libraryButton_clicked( Side side )
+void customizeSplashDialog::on_leftLibraryButton_clicked(){libraryButton_clicked(left);}
+void customizeSplashDialog::on_rightLibraryButton_clicked(){libraryButton_clicked(right);}
+void customizeSplashDialog::libraryButton_clicked( Side side )
 {
   QString fileName;
-  SplashLibraryDialog *ld = new SplashLibraryDialog(this,&fileName);
+  splashLibrary *ld = new splashLibrary(this,&fileName);
   ld->exec();
   if (!fileName.isEmpty()) {
     if (!side.displayImage( fileName, UNDEFINED ))
-      QMessageBox::critical(this, CPN_STR_TTL_ERROR, tr("Cannot load the library image %1.").arg(fileName));
+      QMessageBox::critical(this, tr("Error"), tr("Cannot load the library image %1.").arg(fileName));
   }
 }
 
-void CustomizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);}
-void CustomizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);}
-void CustomizeSplashDialog::saveButton_clicked( Side side )
+void customizeSplashDialog::on_leftSaveButton_clicked(){saveButton_clicked(left);}
+void customizeSplashDialog::on_rightSaveButton_clicked(){saveButton_clicked(right);}
+void customizeSplashDialog::saveButton_clicked( Side side )
 {
   if (side.saveImage()){
     QMessageBox::information(this, tr("File Saved"), tr("The image was saved to the file %1").arg(*side.saveToFileName));
@@ -270,9 +257,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,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.
- */
+#ifndef CUSTOMIZESPLASHDIALOG_H
+#define CUSTOMIZESPLASHDIALOG_H
 
-#ifndef _CUSTOMIZESPLASHDIALOG_H_
-#define _CUSTOMIZESPLASHDIALOG_H_
-
-#include <QtWidgets>
-#include "firmwareinterface.h"
+#include <QtGui>
+#include <QDialog>
+#include "flashinterface.h"
 
 namespace Ui
 {
-  class CustomizeSplashDialog;
+  class customizeSplashDialog;
 }
 
 const int WIDTH_TARANIS = 212;
@@ -63,15 +44,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 +80,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/datamodels/CMakeLists.txt

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

companion/src/datamodels/rawitemdatamodels.cpp

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

companion/src/datamodels/rawitemdatamodels.h

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

companion/src/datamodels/rawitemfilteredmodel.cpp

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

companion/src/datamodels/rawitemfilteredmodel.h

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

companion/src/dialogs/filesyncdialog.cpp

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

companion/src/dialogs/filesyncdialog.h

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

companion/src/downloaddialog.cpp

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

companion/src/downloaddialog.h

@@ -1,32 +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.
- */
+#ifndef DOWNLOADDIALOG_H
+#define DOWNLOADDIALOG_H
 
-#ifndef _DOWNLOADDIALOG_H_
-#define _DOWNLOADDIALOG_H_
-
-#include <QtWidgets>
+#include <QDialog>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QFile>
 
+
 namespace Ui {
     class downloadDialog;
 }
@@ -39,9 +20,6 @@ public:
     explicit downloadDialog(QWidget *parent = 0, QString src = "", QString tgt = "");
     ~downloadDialog();
 
-  public slots:
-    virtual void reject() override;
-
 private slots:
     void fileError();
     void httpFinished();
@@ -57,7 +35,7 @@ private:
     QNetworkAccessManager qnam;
     QNetworkReply *reply;
     QFile *file;
-    bool aborted;
+
 };
 
-#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,53 +11,34 @@
  * 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 "stdio.h"
+#include "inttypes.h"
+#include "string.h"
+#include "file.h"
 #include <assert.h>
 #include <algorithm>
 #include "eeprominterface.h"
-#include "rlefile.h"
 
 RleFile::RleFile():
 eeprom(NULL),
 eeprom_size(0),
 eeFs(NULL),
-eeFsArm(NULL),
-eepromFatHeader(NULL)
+eeFsArm(NULL)
 {
 }
 
-#define EEPROM_SIZE           (4*1024*1024/8)
-#define EEPROM_BLOCK_SIZE     (4*1024)
-#define EEPROM_MARK           0x84697771 /* thanks ;) */
-#define EEPROM_ZONE_SIZE      (8*1024)
-#define EEPROM_FAT_SIZE       128
-#define EEPROM_MAX_ZONES      (EEPROM_SIZE / EEPROM_ZONE_SIZE)
-#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)
 {
   this->eeprom = eeprom;
   this->eeprom_size = size;
   this->board = board;
-  this->version = version;
 
   if (IS_SKY9X(board)) {
     memset(eeprom, 0xFF, size);
-    if (version >= 217) {
-      memset(eeprom, 0, EEPROM_FAT_SIZE);
-      eepromFatHeader = (EepromHeader *)(eeprom + EEPROM_FAT_SIZE);
-      eepromFatHeader->mark = EEPROM_MARK;
-      eepromFatHeader->index = 1;
-      for (int i=0; i<EEPROM_MAX_FILES; i++) {
-        eepromFatHeader->files[i].exists = 0;
-        eepromFatHeader->files[i].zoneIndex = i+1;
-      }
-    }
   }
   else if (IS_TARANIS(board)) {
     eeFsArm = (EeFsArm *)eeprom;
@@ -71,7 +47,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 +62,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 = (board==BOARD_GRUVIN9X || board==BOARD_M128) ? 5 : 4;
     eeFsBlockSize = 16;
     eeFsLinkSize = 1;
 
@@ -116,34 +92,13 @@ void RleFile::EeFsCreate(uint8_t *eeprom, int size, Board::Type board, unsigned
   }
 }
 
-PACK(struct EepromFileHeader
-{
-  uint16_t fileIndex;
-  uint16_t size;
-});
-
-bool RleFile::searchFat()
-{
-  eepromFatHeader = NULL;
-  uint32_t bestFatIndex = 0;
-  for (int i=0; i<EEPROM_ZONE_SIZE/EEPROM_FAT_SIZE; i++) {
-    EepromHeader * header = (EepromHeader *)(eeprom+i*EEPROM_FAT_SIZE);
-    if (header->mark == EEPROM_MARK && header->index >= bestFatIndex) {
-      eepromFatHeader = header;
-      bestFatIndex = header->index;
-    }
-  }
-  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;
   this->board = board;
 
   if (IS_SKY9X(board)) {
-    searchFat();
     return 1;
   }
   else if (IS_TARANIS(board)) {
@@ -154,7 +109,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 {
@@ -239,9 +194,6 @@ void RleFile::EeFsSetDat(unsigned int blk, unsigned int ofs, const uint8_t *buf,
 
 unsigned int RleFile::EeFsGetFree()
 {
-  if (IS_HORUS(board))
-    return 0;
-
   unsigned int ret = 0;
   unsigned int i;
   if (IS_ARM(board))
@@ -261,9 +213,6 @@ unsigned int RleFile::EeFsGetFree()
  */
 void RleFile::EeFsFree(unsigned int blk)
 {
-  if (IS_HORUS(board))
-    return;
-
   unsigned int i = blk;
   while (EeFsGetLink(i)) i = EeFsGetLink(i);
   if (IS_ARM(board)) {
@@ -281,8 +230,6 @@ void RleFile::EeFsFree(unsigned int blk)
  */
 unsigned int RleFile::EeFsAlloc()
 {
-  if (IS_HORUS(board))
-    return 0;
   unsigned int ret = (IS_ARM(board) ? eeFsArm->freeList : eeFs->freeList);
   if (ret) {
     if (IS_ARM(board))
@@ -296,32 +243,14 @@ unsigned int RleFile::EeFsAlloc()
 
 unsigned int RleFile::size(unsigned int id)
 {
-  if (IS_HORUS(board))
-    return 0;
-  else
-    return IS_ARM(board) ? eeFsArm->files[id].size : eeFs->files[id].size;
+  return IS_ARM(board) ? eeFsArm->files[id].size : eeFs->files[id].size;
 }
 
 unsigned int RleFile::openRd(unsigned int i_fileId)
 {
-  if (IS_HORUS(board)) {
-    return 1;
-  }
-  else if (IS_SKY9X(board)) {
-    if (eepromFatHeader) {
-      m_fileId = eepromFatHeader->files[i_fileId].zoneIndex;
-      if (eepromFatHeader->files[i_fileId].exists) {
-        eeprom_read_block(&m_size, m_fileId*(1<<13)+sizeof(uint16_t), sizeof(uint16_t));
-      }
-      else {
-        m_size = 0;
-      }
-      m_pos = sizeof(EepromFileHeader);
-    }
-    else {
-      m_fileId = get_current_block_number(i_fileId * 2, &m_size);
-      m_pos = sizeof(t_eeprom_header);
-    }
+  if (IS_SKY9X(board)) {
+    m_fileId = get_current_block_number(i_fileId * 2, &m_size);
+    m_pos = sizeof(t_eeprom_header);
     return 1;
   }
   else {
@@ -341,9 +270,6 @@ unsigned int RleFile::openRd(unsigned int i_fileId)
 
 unsigned int RleFile::read(uint8_t *buf, unsigned int i_len)
 {
-  if (IS_HORUS(board))
-    return 0;
-
   unsigned int len = IS_ARM(board) ? eeFsArm->files[m_fileId].size : eeFs->files[m_fileId].size;
   len -= m_pos;
   if (i_len > len) i_len = len;
@@ -364,25 +290,14 @@ unsigned int RleFile::read(uint8_t *buf, unsigned int i_len)
 // G: Read runlength (RLE) compressed bytes into buf.
 unsigned int RleFile::readRlc12(uint8_t *buf, unsigned int i_len, bool rlc2)
 {
-  if (IS_HORUS(board))
-    return 0;
-
   memset(buf, 0, i_len);
 
   if (IS_SKY9X(board)) {
-    int len;
-    if (eepromFatHeader) {
-      len = std::min((int)i_len, (int)m_size + (int)sizeof(EepromFileHeader) - (int)m_pos);
-      eeprom_read_block(buf, (m_fileId << 13) + m_pos, len);
+    int len = std::min((int)i_len, (int)m_size + (int)sizeof(t_eeprom_header) - (int)m_pos);
+    if (len > 0) {
+      eeprom_read_block(buf, (m_fileId << 12) + m_pos, len);
       m_pos += len;
     }
-    else {
-      len = std::min((int)i_len, (int)m_size + (int)sizeof(t_eeprom_header) - (int)m_pos);
-      if (len > 0) {
-        eeprom_read_block(buf, (m_fileId << 12) + m_pos, len);
-        m_pos += len;
-      }
-    }
     return len;
   }
   else {
@@ -406,7 +321,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;
@@ -439,11 +354,9 @@ unsigned int importRlc(QByteArray & dst, QByteArray & src, unsigned int rlcVersi
   dst.resize(0);
 
   for( ; 1; ) {
-    if (zeroes > 0) {
-      for (int i = 0; i < zeroes; i++)
-        dst.append((char) 0);
-      zeroes = 0;
-    }
+    for (int i=0; i<zeroes; i++)
+      dst.append((char)0);
+    zeroes = 0;
 
     if (len == 0)
       return dst.size();
@@ -550,9 +463,6 @@ void RleFile::closeTrunc()
 
 unsigned int RleFile::writeRlc1(unsigned int i_fileId, unsigned int typ, const uint8_t *buf, unsigned int i_len)
 {
-  if (IS_HORUS(board))
-    return 0;
-
   create(i_fileId, typ);
   bool state0 = true;
   uint8_t cnt = 0;
@@ -599,30 +509,15 @@ unsigned int RleFile::writeRlc1(unsigned int i_fileId, unsigned int typ, const u
  */
 unsigned int RleFile::writeRlc2(unsigned int i_fileId, unsigned int typ, const uint8_t *buf, unsigned int i_len)
 {
-  if (IS_HORUS(board))
-    return 0;
-
   if (IS_SKY9X(board)) {
     openRd(i_fileId);
-    if (eepromFatHeader) {
-      eepromFatHeader->files[i_fileId].exists = 1;
-      eeprom_write_block(buf, (m_fileId << 13) + m_pos, i_len);
-      {
-        EepromFileHeader header;
-        header.fileIndex = i_fileId;
-        header.size = i_len;
-        eeprom_write_block(&header, (m_fileId << 13), sizeof(header));
-      }
-    }
-    else {
-      eeprom_write_block(buf, (m_fileId << 12) + m_pos, i_len);
-      t_eeprom_header header;
-      header.sequence_no = 1;
-      header.data_size = i_len;
-      header.flags = 0;
-      header.hcsum = byte_checksum((uint8_t *) &header, 7);
-      eeprom_write_block(&header, (m_fileId << 12), sizeof(header));
-    }
+    eeprom_write_block(buf, (m_fileId << 12) + m_pos, i_len);
+    t_eeprom_header header;
+    header.sequence_no = 1;
+    header.data_size = i_len;
+    header.flags = 0;
+    header.hcsum = byte_checksum((uint8_t *) &header, 7);
+    eeprom_write_block(&header, (m_fileId << 12), sizeof(header));
     return i_len;
   }
   else {

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"
 
@@ -66,19 +61,6 @@ struct t_eeprom_header
   uint8_t hcsum ;
 };
 
-PACK(struct EepromHeaderFile
-{
-  uint8_t zoneIndex:7;
-  uint8_t exists:1;
-});
-
-PACK(struct EepromHeader
-{
-  uint32_t         mark;
-  uint32_t         index;
-  EepromHeaderFile files[63];
-});
-
 class RleFile
 {
   uint8_t       m_fileId;    //index of file in directory = filename
@@ -90,8 +72,7 @@ class RleFile
   unsigned int  m_err;       //error reasons
   uint16_t      m_size;
 
-  Board::Type board;
-  unsigned int version;
+  BoardEnum board;
   uint8_t *eeprom;
   unsigned int eeprom_size;
   EeFs         *eeFs;
@@ -104,8 +85,6 @@ class RleFile
   unsigned int eeFsBlocksMax;
   unsigned int eeFsLinkSize;
 
-  EepromHeader * eepromFatHeader;
-
   void eeprom_read_block (void *pointer_ram, unsigned int pointer_eeprom, size_t size);
   void eeprom_write_block(const void *pointer_ram, unsigned int pointer_eeprom, size_t size);
 
@@ -119,15 +98,14 @@ class RleFile
   unsigned int EeFsGetFree();
   void EeFsFree(unsigned int blk); // free one or more blocks
   unsigned int EeFsAlloc(); // alloc one block from freelist
-  bool searchFat();
 
 public:
 
   RleFile();
 
-  void EeFsCreate(uint8_t *eeprom, int size, Board::Type board, unsigned int version);
+  void EeFsCreate(uint8_t *eeprom, int size, BoardEnum board);
 
-  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 +148,4 @@ public:
 
 unsigned int importRlc(QByteArray & dst, QByteArray & src, unsigned int rlcVersion=2);
 
-#endif // _RLEFILE_H_
+#endif

companion/src/firmwares/CMakeLists.txt

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

companion/src/firmwares/boards.cpp

@@ -1,427 +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;
-}
-
-uint32_t Boards::getFourCC(Type board)
-{
-  switch (board) {
-    case BOARD_X12S:
-      return 0x3478746F;
-    case BOARD_X10:
-      return 0x3778746F;
-    case BOARD_TARANIS_XLITE:
-      return 0x3978746F;
-    case BOARD_TARANIS_X7:
-      return 0x3678746F;
-    case BOARD_TARANIS_X9E:
-      return 0x3578746F;
-    case BOARD_TARANIS_X9D:
-    case BOARD_TARANIS_X9DP:
-      return 0x3378746F;
-    case BOARD_SKY9X:
-    case BOARD_AR9X:
-    case BOARD_9XRPRO:
-      return 0x3278746F;
-    case BOARD_MEGA2560:
-    case BOARD_GRUVIN9X:
-      return 0x3178746F;
-    default:
-      return 0;
-  }
-}
-
-const int Boards::getEEpromSize(Board::Type board)
-{
-  switch (board) {
-    case BOARD_STOCK:
-      return EESIZE_STOCK;
-    case BOARD_M128:
-      return EESIZE_M128;
-    case BOARD_MEGA2560:
-    case BOARD_GRUVIN9X:
-      return EESIZE_GRUVIN9X;
-    case BOARD_SKY9X:
-      return EESIZE_SKY9X;
-    case BOARD_9XRPRO:
-    case BOARD_AR9X:
-      return EESIZE_9XRPRO;
-    case BOARD_TARANIS_XLITE:
-    case BOARD_TARANIS_X7:
-    case BOARD_TARANIS_X9D:
-    case BOARD_TARANIS_X9DP:
-    case BOARD_TARANIS_X9E:
-      return EESIZE_TARANIS;
-    case BOARD_UNKNOWN:
-      return EESIZE_MAX;
-    default:
-      return 0; // unlimited
-  }
-}
-
-const int Boards::getFlashSize(Type board)
-{
-  switch (board) {
-    case BOARD_STOCK:
-      return FSIZE_STOCK;
-    case BOARD_M128:
-      return FSIZE_M128;
-    case BOARD_MEGA2560:
-    case BOARD_GRUVIN9X:
-      return FSIZE_GRUVIN9X;
-    case BOARD_SKY9X:
-      return FSIZE_SKY9X;
-    case BOARD_9XRPRO:
-    case BOARD_AR9X:
-      return FSIZE_9XRPRO;
-    case BOARD_TARANIS_XLITE:
-    case BOARD_TARANIS_X7:
-    case BOARD_TARANIS_X9D:
-    case BOARD_TARANIS_X9DP:
-    case BOARD_TARANIS_X9E:
-      return FSIZE_TARANIS;
-    case BOARD_X12S:
-    case BOARD_X10:
-      return FSIZE_HORUS;
-    case BOARD_UNKNOWN:
-      return FSIZE_MAX;
-    default:
-      return 0;
-  }
-}
-
-const SwitchInfo Boards::getSwitchInfo(Board::Type board, int index)
-{
-  if (index < 0)
-    return {SWITCH_NOT_AVAILABLE, CPN_STR_UNKNOWN_ITEM};
-
-  if (IS_TARANIS_XLITE(board)) {
-    const Board::SwitchInfo switches[] = {
-      {SWITCH_3POS,   "SA"},
-      {SWITCH_3POS,   "SB"},
-      {SWITCH_2POS,   "SC"},
-      {SWITCH_2POS,   "SD"}
-    };
-    if (index < DIM(switches))
-      return switches[index];
-  }
-  if (IS_TARANIS_X7(board)) {
-    const Board::SwitchInfo switches[] = {
-      {SWITCH_3POS,   "SA"},
-      {SWITCH_3POS,   "SB"},
-      {SWITCH_3POS,   "SC"},
-      {SWITCH_3POS,   "SD"},
-      {SWITCH_2POS,   "SF"},
-      {SWITCH_TOGGLE, "SH"}
-    };
-    if (index < DIM(switches))
-      return switches[index];
-  }
-  else if (IS_HORUS_OR_TARANIS(board)) {
-    const Board::SwitchInfo switches[] = {
-      {SWITCH_3POS,   "SA"},
-      {SWITCH_3POS,   "SB"},
-      {SWITCH_3POS,   "SC"},
-      {SWITCH_3POS,   "SD"},
-      {SWITCH_3POS,   "SE"},
-      {SWITCH_2POS,   "SF"},
-      {SWITCH_3POS,   "SG"},
-      {SWITCH_TOGGLE, "SH"},
-      {SWITCH_3POS,   "SI"},
-      {SWITCH_3POS,   "SJ"},
-      {SWITCH_3POS,   "SK"},
-      {SWITCH_3POS,   "SL"},
-      {SWITCH_3POS,   "SM"},
-      {SWITCH_3POS,   "SN"},
-      {SWITCH_3POS,   "SO"},
-      {SWITCH_3POS,   "SP"},
-      {SWITCH_3POS,   "SQ"},
-      {SWITCH_3POS,   "SR"}
-    };
-    if (index < DIM(switches))
-      return switches[index];
-  }
-  else {
-    const Board::SwitchInfo switches[] = {
-      {SWITCH_3POS,   "3POS"},
-      {SWITCH_2POS,   "THR"},
-      {SWITCH_2POS,   "RUD"},
-      {SWITCH_2POS,   "ELE"},
-      {SWITCH_2POS,   "AIL"},
-      {SWITCH_2POS,   "GEA"},
-      {SWITCH_TOGGLE, "TRN"}
-    };
-    if (index < DIM(switches))
-      return switches[index];
-  }
-
-  return {SWITCH_NOT_AVAILABLE, CPN_STR_UNKNOWN_ITEM};
-}
-
-const int Boards::getCapability(Board::Type board, Board::Capability capability)
-{
-  switch (capability) {
-    case Sticks:
-      return 4;
-
-    case Pots:
-      if (IS_TARANIS_SMALL(board))
-        return 2;
-      else if (IS_TARANIS_X9E(board))
-        return 4;
-      else
-        return 3;
-
-    case FactoryInstalledPots:
-      if (IS_TARANIS_X9(board))
-        return 2;
-      else
-        return getCapability(board, Pots);
-
-    case Sliders:
-      if (IS_HORUS_X12S(board) || IS_TARANIS_X9E(board))
-        return 4;
-      else if (IS_TARANIS_X9D(board) || IS_HORUS_X10(board))
-        return 2;
-      else
-        return 0;
-
-    case MouseAnalogs:
-      if (IS_HORUS_X12S(board))
-        return 2;
-      else
-        return 0;
-
-    case MaxAnalogs:
-      return getCapability(board, Board::Sticks) + getCapability(board, Board::Pots) + getCapability(board, Board::Sliders) +  getCapability(board, Board::MouseAnalogs);
-
-    case MultiposPots:
-      return IS_HORUS_OR_TARANIS(board) ? 3 : 0;
-
-    case MultiposPotsPositions:
-      return IS_HORUS_OR_TARANIS(board) ? 6 : 0;
-
-    case Switches:
-      if (IS_TARANIS_X9E(board))
-        return 18;
-      else if (IS_TARANIS_X7(board))
-        return 6;
-      else if (IS_TARANIS_XLITE(board))
-        return 4;
-      else if (IS_HORUS_OR_TARANIS(board))
-        return 8;
-      else
-        return 7;
-
-    case FactoryInstalledSwitches:
-      if (IS_TARANIS_X9E(board))
-        return 8;
-      else
-        return getCapability(board, Switches);
-
-    case SwitchPositions:
-      if (IS_HORUS_OR_TARANIS(board))
-        return getCapability(board, Switches) * 3;
-      else
-        return 9;
-
-    case NumTrims:
-      if (IS_HORUS(board))
-        return 6;
-      else
-        return 4;
-
-    case NumTrimSwitches:
-      return getCapability(board, NumTrims) * 2;
-  }
-
-  return 0;
-}
-
-const QString Boards::getAxisName(int index)
-{
-  const QString axes[] = {
-    tr("Left Horizontal"),
-    tr("Left Vertical"),
-    tr("Right Vertical"),
-    tr("Right Horizontal"),
-    tr("Aux. 1"),
-    tr("Aux. 2"),
-  };
-  if (index < (int)DIM(axes))
-    return axes[index];
-  else
-    return tr("Unknown");
-}
-
-const QString Boards::getAnalogInputName(Board::Type board, int index)
-{
-  if (index < 0)
-    return CPN_STR_UNKNOWN_ITEM;
-
-  if (index < getBoardCapability(board, Board::Sticks)) {
-    const QString sticks[] = {
-      tr("Rud"),
-      tr("Ele"),
-      tr("Thr"),
-      tr("Ail")
-    };
-    return sticks[index];
-  }
-
-  index -= getCapability(board, Board::Sticks);
-
-  if (IS_9X(board) || IS_2560(board) || IS_SKY9X(board)) {
-    const QString pots[] = {
-      "P1",
-      "P2",
-      "P3"
-    };
-    if (index < DIM(pots))
-      return pots[index];
-  }
-  else if (IS_TARANIS_X9E(board)) {
-    const QString pots[] = {
-      "F1",
-      "F2",
-      "F3",
-      "F4",
-      "S1",
-      "S2",
-      "LS",
-      "RS"
-    };
-    if (index < DIM(pots))
-      return pots[index];
-  }
-  else if (IS_TARANIS(board)) {
-    const QString pots[] = {
-      "S1",
-      "S2",
-      "S3",
-      "LS",
-      "RS"
-    };
-    if (index < DIM(pots))
-      return pots[index];
-  }
-  else if (IS_HORUS_X12S(board)) {
-    const QString pots[] = {
-      "S1",
-      "6P",
-      "S2",
-      "L1",
-      "L2",
-      "LS",
-      "RS",
-      "JSx",
-      "JSy"
-    };
-    if (index < DIM(pots))
-      return pots[index];
-  }
-  else if (IS_HORUS_X10(board)) {
-    const QString pots[] = {
-      "S1",
-      "6P",
-      "S2",
-      "LS",
-      "RS"
-    };
-    if (index < DIM(pots))
-      return pots[index];
-  }
-
-  return CPN_STR_UNKNOWN_ITEM;
-}
-
-const bool Boards::isBoardCompatible(Type board1, Type board2)
-{
-  return (getFourCC(board1) == getFourCC(board2));
-}
-
-const QString Boards::getBoardName(Board::Type board)
-{
-  switch (board) {
-    case BOARD_STOCK:
-      return "9X";
-    case BOARD_M128:
-      return "9X128";
-    case BOARD_GRUVIN9X:
-      return "Gruvin9x";
-    case BOARD_MEGA2560:
-      return "MEGA2560";
-    case BOARD_TARANIS_X7:
-      return "Taranis X7/X7S";
-     case BOARD_TARANIS_XLITE:
-      return "Taranis X-Lite";
-    case BOARD_TARANIS_X9D:
-      return "Taranis X9D";
-    case BOARD_TARANIS_X9DP:
-      return "Taranis X9D+";
-    case BOARD_TARANIS_X9E:
-      return "Taranis X9E";
-    case BOARD_SKY9X:
-      return "Sky9x";
-    case BOARD_9XRPRO:
-      return "9XR-PRO";
-    case BOARD_AR9X:
-      return "AR9X";
-    case BOARD_X12S:
-      return "Horus X12S";
-    case BOARD_X10:
-      return "Horus X10/X10S";
-    default:
-      return tr("Unknown");
-  }
-}

companion/src/firmwares/boards.h

@@ -1,206 +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 <QtCore>
-#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_X12S,
-    BOARD_X10,
-    BOARD_TARANIS_XLITE,
-    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,
-    FactoryInstalledPots,
-    Sliders,
-    MouseAnalogs,
-    MaxAnalogs,
-    MultiposPots,
-    MultiposPotsPositions,
-    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
-{
-  Q_DECLARE_TR_FUNCTIONS(Boards)
-
-  public:
-
-    Boards(Board::Type board)
-    {
-      setBoardType(board);
-    }
-
-    void setBoardType(const Board::Type & board);
-    Board::Type getBoardType() const { return m_boardType; }
-
-    const uint32_t getFourCC() const { return getFourCC(m_boardType); }
-    const int getEEpromSize() const { return getEEpromSize(m_boardType); }
-    const int getFlashSize() const { return getFlashSize(m_boardType); }
-    const Board::SwitchInfo getSwitchInfo(int index) const { return getSwitchInfo(m_boardType, index); }
-    const int getCapability(Board::Capability capability) const { return getCapability(m_boardType, capability); }
-    const QString getAnalogInputName(int index) const { return getAnalogInputName(m_boardType, index); }
-    const bool isBoardCompatible(Board::Type board2) const { return isBoardCompatible(m_boardType, board2); }
-
-    static uint32_t getFourCC(Board::Type board);
-    static const int getEEpromSize(Board::Type board);
-    static const int getFlashSize(Board::Type board);
-    static const Board::SwitchInfo getSwitchInfo(Board::Type board, int index);
-    static const int getCapability(Board::Type board, Board::Capability capability);
-    static const QString getAxisName(int index);
-    static const QString getAnalogInputName(Board::Type board, int index);
-    static const bool isBoardCompatible(Board::Type board1, Board::Type board2);
-    static const QString getBoardName(Board::Type board);
-
-  protected:
-
-    Board::Type m_boardType;
-};
-
-// temporary aliases for transition period, use Boards class instead.
-#define getBoardCapability(b__, c__)   Boards::getCapability(b__, c__)
-
-#define IS_9X(board)                   (board==Board::BOARD_STOCK || board==Board::BOARD_M128)
-#define IS_STOCK(board)                (board==Board::BOARD_STOCK)
-#define IS_M128(board)                 (board==Board::BOARD_M128)
-#define IS_2560(board)                 (board==Board::BOARD_GRUVIN9X || board==Board::BOARD_MEGA2560)
-#define IS_SKY9X(board)                (board==Board::BOARD_SKY9X || board==Board::BOARD_9XRPRO || board==Board::BOARD_AR9X)
-#define IS_9XRPRO(board)               (board==Board::BOARD_9XRPRO)
-#define IS_TARANIS_XLITE(board)        (board==Board::BOARD_TARANIS_XLITE)
-#define IS_TARANIS_X7(board)           (board==Board::BOARD_TARANIS_X7)
-#define IS_TARANIS_X9(board)           (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E)
-#define IS_TARANIS_X9D(board)          (board==Board::BOARD_TARANIS_X9D || board==Board::BOARD_TARANIS_X9DP)
-#define IS_TARANIS_PLUS(board)         (board==Board::BOARD_TARANIS_X9DP || board==Board::BOARD_TARANIS_X9E)
-#define IS_TARANIS_X9E(board)          (board==Board::BOARD_TARANIS_X9E)
-#define IS_TARANIS(board)              (IS_TARANIS_X9(board) || IS_TARANIS_X7(board) || IS_TARANIS_XLITE(board))
-#define IS_TARANIS_SMALL(board)        (board==Board::BOARD_TARANIS_X7 || board==Board::BOARD_TARANIS_XLITE)
-#define IS_TARANIS_NOT_X9E(board)      (IS_TARANIS(board) && !IS_TARANIS_X9E(board))
-#define IS_HORUS_X12S(board)           (board==Board::BOARD_X12S)
-#define IS_HORUS_X10(board)            (board==Board::BOARD_X10)
-#define IS_HORUS(board)                (IS_HORUS_X12S(board) || IS_HORUS_X10(board))
-#define IS_HORUS_OR_TARANIS(board)     (IS_HORUS(board) || IS_TARANIS(board))
-#define IS_STM32(board)                (IS_TARANIS(board) || IS_HORUS(board))
-#define IS_ARM(board)                  (IS_STM32(board) || IS_SKY9X(board))
-#define HAS_LARGE_LCD(board)           (IS_HORUS(board) || IS_TARANIS_X9(board))
-
-#endif // _BOARDS_H_

companion/src/firmwares/curvereference.cpp

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

companion/src/firmwares/curvereference.h

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

companion/src/firmwares/customfunctiondata.cpp

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

companion/src/firmwares/customfunctiondata.h

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

companion/src/firmwares/eeprominterface.cpp

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

companion/src/firmwares/eeprominterface.h

@@ -1,424 +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 _EEPROMINTERFACE_H_
-#define _EEPROMINTERFACE_H_
-
-#include "boards.h"
-#include "macros.h"
-#include "radiodata.h"
-#include "../../radio/src/definitions.h"
-#include "simulatorinterface.h"
-
-#include <QtCore>
-#include <QStringList>
-#include <QList>
-#include <QDebug>
-
-#include <iostream>
-
-const uint8_t modn12x3[4][4]= {
-  {1, 2, 3, 4},
-  {1, 3, 2, 4},
-  {4, 2, 3, 1},
-  {4, 3, 2, 1} };
-
-enum Capability {
-  Models,
-  ModelName,
-  FlightModes,
-  FlightModesName,
-  FlightModesHaveFades,
-  Imperial,
-  Mixes,
-  Timers,
-  TimersName,
-  VoicesAsNumbers,
-  VoicesMaxLength,
-  MultiLangVoice,
-  ModelImage,
-  CustomFunctions,
-  SafetyChannelCustomFunction,
-  LogicalSwitches,
-  CustomAndSwitches,
-  HasNegAndSwitches,
-  LogicalSwitchesExt,
-  RotaryEncoders,
-  Outputs,
-  ChannelsName,
-  ExtraInputs,
-  TrimsRange,
-  ExtendedTrimsRange,
-  NumCurves,
-  NumCurvePoints,
-  OffsetWeight,
-  Simulation,
-  SoundMod,
-  SoundPitch,
-  MaxVolume,
-  MaxContrast,
-  MinContrast,
-  Haptic,
-  HasBeeper,
-  ModelTrainerEnable,
-  HasExpoNames,
-  HasNoExpo,
-  HasMixerNames,
-  HasCvNames,
-  HasPxxCountry,
-  HasPPMStart,
-  HasGeneralUnits,
-  HasFAIMode,
-  OptrexDisplay,
-  PPMExtCtrl,
-  PPMFrameLength,
-  Telemetry,
-  TelemetryUnits,
-  TelemetryBars,
-  Heli,
-  Gvars,
-  GvarsInCS,
-  GvarsAreNamed,
-  GvarsFlightModes,
-  GvarsName,
-  NoTelemetryProtocol,
-  TelemetryCustomScreens,
-  TelemetryCustomScreensFieldsPerLine,
-  TelemetryMaxMultiplier,
-  HasVario,
-  HasVarioSink,
-  HasFailsafe,
-  HasSoundMixer,
-  NumModules,
-  HasModuleR9MFlex,
-  HasModuleR9MMini,
-  PPMCenter,
-  PPMUnitMicroseconds,
-  SYMLimits,
-  HastxCurrentCalibration,
-  HasVolume,
-  HasBrightness,
-  PerModelTimers,
-  SlowScale,
-  SlowRange,
-  PermTimers,
-  HasSDLogs,
-  CSFunc,
-  LcdWidth,
-  LcdHeight,
-  LcdDepth,
-  GetThrSwitch,
-  HasDisplayText,
-  HasTopLcd,
-  GlobalFunctions,
-  VirtualInputs,
-  InputsLength,
-  TrainerInputs,
-  RtcTime,
-  SportTelemetry,
-  LuaScripts,
-  LuaInputsPerScript,
-  LuaOutputsPerScript,
-  LimitsPer1000,
-  EnhancedCurves,
-  HasFasOffset,
-  HasMahPersistent,
-  SimulatorVariant,
-  MavlinkTelemetry,
-  HasInputDiff,
-  HasMixerExpo,
-  HasBatMeterRange,
-  DangerousFunctions,
-  HasModelCategories
-};
-
-class EEPROMInterface
-{
-  Q_DECLARE_TR_FUNCTIONS(EEPROMInterface)
-
-  public:
-
-    EEPROMInterface(Board::Type board):
-      board(board)
-    {
-    }
-
-    virtual ~EEPROMInterface() {}
-
-    inline Board::Type getBoard() { return board; }
-
-    virtual unsigned long load(RadioData &radioData, const uint8_t * eeprom, int size) = 0;
-
-    virtual unsigned long loadBackup(RadioData & radioData, const uint8_t * eeprom, int esize, int index) = 0;
-
-    virtual int save(uint8_t * eeprom, const RadioData & radioData, uint8_t version=0, uint32_t variant=0) = 0;
-
-    virtual int getSize(const ModelData &) = 0;
-
-    virtual int getSize(const GeneralSettings &) = 0;
-
-    //static void showEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound);
-    static void showEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound);
-
-  protected:
-
-    Board::Type board;
-
-  private:
-
-    EEPROMInterface();
-
-};
-
-/* EEPROM string conversion function (used only by er9xeeprom and ersky9xeeprom) */
-inline void getEEPROMString(char *dst, const char *src, int size)
-{
-  memcpy(dst, src, size);
-  dst[size] = '\0';
-  for (int i=size-1; i>=0; i--) {
-    if (dst[i] == ' ')
-      dst[i] = '\0';
-    else
-      break;
-  }
-}
-
-// (used only by er9xeeprom and ersky9xeeprom)
-inline int applyStickMode(int stick, unsigned int mode)
-{
-  if (mode == 0 || mode > 4) {
-    std::cerr << "Incorrect stick mode" << mode;
-    return stick;
-  }
-
-  if (stick >= 1 && stick <= 4)
-    return modn12x3[mode-1][stick-1];
-  else
-    return stick;
-}
-
-float ValToTim(int value);
-int TimToVal(float value);
-
-void registerEEpromInterfaces();
-void unregisterEEpromInterfaces();
-void registerOpenTxFirmwares();
-void unregisterOpenTxFirmwares();
-
-enum EepromLoadErrors {
-  ALL_OK,
-  UNKNOWN_ERROR,
-  UNSUPPORTED_NEWER_VERSION,
-  WRONG_SIZE,
-  WRONG_FILE_SYSTEM,
-  NOT_OPENTX,
-  NOT_TH9X,
-  NOT_GRUVIN9X,
-  NOT_ERSKY9X,
-  NOT_ER9X,
-  UNKNOWN_BOARD,
-  WRONG_BOARD,
-  BACKUP_NOT_SUPPORTED,
-
-  HAS_WARNINGS,
-  OLD_VERSION,
-  WARNING_WRONG_FIRMWARE,
-
-  NUM_ERRORS
-};
-
-class Firmware
-{
-  Q_DECLARE_TR_FUNCTIONS(Firmware)
-
-  public:
-    struct Option {
-      const char * name = nullptr;
-      QString tooltip;
-      unsigned variant = 0;
-
-      explicit Option(const char * name, const QString & description, unsigned variant = 0) :
-        name(name), tooltip(description), variant(variant) { }
-    };
-    typedef QList<Option> OptionsGroup;
-    typedef QList<OptionsGroup> OptionsList;
-
-
-    explicit Firmware(const QString & id, const QString & name, Board::Type board) :
-      Firmware(nullptr, id, name, board)
-    { }
-
-    explicit Firmware(Firmware * base, const QString & id, const QString & name, Board::Type board) :
-      id(id),
-      name(name),
-      board(board),
-      variantBase(0),
-      base(base),
-      eepromInterface(nullptr)
-    { }
-
-    virtual ~Firmware() { }
-
-    inline const Firmware * getFirmwareBase() const
-    {
-      return base ? base : this;
-    }
-
-    virtual Firmware * getFirmwareVariant(const QString & id) { return NULL; }
-
-    unsigned int getVariantNumber();
-
-    virtual void addLanguage(const char * lang);
-
-    //virtual void addTTSLanguage(const char * lang);
-
-    virtual void addOption(const char * option, const QString & tooltip = QString(), unsigned variant = 0);
-
-    virtual void addOption(const Option & option);
-
-    virtual void addOptionsGroup(const OptionsGroup & options);
-
-    virtual QString getStampUrl() = 0;
-
-    virtual QString getReleaseNotesUrl() = 0;
-
-    virtual QString getFirmwareUrl() = 0;
-
-    Board::Type getBoard() const
-    {
-      return board;
-    }
-
-    void setEEpromInterface(EEPROMInterface * eeprom)
-    {
-      eepromInterface = eeprom;
-    }
-
-    EEPROMInterface * getEEpromInterface()
-    {
-      return eepromInterface;
-    }
-
-    QString getName() const
-    {
-      return name;
-    }
-
-    QString getId() const
-    {
-      return id;
-    }
-
-    QList<const char *> languageList() const
-    {
-      return languages;
-    }
-
-    OptionsList optionGroups() const
-    {
-      return opts;
-    }
-
-    virtual int getCapability(Capability) = 0;
-
-    virtual QString getAnalogInputName(unsigned int index) = 0;
-
-    virtual QTime getMaxTimerStart() = 0;
-
-    virtual int isAvailable(PulsesProtocol proto, int port=0) = 0;
-
-    const int getFlashSize();
-
-    static Firmware * getFirmwareForId(const QString & id);
-
-    static QVector<Firmware *> getRegisteredFirmwares()
-    {
-      return registeredFirmwares;
-    }
-
-    static void addRegisteredFirmware(Firmware * fw)
-    {
-      registeredFirmwares.append(fw);
-    }
-
-    static Firmware * getDefaultVariant()
-    {
-      return defaultVariant;
-    }
-    static void setDefaultVariant(Firmware * value)
-    {
-      defaultVariant = value;
-    }
-
-    static Firmware * getCurrentVariant()
-    {
-      return currentVariant;
-    }
-
-    static void setCurrentVariant(Firmware * value)
-    {
-      currentVariant = value;
-    }
-
-  protected:
-    QString id;
-    QString name;
-    Board::Type board;
-    unsigned int variantBase;
-    Firmware * base;
-    EEPROMInterface * eepromInterface;
-    QList<const char *> languages;
-    //QList<const char *> ttslanguages;
-    OptionsList opts;
-
-    static QVector<Firmware *> registeredFirmwares;
-    static Firmware * defaultVariant;
-    static Firmware * currentVariant;
-};
-
-inline Firmware * getCurrentFirmware()
-{
-  return Firmware::getCurrentVariant();
-}
-
-inline EEPROMInterface * getCurrentEEpromInterface()
-{
-  return Firmware::getCurrentVariant()->getEEpromInterface();
-}
-
-inline Board::Type getCurrentBoard()
-{
-  return Firmware::getCurrentVariant()->getBoard();
-}
-
-inline int divRoundClosest(const int n, const int d)
-{
-  return ((n < 0) ^ (d < 0)) ? ((n - d/2)/d) : ((n + d/2)/d);
-}
-
-inline int calcRESXto100(int x)
-{
-  return divRoundClosest(x*100, 1024);
-}
-
-extern QList<EEPROMInterface *> eepromInterfaces;
-
-
-#endif // _EEPROMINTERFACE_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,31 +61,37 @@ 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.vBatCalib = vBatCalib;
   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) {
     case 0:
-      result.beeperMode = GeneralSettings::BEEPER_QUIET;
+      result.beeperMode = e_quiet;
       break;
     case 1:
-      result.beeperMode = GeneralSettings::BEEPER_NOKEYS;
+      result.beeperMode = e_no_keys;
       break;
     default:
-      result.beeperMode = GeneralSettings::BEEPER_ALL;
+      result.beeperMode = e_all;
       result.beeperLength = beeperVal - 4;
       break;
   }
@@ -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;
 }
 
@@ -371,33 +361,33 @@ t_Er9xModelData::operator ModelData ()
   c9x.timers[0].val = tmrVal;
   switch(protocol) {
     case 1:
-      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      c9x.moduleData[0].protocol = PXX_DJT;
       break;
     case 2:
-      c9x.moduleData[0].protocol = PULSES_DSM2;
+      c9x.moduleData[0].protocol = DSM2;
       break;
     case 3:
-      c9x.moduleData[0].protocol = PULSES_PPM16;
+      c9x.moduleData[0].protocol = PPM16;
       break;
     default:
-      c9x.moduleData[0].protocol = PULSES_PPM;
+      c9x.moduleData[0].protocol = 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.customFn[0].func = FuncInstantTrim;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.funcSw[0].func = FuncInstantTrim;
   if (trimSw) {
-    c9x.customFn[0].swtch = er9xToSwitch(trimSw);
+    c9x.funcSw[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;
-  c9x.swashRingData.collectiveWeight = swashInvertCOL ? -100 : 100;
+  c9x.swashRingData.invertELE = swashInvertELE;
+  c9x.swashRingData.invertAIL = swashInvertAIL;
+  c9x.swashRingData.invertCOL = swashInvertCOL;
   c9x.swashRingData.type = swashType;
   c9x.swashRingData.collectiveSource = er9xToSource(swashCollectiveSource);
   c9x.swashRingData.value = swashRingValue;
@@ -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++) {
@@ -469,13 +459,14 @@ t_Er9xModelData::operator ModelData ()
   }
 
   for (int i=0; i<ER9X_NUM_CSW; i++)
-    c9x.logicalSw[i] = logicalSw[i];
+    c9x.customSw[i] = customSw[i];
 
   // for (int i=0; i<ER9X_NUM_CHNOUT; i++)
   //   c9x.safetySw[i] = safetySw[i];
 
   c9x.frsky = frsky;
   c9x.frsky.usrProto=FrSkyUsrProto;
+  c9x.frsky.FrSkyGpsAlt=FrSkyGpsAlt;
   return c9x;
 }
 

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,14 +54,14 @@ 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;
   uint8_t   vBatWarn;
-  int8_t    txVoltageCalibration;
+  int8_t    vBatCalib;
   int8_t    lightSw;
   Er9xTrainerData trainer;
   uint8_t   view;
@@ -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;
@@ -246,7 +241,7 @@ PACK(typedef struct t_Er9xModelData {
   int8_t    trim[4];
   int8_t    curves5[ER9X_MAX_CURVE5][5];
   int8_t    curves9[ER9X_MAX_CURVE9][9];
-  Er9xLogicalSwitchData   logicalSw[ER9X_NUM_CSW];
+  Er9xLogicalSwitchData   customSw[ER9X_NUM_CSW];
   uint8_t   frSkyVoltThreshold ;
   int8_t   tmrModeB;
   uint8_t   numVoice;
@@ -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 "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++) {
@@ -65,12 +75,12 @@ inline void applyStickModeToModel(Er9xModelData & model, unsigned int mode)
   for (int i=0; i<ER9X_MAX_MIXERS; i++)
     model.mixData[i].srcRaw = applyStickMode(model.mixData[i].srcRaw, mode);
   for (int i=0; i<ER9X_NUM_CSW; i++) {
-    switch (LogicalSwitchData(model.logicalSw[i].func).getFunctionFamily()) {
+    switch (LogicalSwitchData(model.customSw[i].func).getFunctionFamily()) {
       case LS_FAMILY_VCOMP:
-        model.logicalSw[i].v2 = applyStickMode(model.logicalSw[i].v2, mode);
+        model.customSw[i].v2 = applyStickMode(model.customSw[i].v2, mode);
         // no break
       case LS_FAMILY_VOFS:
-        model.logicalSw[i].v1 = applyStickMode(model.logicalSw[i].v1, mode);
+        model.customSw[i].v1 = applyStickMode(model.customSw[i].v1, mode);
         break;
       default:
         break;
@@ -79,26 +89,20 @@ inline void applyStickModeToModel(Er9xModelData & model, unsigned int mode)
   model.swashCollectiveSource = applyStickMode(model.swashCollectiveSource, mode);
 }
 
-#if 0
-unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+bool Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  QDebug dbg = qDebug();
-  dbg.setAutoInsertSpaces(false);
-  dbg << "trying er9x xml import... ";
-
-  std::bitset<NUM_ERRORS> errors;
+  std::cout << "trying er9x xml import... ";
 
   Er9xGeneral er9xGeneral;
   memset(&er9xGeneral,0,sizeof(er9xGeneral));
-  if (!loadRadioSettingsDataXML(&doc, &er9xGeneral)) {
-    errors.set(UNKNOWN_ERROR);
-    return errors.to_ulong();
-  }
-  else {
+  if(!loadGeneralDataXML(&doc, &er9xGeneral)) {
+    return false;
+  } 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 +110,37 @@ unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
       radioData.models[i] = er9xModel;
     }
   }
-  dbg << "ok";
-  errors.set(ALL_OK);
-  return errors.to_ulong();
+  std::cout << "ok\n";
+  return true;
 }
-#endif
 
-unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+bool 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";
-    errors.set(WRONG_SIZE);
-    return errors.to_ulong();
+  if (size != getEEpromSize()) {
+    std::cout << "wrong size\n";
+    return false;
   }
 
-  if (!efile->EeFsOpen((uint8_t *)eeprom, size, Board::BOARD_STOCK)) {
-    dbg << "wrong file system";
-    errors.set(WRONG_FILE_SYSTEM);
-    return errors.to_ulong();
+  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
+    std::cout << "wrong file system\n";
+    return false;
   }
-
+    
   efile->openRd(FILE_GENERAL);
   Er9xGeneral er9xGeneral;
 
   if (efile->readRlc1((uint8_t*)&er9xGeneral, 1) != 1) {
-    dbg << "no";
-    errors.set(UNKNOWN_ERROR);
-    return errors.to_ulong();
+    std::cout << "no\n";
+    return false;
   }
 
-  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 +150,18 @@ unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, i
     case 10:
       break;
     default:
-      dbg << "not er9x";
-      errors.set(NOT_ER9X);
-      return errors.to_ulong();
+      std::cout << "not er9x\n";
+      return false;
   }
 
   efile->openRd(FILE_GENERAL);
   if (!efile->readRlc1((uint8_t*)&er9xGeneral, sizeof(Er9xGeneral))) {
-    dbg << "ko";
-    errors.set(UNKNOWN_ERROR);
-    return errors.to_ulong();
-
+    std::cout << "ko\n";
+    return false;
   }
   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,38 +170,43 @@ unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, i
     else {
       applyStickModeToModel(er9xModel, radioData.generalSettings.stickMode+1);
       radioData.models[i] = er9xModel;
-    }
+    } 
   }
 
-  dbg << "ok";
-  errors.set(ALL_OK);
-  return errors.to_ulong();
+  std::cout << "ok\n";
+  return true;
 }
 
-unsigned long Er9xInterface::loadBackup(RadioData &radioData, const uint8_t *eeprom, int esize, int index)
+bool Er9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  std::bitset<NUM_ERRORS> errors;
-  errors.set(UNKNOWN_ERROR);
-  return errors.to_ulong();
+  return false;
 }
 
-int Er9xInterface::getSize(const ModelData &model)
+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(ModelData &model)
 {
   return 0;
 }
 
-int Er9xInterface::getSize(const GeneralSettings &settings)
+int Er9xInterface::getSize(GeneralSettings &settings)
 {
   return 0;
 }
 
-int Er9xInterface::isAvailable(PulsesProtocol prot, int port)
+int Er9xInterface::isAvailable(Protocol prot, int port)
 {
   switch (prot) {
-    case PULSES_PPM:
-    case PULSES_DSM2:
-    case PULSES_PXX_DJT:
-    case PULSES_PPM16:
+    case PPM:
+    case DSM2:
+    case PXX_DJT:
+    case PPM16:
       return 1;
     default:
       return 0;
@@ -218,11 +215,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)
@@ -249,7 +246,7 @@ QDomElement Er9xInterface::getGeneralDataXML(QDomDocument * qdoc, Er9xGeneral *
 {
   QDomElement gd = qdoc->createElement("GENERAL_DATA");
   appendNumberElement(qdoc, &gd, "Version", tgen->myVers, true); // have to write value here
-  appendTextElement(qdoc, &gd, "Owner", QString::fromLatin1(tgen->ownerName,sizeof(tgen->ownerName)).trimmed());
+  appendTextElement(qdoc, &gd, "Owner", QString::fromAscii(tgen->ownerName,sizeof(tgen->ownerName)).trimmed());
   appendCDATAElement(qdoc, &gd, "Data", (const char *)tgen,sizeof(Er9xGeneral));
   return gd;
 }
@@ -259,42 +256,42 @@ QDomElement Er9xInterface::getModelDataXML(QDomDocument * qdoc, Er9xModelData *
   QDomElement md = qdoc->createElement("MODEL_DATA");
   md.setAttribute("number", modelNum);
   appendNumberElement(qdoc, &md, "Version", mdver, true); // have to write value here
-  appendTextElement(qdoc, &md, "Name", QString::fromLatin1(tmod->name,sizeof(tmod->name)).trimmed());
+  appendTextElement(qdoc, &md, "Name", QString::fromAscii(tmod->name,sizeof(tmod->name)).trimmed());
   appendCDATAElement(qdoc, &md, "Data", (const char *)tmod,sizeof(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()) {
       QString ds = n.toCDATASection().data();
-      QByteArray ba = QByteArray::fromBase64(ds.toLatin1());
+      QByteArray ba = QByteArray::fromBase64(ds.toAscii());
       const char * data = ba.data();
       memcpy(tgen, data, sizeof(Er9xGeneral));
       break;
     }
     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,32 +302,22 @@ 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()) {
       QString ds = n.toCDATASection().data();
-      QByteArray ba = QByteArray::fromBase64(ds.toLatin1());
+      QByteArray ba = QByteArray::fromBase64(ds.toAscii());
       const char * data = ba.data();
       memcpy(tmod, data, sizeof(Er9xModelData));
       break;
     }
     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
- *
- * 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 _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
@@ -36,45 +29,44 @@ class Er9xInterface : public EEPROMInterface
     virtual ~Er9xInterface();
 
     virtual const char * getName();
-
-    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 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 getSize(const ModelData &);
-
-    virtual int getSize(const GeneralSettings &settings);
-
-    virtual int isAvailable(PulsesProtocol proto, int port=0);
     
-    virtual int getCapability(Capability capability);
+    virtual const int getEEpromSize();
+
+    virtual const int getMaxModels();
+
+    virtual bool load(RadioData &, const uint8_t * eeprom, int size);
+
+    virtual bool loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
+    
+    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
+
+    virtual int getSize(ModelData &);
+    
+    virtual int getSize(GeneralSettings &settings);
+
+    virtual int isAvailable(Protocol proto, int port=0);
 
   protected:
 
-    RleFile * efile;
+    RleFile *efile;
 
   private:
     void appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value);
-
+    
     void appendNumberElement(QDomDocument * qdoc, QDomElement * pe,QString name, int value, bool forceZeroWrite = false);
-
+    
     void appendCDATAElement(QDomDocument * qdoc, QDomElement * pe,QString name, const char * data, int size);
-
+    
     QDomElement getGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen);   //parse out data to XML format
-
+    
     QDomElement getModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum, int mdver); //parse out data to XML format
-
-    bool 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/er9xsimulator.cpp

@@ -0,0 +1,224 @@
+/*
+ * 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 IS_BACKLIGHT_ON() (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 GPIO_TRIM_LH_L         pind
+#define GPIO_TRIM_LV_DN        pind
+#define GPIO_TRIM_RV_UP        pind
+#define GPIO_TRIM_RH_L         pind
+#define GPIO_TRIM_LH_R         pind
+#define GPIO_TRIM_LV_UP        pind
+#define GPIO_TRIM_RV_DN        pind
+#define GPIO_TRIM_RH_R         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, GPIO_TRIM_LH_L, PIN_TRIM_LH_L)
+    TRIM_CASE(1, GPIO_TRIM_LH_R, PIN_TRIM_LH_R)
+    TRIM_CASE(2, GPIO_TRIM_LV_DN, PIN_TRIM_LV_DN)
+    TRIM_CASE(3, GPIO_TRIM_LV_UP, PIN_TRIM_LV_UP)
+    TRIM_CASE(4, GPIO_TRIM_RV_DN, PIN_TRIM_RV_DN)
+    TRIM_CASE(5, GPIO_TRIM_RV_UP, PIN_TRIM_RV_UP)
+    TRIM_CASE(6, GPIO_TRIM_RH_L, PIN_TRIM_RH_L)
+    TRIM_CASE(7, GPIO_TRIM_RH_R, 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 IS_BACKLIGHT_ON() (PORTB & (1<<OUT_B_LIGHT))
+
+}
+
+using namespace Er9x;
+
+Er9xSimulator::Er9xSimulator(Er9xInterface * er9xInterface):
+  er9xInterface(er9xInterface)
+{
+}
+
+bool Er9xSimulator::timer10ms()
+{
+  AUDIO_DRIVER();  // the tone generator
+  AUDIO_HEARTBEAT();  // the queue processing
+#define TIMER10MS_IMPORT
+#include "simulatorimport.h"
+}
+
+uint8_t * Er9xSimulator::getLcd()
+{
+#define GETLCD_IMPORT
+#include "simulatorimport.h"
+}
+
+bool Er9xSimulator::lcdChanged(bool & lightEnable)
+{
+#define LCDCHANGED_IMPORT
+#include "simulatorimport.h"
+}
+
+void Er9xSimulator::start(RadioData &radioData, bool tests)
+{
+  er9xInterface->save(&eeprom[0], radioData);
+  StartMainThread(tests);
+}
+
+void Er9xSimulator::stop()
+{
+  StopMainThread();
+}
+
+void Er9xSimulator::getValues(TxOutputs &outputs)
+{
+#define GETVALUES_IMPORT
+#include "simulatorimport.h"
+  outputs.beep = audio.busy();
+}
+
+void Er9xSimulator::setValues(TxInputs &inputs)
+{
+#define SETVALUES_IMPORT
+#include "simulatorimport.h"
+}
+
+void Er9xSimulator::setTrim(unsigned int idx, int value)
+{
+  Er9x::setTrim(idx, value);
+}
+
+void Er9xSimulator::getTrims(Trims & trims)
+{
+  trims.extended = false;
+  Er9x::getTrims(trims.values);
+}
+
+const char * Er9xSimulator::getError()
+{
+#define GETERROR_IMPORT
+#include "simulatorimport.h"
+}

companion/src/firmwares/er9x/er9xsimulator.h

@@ -0,0 +1,62 @@
+/*
+ * 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 void wheelEvent(uint8_t steps) { }
+
+    virtual const char * getError();
+
+  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,16 +73,16 @@ 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;
+  result.vBatCalib = vBatCalib;
 
   result.backlightMode = 0;
   if (lightSw == 22) {
@@ -120,17 +100,18 @@ 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) {
     case 0:
-      result.beeperMode = GeneralSettings::BEEPER_QUIET;
+      result.beeperMode = e_quiet;
       break;
     case 1:
-      result.beeperMode = GeneralSettings::BEEPER_NOKEYS;
+      result.beeperMode = e_no_keys;
       break;
     default:
-      result.beeperMode = GeneralSettings::BEEPER_ALL;
+      result.beeperMode = e_all;
       result.beeperLength = beeperVal - 4;
       break;
   }
@@ -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,9 +132,10 @@ 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;
+  result.currentCalib = current_calib;
   return result;
 }
 
@@ -509,33 +493,33 @@ t_Ersky9xModelData_v10::operator ModelData ()
   }
   switch(protocol) {
     case 1:
-      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      c9x.moduleData[0].protocol = PXX_DJT;
       break;
     case 2:
-      c9x.moduleData[0].protocol = PULSES_DSM2;
+      c9x.moduleData[0].protocol = DSM2;
       break;
     case 3:
-      c9x.moduleData[0].protocol = PULSES_PPM16;
+      c9x.moduleData[0].protocol = PPM16;
       break;
     default:
-      c9x.moduleData[0].protocol = PULSES_PPM;
+      c9x.moduleData[0].protocol = 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.customFn[0].func = FuncInstantTrim;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.funcSw[0].func = FuncInstantTrim;
   if (trimSw) {
-    c9x.customFn[0].swtch = er9xToSwitch(trimSw);
+    c9x.funcSw[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;
-  c9x.swashRingData.collectiveWeight = swashInvertCOL ? -100 : 100;
+  c9x.swashRingData.invertELE = swashInvertELE;
+  c9x.swashRingData.invertAIL = swashInvertAIL;
+  c9x.swashRingData.invertCOL = swashInvertCOL;
   c9x.swashRingData.type = swashType;
   c9x.swashRingData.collectiveSource = ersky9xToSource_v10(swashCollectiveSource);
   c9x.swashRingData.value = swashRingValue;
@@ -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++) {
@@ -603,13 +587,14 @@ t_Ersky9xModelData_v10::operator ModelData ()
   }
 
   for (int i=0; i<ERSKY9X_NUM_CSW_V10; i++)
-    c9x.logicalSw[i] = logicalSw[i];
+    c9x.customSw[i] = customSw[i];
 
   // for (int i=0; i<ERSKY9X_NUM_CHNOUT_V10; i++)
   //   c9x.safetySw[i] = safetySw[i];
 
   c9x.frsky = frsky;
   c9x.frsky.usrProto=FrSkyUsrProto;
+  c9x.frsky.FrSkyGpsAlt=FrSkyGpsAlt;
   return c9x;
 }
 
@@ -624,33 +609,33 @@ t_Ersky9xModelData_v11::operator ModelData ()
   }
   switch(protocol) {
     case 1:
-      c9x.moduleData[0].protocol = PULSES_PXX_DJT;
+      c9x.moduleData[0].protocol = PXX_DJT;
       break;
     case 2:
-      c9x.moduleData[0].protocol = PULSES_DSM2;
+      c9x.moduleData[0].protocol = DSM2;
       break;
     case 3:
-      c9x.moduleData[0].protocol = PULSES_PPM16;
+      c9x.moduleData[0].protocol = PPM16;
       break;
     default:
-      c9x.moduleData[0].protocol = PULSES_PPM;
+      c9x.moduleData[0].protocol = 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.customFn[0].func = FuncInstantTrim;
+  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.funcSw[0].func = FuncInstantTrim;
   if (trimSw) {
-    c9x.customFn[0].swtch = er9xToSwitch(trimSw);
+    c9x.funcSw[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;
-  c9x.swashRingData.collectiveWeight = swashInvertCOL ? -100 : 100;
+  c9x.swashRingData.invertELE = swashInvertELE;
+  c9x.swashRingData.invertAIL = swashInvertAIL;
+  c9x.swashRingData.invertCOL = swashInvertCOL;
   c9x.swashRingData.type = swashType;
   c9x.swashRingData.collectiveSource = ersky9xToSource_v11(swashCollectiveSource);
   c9x.swashRingData.value = swashRingValue;
@@ -661,8 +646,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 +670,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 +684,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++) {
@@ -718,12 +703,25 @@ t_Ersky9xModelData_v11::operator ModelData ()
   }
 
   for (int i=0; i<ERSKY9X_NUM_CSW_V11; i++)
-    c9x.logicalSw[i] = logicalSw[i];
+    c9x.customSw[i] = customSw[i];
+
+  // for (int i=0; i<ERSKY9X_NUM_CHNOUT_V11; i++)
+  //  c9x.safetySw[i] = safetySw[i];
 
   c9x.frsky = frsky;
   c9x.frsky.usrProto=FrSkyUsrProto;
+  c9x.frsky.FrSkyGpsAlt=FrSkyGpsAlt;
+  // for (int i=0; i<8; i++) {
+  //   c9x.frskyalarms[i].frskyAlarmLimit=frskyAlarms.alarmData[i].frskyAlarmLimit;
+  //   c9x.frskyalarms[i].frskyAlarmSound=frskyAlarms.alarmData[i].frskyAlarmSound;
+  //   c9x.frskyalarms[i].frskyAlarmType=frskyAlarms.alarmData[i].frskyAlarmType;
+  // }
+  // for (int i=0; i<8; i++) {
+  //   c9x.customdisplay[i]=customDisplayIndex[i];
+  // }
   for (int i=0; i<5;i++) {
     c9x.flightModeData[0].gvars[i]=gvars[i].gvar;
+    // c9x.gvsource[i]=gvars[i].gvsource;
   }
   return c9x;
 }

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,14 +62,14 @@ 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;
   uint8_t   vBatWarn;
-  int8_t    txVoltageCalibration;
+  int8_t    vBatCalib;
   int8_t    lightSw;
   Ersky9xTrainerData trainer;
   uint8_t   view;
@@ -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;
@@ -251,13 +246,13 @@ PACK(typedef struct t_Ersky9xFlightModeData {
   uint16_t spare ;		// Future expansion
 }) Ersky9xFlightModeData;
 
-PACK(typedef struct t_Ersky9xCustomFunctionData { // Function Switches data
+PACK(typedef struct t_Ersky9xFuncSwData { // Function Switches data
   int8_t  swtch; //input
   uint8_t func;
   char param[6];
   uint8_t delay;
   uint8_t spare;
-}) Ersky9xCustomFunctionData;
+}) Ersky9xFuncSwData;
 
 PACK(typedef struct t_Ersky9xFrSkyChannelData_v10 {
   uint8_t   ratio;                // 0.0 means not used, 0.1V steps EG. 6.6 Volts = 66. 25.1V = 251, etc.
@@ -365,7 +360,7 @@ PACK(typedef struct t_Ersky9xModelData_v10 {
   int8_t    trim[4];
   int8_t    curves5[ERSKY9X_MAX_CURVE5][5];
   int8_t    curves9[ERSKY9X_MAX_CURVE9][9];
-  Ersky9xLogicalSwitchData_v10   logicalSw[ERSKY9X_NUM_CSW_V10];
+  Ersky9xLogicalSwitchData_v10   customSw[ERSKY9X_NUM_CSW_V10];
   uint8_t   frSkyVoltThreshold ;
   uint8_t   res3[2];
   Ersky9xSafetySwData_v10  safetySw[ERSKY9X_NUM_CHNOUT_V10];
@@ -414,7 +409,7 @@ PACK(typedef struct t_Ersky9xModelData_v11 {
   int8_t    curves5[ERSKY9X_MAX_CURVE5][5];
   int8_t    curves9[ERSKY9X_MAX_CURVE9][9];
   int8_t    curvexy[18];
-  Ersky9xLogicalSwitchData_v11   logicalSw[ERSKY9X_NUM_CSW_V11];
+  Ersky9xLogicalSwitchData_v11   customSw[ERSKY9X_NUM_CSW_V11];
   uint8_t   frSkyVoltThreshold ;
   uint8_t   bt_telemetry;
   uint8_t   numVoice;		// 0-16, rest are Safety switches
@@ -425,7 +420,7 @@ PACK(typedef struct t_Ersky9xModelData_v11 {
   Ersky9xFrSkyAlarmData_v11 frskyAlarms ;
 // Add 6 bytes for custom telemetry screen
   uint8_t customDisplayIndex[6] ;
-  Ersky9xCustomFunctionData   customFn[ERSKY9X_NUM_FSW];
+  Ersky9xFuncSwData   funcSw[ERSKY9X_NUM_FSW];
   Ersky9xFlightModeData flightModeData[6] ;
   Ersky9xGvarData gvars[ERSKY9X_MAX_GVARS] ;
 
@@ -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,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 <QMessageBox>
 #include "ersky9xinterface.h"
 #include "ersky9xeeprom.h"
-#include "rlefile.h"
-#include <iostream>
-#include <bitset>
+#include "ersky9xsimulator.h"
+#include "file.h"
 
 #define FILE_TYP_GENERAL 1
 #define FILE_TYP_MODEL   2
@@ -34,7 +31,7 @@
 #define FILE_TMP      (1+16)
 
 Ersky9xInterface::Ersky9xInterface():
-EEPROMInterface(Board::BOARD_SKY9X),
+EEPROMInterface(BOARD_SKY9X),
 efile(new RleFile())
 {
 }
@@ -49,6 +46,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++) {
@@ -67,12 +74,12 @@ inline void applyStickModeToModel(Ersky9xModelData_v10 & model, unsigned int mod
   for (int i=0; i<ERSKY9X_MAX_MIXERS_V10; i++)
     model.mixData[i].srcRaw = applyStickMode(model.mixData[i].srcRaw, mode);
   for (int i=0; i<ERSKY9X_NUM_CSW_V10; i++) {
-    switch (LogicalSwitchData(model.logicalSw[i].func).getFunctionFamily()) {
+    switch (LogicalSwitchData(model.customSw[i].func).getFunctionFamily()) {
       case LS_FAMILY_VCOMP:
-        model.logicalSw[i].v2 = applyStickMode(model.logicalSw[i].v2, mode);
+        model.customSw[i].v2 = applyStickMode(model.customSw[i].v2, mode);
         // no break
       case LS_FAMILY_VOFS:
-        model.logicalSw[i].v1 = applyStickMode(model.logicalSw[i].v1, mode);
+        model.customSw[i].v1 = applyStickMode(model.customSw[i].v1, mode);
         break;
       default:
         break;
@@ -99,12 +106,12 @@ inline void applyStickModeToModel(Ersky9xModelData_v11 & model, unsigned int mod
   for (int i=0; i<ERSKY9X_MAX_MIXERS_V11; i++)
     model.mixData[i].srcRaw = applyStickMode(model.mixData[i].srcRaw, mode);
   for (int i=0; i<ERSKY9X_NUM_CSW_V11; i++) {
-    switch (LogicalSwitchData(model.logicalSw[i].func).getFunctionFamily()) {
+    switch (LogicalSwitchData(model.customSw[i].func).getFunctionFamily()) {
       case LS_FAMILY_VCOMP:
-        model.logicalSw[i].v2 = applyStickMode(model.logicalSw[i].v2, mode);
+        model.customSw[i].v2 = applyStickMode(model.customSw[i].v2, mode);
         // no break
       case LS_FAMILY_VOFS:
-        model.logicalSw[i].v1 = applyStickMode(model.logicalSw[i].v1, mode);
+        model.customSw[i].v1 = applyStickMode(model.customSw[i].v1, mode);
         break;
       default:
         break;
@@ -113,77 +120,60 @@ 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)
+bool Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  QDebug dbg = qDebug();
-  dbg.setAutoInsertSpaces(false);
-  dbg << "trying ersky9x xml import... ";
-
-  std::bitset<NUM_ERRORS> errors;
+  std::cout << "trying ersky9x xml import... ";
 
   Ersky9xGeneral ersky9xGeneral;
   memset(&ersky9xGeneral,0,sizeof(ersky9xGeneral));
-  if(!loadRadioSettingsDataXML(&doc, &ersky9xGeneral)) {
-    errors.set(UNKNOWN_ERROR);
-    return errors.to_ulong();
+  if(!loadGeneralDataXML(&doc, &ersky9xGeneral)) {
+    return false;
   }
   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";
-        errors.set(UNKNOWN_ERROR);
-        return errors.to_ulong();
+        std::cout << "ko\n";
+        return false;
       }
     }
     else {
       if (!loadModelDataXML<Ersky9xModelData_v11>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
-        dbg << "ko";
-        errors.set(UNKNOWN_ERROR);
-        return errors.to_ulong();
+        std::cout << "ko\n";
+        return false;
       }
     }
   }
-  dbg << "ok";
-  errors.set(ALL_OK);
-  return errors.to_ulong();
+  std::cout << "ok\n";
+  return true;
 }
-#endif
 
-unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+bool 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";
-    errors.set(WRONG_SIZE);
-    return errors.to_ulong();
+  if (size != EESIZE_SKY9X) {
+    std::cout << "wrong size\n";
+    return false;
   }
 
-  if (!efile->EeFsOpen((uint8_t *)eeprom, size, Board::BOARD_SKY9X)) {
-    dbg << "wrong file system";
-    errors.set(WRONG_FILE_SYSTEM);
-    return errors.to_ulong();
+  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_SKY9X)) {
+    std::cout << "wrong file system\n";
+    return false;
   }
-
+    
   efile->openRd(FILE_GENERAL);
   Ersky9xGeneral ersky9xGeneral;
 
   if (efile->readRlc2((uint8_t*)&ersky9xGeneral, 1) != 1) {
-    dbg << "no";
-    errors.set(UNKNOWN_ERROR);
-    return errors.to_ulong();
+    std::cout << "no\n";
+    return false;
   }
 
-  dbg << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
+  std::cout << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
 
   switch(ersky9xGeneral.myVers) {
     case 10:
@@ -191,26 +181,24 @@ unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom
     case 11:
       break;
     default:
-      dbg << "not ersky9x";
-      errors.set(NOT_ERSKY9X);
-      return errors.to_ulong();
+      std::cout << "not ersky9x\n";
+      return false;
   }
   efile->openRd(FILE_GENERAL);
   if (!efile->readRlc2((uint8_t*)&ersky9xGeneral, sizeof(Ersky9xGeneral))) {
-    dbg << "ko";
-    errors.set(UNKNOWN_ERROR);
-    return errors.to_ulong();
+    std::cout << "ko\n";
+    return false;
   }
   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,38 +214,43 @@ unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom
         applyStickModeToModel(ersky9xModel, radioData.generalSettings.stickMode+1);
         radioData.models[i] = ersky9xModel;
       }
-    }
+    } 
   }
 
-  dbg << "ok";
-  errors.set(ALL_OK);
-  return errors.to_ulong();
+  std::cout << "ok\n";
+  return true;
 }
 
-unsigned long Ersky9xInterface::loadBackup(RadioData &radioData, const uint8_t *eeprom, int esize, int index)
+bool Ersky9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  std::bitset<NUM_ERRORS> errors;
-  errors.set(UNKNOWN_ERROR);
-  return errors.to_ulong();
+  return false;
 }
 
-int Ersky9xInterface::getSize(const ModelData & model)
+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(ModelData &model)
 {
   return 0;
 }
 
-int Ersky9xInterface::getSize(const GeneralSettings & settings)
+int Ersky9xInterface::getSize(GeneralSettings &settings)
 {
   return 0;
 }
 
-int Ersky9xInterface::isAvailable(PulsesProtocol prot, int port)
+int Ersky9xInterface::isAvailable(Protocol prot, int port)
 {
   switch (prot) {
-    case PULSES_PPM:
-    case PULSES_DSM2:
-    case PULSES_PXX_DJT:
-    case PULSES_PPM16:
+    case PPM:
+    case DSM2:
+    case PXX_DJT:
+    case PPM16:
       return 1;
     default:
       return 0;
@@ -297,7 +290,7 @@ QDomElement Ersky9xInterface::getGeneralDataXML(QDomDocument * qdoc, Ersky9xGene
 {
   QDomElement gd = qdoc->createElement("GENERAL_DATA");
   appendNumberElement(qdoc, &gd, "Version", tgen->myVers, true); // have to write value here
-  appendTextElement(qdoc, &gd, "Owner", QString::fromLatin1(tgen->ownerName,sizeof(tgen->ownerName)).trimmed());
+  appendTextElement(qdoc, &gd, "Owner", QString::fromAscii(tgen->ownerName,sizeof(tgen->ownerName)).trimmed());
   appendCDATAElement(qdoc, &gd, "Data", (const char *)tgen,sizeof(Ersky9xGeneral));
   return gd;
 }
@@ -307,32 +300,32 @@ QDomElement Ersky9xInterface::getModelDataXML(QDomDocument * qdoc, Ersky9xModelD
   QDomElement md = qdoc->createElement("MODEL_DATA");
   md.setAttribute("number", modelNum);
   appendNumberElement(qdoc, &md, "Version", mdver, true); // have to write value here
-  appendTextElement(qdoc, &md, "Name", QString::fromLatin1(tmod->name,sizeof(tmod->name)).trimmed());
+  appendTextElement(qdoc, &md, "Name", QString::fromAscii(tmod->name,sizeof(tmod->name)).trimmed());
   appendCDATAElement(qdoc, &md, "Data", (const char *)tmod,sizeof(Ersky9xModelData_v11));
   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()) {
       QString ds = n.toCDATASection().data();
-      QByteArray ba = QByteArray::fromBase64(ds.toLatin1());
+      QByteArray ba = QByteArray::fromBase64(ds.toAscii());
       const char * data = ba.data();
       memcpy(tgen, data, std::min((unsigned int)ba.size(), (unsigned int)sizeof(Ersky9xGeneral)));
       break;
     }
     n = n.nextSibling();
   }
-  // check version?
+  //check version?
   return true;
 }
 
@@ -342,11 +335,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,12 +353,12 @@ 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()) {
       QString ds = n.toCDATASection().data();
-      QByteArray ba = QByteArray::fromBase64(ds.toLatin1());
+      QByteArray ba = QByteArray::fromBase64(ds.toAscii());
       const char * data = ba.data();
       memcpy(&ersky9xModel, data, std::min(ba.size(), (int)sizeof(ersky9xModel)));
       break;
@@ -377,13 +370,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 unsigned long load(RadioData &, const uint8_t * eeprom, int size);
+    virtual const int  getEEpromSize();
 
-    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 const int getMaxModels();
 
-    virtual int getSize(const ModelData &);
-    
-    virtual int getSize(const GeneralSettings & settings);
+    virtual bool load(RadioData &, const uint8_t * eeprom, int size);
 
-    virtual int isAvailable(PulsesProtocol proto, int port=0);
+    virtual bool loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
+
+    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
+
+    virtual int getSize(ModelData &);
     
-    virtual int getCapability(Capability capability);
+    virtual int getSize(GeneralSettings &settings);
+
+    virtual int isAvailable(Protocol proto, int port=0);
 
   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/ersky9xsimulator.cpp

@@ -0,0 +1,247 @@
+/*
+ * 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 IS_BACKLIGHT_ON() (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 GPIO_BUTTON_MENU                PIOB->PIO_PDSR
+#define GPIO_BUTTON_EXIT                PIOC->PIO_PDSR
+#define GPIO_BUTTON_UP                  PIOC->PIO_PDSR
+#define GPIO_BUTTON_DOWN                PIOC->PIO_PDSR
+#define GPIO_BUTTON_RIGHT               PIOC->PIO_PDSR
+#define GPIO_BUTTON_LEFT                PIOC->PIO_PDSR
+#define PIN_BUTTON_MENU                 0x00000020
+#define PIN_BUTTON_EXIT                 0x01000000
+#define PIN_BUTTON_UP                   0x00000002
+#define PIN_BUTTON_DOWN                 0x00000020
+#define PIN_BUTTON_RIGHT                0x00000010
+#define PIN_BUTTON_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, GPIO_BUTTON_MENU, PIN_BUTTON_MENU)
+    KEY_CASE(KEY_EXIT, GPIO_BUTTON_EXIT, PIN_BUTTON_EXIT)
+    KEY_CASE(KEY_RIGHT, GPIO_BUTTON_RIGHT, PIN_BUTTON_RIGHT)
+    KEY_CASE(KEY_LEFT, GPIO_BUTTON_LEFT, PIN_BUTTON_LEFT)
+    KEY_CASE(KEY_UP, GPIO_BUTTON_UP, PIN_BUTTON_UP)
+    KEY_CASE(KEY_DOWN, GPIO_BUTTON_DOWN, PIN_BUTTON_DOWN)
+  }
+}
+
+#define GPIO_TRIM_LH_L                  PIOA->PIO_PDSR
+#define GPIO_TRIM_LV_DN                 PIOA->PIO_PDSR
+#define GPIO_TRIM_RV_UP                 PIOA->PIO_PDSR
+#define GPIO_TRIM_RH_L                  PIOA->PIO_PDSR
+#define GPIO_TRIM_LH_R                  PIOB->PIO_PDSR
+#define GPIO_TRIM_LV_UP                 PIOC->PIO_PDSR
+#define GPIO_TRIM_RV_DN                 PIOC->PIO_PDSR
+#define GPIO_TRIM_RH_R                  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, GPIO_TRIM_LH_L, PIN_TRIM_LH_L)
+    TRIM_CASE(1, GPIO_TRIM_LH_R, PIN_TRIM_LH_R)
+    TRIM_CASE(2, GPIO_TRIM_LV_DN, PIN_TRIM_LV_DN)
+    TRIM_CASE(3, GPIO_TRIM_LV_UP, PIN_TRIM_LV_UP)
+    TRIM_CASE(4, GPIO_TRIM_RV_DN, PIN_TRIM_RV_DN)
+    TRIM_CASE(5, GPIO_TRIM_RV_UP, PIN_TRIM_RV_UP)
+    TRIM_CASE(6, GPIO_TRIM_RH_L, PIN_TRIM_RH_L)
+    TRIM_CASE(7, GPIO_TRIM_RH_R, PIN_TRIM_RH_R)
+  }
+}
+
+}
+
+using namespace Ersky9x;
+
+Ersky9xSimulator::Ersky9xSimulator(Ersky9xInterface * ersky9xInterface):
+  ersky9xInterface(ersky9xInterface)
+{
+}
+
+bool Ersky9xSimulator::timer10ms()
+{
+#define TIMER10MS_IMPORT
+#include "simulatorimport.h"
+}
+
+uint8_t * Ersky9xSimulator::getLcd()
+{
+#define GETLCD_IMPORT
+#include "simulatorimport.h"
+}
+
+bool Ersky9xSimulator::lcdChanged(bool & lightEnable)
+{
+#define LCDCHANGED_IMPORT
+#include "simulatorimport.h"
+}
+
+void Ersky9xSimulator::start(RadioData &radioData, bool tests)
+{
+  ersky9xInterface->save(Ersky9x::eeprom, radioData);
+  StartEepromThread(NULL);
+  StartMainThread(tests);
+}
+
+void Ersky9xSimulator::stop()
+{
+  StopMainThread();
+  StopEepromThread();
+}
+
+void Ersky9xSimulator::getValues(TxOutputs &outputs)
+{
+#define GETVALUES_IMPORT
+#include "simulatorimport.h"
+}
+
+void Ersky9xSimulator::setValues(TxInputs &inputs)
+{
+#define SETVALUES_IMPORT
+#include "simulatorimport.h"
+}
+
+void Ersky9xSimulator::setTrim(unsigned int idx, int value)
+{
+  Ersky9x::setTrim(idx, value);
+}
+
+void Ersky9xSimulator::getTrims(Trims & trims)
+{
+  trims.extended = false;
+  Ersky9x::getTrims(trims.values);
+}
+
+const char * Ersky9xSimulator::getError()
+{
+#define GETERROR_IMPORT
+#include "simulatorimport.h"
+}

companion/src/firmwares/ersky9x/ersky9xsimulator.h

@@ -0,0 +1,62 @@
+/*
+ * 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 void wheelEvent(uint8_t steps) { }
+
+    virtual const char * getError();
+
+  protected:
+
+    Ersky9xInterface * ersky9xInterface;
+};
+
+#endif

companion/src/firmwares/generalsettings.cpp

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

companion/src/firmwares/generalsettings.h

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

companion/src/firmwares/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.vBatCalib = vBatCalib;
+
+  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 = e_quiet;
+      break;
+    case 1:
+      result.beeperMode = e_no_keys;
+      break;
+    default:
+      result.beeperMode = e_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.vBatCalib = vBatCalib;
+
+  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 = (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.phases= 1 << (phase -1);
+  } else if (phase==0) {
+    c9x.phases=0;
+  } else {
+    c9x.phases=63;
+    c9x.phases &= ~(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;
+}
+
+Gruvin9xFuncSwData::operator FuncSwData ()
+{
+  FuncSwData 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.invertELE = invertELE;
+  c9x.invertAIL = invertAIL;
+  c9x.invertCOL = invertCOL;
+  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 = PXX_DJT;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = DSM2;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = SILV_A;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = SILV_B;
+      break;
+    case 5:
+      c9x.moduleData[0].protocol = SILV_C;
+      break;
+    case 6:
+      c9x.moduleData[0].protocol = CTP1009;
+      break;
+    default:
+      c9x.moduleData[0].protocol = 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.customSw[i] = customSw[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 = PXX_DJT;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = DSM2;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = SILV_A;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = SILV_B;
+      break;
+    case 5:
+      c9x.moduleData[0].protocol = SILV_C;
+      break;
+    case 6:
+      c9x.moduleData[0].protocol = CTP1009;
+      break;
+    default:
+      c9x.moduleData[0].protocol = 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.customSw[i] = customSw[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 = PXX_DJT;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = DSM2;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = SILV_A;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = SILV_B;
+      break;
+    case 5:
+      c9x.moduleData[0].protocol = SILV_C;
+      break;
+    case 6:
+      c9x.moduleData[0].protocol = CTP1009;
+      break;
+    default:
+      c9x.moduleData[0].protocol = 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.customSw[i] = customSw[i];
+  for (int i=0; i<G9X_NUM_FSW; i++)
+    c9x.funcSw[i] = funcSw[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 = PXX_DJT;
+      break;
+    case 2:
+      c9x.moduleData[0].protocol = DSM2;
+      break;
+    case 3:
+      c9x.moduleData[0].protocol = SILV_A;
+      break;
+    case 4:
+      c9x.moduleData[0].protocol = SILV_B;
+      break;
+    case 5:
+      c9x.moduleData[0].protocol = SILV_C;
+      break;
+    case 6:
+      c9x.moduleData[0].protocol = CTP1009;
+      break;
+    default:
+      c9x.moduleData[0].protocol = 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.customSw[i] = customSw[i];
+  for (int i=0; i<G9X_NUM_FSW; i++)
+    c9x.funcSw[i] = funcSw[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    vBatCalib;
+  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    vBatCalib;
+  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_Gruvin9xFuncSwData { // Function Switches data
+  int8_t  swtch; // input
+  uint8_t func;
+
+  operator FuncSwData();
+  t_Gruvin9xFuncSwData() { memset(this, 0, sizeof(t_Gruvin9xFuncSwData)); }
+}) Gruvin9xFuncSwData;
+
+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  customSw[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  customSw[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  customSw[G9X_NUM_CSW];
+  Gruvin9xSafetySwData  safetySw[G9X_NUM_CHNOUT];
+  Gruvin9xFuncSwData    funcSw[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  customSw[G9X_NUM_CSW];
+  Gruvin9xSafetySwData  safetySw[G9X_NUM_CHNOUT];
+  Gruvin9xFuncSwData    funcSw[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,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 <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;
+}
+
+bool Gruvin9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+{
+  return false;
+}
+
+
+bool Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+{
+  std::cout << "trying " << getName() << " import... ";
+
+  if (size != this->getEEpromSize()) {
+    std::cout << "wrong size\n";
+    return false;
+  }
+
+  if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
+    std::cout << "wrong file system\n";
+    return false;
+  }
+
+  efile->openRd(FILE_GENERAL);
+
+  uint8_t version;
+  if (efile->readRlc2(&version, 1) != 1) {
+    std::cout << "no\n";
+    return false;
+  }
+
+  if (version == 0) {
+    efile->openRd(FILE_GENERAL);
+    if (efile->readRlc1(&version, 1) != 1) {
+      std::cout << "no\n";
+      return false;
+    }
+  }
+
+  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";
+      return false;
+  }
+
+  efile->openRd(FILE_GENERAL);
+  if (version == 5) {
+    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings, 1))
+      return false;
+  }
+  else if (version < 104) {
+    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings))
+      return false;
+  }
+  else if (version <= 106) {
+    if (!loadGeneral<Gruvin9xGeneral_v104>(radioData.generalSettings))
+      return false;
+  }
+  else {
+    std::cout << "ko\n";
+    return false;
+  }
+  
+  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";
+      return false;
+    }
+  }
+
+  std::cout << "ok\n";
+  return true;
+}
+
+bool Gruvin9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+{
+  return false;
+}
+
+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(ModelData &model)
+{
+  return 0;
+}
+
+int Gruvin9xInterface::getSize(GeneralSettings &settings)
+{
+  return 0;
+}
+
+int Gruvin9xInterface::isAvailable(Protocol proto, int port)
+{
+  switch (proto) {
+    case PPM:
+    case SILV_A:
+    case SILV_B:
+    case SILV_C:
+    case CTP1009:
+    case DSM2:
+      return 1;
+    default:
+      return 0;
+  }
+}

companion/src/firmwares/gruvin9x/gruvin9xinterface.h

@@ -0,0 +1,64 @@
+/*
+ * 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 bool load(RadioData &, const uint8_t *eeprom, int size);
+
+    virtual bool loadBackup(RadioData &, uint8_t *eeprom,int esize, int index);
+    
+    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
+
+    virtual int getSize(ModelData &);
+    
+    virtual int getSize(GeneralSettings &settings);
+
+    virtual int isAvailable(Protocol 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/gvardata.cpp

@@ -1,92 +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 "gvardata.h"
-
-#include "radiodata.h"
-
-QString GVarData::unitToString() const
-{
-  switch (unit) {
-    case GVAR_UNIT_NUMBER:
-      return tr("");
-    case GVAR_UNIT_PERCENT:
-      return tr("%");
-    default:
-      return tr("?");  //  highlight unknown value
-  }
-}
-
-QString GVarData::precToString() const
-{
-  switch (prec) {
-    case GVAR_PREC_MUL10:
-      return tr("0._");
-    case GVAR_PREC_MUL1:
-      return tr("0.0");
-    default:
-      return tr("?.?");  //  highlight unknown value
-  }
-}
-
-QString GVarData::nameToString(int index) const
-{
-  return RadioData::getElementName(tr("GV"), index + 1, name);
-}
-
-int GVarData::multiplierSet()
-{
-  return (prec == 0 ? 1 : 10);
-}
-
-float GVarData::multiplierGet() const
-{
-  return (prec == 0 ? 1 : 0.1);
-}
-
-void GVarData::setMin(float val)
-{
-  min = (val * multiplierSet()) - GVAR_MIN_VALUE;
-}
-
-void GVarData::setMax(float val)
-{
-  max = GVAR_MAX_VALUE - (val * multiplierSet());
-}
-
-int GVarData::getMin() const
-{
-  return GVAR_MIN_VALUE + min;
-}
-
-int GVarData::getMax() const
-{
-  return GVAR_MAX_VALUE - max;
-}
-
-float GVarData::getMinPrec() const
-{
-  return getMin() * multiplierGet();
-}
-
-float GVarData::getMaxPrec() const
-{
-  return getMax() * multiplierGet();
-}

companion/src/firmwares/gvardata.h

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

companion/src/firmwares/io_data.cpp

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

companion/src/firmwares/io_data.h

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