Fix tricky access to Horus settings (#4094)

Keep version history for now

.gitignore

@@ -1,3 +1,4 @@
+/.idea/
 /.*project
 /.settings
 /.autotools
@@ -6,3 +7,7 @@ radio/src/bootloader/bootloader_ramBoot*
 *.lbm
 *.o
 /doc/
+*.stamp
+radio/src/lua/lua_fields_*.txt
+radio/src/lua/lua_exports_*.txt
+build*/

.travis.yml

@@ -0,0 +1,27 @@
+sudo: required
+dist: trusty
+language: python
+
+virtualenv:
+  system_site_packages: true
+
+python:
+  - 3.4
+
+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
+  - sudo apt-get update -qq
+
+install:
+  - sudo apt-get --yes --force-yes install qtbase5-dev qtmultimedia5-dev qttools5-dev qttools5-dev-tools python3-pyqt5 curl gcc-arm-none-eabi libfox-1.6-dev libgtest-dev
+  - wget --quiet http://firmware.ardupilot.org/Tools/Travis/gcc-avr_1%253a4.8-2.1_amd64.deb
+  - wget --quiet http://firmware.ardupilot.org/Tools/Travis/libmpfr4_3.1.2-1_amd64.deb
+  - wget --quiet http://firmware.ardupilot.org/Tools/Travis/avr-libc_1%253a1.8.0-4.1_all.deb
+  - wget --quiet http://firmware.ardupilot.org/Tools/Travis/binutils-avr_2.23.1-2.1_amd64.deb
+  - wget --quiet http://firmware.ardupilot.org/Tools/Travis/libmpc3_1.0.1-1ubuntu1_amd64.deb
+  - sudo dpkg --install gcc-avr_1%3a4.8-2.1_amd64.deb avr-libc_1%3a1.8.0-4.1_all.deb libmpfr4_3.1.2-1_amd64.deb binutils-avr_2.23.1-2.1_amd64.deb libmpc3_1.0.1-1ubuntu1_amd64.deb
+
+script:
+  - ./tools/commit-tests.sh

CMakeLists.txt

@@ -0,0 +1,70 @@
+project(OpenTX)
+
+set(VERSION_MAJOR "2")
+set(VERSION_MINOR "2")
+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})
+message(STATUS "OpenTX ${VERSION}")
+
+set(SDCARD_REVISION "0004")
+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()
+
+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(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
+
+find_package(Qt5Widgets)
+find_package(Qt5Xml)
+find_package(Qt5LinguistTools)
+find_package(Qt5PrintSupport)
+find_package(Qt5Multimedia)
+
+message(STATUS "Looking for SDL ")
+find_package(Sdl)
+if(SDL_FOUND)
+  message("SDL Include Path: " ${SDL_INCLUDE_DIR})
+else()
+  message("SDL not found! Joysticks support will be disabled. Simulator audio will not work.")
+endif()
+
+message(STATUS "Looking for FOX ")
+find_package(Fox)
+if ((NOT FOX_FOUND) AND (NOT WIN32))
+  message("Libfox not found, simu target will not be available")
+endif()
+
+# Check for a file that is typically left from a OpenTX 2.1 build and abort if found
+if (EXISTS ${RADIO_SRC_DIRECTORY}/stamp.h OR EXISTS ${RADIO_SRC_DIRECTORY}/translations/en.h)
+   message(FATAL_ERROR "Source directory contains files leftover from a OpenTX 2.1 build. Please run `git clean -f` in source directory (Careful: Will remove any extra files) or do a new clean git checkout")
+endif()
+
+include(Macros)
+today(DATE)
+now(TIME)
+git_id(GIT_STR)
+
+add_subdirectory(${RADIO_SRC_DIRECTORY})
+
+if(Qt5Widgets_FOUND)
+  add_subdirectory(${COMPANION_SRC_DIRECTORY})
+endif()

DONATIONS.txt

@@ -26,7 +26,6 @@ Chris Guy
 Adrien Gravouille
 Thomas Black
 Marc Lucht
-Michel Baily
 Zdenek Trojanek
 Martin Hotar
 Stefan Grundevik
@@ -113,7 +112,6 @@ Erhard Werner
 Stig Jøran Moen
 Keith Hertzog
 Christophe Dauvergne
-Michel Baily
 Tauno Rautakorpi
 Sven Assmus
 Paul Dittman
@@ -417,7 +415,6 @@ Andrea Montefusco
 Paul Luby
 Donald L Webster
 Kenneth Frehafer 
-Peter McHenry 
 Matthias Hase 
 Markus Wolf
 Andrew Fazio
@@ -588,7 +585,6 @@ Dietmar Drees
 Jürgen Monden
 David Morgan
 Andrew Fernie
-Michel Baily
 Donald Burke
 Ronald Donker
 Fredie Singh
@@ -813,3 +809,44 @@ Richard Duczmal
 Gregory Barron
 Marcel Fischer
 Klas Mälman
+Viljo Liukku
+Eric Smith
+Sven Assmus
+Luke Mole
+NorthSide
+Hannes Mössler 
+James Kaufman
+Ravi Gupta
+Lexington S Morley
+Ralph Segar 
+Frédéric Devillard
+Cory Theurer
+Valentinos Zachariou
+Garrett Paquette 
+Heung Jin Choi
+Kerry Cochrell
+Doug Miller
+Andrzej Weydmann
+Chair-man.nl
+Eric Beier	
+Jay Warren
+Marian Matej 
+Alastair Smith
+Timothy Senecal
+Dietmar Drees
+Bruce Jones
+Adil Busaidy
+Herman Hofman
+Jean Paul Michel
+Peter McHenry
+Julien lecoquierre
+Jean-Marie Clay
+Robert Nicoll
+Dan Nixon
+Ewald Moehring
+Giovanni Carnesecchi 
+Paul Dumsday
+Tadeusz Adamowski
+Andrew Newton
+Neil Horne
+Kerstin Appelqvist

README.md

@@ -1,5 +1,9 @@
-##OpenTX 2.1 Branch
+##OpenTX 2.2 Branch
 
-The ongoing development on 2.1.x is done in this branch.
+[![Build Status](https://travis-ci.org/opentx/opentx.svg?branch=next)](https://travis-ci.org/opentx/opentx)
+[![Join the chat at https://opentx.rocket.chat](https://camo.githubusercontent.com/3d659054abd6ce21c0e47cf3b83a51bda69ca282/68747470733a2f2f64656d6f2e726f636b65742e636861742f696d616765732f6a6f696e2d636861742e737667)](https://opentx.rocket.chat)
+[![Donate using Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DJ9MASSKVW8WN)
+
+The ongoing development on 2.2.x is done in this branch.
 
 Refer to the opentx.wiki for information about setting up the tool chains for building OpenTX and OpenTX Companion as well as other development related issues.

cmake/Bitmaps.cmake

@@ -0,0 +1,24 @@
+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 ${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 bold)
+  set(target ${RADIO_SRC_DIRECTORY}/fonts/${radio}/font_${name})
+  add_custom_target(ttf_${radio}_${name}
+    COMMAND ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${bold} ${target}
+    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

@@ -0,0 +1,63 @@
+# 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

@@ -4,25 +4,25 @@
 #  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 
+# 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 
+# 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). 
+# 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 
+# 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
@@ -46,14 +46,14 @@ FIND_PATH(SDL_INCLUDE_DIR SDL.h
   /opt/local/include/SDL # DarwinPorts
   /opt/local/include
   /opt/csw/include/SDL # Blastwave
-  /opt/csw/include 
+  /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 
+# 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?), 
+# 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.
@@ -83,7 +83,7 @@ IF(${SDL_INCLUDE_DIR} MATCHES ".framework")
 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 
+  FIND_LIBRARY(SDL_LIBRARY_TEMP
     NAMES SDL SDL-1.1
     PATHS
     $ENV{SDLDIR}/lib
@@ -93,13 +93,13 @@ ELSE(${SDL_INCLUDE_DIR} MATCHES ".framework")
     /opt/local/lib
     /opt/csw/lib
     /opt/lib
-    C:/Programs/SDL/lib
+    C:/Programs/SDL/lib/x86
     )
-  # Non-OS X framework versions expect you to also dynamically link to 
-  # SDLmain. This is mainly for Windows and OS X. Other platforms 
+  # 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 
+  FIND_LIBRARY(SDLMAIN_LIBRARY
     NAMES SDLmain SDLmain-1.1
     PATHS
     $ENV{SDLDIR}/lib
@@ -109,13 +109,12 @@ ELSE(${SDL_INCLUDE_DIR} MATCHES ".framework")
     /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. 
+# 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)
@@ -136,14 +135,14 @@ IF(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 
+  # 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.
@@ -151,15 +150,10 @@ IF(SDL_LIBRARY_TEMP)
     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)
+MARK_AS_ADVANCED(SDL_LIBRARY_TEMP)

cmake/Macros.cmake

@@ -0,0 +1,39 @@
+macro(today RESULT)
+  if(WIN32)
+    execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE ${RESULT})
+    string(REGEX REPLACE "(..)/(..)/(....).*" "\\1.\\2.\\3" ${RESULT} ${${RESULT}})
+    string(SUBSTRING ${${RESULT}} 0 10 ${RESULT})
+  elseif(UNIX)
+    execute_process(COMMAND "date" "+%Y-%m-%d" OUTPUT_VARIABLE ${RESULT})
+    string(REGEX REPLACE "(....)-(..)-(..).*" "\\1-\\2-\\3" ${RESULT} ${${RESULT}})
+  else(WIN32)
+    message(SEND_ERROR "date not implemented")
+    set(${RESULT} 00.00.0000)
+  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)
+
+macro(git_id RESULT)
+  if(WIN32)
+    execute_process(COMMAND "cmd" " /C git --git-dir=${PROJECT_SOURCE_DIR}/.git rev-parse --short=8 HEAD" OUTPUT_VARIABLE ${RESULT})
+    string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})
+  elseif(UNIX)
+    execute_process(COMMAND "git" "--git-dir=${PROJECT_SOURCE_DIR}/.git" "rev-parse" "--short=8" "HEAD" OUTPUT_VARIABLE ${RESULT})
+    string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})
+  else(WIN32)
+    message(SEND_ERROR "Git ID implemented")
+    set(${RESULT} 0)
+  endif(WIN32)
+endmacro(git_id)

companion/releasenotes.txt

@@ -1,3 +1,37 @@
+<h2>Version 2.1.6 / 2015-11-11</h2>
+[Taranis]
+<ul>
+<li>Telemetry custom screen changes didn't emit modified signal (<a href=https://github.com/opentx/opentx/issues/3029>#3029</a>)</li>
+<li>Hide D8/LR12 when eu firmware option is selected</li>
+</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>

companion/src/CMakeLists.txt

@@ -1,160 +1,114 @@
-PROJECT( companion )
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  set(C9X_NAME_SUFFIX ${VERSION_MAJOR}${VERSION_MINOR})
+  set(COMPANION_NAME "companion${C9X_NAME_SUFFIX}")
+  set(SIMULATOR_NAME "simulator${C9X_NAME_SUFFIX}")
+  set(SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX})
+else(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  set(COMPANION_NAME "companion")
+  set(SIMULATOR_NAME "simulator")
+endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 
-SET(C9X_VERSION_MAJOR "2")
-SET(C9X_VERSION_MINOR "1")
-SET(C9X_VERSION_REVISION "3")
-SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
+# 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}")
 
-SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})
-MESSAGE(STATUS "OpenTX Companion ${C9X_VERSION}")
+# 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")
 
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+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)
 
-SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+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()
 
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  SET(C9X_NAME_SUFFIX ${C9X_VERSION_MAJOR}${C9X_VERSION_MINOR})
-  SET(COMPANION_NAME "companion${C9X_NAME_SUFFIX}")
-  SET(SIMULATOR_NAME "simulator${C9X_NAME_SUFFIX}")
-  SET( SIMULATOR_LIB_PATH ${CMAKE_INSTALL_PREFIX}/lib/companion${C9X_NAME_SUFFIX} )
-ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  SET(COMPANION_NAME "companion")
-  SET(SIMULATOR_NAME "simulator")
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+option(TABLE_LAYOUT "Use QTableWidget for grid layouts") # Disabled by default
+if(TABLE_LAYOUT)
+  add_definitions(-DTABLE_LAYOUT)
+  message(STATUS "Using QTableWidget")
+endif()
 
-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)
+if(SDL_FOUND)
+  include_directories(${SDL_INCLUDE_DIR})
+  add_definitions(-DSIMU_AUDIO)
+  add_definitions(-DJOYSTICKS)
+endif()
 
-OPTION(DEBUG_IMPORT "Turn on debug output for EEPROM import") # Disabled by default
-IF(DEBUG_IMPORT)
-    ADD_DEFINITIONS( -DDEBUG_MODEL_IMPORT)
-    MESSAGE( STATUS "EEPROM import debugging enabled" )
-ENDIF(DEBUG_IMPORT)
+message(STATUS "Looking for QT lupdate ")
+find_package(Lupdate)
+if(LUPDATE_FOUND)
+  message("QT lupdate: " ${LUPDATE_EXECUTABLE})
+else()
+  message("QT lupdate not found!")
+endif()
 
-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()
+add_definitions(-DQXT_STATIC)
 
-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()
+if(MSVC)
+  set(CMAKE_CXX_FLAGS "/EHsc /LD")
+  SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,5.01")
+  include_directories(${PROJECT_SOURCE_DIR}/winbuild C:/Programs/pthreads/Pre-built.2/include C:/Programs/msinttypes C:/Programs/dirent/include)
+  link_directories(C:/Programs/pthreads/Pre-built.2/lib/)
+  set(PTHREAD_LIBRARY pthreadVC2.lib)
+else()
+  set(PTHREAD_LIBRARY pthread)
+  add_definitions(-Wall)
+  link_directories(/usr/local/lib)
+endif()
 
-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 )
-    ADD_DEFINITIONS( -DSIMU_AUDIO )
-ELSE()
-    MESSAGE( "SDL not found! Joysticks support will be disabled. Simulator audio will not work." )
-ENDIF()
-
-FIND_PACKAGE(Qt4 4.8.4 REQUIRED)
-SET( QT_USE_QTNETWORK True )
-SET( QT_USE_QTXML True )
-INCLUDE( ${QT_USE_FILE} )
-
-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()
-
-MESSAGE( STATUS "Looking for QT lupdate " )
-FIND_PACKAGE(Lupdate)
-if( LUPDATE_FOUND )
-  MESSAGE( "QT lupdate: " ${LUPDATE_EXECUTABLE} )
-ELSE()
-  MESSAGE( "QT lupdate not found!" )
-ENDIF()
-
-ADD_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
-)
-
-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( )
-
-set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src)
-set(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/simulation)
-set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR})
+set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/radio/src)
+set(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src/simulation)
+set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src)
 
 include_directories(
+  ${CMAKE_BINARY_DIR}
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${PROJECT_SOURCE_DIR}/../..
-  ${PROJECT_SOURCE_DIR}/shared
+  ${COMPANION_SRC_DIRECTORY}
+  ${COMPANION_SRC_DIRECTORY}/shared
   ${SIMU_SRC_DIRECTORY}
-  ${XSD_INCLUDE_DIR}
+  ${COMPANION_SRC_DIRECTORY}/thirdparty/qxtcommandoptions
+  ${COMPANION_SRC_DIRECTORY}/thirdparty/qcustomplot
+  ${COMPANION_SRC_DIRECTORY}/thirdparty/miniz
+  ${COMPANION_SRC_DIRECTORY}/storage
 )
 
 add_subdirectory(shared)
 add_subdirectory(modeledit)
 add_subdirectory(generaledit)
 add_subdirectory(simulation)
-add_subdirectory(firmwares/opentx/simulator)
-add_subdirectory(qcustomplot)
+add_subdirectory(storage)
+add_subdirectory(thirdparty/qcustomplot)
+add_subdirectory(thirdparty/qxtcommandoptions)
 
 set(common_SRCS
   eeprominterface.cpp
-  firmwares/th9x/th9xeeprom.cpp # TODO not needed
-  firmwares/th9x/th9xinterface.cpp
   firmwares/er9x/er9xeeprom.cpp
   firmwares/er9x/er9xinterface.cpp
-  firmwares/gruvin9x/gruvin9xeeprom.cpp
-  firmwares/gruvin9x/gruvin9xinterface.cpp
   firmwares/ersky9x/ersky9xeeprom.cpp
   firmwares/ersky9x/ersky9xinterface.cpp
   firmwares/opentx/opentxeeprom.cpp
-  firmwares/opentx/open9xStockeeprom.cpp
-  firmwares/opentx/open9xGruvin9xeeprom.cpp
-  firmwares/opentx/open9xSky9xeeprom.cpp
   firmwares/opentx/opentxinterface.cpp
-  file.cpp
-  appdata.cpp
-)
+  )
 
-qt4_wrap_cpp(common_SRCS)
+qt5_wrap_cpp(common_SRCS)
 
 add_library(common ${common_SRCS})
+qt5_use_modules(common Core Xml Widgets)
 
 set(companion_SRCS
-  hexinterface.cpp
-  firmwareinterface.cpp
-  converteeprom.cpp
-  # xmlinterface.cpp
-  # ${PROJECT_BINARY_DIR}/radio.cxx
   helpers.cpp
   helpers_html.cpp
   mdichild.cpp
   modelslist.cpp
-  mountlist.cpp
   apppreferencesdialog.cpp
   fwpreferencesdialog.cpp
   burnconfigdialog.cpp
@@ -183,7 +137,7 @@ set(companion_SRCS
   radionotfound.cpp
   wizarddata.cpp
   wizarddialog.cpp
-)
+  )
 
 set(companion_MOC_HDRS
   apppreferencesdialog.h
@@ -215,7 +169,7 @@ set(companion_MOC_HDRS
   wizarddialog.h
   modelprinter.h
   multimodelprinter.h
-)
+  )
 
 set(companion_UIS
   mdichild.ui
@@ -235,80 +189,46 @@ set(companion_UIS
   flashfirmwaredialog.ui
   flasheepromdialog.ui
   radionotfound.ui
-)
+  )
 
-set(companion_RCS
+set(companion_RESOURCES
   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)
+configure_file(${COMPANION_SRC_DIRECTORY}/version.h.in ${CMAKE_BINARY_DIR}/version.h @ONLY)
+configure_file(${COMPANION_SRC_DIRECTORY}/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc @ONLY)
+configure_file(${COMPANION_SRC_DIRECTORY}/companion.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop @ONLY)
+configure_file(${COMPANION_SRC_DIRECTORY}/simulator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop @ONLY)
 
-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)
+if(WIN32)
+  set(companion_SRCS ${companion_SRCS} icon.rc)
+  if(NOT MSVC)
+    set(CMAKE_EXE_LINKER_FLAGS -mwindows)
+  endif()
+endif()
 
-TODAY(DATE)
-NOW(TIME)
+include_directories(${CMAKE_BINARY_DIR})
+include_directories(${CMAKE_SOURCE_DIR})
 
-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)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/companion.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop @ONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/simulator.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop @ONLY)
+set(LANGUAGES he pl pt ru de fr es it sv cs fi nl)
+foreach(language ${LANGUAGES})
+  set(companion_TS ${companion_TS} translations/companion_${language}.ts)
+endforeach(language)
 
-IF( WIN32 )
-  SET( companion_SRCS ${companion_SRCS} icon.rc )
-  IF ( NOT MSVC )
-    SET(CMAKE_EXE_LINKER_FLAGS -mwindows)
-  ENDIF( )
-ENDIF( )
+qt5_wrap_ui(companion_SRCS ${companion_UIS})
+qt5_wrap_cpp(companion_SRCS ${companion_MOC_HDRS})
+qt5_add_translation(companion_QM ${companion_TS})
+qt5_add_resources(companion_RCC ${companion_RESOURCES})
+add_custom_target(gen_qrc DEPENDS ${companion_RCC})
 
-INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} )
-INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} )
+add_definitions(-DQT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}")
 
-SET( LANGUAGES he pl pt ru de fr es it sv cs fi nl)
-FOREACH( language ${LANGUAGES} )
-  SET( companion_TS ${companion_TS} translations/companion_${language}.ts )
-ENDFOREACH( language )
+add_executable(${COMPANION_NAME} MACOSX_BUNDLE WIN32 ${companion_SRCS} ${companion_RCC} ${companion_QM})
 
-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( ${COMPANION_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( ${COMPANION_NAME} WIN32 ${companion_SRCS} ${companion_QM} )
-ENDIF( )
-
-target_link_libraries(${COMPANION_NAME} generaledit modeledit simulation common qcustomplot shared ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${XERCESC_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS})
+add_dependencies(${COMPANION_NAME} gen_qrc)
+qt5_use_modules(${COMPANION_NAME} Core Widgets Network)
+target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit simulation common qcustomplot shared storage ${PTHREAD_LIBRARY} ${SDL_LIBRARY})
 
 ############# Standalone simu ###############
 
@@ -316,156 +236,235 @@ set(simu_SRCS
   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
+qt5_wrap_cpp(simu_SRCS ${simu_MOC_HDRS} )
 
 if(WIN32)
   set(simu_SRCS ${simu_SRCS} icon.rc)
 endif()
 
-if(APPLE)
-  add_executable(${SIMULATOR_NAME} MACOSX_BUNDLE ${simu_SRCS})
-else()
-  add_executable(${SIMULATOR_NAME} WIN32 ${simu_SRCS})
-endif()
 
-target_link_libraries(${SIMULATOR_NAME} simulation common ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} ${OPENTX_SIMULATOR_LIBS})
+add_executable(${SIMULATOR_NAME} MACOSX_BUNDLE WIN32 ${simu_SRCS} ${companion_RCC})
+
+add_dependencies(${SIMULATOR_NAME} gen_qrc)
+# TODO not the same link command than companion?
+target_link_libraries(${SIMULATOR_NAME} PRIVATE simulation common storage qxtcommandoptions ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${OPENTX_SIMULATOR_LIBS})
 
 ############# Packaging ####################
+message(STATUS ${CMAKE_BINARY_DIR} ${CMAKE_INSTALL_PREFIX}/bin)
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+  install(TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  install(TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+  install(DIRECTORY ${CMAKE_BINARY_DIR}/ DESTINATION ${SIMULATOR_LIB_PATH} USE_SOURCE_PERMISSIONS
+    FILES_MATCHING PATTERN "libopentx-*${CMAKE_SHARED_LIBRARY_SUFFIX}"
+    PATTERN "CMakeFiles" EXCLUDE
+    PATTERN "_CPack_Packages" EXCLUDE
+    PATTERN "companion" EXCLUDE
+    PATTERN "radio" EXCLUDE
+  )
+  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")
+    install(FILES images/linuxicons/16x16/companion.png DESTINATION /usr/share/icons/hicolor/16x16/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/22x22/companion.png DESTINATION /usr/share/icons/hicolor/22x22/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/24x24/companion.png DESTINATION /usr/share/icons/hicolor/24x24/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/32x32/companion.png DESTINATION /usr/share/icons/hicolor/32x32/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/48x48/companion.png DESTINATION /usr/share/icons/hicolor/48x48/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/128x128/companion.png DESTINATION /usr/share/icons/hicolor/128x128/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/256x256/companion.png DESTINATION /usr/share/icons/hicolor/256x256/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/512x512/companion.png DESTINATION /usr/share/icons/hicolor/512x512/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps RENAME companion${C9X_NAME_SUFFIX}.svg)
+    install(FILES ../targets/linux/45-companion-taranis.rules DESTINATION /lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-taranis.rules)
+  else()
+    install(FILES images/linuxicons/16x16/companion.png DESTINATION share/icons/hicolor/16x16/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/22x22/companion.png DESTINATION share/icons/hicolor/22x22/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/24x24/companion.png DESTINATION share/icons/hicolor/24x24/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/32x32/companion.png DESTINATION share/icons/hicolor/32x32/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/48x48/companion.png DESTINATION share/icons/hicolor/48x48/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/128x128/companion.png DESTINATION share/icons/hicolor/128x128/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/256x256/companion.png DESTINATION share/icons/hicolor/256x256/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/512x512/companion.png DESTINATION share/icons/hicolor/512x512/apps RENAME companion${C9X_NAME_SUFFIX}.png)
+    install(FILES images/linuxicons/scalable/companion.svg DESTINATION share/icons/hicolor/scalable/apps RENAME companion${C9X_NAME_SUFFIX}.svg)
+    install(FILES ../targets/linux/45-companion-taranis.rules DESTINATION lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-taranis.rules)
+  endif()
+  # Linux specific code
+  set(OperatingSystem "Linux")
+elseif(WIN32)
+  get_target_property(QtCore_LOCATION Qt5::Core LOCATION)
+  get_filename_component(QT_DLL_DIR ${QtCore_LOCATION} PATH)
+  get_filename_component(SDL_DIR ${SDL_LIBRARY} PATH)
+  install(FILES ${QT_DLL_DIR}/icudt54.dll ${QT_DLL_DIR}/icuin54.dll ${QT_DLL_DIR}/icuuc54.dll ${QT_DLL_DIR}/Qt5Core.dll ${QT_DLL_DIR}/Qt5Gui.dll ${QT_DLL_DIR}/Qt5Widgets.dll ${QT_DLL_DIR}/Qt5Xml.dll ${QT_DLL_DIR}/Qt5Network.dll ${QT_DLL_DIR}/Qt5PrintSupport.dll ${QT_DLL_DIR}/Qt5Multimedia.dll ${SDL_DIR}/SDL.dll DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>)
+  install(FILES ${QT_DLL_DIR}/icudt54.dll ${QT_DLL_DIR}/icuin54.dll ${QT_DLL_DIR}/icuuc54.dll ${QT_DLL_DIR}/Qt5Cored.dll ${QT_DLL_DIR}/Qt5Guid.dll ${QT_DLL_DIR}/Qt5Widgetsd.dll ${QT_DLL_DIR}/Qt5Xmld.dll ${QT_DLL_DIR}/Qt5Networkd.dll ${QT_DLL_DIR}/Qt5PrintSupportd.dll ${QT_DLL_DIR}/Qt5Multimediad.dll ${SDL_DIR}/SDL.dll DESTINATION ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>)
+endif()
 
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    INSTALL( TARGETS ${COMPANION_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
-    INSTALL( TARGETS ${SIMULATOR_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
-    INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/companion.desktop DESTINATION share/applications RENAME companion${C9X_NAME_SUFFIX}.desktop)
-    INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/simulator.desktop DESTINATION share/applications RENAME simulator${C9X_NAME_SUFFIX}.desktop)
-    INSTALL( FILES images/linuxicons/16x16/companion.png    DESTINATION /usr/share/icons/hicolor/16x16/apps    RENAME companion${C9X_NAME_SUFFIX}.png )
-    INSTALL( FILES images/linuxicons/22x22/companion.png    DESTINATION /usr/share/icons/hicolor/22x22/apps    RENAME companion${C9X_NAME_SUFFIX}.png )
-    INSTALL( FILES images/linuxicons/24x24/companion.png    DESTINATION /usr/share/icons/hicolor/24x24/apps    RENAME companion${C9X_NAME_SUFFIX}.png )
-    INSTALL( FILES images/linuxicons/32x32/companion.png    DESTINATION /usr/share/icons/hicolor/32x32/apps    RENAME companion${C9X_NAME_SUFFIX}.png )
-    INSTALL( FILES images/linuxicons/48x48/companion.png    DESTINATION /usr/share/icons/hicolor/48x48/apps    RENAME companion${C9X_NAME_SUFFIX}.png )
-    INSTALL( FILES images/linuxicons/128x128/companion.png  DESTINATION /usr/share/icons/hicolor/128x128/apps  RENAME companion${C9X_NAME_SUFFIX}.png )
-    INSTALL( FILES images/linuxicons/256x256/companion.png  DESTINATION /usr/share/icons/hicolor/256x256/apps  RENAME companion${C9X_NAME_SUFFIX}.png )
-    INSTALL( FILES images/linuxicons/512x512/companion.png  DESTINATION /usr/share/icons/hicolor/512x512/apps  RENAME companion${C9X_NAME_SUFFIX}.png )
-    INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps RENAME companion${C9X_NAME_SUFFIX}.svg )
-    INSTALL( FILES ../targets/linux/45-companion-taranis.rules DESTINATION /lib/udev/rules.d RENAME 45-companion${C9X_NAME_SUFFIX}-taranis.rules)
-    # Linux specific code
-    SET(OperatingSystem "Linux")
-ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-    INSTALL( TARGETS ${COMPANION_NAME} DESTINATION ${QT_BINARY_DIR} )
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+if(WIN32)
+  if(MSVC)
+    set(COMPANION_NSI_IN_FILE companion-vs.nsi.in)
+    set(SIMULATOR_NSI_IN_FILE simulator-vs.nsi.in)
+  else()
+    set(COMPANION_NSI_IN_FILE companion-msys.nsi.in)
+    set(SIMULATOR_NSI_IN_FILE simulator-msys.nsi.in)
+  endif()
 
-IF( WIN32 )
-  IF( MSVC )
-    SET(COMPANION_NSI_IN_FILE companion-vs.nsi.in)
-    SET(SIMULATOR_NSI_IN_FILE simulator-vs.nsi.in)
-  ELSE( )
-    SET(COMPANION_NSI_IN_FILE companion-msys.nsi.in)
-    SET(SIMULATOR_NSI_IN_FILE simulator-msys.nsi.in)
-  ENDIF( )
+  set(SYSDIR "$ENV{windir}/system32")
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${COMPANION_NSI_IN_FILE} ${PROJECT_BINARY_DIR}/companion/companion.nsi @ONLY)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${SIMULATOR_NSI_IN_FILE} ${PROJECT_BINARY_DIR}/companion/simulator.nsi @ONLY)
 
-  SET( SYSDIR "$ENV{windir}/system32" )
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${COMPANION_NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion.nsi @ONLY)
-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${SIMULATOR_NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/simulator.nsi @ONLY)
-
-  FIND_PROGRAM(NSIS_EXE makensis.exe PATHS
+  find_program(NSIS_EXE makensis.exe PATHS
     "C:/Program Files/NSIS"
     "C:/Program Files (x86)/NSIS"
     "C:/Programs/NSIS"
-  )
+    )
 
-  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companion-windows.exe
-                     COMMAND "${NSIS_EXE}" ARGS companion.nsi
-                     DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion.nsi
-                     COMMENT "Companion Windows NSIS Installer")
+  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/companion/companion-windows.exe
+    COMMAND "${NSIS_EXE}" ARGS ${PROJECT_BINARY_DIR}/companion/companion.nsi
+    DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion/companion.nsi
+    COMMENT "Companion Windows NSIS Installer")
 
-  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/simulator-install.exe
-                     COMMAND "${NSIS_EXE}" ARGS simulator.nsi
-                     DEPENDS simulator opentx-simulators ${PROJECT_BINARY_DIR}/simulator.nsi
-                     COMMENT "Simulator Windows NSIS Installer")
+  add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/companion/simulator-install.exe
+    COMMAND "${NSIS_EXE}" ARGS ${PROJECT_BINARY_DIR}/companion/simulator.nsi
+    DEPENDS simulator ${PROJECT_BINARY_DIR}/companion/simulator.nsi
+    COMMENT "Simulator Windows NSIS Installer")
 
-  ADD_CUSTOM_TARGET( installer
-    DEPENDS ${PROJECT_BINARY_DIR}/companion-windows.exe
-    DEPENDS ${PROJECT_BINARY_DIR}/simulator-windows.exe
-    SOURCES ${PROJECT_BINARY_DIR}/companion.nsi
-    SOURCES ${PROJECT_BINARY_DIR}/simulator.nsi
-  )
-ENDIF( )
+  add_custom_target(installer
+    DEPENDS ${PROJECT_BINARY_DIR}/companion/companion-windows.exe
+    DEPENDS ${PROJECT_BINARY_DIR}/companion/simulator-windows.exe
+    SOURCES ${PROJECT_BINARY_DIR}/companion/companion.nsi
+    SOURCES ${PROJECT_BINARY_DIR}/companion/simulator.nsi
+    )
+endif()
 
-IF( APPLE )
-  SET(MACOSX_BUNDLE_ICON_FILE iconmac.icns)
-  IF( CMAKE_GENERATOR STREQUAL Xcode )
-    SET( WORK_DIR ${CMAKE_BINARY_DIR}/Debug )
-  ELSE( )
-    SET( WORK_DIR ${PROJECT_BINARY_DIR} )
-  ENDIF()
-
-  ADD_CUSTOM_TARGET( addframeworks
-                     COMMAND mkdir -p companion.app/Contents/Frameworks
-                     COMMAND mkdir -p companion.app/Contents/Resources
-                     COMMAND mkdir -p companion.app/Contents/translations
-                     COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
-                     COMMAND rsync -r --exclude=.svn  ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/
-                     COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
-                     COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
-                     COMMAND rsync -r ${XSD_INCLUDE_DIR}/.. companion.app/Contents/Frameworks/
-                     COMMAND rsync -r /Library/Frameworks/SDL.framework companion.app/Contents/Frameworks/
-                     COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
-                     COMMAND install_name_tool -change @rpath/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL companion.app/Contents/MacOS/companion
-                     WORKING_DIRECTORY ${WORK_DIR}
-                     DEPENDS ${COMPANION_NAME} )
-
-  ADD_CUSTOM_TARGET( makedmg
-                     COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
-                     WORKING_DIRECTORY ${WORK_DIR}
-                     DEPENDS addframeworks opentx-simulators-bundle)
-ENDIF( )
-
-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( LUPDATE_FOUND )
-  ADD_CUSTOM_TARGET( translations
+if(LUPDATE_FOUND)
+  add_custom_target(translations
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -ts ${companion_TS}
-  )
-ELSE()
-  ADD_CUSTOM_TARGET( translations
+    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
+    )
+else()
+  add_custom_target(translations
     COMMAND echo "Sorry, QT lupdate was not found."
-  )
-ENDIF()
+    )
+endif()
 
-SET(CPACK_PACKAGE_NAME "companion${C9X_NAME_SUFFIX}")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
+set(CPACK_PACKAGE_NAME "companion${C9X_NAME_SUFFIX}")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTX open source firmware")
 string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
-SET( CPACK_STRIP_FILES TRUE )
+
+# 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)
+
+set(plugin_dest_dir bin)
+set(qtconf_dest_dir bin)
+set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/${COMPANION_NAME}")
+IF(APPLE)
+  set(plugin_dest_dir ${COMPANION_NAME}.app/Contents/Plugins)
+  set(qtconf_dest_dir ${COMPANION_NAME}.app/Contents/Resources)
+  set(translations_dest_dir ${COMPANION_NAME}.app/Contents/translations)
+  set(APPS "\${CMAKE_INSTALL_PREFIX}/${COMPANION_NAME}.app")
+  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}")
+ENDIF(APPLE)
+IF(WIN32)
+  set(APPS "\${CMAKE_INSTALL_PREFIX}/bin/QtTest.exe")
+ENDIF(WIN32)
+
+
+INSTALL(TARGETS ${COMPANION_NAME}
+    BUNDLE DESTINATION . COMPONENT Runtime
+    RUNTIME DESTINATION bin COMPONENT Runtime
+    )
+
+# 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(APPS "\${CMAKE_INSTALL_PREFIX}/${COMPANION_NAME}.app")
+
+  file(GLOB simulator_plugins "${CMAKE_BINARY_DIR}/libopentx-*${CMAKE_SHARED_LIBRARY_SUFFIX}")
+  set(companion_res_dir ${COMPANION_NAME}.app/Contents/Resources)
+  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)
+
+  # translations file
+  install(FILES ${companion_QM} DESTINATION "${translations_dest_dir}" COMPONENT Runtime)
+
+  # manually add the cocoa plugin
+  get_target_property(QPA_PLUGIN Qt5::QCocoaIntegrationPlugin LOCATION)
+  install(FILES ${QPA_PLUGIN} DESTINATION "${plugin_dest_dir}/platforms/" COMPONENT Runtime)
+  set(bundle_qt_libs "\${CMAKE_INSTALL_PREFIX}/${plugin_dest_dir}/platforms/libqcocoa.dylib")
+
+  # 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, resolve symlink first
+  get_filename_component(DFU_UTIL_ABSOLUTE_PATH ${DFU_UTIL_PATH} REALPATH)
+  install(FILES ${DFU_UTIL_ABSOLUTE_PATH} DESTINATION ${companion_res_dir} COMPONENT Runtime)
+  set(bundle_dfu_util_path "\${CMAKE_INSTALL_PREFIX}/${companion_res_dir}/dfu-util")
+
+  # These needs to be relative to CMAKE_INSTALL_PREFIX
+  get_target_property(QT_LIBRARY_DIR Qt5::Core LOCATION)
+  get_filename_component(QT_LIBRARY_DIR ${QT_LIBRARY_DIR} PATH)
+  get_filename_component(QT_LIBRARY_DIR "${QT_LIBRARY_DIR}/.." ABSOLUTE)
+
+  # Include depencies (adding frameworks, fixing the embbeded libraries)
+  # I get write errors without setting BU_CHMOD_BUNDLE_ITEMS even though it is
+  # 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_dfu_util_path}\"   \"${QT_LIBRARY_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}_${C9X_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-  SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Bertrand Songis <bsongis-nosp@m-gmail.com>")
-  SET(CPACK_DEBIAN_PACKAGE_VERSION ${C9X_VERSION})
-  SET(CPACK_DEBIAN_PACKAGE_VERSION_MAJOR ${C9X_VERSION_MAJOR})
-  SET(CPACK_DEBIAN_PACKAGE_VERSION_MINOR ${C9X_VERSION_MINOR})
-  SET(CPACK_DEBIAN_ARCHITECTURE $(CMAKE_SYSTEM_PROCESSOR))
-  SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+  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_SHLIBDEPS ON)
+elseif(APPLE)
+  set(CPACK_GENERATOR "DragNDrop")
+# set(CPACK_GENERATOR "TGZ")  # for quick testing
+  set(CPACK_BINARY_DRAGNDROP ON)
+  set(CPACK_DMG_BACKGROUND_IMAGE ${COMPANION_SRC_DIRECTORY}/images/splash22_3_dmg.png)
+  set(CPACK_DMG_VOLUME_NAME "OpenTX Companion")
+  set(CPACK_DMG_DS_STORE ${PROJECT_SOURCE_DIR}/companion/targets/mac/DS_Store)
+  set(CPACK_PACKAGE_FILE_NAME "opentx-${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}")
 else(DPKG_PROGRAM)
-  SET(CPACK_GENERATOR "RPM")
-  SET(CPACK_RPM_PACKAGE_VERSION ${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}")
+  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)
 
-INCLUDE(CPack)
+include(CPack)

companion/src/apppreferencesdialog.cpp

@@ -1,3 +1,23 @@
+/*
+ * 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"
@@ -11,7 +31,7 @@
 #include <QDesktopServices>
 #include <QtGui>
 
-AppPreferencesDialog::AppPreferencesDialog(QWidget *parent) :
+AppPreferencesDialog::AppPreferencesDialog(QWidget * parent) :
   QDialog(parent),
   ui(new Ui::AppPreferencesDialog)
 {
@@ -23,7 +43,7 @@ AppPreferencesDialog::AppPreferencesDialog(QWidget *parent) :
   connect(ui->downloadVerCB, SIGNAL(currentIndexChanged(int)), this, SLOT(baseFirmwareChanged()));
   connect(this, SIGNAL(accepted()), this, SLOT(writeValues()));
 
-#ifndef JOYSTICKS
+#if !defined(JOYSTICKS)
   ui->joystickCB->hide();
   ui->joystickCB->setDisabled(true);
   ui->joystickcalButton->hide();
@@ -91,7 +111,7 @@ void AppPreferencesDialog::writeValues()
 
 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);
@@ -137,15 +157,17 @@ void AppPreferencesDialog::initSettings()
       ui->backupPath->setText(g.backupDir());
       ui->backupEnable->setEnabled(true);
       ui->backupEnable->setChecked(g.enableBackup());
-    } else {
+    }
+    else {
       ui->backupEnable->setDisabled(true);
     }
-  } else {
+  }
+  else {
       ui->backupEnable->setDisabled(true);
   }
   ui->splashincludeCB->setCurrentIndex(g.embedSplashes());
 
-#ifdef JOYSTICKS
+#if defined(JOYSTICKS)
   ui->joystickChkB->setChecked(g.jsSupport());
   if (ui->joystickChkB->isChecked()) {
     QStringList joystickNames;
@@ -172,7 +194,7 @@ void AppPreferencesDialog::initSettings()
     ui->joystickcalButton->setDisabled(true);
   }
 #endif  
-//  Profile Tab Inits  
+  //  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());
@@ -185,7 +207,8 @@ void AppPreferencesDialog::initSettings()
     } else {
       ui->pbackupEnable->setDisabled(true);
     }
-  } else {
+  }
+  else {
       ui->pbackupEnable->setDisabled(true);
   }
 
@@ -270,7 +293,7 @@ void AppPreferencesDialog::on_ge_pathButton_clicked()
   }
 }
  
-#ifdef JOYSTICKS
+#if defined(JOYSTICKS)
 void AppPreferencesDialog::on_joystickChkB_clicked() {
   if (ui->joystickChkB->isChecked()) {
     QStringList joystickNames;
@@ -325,23 +348,17 @@ void AppPreferencesDialog::on_removeProfileButton_clicked()
   }
 }
 
-
-bool AppPreferencesDialog::displayImage( QString fileName )
+bool AppPreferencesDialog::displayImage(const QString & fileName)
 {
-  // Start by clearing the pixmap
-  ui->imageLabel->setPixmap(QPixmap());
+  // Start by clearing the label
+  ui->imageLabel->clear();
 
   QImage image(fileName);
   if (image.isNull()) 
     return false;
-
-  // 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);
+  ui->imageLabel->setPixmap(makePixMap(image));
+  ui->imageLabel->setFixedSize(GetCurrentFirmware()->getCapability(LcdWidth), GetCurrentFirmware()->getCapability(LcdHeight));
   return true;
 }
 
@@ -473,7 +490,7 @@ void AppPreferencesDialog::populateFirmwareOptions(const Firmware * firmware)
     foreach(Option opt, opts) {
       if (index >= optionsCheckBoxes.size()) {
         QCheckBox * checkbox = new QCheckBox(ui->profileTab);
-        ui->optionsLayout->addWidget(checkbox, optionsCheckBoxes.count()/5, optionsCheckBoxes.count()%5, 1, 1);
+        ui->optionsLayout->addWidget(checkbox, optionsCheckBoxes.count()/4, optionsCheckBoxes.count()%4, 1, 1);
         optionsCheckBoxes.push_back(checkbox);
         connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
         if (prevFocus) {

companion/src/apppreferencesdialog.h

@@ -1,5 +1,25 @@
-#ifndef APPPREFERENCESDIALOG_H
-#define APPPREFERENCESDIALOG_H
+/*
+ * 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_
 
 #include <QDialog>
 #include <QCheckBox>
@@ -16,9 +36,9 @@ 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;
@@ -33,9 +53,7 @@ class AppPreferencesDialog : public QDialog
 
     Ui::AppPreferencesDialog *ui;
     void initSettings();
-    bool displayImage( QString fileName );
-    void loadProfileString(QString profile, QString label);
-    void loadFromProfile();
+    bool displayImage(const QString & fileName);
 
   protected slots:
     void shrink();  
@@ -55,10 +73,10 @@ class AppPreferencesDialog : public QDialog
     void on_SplashSelect_clicked();
     void on_clearImageButton_clicked();
 
-#ifdef JOYSTICKS
+#if defined(JOYSTICKS)
     void on_joystickChkB_clicked();
     void on_joystickcalButton_clicked();
 #endif
 };
 
-#endif // APPPREFERENCESDIALOG_H
+#endif // _APPPREFERENCESDIALOG_H_

companion/src/apppreferencesdialog.ui

@@ -627,7 +627,7 @@ Mode 4:
        <item row="10" column="2" colspan="2">
         <widget class="QPushButton" name="sdPathButton">
          <property name="text">
-          <string>Open Folder</string>
+          <string>Select Folder</string>
          </property>
         </widget>
        </item>
@@ -637,7 +637,7 @@ Mode 4:
           <string>The profile specific folder,  if set, will override general Backup folder</string>
          </property>
          <property name="text">
-          <string>Open Folder</string>
+          <string>Select Folder</string>
          </property>
         </widget>
        </item>
@@ -854,7 +854,7 @@ Mode 4:
        <item row="12" column="2" colspan="2">
         <widget class="QPushButton" name="backupPathButton">
          <property name="text">
-          <string>Open Folder</string>
+          <string>Select Folder</string>
          </property>
         </widget>
        </item>
@@ -874,14 +874,14 @@ Mode 4:
        <item row="0" column="2" colspan="2">
         <widget class="QPushButton" name="ge_pathButton">
          <property name="text">
-          <string>Find Executable</string>
+          <string>Select Executable</string>
          </property>
         </widget>
        </item>
        <item row="16" column="2" colspan="2">
         <widget class="QPushButton" name="libraryPathButton">
          <property name="text">
-          <string>Open Folder</string>
+          <string>Select Folder</string>
          </property>
         </widget>
        </item>
@@ -1001,7 +1001,7 @@ Mode 4:
        <item row="0" column="3">
         <widget class="QPushButton" name="snapshotPathButton">
          <property name="text">
-          <string>Open Folder</string>
+          <string>Select Folder</string>
          </property>
          <property name="flat">
           <bool>false</bool>

companion/src/burnconfigdialog.cpp

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "burnconfigdialog.h"
 #include "ui_burnconfigdialog.h"
 #include "eeprominterface.h"
@@ -21,7 +41,7 @@ burnConfigDialog::burnConfigDialog(QWidget *parent) :
     getSettings();
     populateProgrammers();
     EEPROMInterface *eepromInterface = GetEepromInterface();
-    if (IS_TARANIS(eepromInterface->getBoard())) {
+    if (IS_STM32(eepromInterface->getBoard())) {
       setWindowTitle(tr("DFU-UTIL Configuration"));
       ui->avrArgs->hide();
       ui->avrdude_location->hide();
@@ -310,7 +330,7 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
 {
   EEPROMInterface *eepromInterface = GetEepromInterface();
   if (checked) {
-    if (IS_TARANIS(eepromInterface->getBoard())) {
+    if (IS_STM32(eepromInterface->getBoard())) {
       ui->label_dfu2->show();
       ui->dfuArgs->show();
     }
@@ -327,7 +347,7 @@ void burnConfigDialog::on_advCtrChkB_toggled(bool checked)
     }
   }
   else {
-    if (IS_TARANIS(eepromInterface->getBoard())) {
+    if (IS_STM32(eepromInterface->getBoard())) {
       ui->label_dfu2->hide();
       ui->dfuArgs->hide();
     }

companion/src/burnconfigdialog.h

@@ -1,8 +1,27 @@
-#ifndef BURNCONFIGDIALOG_H_
-#define BURNCONFIGDIALOG_H_
+/*
+ * 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 <QDialog>
-#include <QtGui>
+#ifndef _BURNCONFIGDIALOG_H_
+#define _BURNCONFIGDIALOG_H_
+
+#include <QtWidgets>
 
 #define MEM_TYPE_EEPROM 1
 #define MEM_TYPE_FLASH  2
@@ -71,4 +90,4 @@ private slots:
     void putSettings();
 };
 
-#endif // BURNCONFIGDIALOG_H_
+#endif // _BURNCONFIGDIALOG_H_

companion/src/companion.cpp

@@ -1,159 +1,147 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QTranslator>
-#include <QLocale>
-#include <QString>
-#include <QDir>
-#include <QFileInfo>
-#include <QSplashScreen>
-#include <QThread>
-#include <iostream>
-#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
-  #include <SDL.h>
-  #undef main
-#endif
-#include "mainwindow.h"
-#include "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"));
-
-#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
-  uint32_t sdlFlags = 0;
-  #ifdef JOYSTICKS
-    sdlFlags |= SDL_INIT_JOYSTICK;
-  #endif
-  #ifdef SIMU_AUDIO
-    sdlFlags |= SDL_INIT_AUDIO;
-  #endif
-  if (SDL_Init(sdlFlags) < 0) {
-    fprintf(stderr, "ERROR: couldn't initialize SDL: %s\n", SDL_GetError());
-  }
-#endif
-
-  registerEEpromInterfaces();
-  registerOpenTxFirmwares();
-  registerSimulators();
-
-  if (g.profile[g.id()].fwType().isEmpty()){
-    g.profile[g.id()].fwType(default_firmware_variant->getId());
-    g.profile[g.id()].fwName("");
-  }
-
-  QString splashScreen;
-  if ( g.profile[g.id()].fwType().contains("taranis"))     splashScreen = ":/images/splash-taranis.png";
-  else if ( g.profile[g.id()].fwType().contains("9xrpro")) splashScreen = ":/images/splash-9xrpro.png";
-  else if ( g.profile[g.id()].fwType().contains("9xr"))    splashScreen = ":/images/splash-9xr.png";
-  else  splashScreen = ":/images/splash-9x.png";
-
-  QPixmap pixmap = QPixmap(splashScreen);
-  QSplashScreen *splash = new QSplashScreen(pixmap);
-
-  current_firmware_variant = GetFirmware(g.profile[g.id()].fwType());
-
-  MainWindow *mainWin = new MainWindow();
-  if (g.showSplash()) {
-    splash->show();
-    QTimer::singleShot(1000*SPLASH_TIME, splash, SLOT(close()));
-    QTimer::singleShot(1000*SPLASH_TIME, mainWin, SLOT(show()));
-  }
-  else {
-    mainWin->show();
-  }
-
-  int result = app.exec();
-
-  delete splash;
-  delete mainWin;
-
-  unregisterFirmwares();
-  unregisterEEpromInterfaces();
-
-#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
-  SDL_Quit();
-#endif
-
-  return result;
-}
+/*
+ * 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 <QTranslator>
+#include <QLocale>
+#include <QString>
+#include <QDir>
+#include <QFileInfo>
+#include <QSplashScreen>
+#include <QThread>
+#include <iostream>
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  #include <SDL.h>
+  #undef main
+#endif
+#include "mainwindow.h"
+#include "version.h"
+#include "eeprominterface.h"
+#include "appdata.h"
+
+#if defined WIN32 || !defined __GNUC__
+#include <windows.h>
+#define sleep(x) Sleep(x*1000)
+#else
+#include <unistd.h>
+#endif
+
+#ifdef __APPLE__
+#include <QProxyStyle> 
+
+class MyProxyStyle : public QProxyStyle
+ {
+   public:
+    void polish ( QWidget * w ) {
+      QMenu* mn = dynamic_cast<QMenu*>(w);
+      QPushButton* pb = dynamic_cast<QPushButton*>(w);
+      if(!(mn || pb) && !w->testAttribute(Qt::WA_MacNormalSize))
+          w->setAttribute(Qt::WA_MacSmallSize);
+    }
+ };
+#endif
+
+int main(int argc, char *argv[])
+{
+  Q_INIT_RESOURCE(companion);
+
+  QApplication app(argc, argv);
+  app.setApplicationName("OpenTX Companion");
+  app.setOrganizationName("OpenTX");
+  app.setOrganizationDomain("open-tx.org");
+  app.setAttribute(Qt::AA_DontShowIconsInMenus, false);
+
+  g.init();
+
+  QStringList strl = QApplication::arguments();
+  if (strl.contains("--version")) {
+    printf("%s\n", VERSION);
+    fflush(stdout);
+    exit(0);
+  }
+
+#ifdef __APPLE__
+  app.setStyle(new MyProxyStyle);
+#endif
+
+  QTranslator companionTranslator;
+  companionTranslator.load(":/companion_" + g.locale());
+  QTranslator qtTranslator;
+  qtTranslator.load((QString)"qt_" + g.locale().left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+  app.installTranslator(&companionTranslator);
+  app.installTranslator(&qtTranslator);
+
+  // QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  uint32_t sdlFlags = 0;
+  #ifdef JOYSTICKS
+    sdlFlags |= SDL_INIT_JOYSTICK;
+  #endif
+  #ifdef SIMU_AUDIO
+    sdlFlags |= SDL_INIT_AUDIO;
+  #endif
+  if (SDL_Init(sdlFlags) < 0) {
+    fprintf(stderr, "ERROR: couldn't initialize SDL: %s\n", SDL_GetError());
+  }
+#endif
+
+  registerEEpromInterfaces();
+  registerOpenTxFirmwares();
+  registerSimulators();
+
+  if (g.profile[g.id()].fwType().isEmpty()){
+    g.profile[g.id()].fwType(default_firmware_variant->getId());
+    g.profile[g.id()].fwName("");
+  }
+
+  QString splashScreen;
+  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;
+
+  unregisterSimulators();
+  unregisterOpenTxFirmwares();
+  unregisterEEpromInterfaces();
+
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  SDL_Quit();
+#endif
+
+  return result;
+}

companion/src/companion.desktop.in

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Encoding=UTF-8
-Name=Companion @C9X_VERSION@
+Name=Companion @VERSION@
 GenericName=Transmitter Companion App
 Comment=The Ultimate Transmitter Companion
 Icon=@COMPANION_NAME@

companion/src/companion.qrc

@@ -1,64 +1,76 @@
-<RCC>
+<!DOCTYPE RCC><RCC version="1.0">
   <qresource prefix="/">
     <file>images/customize.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/simulator/Horus/middle.png</file>
+    <file>images/simulator/Horus/left.png</file>
+    <file>images/simulator/Horus/right.png</file>
+    <file>images/simulator/Horus/top.png</file>
+    <file>images/simulator/Horus/bottom.png</file>
+    <file>images/simulator/Horus/led.png</file>
+    <file>images/simulator/Horus/border-right.png</file>
+    <file>images/simulator/Horus/left_btn1.png</file>
+    <file>images/simulator/Horus/left_btn2.png</file>
+    <file>images/simulator/Horus/left_scrnsht.png</file>
+    <file>images/simulator/Horus/right_btnU.png</file>
+    <file>images/simulator/Horus/right_btnL.png</file>
+    <file>images/simulator/Horus/right_btnD.png</file>
+    <file>images/simulator/Horus/right_btnR.png</file>
+    <file>images/simulator/Horus/right_ent.png</file>    
+    <file>images/simulator/9X/9xdb.png</file>
+    <file>images/simulator/9X/9xdl.png</file>
+    <file>images/simulator/9X/9xdr.png</file>
+    <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/screenshot.png</file>
-    <file>images/splash-9x.png</file>
-    <file>images/splash-9xrpro.png</file>
-    <file>images/splash-9xr.png</file>
-    <file>images/splash-taranis.png</file>
+    <file>images/splash.png</file>
     <file>images/companion-title.png</file>
     <file>images/maps.png</file>
     <file>images/track.png</file>
     <file>images/track0.png</file>
-    <file>images/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/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/taranison.png</file>    
     <file>images/wizard/ailerons.png</file>
     <file>images/wizard/airbrakes.png</file>

companion/src/comparedialog.cpp

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "comparedialog.h"
 #include "ui_comparedialog.h"
 #include "helpers.h"
@@ -17,7 +37,7 @@ class DragDropHeader {
     }
     bool general_settings;
     uint8_t models_count;
-    uint8_t models[C9X_MAX_MODELS];
+    uint8_t models[CPN_MAX_MODELS];
 };
 
 CompareDialog::CompareDialog(QWidget * parent, Firmware * firmware):
@@ -101,7 +121,7 @@ void CompareDialog::dropEvent(QDropEvent *event)
   if (model1Valid && model2Valid) {
     multimodelprinter.setModel(0, model1);
     multimodelprinter.setModel(1, model2);
-    ui->textEdit->setHtml(multimodelprinter.print());
+    ui->textEdit->setHtml(multimodelprinter.print(ui->textEdit->document()));
   }
 }
 

companion/src/comparedialog.h

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

companion/src/constants.h

@@ -1,5 +1,25 @@
-#ifndef _constants_h_
-#define _constants_h_
+/*
+ * 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_
 
 enum BoardEnum {
   BOARD_STOCK,
@@ -9,31 +29,45 @@ enum BoardEnum {
   BOARD_SKY9X,
   BOARD_9XRPRO,
   BOARD_AR9X,
-  BOARD_TARANIS,
-  BOARD_TARANIS_PLUS,
-  BOARD_TARANIS_X9E
+  BOARD_X7D,
+  BOARD_TARANIS_X9D,
+  BOARD_TARANIS_X9DP,
+  BOARD_TARANIS_X9E,
+  BOARD_FLAMENCO,
+  BOARD_HORUS
 };
 
-#define C9X_MAX_MODELS            60
-#define C9X_MAX_TIMERS            3
-#define C9X_MAX_FLIGHT_MODES      9
-#define C9X_MAX_MIXERS            64
-#define C9X_MAX_INPUTS            32
-#define C9X_MAX_EXPOS             64
-#define C9X_MAX_CURVES            32
-#define C9X_MAX_POINTS            17
-#define C9X_MAX_GVARS             9
-#define C9X_MAX_ENCODERS          2
-#define C9X_NUM_CHNOUT            32 // number of real output channels
-#define C9X_NUM_CSW               32 // number of custom switches
-#define C9X_MAX_CUSTOM_FUNCTIONS  64 // number of functions assigned to switches
-#define C9X_NUM_MODULES           2
-#define NUM_STICKS                4
-#define BOARD_9X_NUM_POTS         3
-#define C9X_NUM_POTS              8
-#define NUM_CAL_PPM               4
-#define NUM_CYC                   3
-#define C9X_NUM_SWITCHES          32
-#define C9X_NUM_KEYS              32
+#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
+#define CPN_MAX_CHNOUT                 32 // number of real output channels
+#define CPN_MAX_CSW                    64 // number of custom switches
+#define CPN_MAX_CUSTOM_FUNCTIONS       64 // number of functions assigned to switches
+#define CPN_MAX_MODULES                2
+#define CPN_MAX_STICKS                 4
+#define CPN_MAX_AUX_TRIMS              2
+#define CPN_MAX_POTS                   8
+#define CPN_MAX_CYC                    3
+#define CPN_MAX_SWITCHES               32
+#define CPN_MAX_KEYS                   32
+#define CPN_MAX_MOUSE_ANALOGS          2
 
+const char * const ARROW_LEFT = "\xE2\x86\x90";
+const char * const ARROW_UP = "\xE2\x86\x91";
+const char * const ARROW_RIGHT = "\xE2\x86\x92";
+const char * const ARROW_DOWN = "\xE2\x86\x93";
+
+#if defined(DEBUG)
+#define HORUS_READY_FOR_RELEASE()     true
+#else
+#define HORUS_READY_FOR_RELEASE()     false
 #endif
+
+#endif // _CONSTANTS_H_

companion/src/contributorsdialog.cpp

@@ -1,9 +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 "contributorsdialog.h"
 #include "ui_htmldialog.h"
 #include "helpers.h"
 
 ContributorsDialog::ContributorsDialog(QWidget * parent):
-  QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint),
+  QDialog(parent),
   ui(new Ui::HtmlDialog)
 {
   ui->setupUi(this);

companion/src/contributorsdialog.h

@@ -1,5 +1,25 @@
-#ifndef CONTRIBUTORSDIALOG_H
-#define CONTRIBUTORSDIALOG_H
+/*
+ * 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 _CONTRIBUTORSDIALOG_H_
+#define _CONTRIBUTORSDIALOG_H_
 
 #include <QDialog>
 
@@ -20,4 +40,4 @@ class ContributorsDialog : public QDialog
     QString formatTable(const QString & title, const QStringList & names, int colums);
 };
 
-#endif // CONTRIBUTORSDIALOG_H
+#endif // _CONTRIBUTORSDIALOG_H_

companion/src/converteeprom.cpp

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

companion/src/converteeprom.h

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

companion/src/customdebug.h

@@ -1,11 +1,30 @@
-#ifndef customdebug_h
-#define customdebug_h
+/*
+ * 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 <QDebug>
 
-
 // Controls the generation of debug output for EEPROM import
-#if defined(DEBUG_MODEL_IMPORT)
+#if defined(DEBUG_STORAGE_IMPORT)
   inline QDebug eepromImportDebug() { return QDebug(QtDebugMsg); }
 #else
   #undef eepromImportDebug
@@ -13,4 +32,4 @@
 #endif
 
 
-#endif
+#endif // _CUSTOMDEBUG_H_

companion/src/customizesplashdialog.cpp

@@ -1,3 +1,23 @@
+/*
+ * 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"
@@ -29,11 +49,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;
 
@@ -41,7 +61,7 @@ bool Side::displayImage( QString fileName, Source pictSource )
     return false;
 
   // Determine which picture format to use
-  if (pictSource == FW ){
+  if (pictSource == FW) {
     FirmwareInterface firmware(fileName);
     if (!firmware.hasSplash())
       return false;
@@ -54,39 +74,36 @@ bool Side::displayImage( QString fileName, Source pictSource )
     if (pictSource== PICT)
       *format = image.width()>WIDTH_9X ? LCDTARANIS : LCD9X;
     else if (pictSource == PROFILE)
-      *format = (g.profile[g.id()].fwType().contains("taranis")) ? LCDTARANIS : LCD9X; 
+      *format = (g.profile[g.id()].fwType().contains("x9")) ? LCDTARANIS : LCD9X; 
   }
+
   if (image.isNull()) {
     return false;
   }
-  // Load image
-  if (*format==LCDTARANIS) {
-    imageLabel->setPixmap( makePixMap( image, "taranis" ));
-    imageLabel->setFixedSize(WIDTH_TARANIS*2, HEIGHT_TARANIS*2);
-  }
-  else {
-    imageLabel->setPixmap( makePixMap( image, "9x" )); 
-    imageLabel->setFixedSize(WIDTH_9X*2, HEIGHT_9X*2);
-  }
 
-  switch (pictSource){
-  case FW:
-    fileNameEdit->setText(QObject::tr("FW: %1").arg(fileName));
-    *saveToFileName = fileName;
-    *source=FW;
-    break;
-  case PICT:
-    fileNameEdit->setText(QObject::tr("Pict: %1").arg(fileName));
-    *saveToFileName = fileName;
-    *source=PICT;
-    break;
-  case PROFILE:
-    fileNameEdit->setText(QObject::tr("Profile image"));
-    *saveToFileName = fileName;
-    *source=PROFILE;
-    break;
-  default:
-    break;
+  // Load image
+  QPixmap pixmap = makePixMap(image);
+  imageLabel->setPixmap(pixmap);
+  imageLabel->setFixedSize(pixmap.width()*2, pixmap.height()*2);
+
+  switch (pictSource) {
+    case FW:
+      fileNameEdit->setText(QObject::tr("FW: %1").arg(fileName));
+      *saveToFileName = fileName;
+      *source = FW;
+      break;
+    case PICT:
+      fileNameEdit->setText(QObject::tr("Pict: %1").arg(fileName));
+      *saveToFileName = fileName;
+      *source = PICT;
+      break;
+    case PROFILE:
+      fileNameEdit->setText(QObject::tr("Profile image"));
+      *saveToFileName = fileName;
+      *source = PROFILE;
+      break;
+    default:
+      break;
   }
   saveButton->setEnabled(true);
   libraryButton->setEnabled(true);

companion/src/customizesplashdialog.h

@@ -1,8 +1,27 @@
-#ifndef CUSTOMIZESPLASHDIALOG_H
-#define CUSTOMIZESPLASHDIALOG_H
+/*
+ * 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 <QtGui>
-#include <QDialog>
+#ifndef _CUSTOMIZESPLASHDIALOG_H_
+#define _CUSTOMIZESPLASHDIALOG_H_
+
+#include <QtWidgets>
 #include "firmwareinterface.h"
 
 namespace Ui
@@ -84,4 +103,4 @@ private:
   enum sideEnum { LEFT, RIGHT };
 };
 
-#endif // CUSTOMIZESPLASHDIALOG_H
+#endif // _CUSTOMIZESPLASHDIALOG_H_

companion/src/downloaddialog.cpp

@@ -1,7 +1,25 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "downloaddialog.h"
 #include "ui_downloaddialog.h"
-#include <QMessageBox>
-#include <QtGui>
 #include <QTime>
 #include "helpers.h"
 

companion/src/downloaddialog.h

@@ -1,13 +1,32 @@
-#ifndef DOWNLOADDIALOG_H
-#define DOWNLOADDIALOG_H
+/*
+ * 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 <QDialog>
+#ifndef _DOWNLOADDIALOG_H_
+#define _DOWNLOADDIALOG_H_
+
+#include <QtWidgets>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
 #include <QNetworkRequest>
 #include <QFile>
 
-
 namespace Ui {
     class downloadDialog;
 }
@@ -38,4 +57,4 @@ private:
 
 };
 
-#endif // DOWNLOADDIALOG_H
+#endif // _DOWNLOADDIALOG_H_

companion/src/eeprominterface.cpp

@@ -1,13 +1,33 @@
+/*
+ * 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 <stdio.h>
 #include <list>
 #include <float.h>
+#include <QtWidgets>
+#include <stdlib.h>
 #include "eeprominterface.h"
 #include "firmwares/er9x/er9xinterface.h"
-#include "firmwares/th9x/th9xinterface.h"
-#include "firmwares/gruvin9x/gruvin9xinterface.h"
+#include "firmwares/ersky9x/ersky9xinterface.h"
 #include "firmwares/opentx/opentxinterface.h"
 #include "firmwares/opentx/opentxeeprom.h"
-#include "firmwares/ersky9x/ersky9xinterface.h"
 #include "appdata.h"
 #include "helpers.h"
 #include "wizarddata.h"
@@ -15,13 +35,6 @@
 
 std::list<QString> EEPROMWarnings;
 
-const char * switches9X[] = { "3POS", "THR", "RUD", "ELE", "AIL", "GEA", "TRN" };
-const char * switchesX9D[] = { "SA", "SB", "SC", "SD", "SE", "SF", "SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO", "SP", "SQ", "SR" };
-const char leftArrow[] = {(char)0xE2, (char)0x86, (char)0x90, 0};
-const char rightArrow[] = {(char)0xE2, (char)0x86, (char)0x92, 0};
-const char upArrow[] = {(char)0xE2, (char)0x86, (char)0x91, 0};
-const char downArrow[] = {(char)0xE2, (char)0x86, (char)0x93, 0};
-
 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,
@@ -29,6 +42,8 @@ const uint8_t chout_ar[] = { // First number is 0..23 -> template setup,  Second
   4,1,2,3 , 4,1,3,2 , 4,2,1,3 , 4,2,3,1 , 4,3,1,2 , 4,3,2,1
 };
 
+static const char specialCharsTab[] = "_-.,";
+
 void setEEPROMString(char *dst, const char *src, int size)
 {
   memcpy(dst, src, size);
@@ -52,6 +67,52 @@ void getEEPROMString(char *dst, const char *src, int size)
   }
 }
 
+int8_t char2idx(char c)
+{
+  if (c==' ') return 0;
+  if (c>='A' && c<='Z') return 1+c-'A';
+  if (c>='a' && c<='z') return -1-c+'a';
+  if (c>='0' && c<='9') return 27+c-'0';
+  for (int8_t i=0;;i++) {
+    char cc = specialCharsTab[i];
+    if (cc==0) return 0;
+    if (cc==c) return 37+i;
+  }
+}
+
+#define ZCHAR_MAX 40
+char idx2char(int8_t idx)
+{
+  if (idx == 0) return ' ';
+  if (idx < 0) {
+    if (idx > -27) return 'a' - idx - 1;
+    idx = -idx;
+  }
+  if (idx < 27) return 'A' + idx - 1;
+  if (idx < 37) return '0' + idx - 27;
+  if (idx <= ZCHAR_MAX) return specialCharsTab[idx-37];
+  return ' ';
+}
+
+void setEEPROMZString(char *dst, const char *src, int size)
+{
+  for (int i=size-1; i>=0; i--)
+    dst[i] = char2idx(src[i]);
+}
+
+void getEEPROMZString(char *dst, const char *src, int size)
+{
+  for (int i=size-1; i>=0; i--)
+    dst[i] = idx2char(src[i]);
+  dst[size] = '\0';
+  for (int i=size-1; i>=0; i--) {
+    if (dst[i] == ' ')
+      dst[i] = '\0';
+    else
+      break;
+  }
+}
+
 float ValToTim(int value)
 {
    return ((value < -109 ? 129+value : (value < 7 ? (113+value)*5 : (53+value)*10))/10.0);
@@ -428,22 +489,6 @@ RawSourceRange RawSource::getRange(const ModelData * model, const GeneralSetting
   return result;
 }
 
-QString AnalogString(int index)
-{
-  static const QString sticks[]  = { QObject::tr("Rud"), QObject::tr("Ele"), QObject::tr("Thr"), QObject::tr("Ail") };
-  static const QString pots9X[]  = { QObject::tr("P1"), QObject::tr("P2"), QObject::tr("P3") };
-  static const QString potsTaranisX9E[] = { QObject::tr("F1"), QObject::tr("F2"), QObject::tr("F3"), QObject::tr("F4"), QObject::tr("S1"), QObject::tr("S2"), QObject::tr("LS"), QObject::tr("RS") };
-  static const QString potsTaranis[] = { QObject::tr("S1"), QObject::tr("S2"), QObject::tr("S3"), QObject::tr("LS"), QObject::tr("RS") };
-  if (index < 4)
-    return CHECK_IN_ARRAY(sticks, index);
-  else if (IS_TARANIS_X9E(GetEepromInterface()->getBoard()))
-    return CHECK_IN_ARRAY(potsTaranisX9E, index-4);
-  else if (IS_TARANIS(GetEepromInterface()->getBoard()))
-    return CHECK_IN_ARRAY(potsTaranis, index-4);
-  else
-    return CHECK_IN_ARRAY(pots9X, index-4);
-}
-
 QString RotaryEncoderString(int index)
 {
   static const QString rotary[]  = { QObject::tr("REa"), QObject::tr("REb") };
@@ -475,13 +520,6 @@ QString RawSource::toString(const ModelData * model) const
     QObject::tr("ACC"), QObject::tr("GPS Time"),
   };
 
-  static const QString logicalSwitches[] = {
-    QObject::tr("L1"), QObject::tr("L2"), QObject::tr("L3"), QObject::tr("L4"), QObject::tr("L5"), QObject::tr("L6"), QObject::tr("L7"), QObject::tr("L8"), QObject::tr("L9"), QObject::tr("L10"),
-    QObject::tr("L11"), QObject::tr("L12"), QObject::tr("L13"), QObject::tr("L14"), QObject::tr("L15"), QObject::tr("L16"), QObject::tr("L17"), QObject::tr("L18"), QObject::tr("L19"), QObject::tr("L20"),
-    QObject::tr("L21"), QObject::tr("L22"), QObject::tr("L23"), QObject::tr("L24"), QObject::tr("L25"), QObject::tr("L26"), QObject::tr("L27"), QObject::tr("L28"), QObject::tr("L29"), QObject::tr("L30"),
-    QObject::tr("L31"), QObject::tr("L32")
-  };
-  
   if (index<0) {
     return QObject::tr("----");
   }
@@ -498,7 +536,7 @@ QString RawSource::toString(const ModelData * model) const
     case SOURCE_TYPE_LUA_OUTPUT:
       return QObject::tr("LUA%1%2").arg(index/16+1).arg(QChar('a'+index%16));
     case SOURCE_TYPE_STICK:
-      return AnalogString(index);
+      return GetCurrentFirmware()->getAnalogInputName(index);
     case SOURCE_TYPE_TRIM:
       return CHECK_IN_ARRAY(trims, index);
     case SOURCE_TYPE_ROTARY_ENCODER:
@@ -506,9 +544,9 @@ QString RawSource::toString(const ModelData * model) const
     case SOURCE_TYPE_MAX:
       return QObject::tr("MAX");
     case SOURCE_TYPE_SWITCH:
-      return (IS_TARANIS(GetEepromInterface()->getBoard()) ? CHECK_IN_ARRAY(switchesX9D, index) : CHECK_IN_ARRAY(switches9X, index));
+      return GetCurrentFirmware()->getSwitch(index).name;
     case SOURCE_TYPE_CUSTOM_SWITCH:
-      return logicalSwitches[index];
+      return QObject::tr("L%1").arg(index+1);
     case SOURCE_TYPE_CYC:
       return QObject::tr("CYC%1").arg(index+1);
     case SOURCE_TYPE_PPM:
@@ -528,7 +566,7 @@ QString RawSource::toString(const ModelData * model) const
         return CHECK_IN_ARRAY(telemetry, index);
       }
     case SOURCE_TYPE_GVAR:
-      return QObject::tr("GV%1").arg(index+1);      
+      return QObject::tr("GV%1").arg(index+1);
     default:
       return QObject::tr("----");
   }
@@ -536,29 +574,16 @@ QString RawSource::toString(const ModelData * model) const
 
 bool RawSource::isPot() const
 {
-  return (type == SOURCE_TYPE_STICK && 
-          index >= NUM_STICKS && 
-          index < NUM_STICKS+GetCurrentFirmware()->getCapability(Pots));
+  return (type == SOURCE_TYPE_STICK &&
+          index >= CPN_MAX_STICKS &&
+          index < CPN_MAX_STICKS+GetCurrentFirmware()->getCapability(Pots));
 }
 
 bool RawSource::isSlider() const
 {
-  return (type == SOURCE_TYPE_STICK && 
-          index >= NUM_STICKS+GetCurrentFirmware()->getCapability(Pots) && 
-          index < NUM_STICKS+GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders));
-}
-
-
-QString SwitchUp(const char sw)
-{
-  const char result[] = {'S', sw, upArrow[0], upArrow[1], upArrow[2], 0};
-  return QString::fromUtf8(result);
-}
-
-QString SwitchDn(const char sw)
-{
-  const char result[] = {'S', sw, downArrow[0], downArrow[1], downArrow[2], 0};
-  return QString::fromUtf8(result);
+  return (type == SOURCE_TYPE_STICK &&
+          index >= CPN_MAX_STICKS+GetCurrentFirmware()->getCapability(Pots) &&
+          index < CPN_MAX_STICKS+GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders));
 }
 
 QString RawSwitch::toString() const
@@ -569,34 +594,6 @@ QString RawSwitch::toString() const
     QString("AIL"), QString("GEA"), QString("TRN")
   };
 
-  static const QString switchesX9D[] = {
-    SwitchUp('A'), QString::fromUtf8("SA-"), SwitchDn('A'),
-    SwitchUp('B'), QString::fromUtf8("SB-"), SwitchDn('B'),
-    SwitchUp('C'), QString::fromUtf8("SC-"), SwitchDn('C'),
-    SwitchUp('D'), QString::fromUtf8("SD-"), SwitchDn('D'),
-    SwitchUp('E'), QString::fromUtf8("SE-"), SwitchDn('E'),
-    SwitchUp('F'), QString::fromUtf8("SF-"), SwitchDn('F'),
-    SwitchUp('G'), QString::fromUtf8("SG-"), SwitchDn('G'),
-    SwitchUp('H'), QString::fromUtf8("SH-"), SwitchDn('H'),
-    SwitchUp('I'), QString::fromUtf8("SI-"), SwitchDn('I'),
-    SwitchUp('J'), QString::fromUtf8("SJ-"), SwitchDn('J'),
-    SwitchUp('K'), QString::fromUtf8("SK-"), SwitchDn('K'),
-    SwitchUp('L'), QString::fromUtf8("SL-"), SwitchDn('L'),
-    SwitchUp('M'), QString::fromUtf8("SM-"), SwitchDn('M'),
-    SwitchUp('N'), QString::fromUtf8("SN-"), SwitchDn('N'),
-    SwitchUp('O'), QString::fromUtf8("SO-"), SwitchDn('O'),
-    SwitchUp('P'), QString::fromUtf8("SP-"), SwitchDn('P'),
-    SwitchUp('Q'), QString::fromUtf8("SQ-"), SwitchDn('Q'),
-    SwitchUp('R'), QString::fromUtf8("SR-"), SwitchDn('R'),
-  };
-
-  static const QString logicalSwitches[] = {
-    QObject::tr("L1"), QObject::tr("L2"), QObject::tr("L3"), QObject::tr("L4"), QObject::tr("L5"), QObject::tr("L6"), QObject::tr("L7"), QObject::tr("L8"), QObject::tr("L9"), QObject::tr("L10"),
-    QObject::tr("L11"), QObject::tr("L12"), QObject::tr("L13"), QObject::tr("L14"), QObject::tr("L15"), QObject::tr("L16"), QObject::tr("L17"), QObject::tr("L18"), QObject::tr("L19"), QObject::tr("L20"),
-    QObject::tr("L21"), QObject::tr("L22"), QObject::tr("L23"), QObject::tr("L24"), QObject::tr("L25"), QObject::tr("L26"), QObject::tr("L27"), QObject::tr("L28"), QObject::tr("L29"), QObject::tr("L30"),
-    QObject::tr("L31"), QObject::tr("L32")
-  };
-
   static const QString flightModes[] = {
     QObject::tr("FM0"), QObject::tr("FM1"), QObject::tr("FM2"), QObject::tr("FM3"), QObject::tr("FM4"), QObject::tr("FM5"), QObject::tr("FM6"), QObject::tr("FM7"), QObject::tr("FM8")
   };
@@ -627,14 +624,20 @@ QString RawSwitch::toString() const
     return QString("!") + RawSwitch(type, -index).toString();
   }
   else {
+    BoardEnum board = GetEepromInterface()->getBoard();
     switch(type) {
       case SWITCH_TYPE_SWITCH:
-        if (IS_TARANIS(GetEepromInterface()->getBoard()))
-          return CHECK_IN_ARRAY(switchesX9D, index-1);
-        else
-          return CHECK_IN_ARRAY(switches9X, index-1);
+        if (IS_HORUS(board) || IS_TARANIS(board)) {
+          div_t qr = div(index-1, 3);
+          Firmware::Switch sw = GetCurrentFirmware()->getSwitch(qr.quot);
+          const char * positions[] = { ARROW_UP, "-", ARROW_DOWN };
+          return QString(sw.name) + QString(positions[qr.rem]);
+        }
+        else {
+          return CHECK_IN_ARRAY(switches9X, index - 1);
+        }
       case SWITCH_TYPE_VIRTUAL:
-        return CHECK_IN_ARRAY(logicalSwitches, index-1);
+        return QObject::tr("L%1").arg(index);
       case SWITCH_TYPE_MULTIPOS_POT:
         return CHECK_IN_ARRAY(multiposPots, index-1);
       case SWITCH_TYPE_TRIM:
@@ -797,7 +800,7 @@ QString CustomFunctionData::funcToString() const
   else if (func == FuncPlayScript)
     return QObject::tr("Play Script");
   else if (func == FuncLogs)
-    return QObject::tr("Start Logs");
+    return QObject::tr("SD Logs");
   else if (func == FuncVolume)
     return QObject::tr("Volume");
   else if (func == FuncBacklight)
@@ -810,6 +813,18 @@ QString CustomFunctionData::funcToString() const
     return QObject::tr("Background Music Pause");
   else if (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast)
     return QObject::tr("Adjust GV%1").arg(func-FuncAdjustGV1+1);
+  else if (func == FuncSetFailsafeInternalModule)
+    return QObject::tr("SetFailsafe Int. Module");
+  else if (func == FuncSetFailsafeExternalModule)
+    return QObject::tr("SetFailsafe Ext. Module");
+  else if (func == FuncRangeCheckInternalModule)
+    return QObject::tr("RangeCheck Int. Module");
+  else if (func == FuncRangeCheckExternalModule)
+    return QObject::tr("RangeCheck Ext. Module");
+  else if (func == FuncBindInternalModule)
+    return QObject::tr("Bind Int. Module");
+  else if (func == FuncBindExternalModule)
+    return QObject::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)
   }
@@ -840,7 +855,7 @@ void CustomFunctionData::populateResetParams(const ModelData * model, QComboBox
     b->setCurrentIndex(value);
   }
   if (model && IS_ARM(board)) {
-    for (int i=0; i<C9X_MAX_SENSORS; ++i) {
+    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);
@@ -858,7 +873,7 @@ void CustomFunctionData::populatePlaySoundParams(QStringList & qs)
   qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt"  << "AlmClk"  ;
 }
 
-void CustomFunctionData::populateHapticParams(QStringList & qs) 
+void CustomFunctionData::populateHapticParams(QStringList & qs)
 {
   qs << "0" << "1" << "2" << "3";
 }
@@ -892,7 +907,7 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
     int pos = cb.findData(param);
     if (pos >= 0)
       return cb.itemText(pos);
-    else 
+    else
       return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
   }
   else if ((func==FuncVolume)|| (func==FuncPlayValue)) {
@@ -909,12 +924,12 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
   }
   else if ((func>=FuncAdjustGV1) && (func<FuncCount)) {
     switch (adjustMode) {
-      case 0:
+      case FUNC_ADJUST_GVAR_CONSTANT:
         return QObject::tr("Value ")+QString("%1").arg(param);
-      case 1:
-      case 2:
+      case FUNC_ADJUST_GVAR_SOURCE:
+      case FUNC_ADJUST_GVAR_GVAR:
         return RawSource(param).toString();
-      case 3:
+      case FUNC_ADJUST_GVAR_INCDEC:
         if (param==0) return QObject::tr("Decr:") + " -1";
         else          return QObject::tr("Incr:") + " +1";
     }
@@ -924,12 +939,15 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
 
 QString CustomFunctionData::repeatToString() const
 {
-  if (repeatParam==0) {
+  if (repeatParam == -1) {
+    return QObject::tr("played once, not during startup");
+  }
+  else if (repeatParam == 0) {
     return "";
   }
   else {
     unsigned int step = IS_ARM(GetEepromInterface()->getBoard()) ? 1 : 10;
-    return QObject::tr("repeat") + QString("(%1").arg(step*repeatParam) + QObject::tr("s") + ")";
+    return QObject::tr("repeat(%1s)").arg(step*repeatParam);
   }
 }
 
@@ -1006,17 +1024,17 @@ bool GeneralSettings::switchPositionAllowedTaranis(int index) const
   if (index == 0)
     return true;
   SwitchInfo info = switchInfoFromSwitchPositionTaranis(abs(index));
-  if (index < 0 && switchConfig[info.index] != SWITCH_3POS)
+  if (index < 0 && switchConfig[info.index] != Firmware::SWITCH_3POS)
     return false;
   else if (info.position == 1)
-    return switchConfig[info.index] == SWITCH_3POS;
+    return switchConfig[info.index] == Firmware::SWITCH_3POS;
   else
-    return switchConfig[info.index] != SWITCH_NONE;
+    return switchConfig[info.index] != Firmware::SWITCH_NONE;
 }
 
 bool GeneralSettings::switchSourceAllowedTaranis(int index) const
 {
-  return switchConfig[index] != SWITCH_NONE;
+  return switchConfig[index] != Firmware::SWITCH_NONE;
 }
 
 bool GeneralSettings::isPotAvailable(int index) const
@@ -1038,26 +1056,22 @@ GeneralSettings::GeneralSettings()
   contrast  = 25;
   vBatWarn  = 90;
 
-  for (int i=0; i<NUM_STICKS+C9X_NUM_POTS; ++i) {
+  for (int i=0; i<CPN_MAX_STICKS+CPN_MAX_POTS; ++i) {
     calibMid[i]     = 0x200;
     calibSpanNeg[i] = 0x180;
     calibSpanPos[i] = 0x180;
   }
-
+  
+  for (int i=0; i<GetCurrentFirmware()->getCapability(Switches); i++) {
+    switchConfig[i] = GetCurrentFirmware()->getSwitch(i).type;
+  }
+  
   BoardEnum board = GetEepromInterface()->getBoard();
   if (IS_TARANIS(board)) {
     potConfig[0] = POT_WITH_DETENT;
     potConfig[1] = POT_WITH_DETENT;
     sliderConfig[0] = SLIDER_WITH_DETENT;
     sliderConfig[1] = SLIDER_WITH_DETENT;
-    switchConfig[0] = SWITCH_3POS;
-    switchConfig[1] = SWITCH_3POS;
-    switchConfig[2] = SWITCH_3POS;
-    switchConfig[3] = SWITCH_3POS;
-    switchConfig[4] = SWITCH_3POS;
-    switchConfig[5] = SWITCH_2POS;
-    switchConfig[6] = SWITCH_3POS;
-    switchConfig[7] = SWITCH_TOGGLE;
   }
   else {
     for (int i=0; i<3; i++) {
@@ -1076,12 +1090,9 @@ GeneralSettings::GeneralSettings()
   templateSetup = g.profile[g.id()].channelOrder();
   stickMode = g.profile[g.id()].defaultMode();
 
-  QString t_calib=g.profile[g.id()].stickPotCalib();
-  int potsnum=GetCurrentFirmware()->getCapability(Pots);
-  if (t_calib.isEmpty()) {
-    return;
-  }
-  else {
+  QString t_calib = g.profile[g.id()].stickPotCalib();
+  int potsnum = GetCurrentFirmware()->getCapability(Pots);
+  if (!t_calib.isEmpty()) {
     QString t_trainercalib=g.profile[g.id()].trainerCalib();
     int8_t t_txVoltageCalibration=(int8_t)g.profile[g.id()].txVoltageCalibration();
     int8_t t_txCurrentCalibration=(int8_t)g.profile[g.id()].txCurrentCalibration();
@@ -1094,11 +1105,11 @@ GeneralSettings::GeneralSettings()
     QString t_SpeakerSet=g.profile[g.id()].speaker();
     QString t_CountrySet=g.profile[g.id()].countryCode();
 
-    if ((t_calib.length()==(NUM_STICKS+potsnum)*12) && (t_trainercalib.length()==16)) {
+    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<(NUM_STICKS+potsnum); i++) {
+      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)
@@ -1168,17 +1179,23 @@ GeneralSettings::GeneralSettings()
         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].toAscii();
-        ttsLanguage[1]=chars[1].toAscii();
+        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));
 }
 
 int GeneralSettings::getDefaultStick(unsigned int channel) const
 {
-  if (channel >= NUM_STICKS)
+  if (channel >= CPN_MAX_STICKS)
     return -1;
   else
     return chout_ar[4*templateSetup + channel] - 1;
@@ -1272,14 +1289,14 @@ ModelData & ModelData::operator = (const ModelData & src)
 
 ExpoData * ModelData::insertInput(const int idx)
 {
-  memmove(&expoData[idx+1], &expoData[idx], (C9X_MAX_EXPOS-(idx+1))*sizeof(ExpoData));
+  memmove(&expoData[idx+1], &expoData[idx], (CPN_MAX_EXPOS-(idx+1))*sizeof(ExpoData));
   expoData[idx].clear();
   return &expoData[idx];
 }
 
 bool ModelData::isInputValid(const unsigned int idx) const
 {
-  for (int i=0; i<C9X_MAX_EXPOS; i++) {
+  for (int i=0; i<CPN_MAX_EXPOS; i++) {
     const ExpoData * expo = &expoData[i];
     if (expo->mode == 0) break;
     if (expo->chn == idx)
@@ -1290,7 +1307,7 @@ bool ModelData::isInputValid(const unsigned int idx) const
 
 bool ModelData::hasExpos(uint8_t inputIdx) const
 {
-  for (int i=0; i<C9X_MAX_EXPOS; i++) {
+  for (int i=0; i<CPN_MAX_EXPOS; i++) {
     const ExpoData & expo = expoData[i];
     if (expo.chn==inputIdx && expo.mode!=0) {
       return true;
@@ -1302,7 +1319,7 @@ bool ModelData::hasExpos(uint8_t inputIdx) const
 bool ModelData::hasMixes(uint8_t channelIdx) const
 {
   channelIdx += 1;
-  for (int i=0; i<C9X_MAX_MIXERS; i++) {
+  for (int i=0; i<CPN_MAX_MIXERS; i++) {
     if (mixData[i].destCh == channelIdx) {
       return true;
     }
@@ -1313,7 +1330,7 @@ bool ModelData::hasMixes(uint8_t channelIdx) const
 QVector<const ExpoData *> ModelData::expos(int input) const
 {
   QVector<const ExpoData *> result;
-  for (int i=0; i<C9X_MAX_EXPOS; i++) {
+  for (int i=0; i<CPN_MAX_EXPOS; i++) {
     const ExpoData * ed = &expoData[i];
     if ((int)ed->chn==input && ed->mode!=0) {
       result << ed;
@@ -1325,7 +1342,7 @@ QVector<const ExpoData *> ModelData::expos(int input) const
 QVector<const MixData *> ModelData::mixes(int channel) const
 {
   QVector<const MixData *> result;
-  for (int i=0; i<C9X_MAX_MIXERS; i++) {
+  for (int i=0; i<CPN_MAX_MIXERS; i++) {
     const MixData * md = &mixData[i];
     if ((int)md->destCh == channel+1) {
       result << md;
@@ -1338,12 +1355,12 @@ void ModelData::removeInput(const int idx)
 {
   unsigned int chn = expoData[idx].chn;
 
-  memmove(&expoData[idx], &expoData[idx+1], (C9X_MAX_EXPOS-(idx+1))*sizeof(ExpoData));
-  expoData[C9X_MAX_EXPOS-1].clear();
+  memmove(&expoData[idx], &expoData[idx+1], (CPN_MAX_EXPOS-(idx+1))*sizeof(ExpoData));
+  expoData[CPN_MAX_EXPOS-1].clear();
 
   //also remove input name if removing last line for this input
   bool found = false;
-  for (int i=0; i<C9X_MAX_EXPOS; i++) {
+  for (int i=0; i<CPN_MAX_EXPOS; i++) {
     if (expoData[i].mode==0) continue;
     if (expoData[i].chn==chn) {
       found = true;
@@ -1355,12 +1372,12 @@ void ModelData::removeInput(const int idx)
 
 void ModelData::clearInputs()
 {
-  for (int i=0; i<C9X_MAX_EXPOS; i++)
+  for (int i=0; i<CPN_MAX_EXPOS; i++)
     expoData[i].clear();
 
   //clear all input names
   if (GetCurrentFirmware()->getCapability(VirtualInputs)) {
-    for (int i=0; i<C9X_MAX_INPUTS; i++) {
+    for (int i=0; i<CPN_MAX_INPUTS; i++) {
       inputNames[i][0] = 0;
     }
   }
@@ -1368,7 +1385,7 @@ void ModelData::clearInputs()
 
 void ModelData::clearMixes()
 {
-  for (int i=0; i<C9X_MAX_MIXERS; i++)
+  for (int i=0; i<CPN_MAX_MIXERS; i++)
     mixData[i].clear();
 }
 
@@ -1378,11 +1395,11 @@ void ModelData::clear()
   moduleData[0].channelsCount = 8;
   moduleData[1].channelsStart = 0;
   moduleData[1].channelsCount = 8;
-  moduleData[0].ppmDelay = 300;
-  moduleData[1].ppmDelay = 300;
-  moduleData[2].ppmDelay = 300;
+  moduleData[0].ppm.delay = 300;
+  moduleData[1].ppm.delay = 300;
+  moduleData[2].ppm.delay = 300;
   int board = GetEepromInterface()->getBoard();
-  if (IS_TARANIS(board)) {
+  if (IS_TARANIS(board) || IS_HORUS(board)) {
     moduleData[0].protocol = PULSES_PXX_XJT_X16;
     moduleData[1].protocol = PULSES_OFF;
   }
@@ -1394,26 +1411,26 @@ void ModelData::clear()
     moduleData[0].protocol = PULSES_PPM;
     moduleData[1].protocol = PULSES_OFF;
   }
-  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    flightModeData[i].clear();
+  for (int i=0; i<CPN_MAX_FLIGHT_MODES; i++) {
+    flightModeData[i].clear(i);
   }
   clearInputs();
   clearMixes();
-  for (int i=0; i<C9X_NUM_CHNOUT; i++)
+  for (int i=0; i<CPN_MAX_CHNOUT; i++)
     limitData[i].clear();
-  for (int i=0; i<NUM_STICKS; i++)
+  for (int i=0; i<CPN_MAX_STICKS; i++)
     expoData[i].clear();
-  for (int i=0; i<C9X_NUM_CSW; i++)
+  for (int i=0; i<CPN_MAX_CSW; i++)
     logicalSw[i].clear();
-  for (int i=0; i<C9X_MAX_CUSTOM_FUNCTIONS; i++)
+  for (int i=0; i<CPN_MAX_CUSTOM_FUNCTIONS; i++)
     customFn[i].clear();
-  for (int i=0; i<C9X_MAX_CURVES; i++)
+  for (int i=0; i<CPN_MAX_CURVES; i++)
     curves[i].clear(5);
-  for (int i=0; i<C9X_MAX_TIMERS; i++)
+  for (int i=0; i<CPN_MAX_TIMERS; i++)
     timers[i].clear();
   swashRingData.clear();
   frsky.clear();
-  for (int i=0; i<C9X_MAX_SENSORS; i++)
+  for (int i=0; i<CPN_MAX_SENSORS; i++)
     sensorData[i].clear();
 }
 
@@ -1452,8 +1469,9 @@ QString removeAccents(const QString & str)
 
 void ModelData::setDefaultInputs(const GeneralSettings & settings)
 {
-  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
-    for (int i=0; i<NUM_STICKS; i++) {
+  BoardEnum board = GetEepromInterface()->getBoard();
+  if (IS_ARM(board)) {
+    for (int i=0; i<CPN_MAX_STICKS; i++) {
       ExpoData * expo = &expoData[i];
       expo->chn = i;
       expo->mode = INPUT_MODE_BOTH;
@@ -1466,15 +1484,16 @@ void ModelData::setDefaultInputs(const GeneralSettings & settings)
 
 void ModelData::setDefaultMixes(const GeneralSettings & settings)
 {
-  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+  BoardEnum board = GetEepromInterface()->getBoard();
+  if (IS_ARM(board)) {
     setDefaultInputs(settings);
   }
 
-  for (int i=0; i<NUM_STICKS; i++) {
+  for (int i=0; i<CPN_MAX_STICKS; i++) {
     MixData * mix = &mixData[i];
     mix->destCh = i+1;
     mix->weight = 100;
-    if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+    if (IS_ARM(board)) {
       mix->srcRaw = RawSource(SOURCE_TYPE_VIRTUAL_INPUT, i);
     }
     else {
@@ -1488,7 +1507,7 @@ void ModelData::setDefaultValues(unsigned int id, const GeneralSettings & settin
   clear();
   used = true;
   sprintf(name, "MODEL%02d", id+1);
-  for (int i=0; i<C9X_NUM_MODULES; i++) {
+  for (int i=0; i<CPN_MAX_MODULES; i++) {
     moduleData[i].modelId = id+1;
   }
   setDefaultMixes(settings);
@@ -1497,7 +1516,7 @@ void ModelData::setDefaultValues(unsigned int id, const GeneralSettings & settin
 int ModelData::getTrimValue(int phaseIdx, int trimIdx)
 {
   int result = 0;
-  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
+  for (int i=0; i<CPN_MAX_FLIGHT_MODES; i++) {
     FlightModeData & phase = flightModeData[phaseIdx];
     if (phase.trimMode[trimIdx] < 0) {
       return result;
@@ -1508,9 +1527,7 @@ int ModelData::getTrimValue(int phaseIdx, int trimIdx)
       }
       else {
         phaseIdx = phase.trimRef[trimIdx];
-        if (phase.trimMode[trimIdx] == 0)
-          result = 0;
-        else
+        if (phase.trimMode[trimIdx] != 0)
           result += phase.trim[trimIdx];
       }
     }
@@ -1523,10 +1540,10 @@ bool ModelData::isGVarLinked(int phaseIdx, int gvarIdx)
   return flightModeData[phaseIdx].gvars[gvarIdx] > 1024;
 }
 
-int ModelData::getGVarValue(int phaseIdx, int gvarIdx)
+int ModelData::getGVarFieldValue(int phaseIdx, int gvarIdx)
 {
   int idx = flightModeData[phaseIdx].gvars[gvarIdx];
-  for (int i=0; idx>1024 && i<C9X_MAX_FLIGHT_MODES; i++) {
+  for (int i=0; idx>1024 && i<CPN_MAX_FLIGHT_MODES; i++) {
     int nextPhase = idx - 1025;
     if (nextPhase >= phaseIdx) nextPhase += 1;
     phaseIdx = nextPhase;
@@ -1537,7 +1554,7 @@ int ModelData::getGVarValue(int phaseIdx, int gvarIdx)
 
 void ModelData::setTrimValue(int phaseIdx, int trimIdx, int value)
 {
-  for (uint8_t i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
+  for (uint8_t i=0; i<CPN_MAX_FLIGHT_MODES; i++) {
     FlightModeData & phase = flightModeData[phaseIdx];
     int mode = phase.trimMode[trimIdx];
     int p = phase.trimRef[trimIdx];
@@ -1574,13 +1591,13 @@ ModelData ModelData::removeGlobalVars()
 {
   ModelData result = *this;
 
-  for (int i=0; i<C9X_MAX_MIXERS; i++) {
+  for (int i=0; i<CPN_MAX_MIXERS; i++) {
     removeGlobalVar(mixData[i].weight);
     removeGlobalVar(mixData[i].curve.value);
     removeGlobalVar(mixData[i].sOffset);
   }
 
-  for (int i=0; i<C9X_MAX_EXPOS; i++) {
+  for (int i=0; i<CPN_MAX_EXPOS; i++) {
     removeGlobalVar(expoData[i].weight);
     removeGlobalVar(expoData[i].curve.value);
   }
@@ -1604,14 +1621,11 @@ void registerEEpromInterfaces()
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_GRUVIN9X));
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_SKY9X));
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_9XRPRO));
-  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS));
-  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_PLUS));  
+  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_X9D));
+  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_X9DP));
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_X9E));
-  eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_STOCK));
-  eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_GRUVIN9X));
-  eepromInterfaces.push_back(new Ersky9xInterface());
-  eepromInterfaces.push_back(new Th9xInterface());
-  eepromInterfaces.push_back(new Er9xInterface());
+  // eepromInterfaces.push_back(new Ersky9xInterface());
+  // eepromInterfaces.push_back(new Er9xInterface());
 }
 
 void unregisterEEpromInterfaces()
@@ -1619,7 +1633,7 @@ void unregisterEEpromInterfaces()
   foreach(EEPROMInterface * intf, eepromInterfaces) {
     // qDebug() << "UnregisterEepromInterfaces(): deleting " <<  QString::number( reinterpret_cast<uint64_t>(intf), 16 );
     delete intf;
-  } 
+  }
   OpenTxEepromCleanup();
 }
 
@@ -1627,42 +1641,55 @@ QList<Firmware *> firmwares;
 Firmware * default_firmware_variant;
 Firmware * current_firmware_variant;
 
-void unregisterFirmwares()
+void ShowEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound)
 {
-  foreach (Firmware * f, firmwares) {
-    delete f;
+  std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
+  QStringList errorsList;
+
+  errorsList << QT_TRANSLATE_NOOP("EepromInterface", "Possible causes for this:");
+
+  if (errors.test(UNSUPPORTED_NEWER_VERSION)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is from a newer version of OpenTX"); }
+  if (errors.test(NOT_OPENTX)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from OpenTX"); }
+  if (errors.test(NOT_TH9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from Th9X"); }
+  if (errors.test(NOT_GRUVIN9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from Gruvin9X"); }
+  if (errors.test(NOT_ERSKY9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from ErSky9X"); }
+  if (errors.test(NOT_ER9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from Er9X"); }
+  if (errors.test(WRONG_SIZE)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom size is invalid"); }
+  if (errors.test(WRONG_FILE_SYSTEM)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom file system is invalid"); }
+  if (errors.test(UNKNOWN_BOARD)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is from a unknown board"); }
+  if (errors.test(WRONG_BOARD)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is from the wrong board"); }
+  if (errors.test(BACKUP_NOT_SUPPORTED)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom backup not supported"); }
+
+  if (errors.test(UNKNOWN_ERROR)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Something that couldn't be guessed, sorry"); }
+
+  if (errors.test(HAS_WARNINGS)) {
+    errorsList << QT_TRANSLATE_NOOP("EepromInterface", "Warning:");
+    if (errors.test(WARNING_WRONG_FIRMWARE)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- 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();
 }
 
-bool loadEEprom(RadioData &radioData, const uint8_t *eeprom, const int size)
+void ShowEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound)
 {
-  foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
-    if (eepromInterface->load(radioData, eeprom, size))
-      return true;
-  }
+  std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
+  QStringList warningsList;
+  if (errors.test(WARNING_WRONG_FIRMWARE)) { warningsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"); }
+  if (errors.test(OLD_VERSION)) { warningsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your eeprom is from an old version of OpenTX, upgrading!\n You should 'save as' to keep the old file as a backup."); }
 
-  return false;
-}
-
-bool loadBackup(RadioData &radioData, uint8_t *eeprom, int size, int index)
-{
-  foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
-    if (eepromInterface->loadBackup(radioData, eeprom, size, index))
-      return true;
-  }
-
-  return false;
-}
-
-
-bool loadEEpromXml(RadioData &radioData, QDomDocument &doc)
-{
-  foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
-    if (eepromInterface->loadxml(radioData, doc))
-      return true;
-  }
-
-  return false;
+  QMessageBox msgBox(parent);
+  msgBox.setWindowTitle(title);
+  msgBox.setIcon(QMessageBox::Warning);
+  msgBox.setText(QT_TRANSLATE_NOOP("EepromInterface", "Warnings!"));
+  msgBox.setInformativeText(warningsList.join("\n"));
+  msgBox.setStandardButtons(QMessageBox::Ok);
+  msgBox.exec();
 }
 
 QString getBoardName(BoardEnum board)
@@ -1676,21 +1703,54 @@ QString getBoardName(BoardEnum board)
       return "Gruvin9x";
     case BOARD_MEGA2560:
       return "MEGA2560";
-    case BOARD_TARANIS:
-      return "Taranis";
-    case BOARD_TARANIS_PLUS:
-      return "Taranis Plus";
+    case BOARD_X7D:
+      return "X7D";  
+    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_HORUS:
+      return "Horus";  
     default:
       return "Unknown";
   }
 }
 
+const int Firmware::getFlashSize()
+{
+  switch (board) {
+    case BOARD_STOCK:
+      return FSIZE_STOCK;
+    case BOARD_M128:
+      return FSIZE_M128;
+    case BOARD_MEGA2560:
+    case BOARD_GRUVIN9X:
+      return FSIZE_GRUVIN9X;
+    case BOARD_SKY9X:
+      return FSIZE_SKY9X;
+    case BOARD_9XRPRO:
+    case BOARD_AR9X:
+      return FSIZE_9XRPRO;
+    case BOARD_TARANIS_X9D:
+    case BOARD_TARANIS_X9DP:
+    case BOARD_TARANIS_X9E:
+    case BOARD_FLAMENCO:
+      return FSIZE_TARANIS;
+    case BOARD_HORUS:
+      return FSIZE_HORUS;
+    default:
+      return 0;
+  }
+}
+
 Firmware * GetFirmware(QString id)
 {
   foreach(Firmware * firmware, firmwares) {
@@ -1754,3 +1814,45 @@ SimulatorInterface *GetCurrentFirmwareSimulator()
   else
     return NULL;
 }
+
+unsigned int getNumSubtypes(MultiModuleRFProtocols type) {
+  switch (type) {
+    case MM_RF_PROTO_HISKY:
+    case MM_RF_PROTO_SYMAX:
+    case MM_RF_PROTO_KN:
+      return 2;
+
+    case MM_RF_PROTO_CG023:
+    case MM_RF_PROTO_MT99XX:
+      return 3;
+
+    case MM_RF_PROTO_FRSKY:
+    case MM_RF_PROTO_FLYSKY:
+    case MM_RF_PROTO_DSM2:
+    case MM_RF_PROTO_AFHDS2A:
+      return 4;
+
+    case MM_RF_PROTO_MJXQ:
+    case MM_RF_PROTO_YD717:
+      return 5;
+
+    case MM_RF_PROTO_CX10:
+      return 8;
+    default:
+      return 1;
+  }
+
+}
+
+void FlightModeData::clear(const int phase)
+{
+  memset(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;
+    }
+  }
+}

companion/src/eeprominterface.h

@@ -1,7 +1,12 @@
 /*
- * Author - Bertrand Songis <bsongis@gmail.com>
+ * Copyright (C) OpenTX
  *
- * Based on th9x -> http://code.google.com/p/th9x/
+ * 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
@@ -11,20 +16,21 @@
  * 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 eeprom_interface_h
-#define eeprom_interface_h
+#ifndef _EEPROMINTERFACE_H_
+#define _EEPROMINTERFACE_H_
 
 #include <string.h>
 #include <QString>
 #include <QStringList>
 #include <QList>
-#include <QtXml>
+#include <QtXml> // This should be removed from here, and remove Xml dependency from all libs which don't need it.
 #include <QComboBox>
 #include <iostream>
+#include <bitset>
 #include "constants.h"
+#include "../../radio/src/definitions.h"
 #include "simulatorinterface.h"
 
 #define EESIZE_STOCK           2048
@@ -35,17 +41,28 @@
 #define EESIZE_9XRPRO          (128*4096)
 #define EESIZE_MAX             EESIZE_9XRPRO
 
-QString getBoardName(BoardEnum board);
+#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
 
 #define IS_9X(board)           (board==BOARD_STOCK || board==BOARD_M128)
 #define IS_STOCK(board)        (board==BOARD_STOCK)
 #define IS_2560(board)         (board==BOARD_GRUVIN9X || board==BOARD_MEGA2560)
 #define IS_SKY9X(board)        (board==BOARD_SKY9X || board==BOARD_9XRPRO || board==BOARD_AR9X)
 #define IS_9XRPRO(board)       (board==BOARD_9XRPRO)
-#define IS_TARANIS(board)      (board==BOARD_TARANIS  || board==BOARD_TARANIS_PLUS || board==BOARD_TARANIS_X9E)
-#define IS_TARANIS_PLUS(board) (board==BOARD_TARANIS_PLUS || board==BOARD_TARANIS_X9E)
+#define IS_TARANIS(board)      (board==BOARD_TARANIS_X9D  || board==BOARD_TARANIS_X9DP || board==BOARD_TARANIS_X9E || board==BOARD_X7D)
+#define IS_TARANIS_PLUS(board) (board==BOARD_TARANIS_X9DP || board==BOARD_TARANIS_X9E)
 #define IS_TARANIS_X9E(board)  (board==BOARD_TARANIS_X9E)
-#define IS_ARM(board)          (IS_TARANIS(board) || IS_SKY9X(board))
+#define IS_HORUS(board)        (board==BOARD_HORUS)
+#define IS_FLAMENCO(board)     (board==BOARD_FLAMENCO)
+#define IS_STM32(board)        (IS_TARANIS(board) || IS_HORUS(board) || IS_FLAMENCO(board))
+#define IS_ARM(board)          (IS_STM32(board) || IS_SKY9X(board))
+#define HAS_LARGE_LCD(board)   (IS_HORUS(board) || (IS_TARANIS(board) && board != BOARD_X7D))
 
 const uint8_t modn12x3[4][4]= {
   {1, 2, 3, 4},
@@ -53,14 +70,6 @@ const uint8_t modn12x3[4][4]= {
   {4, 2, 3, 1},
   {4, 3, 2, 1} };
 
-#define STK_RUD  1
-#define STK_ELE  2
-#define STK_THR  3
-#define STK_AIL  4
-#define STK_P1   5
-#define STK_P2   6
-#define STK_P3   7
-
 enum Switches {
   SWITCH_NONE,
 
@@ -131,36 +140,11 @@ enum FailsafeModes {
 #define TRIM_RV_UP 5
 #define TRIM_RH_L  6
 #define TRIM_RH_R  7
-#define TRIM_NONE  8
-
-// Beep center bits
-#define BC_BIT_RUD (0x01)
-#define BC_BIT_ELE (0x02)
-#define BC_BIT_THR (0x04)
-#define BC_BIT_AIL (0x08)
-#define BC_BIT_P1  (0x10)
-#define BC_BIT_P2  (0x20)
-#define BC_BIT_P3  (0x40)
-#define BC_BIT_P4  (0x80)
-#define BC_BIT_REA (0x80)
-#define BC_BIT_REB (0x100)
-
-// TODO remove this enum!
-enum EnumKeys {
-  KEY_MENU,
-  KEY_EXIT,
-#if defined(PCBTARANIS)
-  KEY_ENTER,
-  KEY_PAGE,
-  KEY_PLUS,
-  KEY_MINUS,
-#else
-  KEY_DOWN,
-  KEY_UP,
-  KEY_RIGHT,
-  KEY_LEFT,
-#endif
-};
+#define TRIM_T5_DN 8
+#define TRIM_T5_UP 9
+#define TRIM_T6_DN 10
+#define TRIM_T6_UP 11
+#define TRIM_NONE  12
 
 #define CHAR_FOR_NAMES " ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_-."
 #define CHAR_FOR_NAMES_REGEX "[ A-Za-z0-9_.-,]*"
@@ -173,13 +157,6 @@ enum HeliSwashTypes {
  HELI_SWASH_TYPE_90
 };
 
-extern const char * switches9X[];
-extern const char * switchesX9D[];
-extern const char leftArrow[];
-extern const char rightArrow[];
-extern const char upArrow[];
-extern const char downArrow[];
-
 class ModelData;
 class GeneralSettings;
 
@@ -265,7 +242,6 @@ enum RawSourceType {
   MAX_SOURCE_TYPE
 };
 
-QString AnalogString(int index);
 QString RotaryEncoderString(int index);
 
 class RawSourceRange
@@ -461,7 +437,7 @@ class CurveData {
     CurveType type;
     bool smooth;
     int  count;
-    CurvePoint points[C9X_MAX_POINTS];
+    CurvePoint points[CPN_MAX_POINTS];
     char name[6+1];
 };
 
@@ -494,7 +470,7 @@ enum MltpxValue {
 class MixData {
   public:
     MixData() { clear(); }
-    unsigned int destCh;            //        1..C9X_NUM_CHNOUT
+    unsigned int destCh;            //        1..CPN_MAX_CHNOUT
     RawSource srcRaw;
     int     weight;
     RawSwitch swtch;
@@ -571,7 +547,7 @@ class LogicalSwitchData { // Logical Switches data
 
 enum AssignFunc {
   FuncOverrideCH1 = 0,
-  FuncOverrideCH32 = FuncOverrideCH1+C9X_NUM_CHNOUT-1,
+  FuncOverrideCH32 = FuncOverrideCH1+CPN_MAX_CHNOUT-1,
   FuncTrainer,
   FuncTrainerRUD,
   FuncTrainerELE,
@@ -596,11 +572,25 @@ enum AssignFunc {
   FuncBackgroundMusic,
   FuncBackgroundMusicPause,
   FuncAdjustGV1,
-  FuncAdjustGVLast = FuncAdjustGV1+C9X_MAX_GVARS-1,
+  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 { // Function Switches data
   public:
     CustomFunctionData(AssignFunc func=FuncOverrideCH1) { clear(); this->func = func; }
@@ -625,17 +615,17 @@ class CustomFunctionData { // Function Switches data
 
 class FlightModeData {
   public:
-    FlightModeData() { clear(); }
-    int trimMode[NUM_STICKS];
-    int trimRef[NUM_STICKS];
-    int trim[NUM_STICKS];
+    FlightModeData() { clear(0); }
+    int trimMode[CPN_MAX_STICKS+CPN_MAX_AUX_TRIMS];
+    int trimRef[CPN_MAX_STICKS+CPN_MAX_AUX_TRIMS];
+    int trim[CPN_MAX_STICKS+CPN_MAX_AUX_TRIMS];
     RawSwitch swtch;
     char name[10+1];
     unsigned int fadeIn;
     unsigned int fadeOut;
-    int rotaryEncoders[2];
-    int gvars[C9X_MAX_GVARS];
-    void clear() { memset(this, 0, sizeof(FlightModeData)); }
+    int rotaryEncoders[CPN_MAX_ENCODERS];
+    int gvars[CPN_MAX_GVARS];
+    void clear(const int phase);
 };
 
 class SwashRingData { // Swash Ring data
@@ -748,6 +738,22 @@ enum TelemetryCurrentSources {
   TELEMETRY_CURRENT_SOURCE_FAS
 };
 
+enum UartModes {
+  UART_MODE_NONE,
+  UART_MODE_TELEMETRY_MIRROR,
+  UART_MODE_TELEMETRY,
+  UART_MODE_SBUS_TRAINER,
+  UART_MODE_DEBUG
+};
+
+enum TrainerMode {
+  TRAINER_MODE_MASTER_TRAINER_JACK,
+  TRAINER_MODE_SLAVE,
+  TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE,
+  TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE,
+  TRAINER_MODE_MASTER_BATTERY_COMPARTMENT,
+};
+
 class FrSkyData {
   public:
     FrSkyData() { clear(); }
@@ -818,9 +824,44 @@ enum PulsesProtocol {
   PULSES_PXX_XJT_D8,
   PULSES_PXX_XJT_LR12,
   PULSES_PXX_DJT,
+  PULSES_CROSSFIRE,
+  PULSES_MULTIMODULE,
   PULSES_PROTOCOL_LAST
 };
 
+enum MultiModuleRFProtocols {
+  MM_RF_PROTO_FLYSKY=0,
+  MM_RF_PROTO_FIRST=MM_RF_PROTO_FLYSKY,
+  MM_RF_PROTO_HUBSAN,
+  MM_RF_PROTO_FRSKY,
+  MM_RF_PROTO_HISKY,
+  MM_RF_PROTO_V2X2,
+  MM_RF_PROTO_DSM2,
+  MM_RF_PROTO_DEVO,
+  MM_RF_PROTO_YD717,
+  MM_RF_PROTO_KN,
+  MM_RF_PROTO_SYMAX,
+  MM_RF_PROTO_SLT,
+  MM_RF_PROTO_CX10,
+  MM_RF_PROTO_CG023,
+  MM_RF_PROTO_BAYANG,
+  MM_RF_PROTO_ESky,
+  MM_RF_PROTO_MT99XX,
+  MM_RF_PROTO_MJXQ,
+  MM_RF_PROTO_SHENQI,
+  MM_RF_PROTO_FY326,
+  MM_RF_PROTO_SFHSS,
+  MM_RF_PROTO_J6PRO,
+  MM_RF_PROTO_FQ777,
+  MM_RF_PROTO_ASSAN,
+  MM_RF_PROTO_HONTAI,
+  MM_RF_PROTO_OLRS,
+  MM_RF_PROTO_AFHDS2A,
+  MM_RF_PROTO_LAST= MM_RF_PROTO_AFHDS2A
+};
+
+unsigned int getNumSubtypes(MultiModuleRFProtocols type);
+
 enum TrainerProtocol {
   TRAINER_MASTER_JACK,
   TRAINER_SLAVE_JACK,
@@ -834,31 +875,47 @@ class ModuleData {
     ModuleData() { clear(); }
     unsigned int modelId;
     int          protocol;
-    int          subprotocol;
+    unsigned int subType;
+    bool         invertedSerial;
     unsigned int channelsStart;
     int          channelsCount; // 0=8 channels
     unsigned int failsafeMode;
-    int          failsafeChannels[C9X_NUM_CHNOUT];
-    int          ppmDelay;
-    bool         ppmPulsePol;           // false = positive
-    bool         ppmOutputType;         // false = open drain, true = push pull 
-    int          ppmFrameLength;
+    int          failsafeChannels[CPN_MAX_CHNOUT];
+
+
+    struct {
+        int delay;
+        bool pulsePol;           // false = positive
+        bool outputType;         // false = open drain, true = push pull
+        int frameLength;
+    } ppm;
+
+    struct {
+      unsigned int rfProtocol;
+      bool autoBindMode;
+      bool lowPowerMode;
+      bool customProto;
+      int optionValue;
+   } multi;
+
+
+
     void clear() { memset(this, 0, sizeof(ModuleData)); }
-    QString polarityToString() const { return ppmPulsePol ? QObject::tr("Positive") : QObject::tr("Negative"); } // TODO ModelPrinter
+    QString polarityToString() const { return ppm.pulsePol ? QObject::tr("Positive") : QObject::tr("Negative"); } // TODO ModelPrinter
 };
 
-#define C9X_MAX_SCRIPTS       7
-#define C9X_MAX_SCRIPT_INPUTS 10
+#define CPN_MAX_SCRIPTS       7
+#define CPN_MAX_SCRIPT_INPUTS 10
 class ScriptData {
   public:
     ScriptData() { clear(); }
     char    filename[10+1];
     char    name[10+1];
-    int     inputs[C9X_MAX_SCRIPT_INPUTS];
+    int     inputs[CPN_MAX_SCRIPT_INPUTS];
     void clear() { memset(this, 0, sizeof(ScriptData)); }
 };
 
-#define C9X_MAX_SENSORS       32
+#define CPN_MAX_SENSORS       32
 class SensorData {
 
   public:
@@ -940,6 +997,7 @@ class SensorData {
     SensorData() { clear(); }
     unsigned int type; // custom / formula
     unsigned int id;
+    unsigned int subid;
     unsigned int instance;
     unsigned int persistentValue;
     unsigned int formula;
@@ -976,6 +1034,34 @@ class SensorData {
     void clear() { memset(this, 0, sizeof(SensorData)); }
 };
 
+/*
+ * TODO ...
+ */
+#if 0
+class CustomScreenOptionData {
+  public:
+    
+};
+
+class CustomScreenZoneData {
+  public:
+    char widgetName[10+1];
+    WidgetOptionData widgetOptions[5];
+};
+
+class CustomScreenData {
+  public:
+    CustomScreenData();
+    
+    char layoutName[10+1];
+    CustomScreenZoneData zones[];
+    CustomScreenOptionData options[];
+};
+#else
+typedef char CustomScreenData[610+1];
+typedef char TopbarData[216+1];
+#endif
+
 class ModelData {
   public:
     ModelData();
@@ -993,8 +1079,8 @@ class ModelData {
     QVector<const MixData *> mixes(int channel) const;
 
     bool      used;
-    char      name[12+1];
-    TimerData timers[C9X_MAX_TIMERS];
+    char      name[15+1];
+    TimerData timers[CPN_MAX_TIMERS];
     bool      noGlobalFunctions;
     bool      thrTrim;            // Enable Throttle Trim
     int       trimInc;            // Trim Increments
@@ -1006,27 +1092,27 @@ class ModelData {
     bool      extendedLimits; // TODO xml
     bool      extendedTrims;
     bool      throttleReversed;
-    FlightModeData flightModeData[C9X_MAX_FLIGHT_MODES];
-    MixData   mixData[C9X_MAX_MIXERS];
-    LimitData limitData[C9X_NUM_CHNOUT];
+    FlightModeData flightModeData[CPN_MAX_FLIGHT_MODES];
+    MixData   mixData[CPN_MAX_MIXERS];
+    LimitData limitData[CPN_MAX_CHNOUT];
 
-    char      inputNames[C9X_MAX_INPUTS][4+1];
-    ExpoData  expoData[C9X_MAX_EXPOS];
+    char      inputNames[CPN_MAX_INPUTS][4+1];
+    ExpoData  expoData[CPN_MAX_EXPOS];
 
-    CurveData curves[C9X_MAX_CURVES];
-    LogicalSwitchData  logicalSw[C9X_NUM_CSW];
-    CustomFunctionData customFn[C9X_MAX_CUSTOM_FUNCTIONS];
+    CurveData curves[CPN_MAX_CURVES];
+    LogicalSwitchData  logicalSw[CPN_MAX_CSW];
+    CustomFunctionData customFn[CPN_MAX_CUSTOM_FUNCTIONS];
     SwashRingData swashRingData;
     unsigned int thrTraceSrc;
     uint64_t switchWarningStates;
     unsigned int switchWarningEnable;
     unsigned int potsWarningMode;
-    bool potsWarningEnabled[C9X_NUM_POTS];
-    int          potPosition[C9X_NUM_POTS];
+    bool potsWarningEnabled[CPN_MAX_POTS];
+    int          potPosition[CPN_MAX_POTS];
     bool         displayChecklist;
     // TODO structure
-    char     gvars_names[C9X_MAX_GVARS][6+1];
-    bool     gvars_popups[C9X_MAX_GVARS];
+    char     gvars_names[CPN_MAX_GVARS][6+1];
+    bool     gvars_popups[CPN_MAX_GVARS];
     MavlinkData mavlink;
     unsigned int telemetryProtocol;
     FrSkyData frsky;
@@ -1035,12 +1121,18 @@ class ModelData {
 
     unsigned int trainerMode;
 
-    ModuleData moduleData[C9X_NUM_MODULES+1/*trainer*/];
+    ModuleData moduleData[CPN_MAX_MODULES+1/*trainer*/];
 
-    ScriptData scriptData[C9X_MAX_SCRIPTS];
+    ScriptData scriptData[CPN_MAX_SCRIPTS];
 
-    SensorData sensorData[C9X_MAX_SENSORS];
+    SensorData sensorData[CPN_MAX_SENSORS];
 
+    unsigned int toplcdTimer;
+    
+    CustomScreenData customScreenData[5];
+    
+    TopbarData topbarData;
+    
     void clear();
     bool isEmpty() const;
     void setDefaultInputs(const GeneralSettings & settings);
@@ -1051,7 +1143,7 @@ class ModelData {
     void setTrimValue(int phaseIdx, int trimIdx, int value);
 
     bool isGVarLinked(int phaseIdx, int gvarIdx);
-    int getGVarValue(int phaseIdx, int gvarIdx);
+    int getGVarFieldValue(int phaseIdx, int gvarIdx);
 
     ModelData removeGlobalVars();
 
@@ -1105,13 +1197,6 @@ class GeneralSettings {
       SLIDER_WITH_DETENT
     };
 
-    enum SwitchConfig {
-      SWITCH_NONE,
-      SWITCH_TOGGLE,
-      SWITCH_2POS,
-      SWITCH_3POS,
-    };
-
     GeneralSettings();
 
     int getDefaultStick(unsigned int channel) const;
@@ -1120,9 +1205,9 @@ class GeneralSettings {
 
     unsigned int version;
     unsigned int variant;
-    int   calibMid[NUM_STICKS+C9X_NUM_POTS];
-    int   calibSpanNeg[NUM_STICKS+C9X_NUM_POTS];
-    int   calibSpanPos[NUM_STICKS+C9X_NUM_POTS];
+    int   calibMid[CPN_MAX_STICKS+CPN_MAX_POTS+CPN_MAX_MOUSE_ANALOGS];
+    int   calibSpanNeg[CPN_MAX_STICKS+CPN_MAX_POTS+CPN_MAX_MOUSE_ANALOGS];
+    int   calibSpanPos[CPN_MAX_STICKS+CPN_MAX_POTS+CPN_MAX_MOUSE_ANALOGS];
     unsigned int  currModel; // 0..15
     unsigned int   contrast;
     unsigned int   vBatWarn;
@@ -1174,6 +1259,7 @@ class GeneralSettings {
     unsigned int    gpsFormat;
     int     speakerVolume;
     unsigned int   backlightBright;
+    unsigned int   backlightOffBright;
     int switchesDelay;
     int    temperatureCalib;
     int    temperatureWarn;
@@ -1186,6 +1272,7 @@ class GeneralSettings {
     unsigned int sticksGain;
     unsigned int rotarySteps;
     unsigned int countryCode;
+    bool jitterFilter;
     unsigned int imperial;
     bool crosstrim;
     char ttsLanguage[2+1];
@@ -1200,7 +1287,7 @@ class GeneralSettings {
     unsigned int switchUnlockStates;
     unsigned int hw_uartMode;
     unsigned int backlightColor;
-    CustomFunctionData customFn[C9X_MAX_CUSTOM_FUNCTIONS];
+    CustomFunctionData customFn[CPN_MAX_CUSTOM_FUNCTIONS];
     char switchName[18][3+1];
     unsigned int switchConfig[18];
     char stickName[4][3+1];
@@ -1209,6 +1296,10 @@ class GeneralSettings {
     char sliderName[4][3+1];
     unsigned int sliderConfig[4];
 
+    char themeName[8+1];
+    typedef uint8_t ThemeOptionData[8+1];
+    ThemeOptionData themeOptionValue[5];
+    
     struct SwitchInfo {
       SwitchInfo(unsigned int index, unsigned int position):
         index(index),
@@ -1229,10 +1320,11 @@ class GeneralSettings {
 class RadioData {
   public:
     GeneralSettings generalSettings;
-    ModelData models[C9X_MAX_MODELS];
+    ModelData models[CPN_MAX_MODELS];
 };
 
 enum Capability {
+  ModelName,
   FlightModes,
   FlightModesName,
   FlightModesHaveFades,
@@ -1275,7 +1367,6 @@ enum Capability {
   HasExpoNames,
   HasNoExpo,
   HasMixerNames,
-  HasChNames,
   HasCvNames,
   HasPxxCountry,
   HasPPMStart,
@@ -1314,9 +1405,12 @@ enum Capability {
   PermTimers,
   HasSDLogs,
   CSFunc,
-  LCDWidth,
+  LcdWidth,
+  LcdHeight,
+  LcdDepth,
   GetThrSwitch,
   HasDisplayText,
+  HasTopLcd,
   GlobalFunctions,
   VirtualInputs,
   TrainerInputs,
@@ -1336,7 +1430,8 @@ enum Capability {
   HasInputDiff,
   HasMixerExpo,
   MixersMonitor,
-  HasBatMeterRange
+  HasBatMeterRange,
+  DangerousFunctions,
 };
 
 class SimulatorInterface;
@@ -1353,24 +1448,26 @@ class EEPROMInterface
 
     inline BoardEnum getBoard() { return board; }
 
-    virtual bool load(RadioData &radioData, const uint8_t *eeprom, int size) = 0;
+    virtual unsigned long load(RadioData &radioData, const uint8_t * eeprom, int size) = 0;
 
-    virtual bool loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index) = 0;
+    virtual unsigned long loadBackup(RadioData & radioData, const uint8_t * eeprom, int esize, int index) = 0;
+    
+    virtual unsigned long loadxml(RadioData & radioData, QDomDocument &doc) = 0;
 
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc) = 0;
-
-    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0) = 0;
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint8_t version=0, uint32_t variant=0) = 0;
 
     virtual int getSize(const ModelData &) = 0;
 
     virtual int getSize(const GeneralSettings &) = 0;
 
-    virtual int isAvailable(PulsesProtocol proto, int port=0) = 0;
-
     virtual const int getEEpromSize() = 0;
 
     virtual const int getMaxModels() = 0;
-
+    
+    virtual int loadFile(RadioData & radioData, const QString & filename) = 0;
+    
+    virtual int saveFile(const RadioData & radioData, const QString & filename) = 0;
+  
   protected:
 
     BoardEnum board;
@@ -1417,8 +1514,8 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
   ModelData model_copy = model;
 
   // trims
-  for (int p=0; p<C9X_MAX_FLIGHT_MODES; p++) {
-    for (int i=0; i<NUM_STICKS/2; i++) {
+  for (int p=0; p<CPN_MAX_FLIGHT_MODES; p++) {
+    for (int i=0; i<CPN_MAX_STICKS/2; i++) {
       int converted_stick = applyStickMode(i+1, mode) - 1;
       int tmp = model.flightModeData[p].trim[i];
       model.flightModeData[p].trim[i] = model.flightModeData[p].trim[converted_stick];
@@ -1435,7 +1532,7 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
       model_copy.expoData[i].chn = applyStickMode(model.expoData[i].chn+1, mode) - 1;
   }
   int index=0;
-  for (unsigned int i=0; i<NUM_STICKS; i++) {
+  for (unsigned int i=0; i<CPN_MAX_STICKS; i++) {
     for (unsigned int e=0; e<sizeof(model.expoData) / sizeof(model.expoData[1]); e++) {
       if (model_copy.expoData[e].mode && model_copy.expoData[e].chn == i)
         model.expoData[index++] = model_copy.expoData[e];
@@ -1443,14 +1540,14 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
   }
 
   // mixers
-  for (int i=0; i<C9X_MAX_MIXERS; i++) {
+  for (int i=0; i<CPN_MAX_MIXERS; i++) {
     if (model.mixData[i].srcRaw.type == SOURCE_TYPE_STICK) {
       model.mixData[i].srcRaw.index = applyStickMode(model.mixData[i].srcRaw.index + 1, mode) - 1;
     }
   }
 
   // virtual switches
-  for (int i=0; i<C9X_NUM_CSW; i++) {
+  for (int i=0; i<CPN_MAX_CSW; i++) {
     RawSource source;
     switch (model.logicalSw[i].getFunctionFamily()) {
       case LS_FAMILY_VCOMP:
@@ -1478,11 +1575,33 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
 void registerEEpromInterfaces();
 void unregisterEEpromInterfaces();
 void registerOpenTxFirmwares();
-void unregisterFirmwares();
+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
+};
+
+void ShowEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound);
+void ShowEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound);
 
-bool loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index);
-bool loadEEprom(RadioData &radioData, const uint8_t *eeprom, int size);
-bool loadEEpromXml(RadioData &radioData, QDomDocument &doc);
 
 struct Option {
   const char * name;
@@ -1491,7 +1610,7 @@ struct Option {
 };
 
 class Firmware {
-
+    
   public:
     Firmware(const QString & id, const QString & name, const BoardEnum board, EEPROMInterface * eepromInterface):
       id(id),
@@ -1541,9 +1660,9 @@ class Firmware {
 
     virtual void addOptions(Option options[]);
 
-    inline int saveEEPROM(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, unsigned int version=0)
+    inline int saveEEPROM(uint8_t * eeprom, RadioData & radioData, uint8_t version=0, uint32_t variant=0)
     {
-      return eepromInterface->save(eeprom, radioData, variant, version);
+      return eepromInterface->save(eeprom, radioData, version, variant);
     }
 
     virtual QString getStampUrl() = 0;
@@ -1572,10 +1691,32 @@ class Firmware {
       return eepromInterface;
     }
 
-    virtual int getCapability(const Capability) = 0;
+    virtual int getCapability(Capability) = 0;
+    
+    enum SwitchType {
+      SWITCH_NONE,
+      SWITCH_TOGGLE,
+      SWITCH_2POS,
+      SWITCH_3POS
+    };
+    
+    struct Switch {
+      SwitchType type;
+      const char * name;
+    };
+    
+    virtual Switch getSwitch(unsigned int index) = 0;
+    
+    virtual QString getAnalogInputName(unsigned int index) = 0;
+    
+    virtual QTime getMaxTimerStart() = 0;
 
     virtual bool isTelemetrySourceAvailable(int source) = 0;
 
+    virtual int isAvailable(PulsesProtocol proto, int port=0) = 0;
+    
+    const int getFlashSize();
+
   public:
     QList<const char *> languages;
     QList<const char *> ttslanguages;
@@ -1621,4 +1762,6 @@ inline int divRoundClosest(const int n, const int d)
 
 SimulatorInterface * GetCurrentFirmwareSimulator();
 
-#endif
+extern QList<EEPROMInterface *> eepromInterfaces;
+
+#endif // _EEPROMINTERFACE_H_

companion/src/firmwares/er9x/er9xeeprom.cpp

@@ -1,3 +1,23 @@
+/*
+ * 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"
@@ -45,7 +65,7 @@ t_Er9xTrainerData::t_Er9xTrainerData()
 t_Er9xTrainerData::operator TrainerData ()
 {
   TrainerData c9x;
-  for (int i=0; i<NUM_STICKS; i++) {
+  for (int i=0; i<CPN_MAX_STICKS; i++) {
     c9x.calib[i] = calib[i];
     c9x.mix[i] = mix[i];
   }
@@ -61,7 +81,7 @@ Er9xGeneral::operator GeneralSettings ()
 {
   GeneralSettings result;
   result.version = myVers;
-  for (int i=0; i<NUM_STICKSnPOTS; i++) {
+  for (int i=0; i<CPN_MAX_STICKSnPOTS; i++) {
     result.calibMid[i] = calibMid[i];
     result.calibSpanNeg[i] = calibSpanNeg[i];
     result.calibSpanPos[i] = calibSpanPos[i];
@@ -373,17 +393,17 @@ t_Er9xModelData::operator ModelData ()
       c9x.moduleData[0].protocol = PULSES_PPM;
       break;
   }
-  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
+  c9x.moduleData[0].ppm.frameLength=ppmFrameLength;
   c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
   c9x.thrTrim = thrTrim;
   c9x.trimInc = trimInc-2;
-  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.moduleData[0].ppm.delay = 300 + 50 * ppmDelay;
   c9x.customFn[0].func = FuncInstantTrim;
   if (trimSw) {
     c9x.customFn[0].swtch = er9xToSwitch(trimSw);
   }
   c9x.beepANACenter = beepANACenter;
-  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.moduleData[0].ppm.pulsePol = pulsePol;
   c9x.extendedLimits = extendedLimits;
   c9x.swashRingData.elevatorWeight = swashInvertELE ? -100 : 100;
   c9x.swashRingData.aileronWeight = swashInvertAIL ? -100 : 100;
@@ -402,8 +422,8 @@ t_Er9xModelData::operator ModelData ()
 
   // expoData
   int e = 0;
-  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++) {
+  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++) {
       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])
@@ -426,7 +446,7 @@ t_Er9xModelData::operator ModelData ()
       }
       else {
         c9x.expoData[e].mode = 2;
-        if (e < C9X_MAX_EXPOS - 1) {
+        if (e < CPN_MAX_EXPOS - 1) {
           c9x.expoData[e + 1].swtch = c9x.expoData[e].swtch;
           c9x.expoData[++e].chn = ch;
           c9x.expoData[e].mode = 1;
@@ -440,7 +460,7 @@ t_Er9xModelData::operator ModelData ()
     }
   }
 
-  for (int i=0; i<NUM_STICKS; i++)
+  for (int i=0; i<CPN_MAX_STICKS; i++)
     c9x.flightModeData[0].trim[i] = trim[i];
 
   for (int i=0; i<ER9X_MAX_CURVE5; i++) {

companion/src/firmwares/er9x/er9xeeprom.h

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

companion/src/firmwares/er9x/er9xinterface.cpp

@@ -1,7 +1,12 @@
 /*
- * Author - Bertrand Songis <bsongis@gmail.com>
- * 
- * Based on th9x -> http://code.google.com/p/th9x/
+ * 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
@@ -11,14 +16,12 @@
  * 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 "simulator/er9xsimulator.h"
-#include "file.h"
+#include "rlefile.h"
 #include "appdata.h"
 
 #define FILE_TYP_GENERAL 1
@@ -89,20 +92,23 @@ inline void applyStickModeToModel(Er9xModelData & model, unsigned int mode)
   model.swashCollectiveSource = applyStickMode(model.swashCollectiveSource, mode);
 }
 
-bool Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
   std::cout << "trying er9x xml import... ";
 
+  std::bitset<NUM_ERRORS> errors;
+
   Er9xGeneral er9xGeneral;
   memset(&er9xGeneral,0,sizeof(er9xGeneral));
-  if(!loadGeneralDataXML(&doc, &er9xGeneral)) {
-    return false;
-  } else {
+  if (!loadRadioSettingsDataXML(&doc, &er9xGeneral)) {
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
+  }
+  else {
     radioData.generalSettings=er9xGeneral;
     std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
   }
-  for(int i=0; i<getMaxModels(); i++)
-  {
+  for (int i=0; i<getMaxModels(); i++) {
     Er9xModelData er9xModel;
     memset(&er9xModel,0,sizeof(er9xModel));
     if(loadModelDataXML(&doc, &er9xModel, i)) {
@@ -111,21 +117,26 @@ bool Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
     }
   }
   std::cout << "ok\n";
-  return true;
+  errors.set(ALL_OK);
+  return errors.to_ulong();
 }
 
-bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
   std::cout << "trying er9x import... ";
 
+  std::bitset<NUM_ERRORS> errors;
+
   if (size != getEEpromSize()) {
     std::cout << "wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
   }
 
   if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
     std::cout << "wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
   }
     
   efile->openRd(FILE_GENERAL);
@@ -133,7 +144,8 @@ bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 
   if (efile->readRlc1((uint8_t*)&er9xGeneral, 1) != 1) {
     std::cout << "no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
 
   std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
@@ -151,13 +163,16 @@ bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
       break;
     default:
       std::cout << "not er9x\n";
-      return false;
+      errors.set(NOT_ER9X);
+      return errors.to_ulong();
   }
 
   efile->openRd(FILE_GENERAL);
   if (!efile->readRlc1((uint8_t*)&er9xGeneral, sizeof(Er9xGeneral))) {
     std::cout << "ko\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
+
   }
   radioData.generalSettings = er9xGeneral;
   
@@ -174,20 +189,15 @@ bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
   }
 
   std::cout << "ok\n";
-  return true;
+  errors.set(ALL_OK);
+  return errors.to_ulong();
 }
 
-bool Er9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long Er9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  return false;
-}
-
-int Er9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
-{
-  std::cout << "NO!\n";
-  // TODO an error
-
-  return 0;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }
 
 int Er9xInterface::getSize(const ModelData &model)
@@ -246,7 +256,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::fromAscii(tgen->ownerName,sizeof(tgen->ownerName)).trimmed());
+  appendTextElement(qdoc, &gd, "Owner", QString::fromLatin1(tgen->ownerName,sizeof(tgen->ownerName)).trimmed());
   appendCDATAElement(qdoc, &gd, "Data", (const char *)tgen,sizeof(Er9xGeneral));
   return gd;
 }
@@ -256,12 +266,12 @@ 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::fromAscii(tmod->name,sizeof(tmod->name)).trimmed());
+  appendTextElement(qdoc, &md, "Name", QString::fromLatin1(tmod->name,sizeof(tmod->name)).trimmed());
   appendCDATAElement(qdoc, &md, "Data", (const char *)tmod,sizeof(Er9xModelData));
   return md;
 }
 
-bool Er9xInterface::loadGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen)
+bool Er9xInterface::loadRadioSettingsDataXML(QDomDocument * qdoc, Er9xGeneral * tgen)
 {
   //look for "GENERAL_DATA" tag
   QDomElement gde = qdoc->elementsByTagName("GENERAL_DATA").at(0).toElement();
@@ -274,7 +284,7 @@ bool Er9xInterface::loadGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen)
   while (!n.isNull()) {
     if (n.isCDATASection()) {
       QString ds = n.toCDATASection().data();
-      QByteArray ba = QByteArray::fromBase64(ds.toAscii());
+      QByteArray ba = QByteArray::fromBase64(ds.toLatin1());
       const char * data = ba.data();
       memcpy(tgen, data, sizeof(Er9xGeneral));
       break;
@@ -311,7 +321,7 @@ bool Er9xInterface::loadModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod,
   while (!n.isNull()) {
     if (n.isCDATASection()) {
       QString ds = n.toCDATASection().data();
-      QByteArray ba = QByteArray::fromBase64(ds.toAscii());
+      QByteArray ba = QByteArray::fromBase64(ds.toLatin1());
       const char * data = ba.data();
       memcpy(tmod, data, sizeof(Er9xModelData));
       break;

companion/src/firmwares/er9x/er9xinterface.h

@@ -1,7 +1,12 @@
 /*
- * Author - Bertrand Songis <bsongis@gmail.com>
- * 
- * Based on th9x -> http://code.google.com/p/th9x/
+ * 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
@@ -11,13 +16,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.
- *
  */
-#ifndef er9x_interface_h
-#define er9x_interface_h
+
+#ifndef _ER9XINTERFACE_H_
+#define _ER9XINTERFACE_H_
+
 #include <QtXml>
 #include "eeprominterface.h"
 #include "er9xeeprom.h"
+
 class RleFile;
 
 class Er9xInterface : public EEPROMInterface
@@ -29,44 +36,47 @@ class Er9xInterface : public EEPROMInterface
     virtual ~Er9xInterface();
 
     virtual const char * getName();
-    
+
     virtual const int getEEpromSize();
 
     virtual const int getMaxModels();
 
-    virtual bool load(RadioData &, const uint8_t * eeprom, int size);
+    virtual unsigned long 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 unsigned long loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
 
-    virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual int save(uint8_t * eeprom, 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);
 
   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 loadGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen); // get data from XML
-    
+
+    bool loadRadioSettingsDataXML(QDomDocument * qdoc, Er9xGeneral * tgen); // get data from XML
+
     bool loadModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum = -1); // get data from XML
 
 };
 
-#endif
+#endif // _ER9XINTERFACE_H_

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

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

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

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

@@ -1,3 +1,23 @@
+/*
+ * 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"
@@ -55,7 +75,7 @@ t_Ersky9xTrainerData::t_Ersky9xTrainerData()
 t_Ersky9xTrainerData::operator TrainerData ()
 {
   TrainerData c9x;
-  for (int i=0; i<NUM_STICKS; i++) {
+  for (int i=0; i<CPN_MAX_STICKS; i++) {
     c9x.calib[i] = calib[i];
     c9x.mix[i] = mix[i];
   }
@@ -73,7 +93,7 @@ Ersky9xGeneral::operator GeneralSettings ()
   
   result.version = myVers;
   
-  for (int i=0; i<NUM_STICKSnPOTS; i++) {
+  for (int i=0; i<CPN_MAX_STICKSnPOTS; i++) {
     result.calibMid[i] = calibMid[i];
     result.calibSpanNeg[i] = calibSpanNeg[i];
     result.calibSpanPos[i] = calibSpanPos[i];
@@ -505,17 +525,17 @@ t_Ersky9xModelData_v10::operator ModelData ()
       c9x.moduleData[0].protocol = PULSES_PPM;
       break;
   }
-  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
+  c9x.moduleData[0].ppm.frameLength=ppmFrameLength;
   c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
   c9x.thrTrim = thrTrim;
   c9x.trimInc = trimInc-2;
-  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.moduleData[0].ppm.delay = 300 + 50 * ppmDelay;
   c9x.customFn[0].func = FuncInstantTrim;
   if (trimSw) {
     c9x.customFn[0].swtch = er9xToSwitch(trimSw);
   }
   c9x.beepANACenter = beepANACenter;
-  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.moduleData[0].ppm.pulsePol = pulsePol;
   c9x.extendedLimits = extendedLimits;
   c9x.swashRingData.elevatorWeight = swashInvertELE ? -100 : 100;
   c9x.swashRingData.aileronWeight = swashInvertAIL ? -100 : 100;
@@ -530,8 +550,8 @@ t_Ersky9xModelData_v10::operator ModelData ()
 
   // expoData
   int e = 0;
-  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++) {
+  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++) {
       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])
@@ -554,7 +574,7 @@ t_Ersky9xModelData_v10::operator ModelData ()
       }
       else {
         c9x.expoData[e].mode = 2;
-        if (e < C9X_MAX_EXPOS - 1) {
+        if (e < CPN_MAX_EXPOS - 1) {
           c9x.expoData[e + 1].swtch = c9x.expoData[e].swtch;
           c9x.expoData[++e].chn = ch;
           c9x.expoData[e].mode = 1;
@@ -568,7 +588,7 @@ t_Ersky9xModelData_v10::operator ModelData ()
     }
   }
 
-  for (int i=0; i<NUM_STICKS; i++)
+  for (int i=0; i<CPN_MAX_STICKS; i++)
     c9x.flightModeData[0].trim[i] = trim[i];
 
   for (int i=0; i<ERSKY9X_MAX_CURVE5; i++) {
@@ -620,17 +640,17 @@ t_Ersky9xModelData_v11::operator ModelData ()
       c9x.moduleData[0].protocol = PULSES_PPM;
       break;
   }
-  c9x.moduleData[0].ppmFrameLength=ppmFrameLength;
+  c9x.moduleData[0].ppm.frameLength=ppmFrameLength;
   c9x.moduleData[0].channelsCount = 8 + 2 * ppmNCH;
   c9x.thrTrim = thrTrim;
   c9x.trimInc = trimInc-2;
-  c9x.moduleData[0].ppmDelay = 300 + 50 * ppmDelay;
+  c9x.moduleData[0].ppm.delay = 300 + 50 * ppmDelay;
   c9x.customFn[0].func = FuncInstantTrim;
   if (trimSw) {
     c9x.customFn[0].swtch = er9xToSwitch(trimSw);
   }
   c9x.beepANACenter = beepANACenter;
-  c9x.moduleData[0].ppmPulsePol = pulsePol;
+  c9x.moduleData[0].ppm.pulsePol = pulsePol;
   c9x.extendedLimits = extendedLimits;
   c9x.swashRingData.elevatorWeight = swashInvertELE ? -100 : 100;
   c9x.swashRingData.aileronWeight = swashInvertAIL ? -100 : 100;
@@ -645,8 +665,8 @@ t_Ersky9xModelData_v11::operator ModelData ()
 
   // expoData
   int e = 0;
-  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++) {
+  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++) {
       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])
@@ -669,7 +689,7 @@ t_Ersky9xModelData_v11::operator ModelData ()
       }
       else {
         c9x.expoData[e].mode = 2;
-        if (e < C9X_MAX_EXPOS - 1) {
+        if (e < CPN_MAX_EXPOS - 1) {
           c9x.expoData[e + 1].swtch = c9x.expoData[e].swtch;
           c9x.expoData[++e].chn = ch;
           c9x.expoData[e].mode = 1;
@@ -683,7 +703,7 @@ t_Ersky9xModelData_v11::operator ModelData ()
     }
   }
 
-  for (int i=0; i<NUM_STICKS; i++)
+  for (int i=0; i<CPN_MAX_STICKS; i++)
     c9x.flightModeData[0].trim[i] = trim[i];
 
   for (int i=0; i<ERSKY9X_MAX_CURVE5; i++) {

companion/src/firmwares/ersky9x/ersky9xeeprom.h

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

companion/src/firmwares/ersky9x/ersky9xinterface.cpp

@@ -1,7 +1,12 @@
 /*
- * Author - Bertrand Songis <bsongis@gmail.com>
- * 
- * Based on th9x -> http://code.google.com/p/th9x/
+ * 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
@@ -11,15 +16,12 @@
  * 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 "simulator/ersky9xsimulator.h"
-#include "file.h"
+#include "rlefile.h"
 
 #define FILE_TYP_GENERAL 1
 #define FILE_TYP_MODEL   2
@@ -120,14 +122,17 @@ inline void applyStickModeToModel(Ersky9xModelData_v11 & model, unsigned int mod
   model.swashCollectiveSource = applyStickMode(model.swashCollectiveSource, mode);
 }
 
-bool Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
   std::cout << "trying ersky9x xml import... ";
 
+  std::bitset<NUM_ERRORS> errors;
+
   Ersky9xGeneral ersky9xGeneral;
   memset(&ersky9xGeneral,0,sizeof(ersky9xGeneral));
-  if(!loadGeneralDataXML(&doc, &ersky9xGeneral)) {
-    return false;
+  if(!loadRadioSettingsDataXML(&doc, &ersky9xGeneral)) {
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
   else {
     radioData.generalSettings=ersky9xGeneral;
@@ -137,32 +142,39 @@ bool Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
     if (ersky9xGeneral.myVers == 10) {
       if (!loadModelDataXML<Ersky9xModelData_v10>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
         std::cout << "ko\n";
-        return false;
+        errors.set(UNKNOWN_ERROR);
+        return errors.to_ulong();
       }
     }
     else {
       if (!loadModelDataXML<Ersky9xModelData_v11>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
         std::cout << "ko\n";
-        return false;
+        errors.set(UNKNOWN_ERROR);
+        return errors.to_ulong();
       }
     }
   }
   std::cout << "ok\n";
-  return true;
+  errors.set(ALL_OK);
+  return errors.to_ulong();
 }
 
-bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
   std::cout << "trying ersky9x import... ";
 
+  std::bitset<NUM_ERRORS> errors;
+
   if (size != EESIZE_SKY9X) {
     std::cout << "wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
   }
 
   if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_SKY9X)) {
     std::cout << "wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
   }
     
   efile->openRd(FILE_GENERAL);
@@ -170,7 +182,8 @@ bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int siz
 
   if (efile->readRlc2((uint8_t*)&ersky9xGeneral, 1) != 1) {
     std::cout << "no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
 
   std::cout << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
@@ -182,12 +195,14 @@ bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int siz
       break;
     default:
       std::cout << "not ersky9x\n";
-      return false;
+      errors.set(NOT_ERSKY9X);
+      return errors.to_ulong();
   }
   efile->openRd(FILE_GENERAL);
   if (!efile->readRlc2((uint8_t*)&ersky9xGeneral, sizeof(Ersky9xGeneral))) {
     std::cout << "ko\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
   radioData.generalSettings = ersky9xGeneral;
   
@@ -218,20 +233,15 @@ bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int siz
   }
 
   std::cout << "ok\n";
-  return true;
+  errors.set(ALL_OK);
+  return errors.to_ulong();
 }
 
-bool Ersky9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long Ersky9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  return false;
-}
-
-int Ersky9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
-{
-  std::cout << "NO!\n";
-  // TODO an error
-
-  return 0;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }
 
 int Ersky9xInterface::getSize(const ModelData & model)
@@ -290,7 +300,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::fromAscii(tgen->ownerName,sizeof(tgen->ownerName)).trimmed());
+  appendTextElement(qdoc, &gd, "Owner", QString::fromLatin1(tgen->ownerName,sizeof(tgen->ownerName)).trimmed());
   appendCDATAElement(qdoc, &gd, "Data", (const char *)tgen,sizeof(Ersky9xGeneral));
   return gd;
 }
@@ -300,12 +310,12 @@ 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::fromAscii(tmod->name,sizeof(tmod->name)).trimmed());
+  appendTextElement(qdoc, &md, "Name", QString::fromLatin1(tmod->name,sizeof(tmod->name)).trimmed());
   appendCDATAElement(qdoc, &md, "Data", (const char *)tmod,sizeof(Ersky9xModelData_v11));
   return md;
 }
 
-bool Ersky9xInterface::loadGeneralDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen)
+bool Ersky9xInterface::loadRadioSettingsDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen)
 {
   //look for "GENERAL_DATA" tag
   QDomElement gde = qdoc->elementsByTagName("GENERAL_DATA").at(0).toElement();
@@ -318,7 +328,7 @@ bool Ersky9xInterface::loadGeneralDataXML(QDomDocument * qdoc, Ersky9xGeneral *
   while (!n.isNull()) {
     if (n.isCDATASection()) {
       QString ds = n.toCDATASection().data();
-      QByteArray ba = QByteArray::fromBase64(ds.toAscii());
+      QByteArray ba = QByteArray::fromBase64(ds.toLatin1());
       const char * data = ba.data();
       memcpy(tgen, data, std::min((unsigned int)ba.size(), (unsigned int)sizeof(Ersky9xGeneral)));
       break;
@@ -358,7 +368,7 @@ bool Ersky9xInterface::loadModelDataXML(QDomDocument * qdoc, ModelData *model, i
   while (!n.isNull()) {
     if (n.isCDATASection()) {
       QString ds = n.toCDATASection().data();
-      QByteArray ba = QByteArray::fromBase64(ds.toAscii());
+      QByteArray ba = QByteArray::fromBase64(ds.toLatin1());
       const char * data = ba.data();
       memcpy(&ersky9xModel, data, std::min(ba.size(), (int)sizeof(ersky9xModel)));
       break;

companion/src/firmwares/ersky9x/ersky9xinterface.h

@@ -1,7 +1,12 @@
 /*
- * Author - Bertrand Songis <bsongis@gmail.com>
- * 
- * Based on th9x -> http://code.google.com/p/th9x/
+ * 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
@@ -11,13 +16,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.
- *
  */
-#ifndef ersky9x_interface_h
-#define ersky9x_interface_h
+
+#ifndef _ERSKY9XINTERFACE_H_
+#define _ERSKY9XINTERFACE_H_
+
 #include <QtXml>
 #include "eeprominterface.h"
 #include "ersky9xeeprom.h"
+
 class RleFile;
 
 class Ersky9xInterface : public EEPROMInterface
@@ -34,13 +41,16 @@ class Ersky9xInterface : public EEPROMInterface
 
     virtual const int getMaxModels();
 
-    virtual bool load(RadioData &, const uint8_t * eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t * eeprom, int size);
 
-    virtual bool loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
+    virtual unsigned long loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
 
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
-    virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint8_t version=0, uint32_t variant=0)
+    {
+      return 0;
+    }
 
     virtual int getSize(const ModelData &);
     
@@ -50,7 +60,7 @@ class Ersky9xInterface : public EEPROMInterface
 
   protected:
 
-    RleFile *efile;
+    RleFile * efile;
 
   private:
     void appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value);
@@ -63,11 +73,11 @@ class Ersky9xInterface : public EEPROMInterface
     
     QDomElement getModelDataXML(QDomDocument * qdoc, Ersky9xModelData_v11 * tmod, int modelNum, int mdver); //parse out data to XML format
     
-    bool loadGeneralDataXML(QDomDocument * qdoc, Ersky9xGeneral * tgen); // get data from XML
+    bool loadRadioSettingsDataXML(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
+#endif // _ERSKY9XINTERFACE_H_

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

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

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

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

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

companion/src/firmwares/gruvin9x/gruvin9xeeprom.cpp

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

companion/src/firmwares/gruvin9x/gruvin9xeeprom.h

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

companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp

@@ -1,232 +0,0 @@
-/*
- * 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(const ModelData & model)
-{
-  return 0;
-}
-
-int Gruvin9xInterface::getSize(const GeneralSettings & settings)
-{
-  return 0;
-}
-
-int Gruvin9xInterface::isAvailable(PulsesProtocol proto, int port)
-{
-  switch (proto) {
-    case PULSES_PPM:
-    case PULSES_SILV_A:
-    case PULSES_SILV_B:
-    case PULSES_SILV_C:
-    case PULSES_CTP1009:
-    case PULSES_DSM2:
-      return 1;
-    default:
-      return 0;
-  }
-}

companion/src/firmwares/gruvin9x/gruvin9xinterface.h

@@ -1,64 +0,0 @@
-/*
- * 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(const ModelData &);
-    
-    virtual int getSize(const GeneralSettings & settings);
-
-    virtual int isAvailable(PulsesProtocol proto, int port=0);
-
-  protected:
-
-    template <class T>
-    void loadModel(ModelData &model, unsigned int stickMode=0, int version=2);
-
-    template <class T>
-    bool loadGeneral(GeneralSettings &settings, int version=2);
-
-    RleFile *efile;
-
-};
-
-#endif

companion/src/firmwares/opentx/open9xGruvin9xeeprom.cpp

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

companion/src/firmwares/opentx/open9xGruvin9xeeprom.h

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

companion/src/firmwares/opentx/open9xSky9xeeprom.h

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

companion/src/firmwares/opentx/open9xStockeeprom.h

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

companion/src/firmwares/opentx/opentxeeprom.h

@@ -1,7 +1,12 @@
 /*
- * Author - Bertrand Songis <bsongis@gmail.com>
+ * Copyright (C) OpenTX
  *
- * Based on th9x -> http://code.google.com/p/th9x/
+ * 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
@@ -11,11 +16,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 open9xeeprom_h
-#define open9xeeprom_h
+#ifndef _OPENTXEEPROM_H_
+#define _OPENTXEEPROM_H_
 
 #include <inttypes.h>
 #include "eeprominterface.h"
@@ -81,6 +85,10 @@ class ProtocolsConversionTable: public ConversionTable
         addConversion(PULSES_DSM2, val++);
         addConversion(PULSES_DSMX, val++);
       }
+      if (IS_TARANIS(board)) {
+    	addConversion(PULSES_CROSSFIRE, val++);
+        addConversion(PULSES_MULTIMODULE, val++);
+      }
     }
 };
 
@@ -113,10 +121,10 @@ class OpenTxModelData: public TransformedField {
 
   private:
     char name[256];
-    int subprotocols[C9X_NUM_MODULES+1/*trainer*/];
+    int subprotocols[CPN_MAX_MODULES+1/*trainer*/];
     ProtocolsConversionTable protocolsConversionTable;
     ChannelsConversionTable channelsConversionTable;
 };
 
 void OpenTxEepromCleanup(void);
-#endif
+#endif // _OPENTXEEPROM_H_

companion/src/firmwares/opentx/opentxinterface.h

@@ -1,7 +1,12 @@
 /*
- * Author - Bertrand Songis <bsongis@gmail.com>
- * 
- * Based on th9x -> http://code.google.com/p/th9x/
+ * 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
@@ -11,11 +16,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 opentx_interface_h
-#define opentx_interface_h
+#ifndef _OPENTXINTERFACE_H_
+#define _OPENTXINTERFACE_H_
 
 #include "eeprominterface.h"
 
@@ -33,50 +37,59 @@ class OpenTxEepromInterface : public EEPROMInterface
 
     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 unsigned long load(RadioData &, const uint8_t * eeprom, int size);
     
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    bool loadModelFromBackup(ModelData & model, const uint8_t * data, unsigned int size, uint8_t version, uint32_t variant);
+    
+    virtual unsigned long loadBackup(RadioData &, const uint8_t * eeprom, int esize, int index);
 
-    virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
+    virtual unsigned long loadxml(RadioData & radioData, QDomDocument & doc);
+    
+    virtual int save(uint8_t * eeprom, RadioData & radioData, uint8_t version=0, uint32_t variant=0);
 
     virtual int getSize(const ModelData &);
 
     virtual int getSize(const GeneralSettings &);
     
-    virtual int isAvailable(PulsesProtocol proto, int port=0);
+    virtual int loadFile(RadioData & radioData, const QString & filename);
     
+    virtual int saveFile(const RadioData & radioData, const QString & filename);
+
   protected:
 
     const char * getName();
 
-    bool checkVersion(unsigned int version);
+    EepromLoadErrors checkVersion(unsigned int version);
 
     bool checkVariant(unsigned int version, unsigned int variant);
+    
+    template <class T, class M>
+    bool loadFromByteArray(T & dest, const QByteArray & data, uint8_t version, uint32_t variant=0);
+    
+    template <class T, class M>
+    bool loadFromByteArray(T & dest, const QByteArray & data);
+    
+    template <class T, class M>
+    bool saveToByteArray(const T & src, QByteArray & data, uint8_t version);
 
+    bool loadRadioSettingsFromRLE(GeneralSettings & settings, RleFile * rleFile, uint8_t version);
+    
+    bool loadModelFromRLE(ModelData & model, RleFile * rleFile, unsigned int index, uint8_t version, uint32_t variant);
+    
     template <class T>
-    bool loadModel(ModelData &model, uint8_t *data, int index, unsigned int stickMode=0);
-
+    bool saveModel(unsigned int index, ModelData & model, uint8_t version, uint32_t variant);
+    
     template <class T>
-    bool loadModelVariant(unsigned int index, ModelData &model, uint8_t *data, unsigned int version, unsigned int variant);
-
-    bool loadModel(uint8_t version, ModelData &model, uint8_t *data, int index, unsigned int variant, unsigned int stickMode=0);
-
-    template <class T>
-    bool saveModel(unsigned int index, ModelData &model, unsigned int version, unsigned int variant);
-
-    template <class T>
-    bool loadGeneral(GeneralSettings &settings, unsigned int version);
-
-    template <class T>
-    bool saveGeneral(GeneralSettings &settings, BoardEnum board, uint32_t version, uint32_t variant);
-
-    RleFile *efile;
+    bool saveRadioSettings(GeneralSettings & settings, BoardEnum board, uint8_t version, uint32_t variant);
+    
+    uint8_t getLastDataVersion(BoardEnum board);
+    
+    RleFile * efile;
 
 };
 
-class OpenTxFirmware: public Firmware {
+class OpenTxFirmware: public Firmware
+{
   public:
     OpenTxFirmware(const QString & id, OpenTxFirmware * parent):
       Firmware(parent, id, parent->getName(), parent->getBoard(), parent->eepromInterface)
@@ -112,17 +125,25 @@ class OpenTxFirmware: public Firmware {
     }
 
     virtual Firmware * getFirmwareVariant(const QString & id);
-    
+
     virtual QString getStampUrl();
 
     virtual QString getReleaseNotesUrl();
 
     virtual QString getFirmwareUrl();
 
-    virtual int getCapability(const Capability);
+    virtual int getCapability(Capability);
+    
+    virtual Switch getSwitch(unsigned int index);
+    
+    virtual QString getAnalogInputName(unsigned int index);
+    
+    virtual QTime getMaxTimerStart();
 
     virtual bool isTelemetrySourceAvailable(int source);
-    
+
+    virtual int isAvailable(PulsesProtocol proto, int port=0);
+
   protected:
 
     QString getFirmwareBaseUrl();
@@ -130,5 +151,6 @@ class OpenTxFirmware: public Firmware {
 };
 
 void registerOpenTxFirmwares();
+void unregisterOpenTxFirmwares();
 
-#endif
+#endif // _OPENTXINTERFACE_H_

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

@@ -1,203 +0,0 @@
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
-
-set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src)
-
-add_custom_target(about_lbm_9x
-  make lbm PCB=9X
-  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
-)
-
-add_custom_target(about_lbm_taranis
-  make lbm PCB=TARANIS
-  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
-)
-
-add_custom_target(commondeps
-  make stamp_header tra
-  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
-)
-
-set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${RADIO_SRC_DIRECTORY}/stamp-opentx.h)
-
-add_custom_target(lua_exports 
-  make PCB=TARANIS lua_exports.inc
-  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
-)
-
-set(OPENTX_SRC_FILES
-  opentxsimulator.cpp
-)
-
-include_directories(
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${PROJECT_SOURCE_DIR}
-  ${PROJECT_SOURCE_DIR}/firmwares/opentx
-  ${RADIO_SRC_DIRECTORY}
-  ${RADIO_SRC_DIRECTORY}/fonts/std
-  ${RADIO_SRC_DIRECTORY}/lua/src
-  ${RADIO_SRC_DIRECTORY}/thirdparty
-  ${RADIO_SRC_DIRECTORY}/thirdparty/FatFs
-  ${RADIO_SRC_DIRECTORY}/thirdparty/FatFs/option
-  ${RADIO_SRC_DIRECTORY}/thirdparty/CoOS
-  ${RADIO_SRC_DIRECTORY}/thirdparty/Lua/src
-)
-
-if(APPLE)
-  # OS X compiler no longer automatically includes /Library/Frameworks in search path
-  set(CMAKE_SHARED_LINKER_FLAGS -F/Library/Frameworks)
-endif(APPLE)
-
-if(DEFINED TRANSLATIONS)
-  set(COMMON_DEFINITIONS ${COMMON_DEFINITIONS} TRANSLATIONS_${TRANSLATIONS})
-  string(TOLOWER ${TRANSLATIONS} TRANSLATION_SUFFIX)
-  set(SUFFIX ${SUFFIX}-${TRANSLATION_SUFFIX})
-endif()
-
-set(COMMON_DEFINITIONS
-  ${COMMON_DEFINITIONS}
-  SUFFIX="${SUFFIX}" 
-  HELI
-  GVARS
-  FLIGHT_MODES
-  PPM_CENTER_ADJUSTABLE
-  PPM_LIMITS_SYMETRICAL
-  OVERRIDE_CHANNEL_FUNCTION 
-  FAI_CHOICE
-)
-
-set(COMMON_LIBRARIES
-  ${QT_LIBRARIES}
-  ${PTHREAD_LIBRARY}
-  ${SDL_LIBRARY}
-)
-
-add_library(opentx-9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-9xr${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-9x128${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-9xr128${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-gruvin9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-mega2560${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-sky9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-9xrpro${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-ar9x${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-taranis${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-taranisplus${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-add_library(opentx-taranisx9e${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})
-
-add_dependencies(opentx-9x${SUFFIX}-simulator about_lbm_9x commondeps)
-add_dependencies(opentx-9xr${SUFFIX}-simulator about_lbm_9x commondeps)
-add_dependencies(opentx-9x128${SUFFIX}-simulator about_lbm_9x commondeps)
-add_dependencies(opentx-9xr128${SUFFIX}-simulator about_lbm_9x commondeps)
-add_dependencies(opentx-gruvin9x${SUFFIX}-simulator about_lbm_9x commondeps)
-add_dependencies(opentx-mega2560${SUFFIX}-simulator about_lbm_9x commondeps)
-add_dependencies(opentx-sky9x${SUFFIX}-simulator about_lbm_9x commondeps)
-add_dependencies(opentx-9xrpro${SUFFIX}-simulator about_lbm_9x commondeps)
-add_dependencies(opentx-ar9x${SUFFIX}-simulator about_lbm_9x commondeps)
-add_dependencies(opentx-taranis${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
-add_dependencies(opentx-taranisplus${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
-add_dependencies(opentx-taranisx9e${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
-
-set(OPENTX_LIBRARIES
-  opentx-9x${SUFFIX}-simulator
-  opentx-9xr${SUFFIX}-simulator
-  opentx-9x128${SUFFIX}-simulator
-  opentx-9xr128${SUFFIX}-simulator
-  opentx-gruvin9x${SUFFIX}-simulator
-  opentx-mega2560${SUFFIX}-simulator
-  opentx-sky9x${SUFFIX}-simulator
-  opentx-9xrpro${SUFFIX}-simulator
-  opentx-ar9x${SUFFIX}-simulator
-  opentx-taranis${SUFFIX}-simulator
-  opentx-taranisplus${SUFFIX}-simulator
-  opentx-taranisx9e${SUFFIX}-simulator
-)
-
-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-  install(TARGETS ${OPENTX_LIBRARIES} LIBRARY DESTINATION ${SIMULATOR_LIB_PATH})
-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
-
-# 9X with ATmega64
-target_include_directories(opentx-9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/stock)
-target_compile_definitions(opentx-9x${SUFFIX}-simulator PRIVATE PCBSTD PCB9X CPUM64 EEPROM_RLC ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-9x${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# 9XR with ATmega64
-target_include_directories(opentx-9xr${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/stock)
-target_compile_definitions(opentx-9xr${SUFFIX}-simulator PRIVATE PCBSTD PCB9XR CPUM64 EEPROM_RLC ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-9xr${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# 9X with ATmega128
-target_include_directories(opentx-9x128${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/stock)
-target_compile_definitions(opentx-9x128${SUFFIX}-simulator PRIVATE PCBSTD PCB9X CPUM128 EEPROM_RLC ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-9x128${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# 9XR with ATmega128
-target_include_directories(opentx-9xr128${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/stock)
-target_compile_definitions(opentx-9xr128${SUFFIX}-simulator PRIVATE PCBSTD PCB9XR CPUM128 EEPROM_RLC ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-9xr128${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# Gruvin9x
-target_include_directories(opentx-gruvin9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/gruvin9x)
-target_compile_definitions(opentx-gruvin9x${SUFFIX}-simulator PRIVATE PCBGRUVIN9X CPUM2560 EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-gruvin9x${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# Mega2560
-target_include_directories(opentx-mega2560${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/mega2560)
-target_compile_definitions(opentx-mega2560${SUFFIX}-simulator PRIVATE PCBMEGA2560 CPUM2560 EEPROM_RLC SDCARD ROTARY_ENCODERS=2 ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-mega2560${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# Sky9x
-target_include_directories(opentx-sky9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/sky9x)
-target_compile_definitions(opentx-sky9x${SUFFIX}-simulator PRIVATE PCBSKY9X CPUARM VOICE SDCARD ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-sky9x${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# 9XR-PRO
-target_include_directories(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/sky9x)
-target_compile_definitions(opentx-9xrpro${SUFFIX}-simulator PRIVATE PCBSKY9X REVX CPUARM VOICE SDCARD ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-9xrpro${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# AR9X
-target_include_directories(opentx-ar9x${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/sky9x)
-target_compile_definitions(opentx-ar9x${SUFFIX}-simulator PRIVATE PCBSKY9X AR9X CPUARM VOICE SDCARD ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-ar9x${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# Taranis standard
-target_include_directories(opentx-taranis${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis)
-target_compile_definitions(opentx-taranis${SUFFIX}-simulator PRIVATE PCBTARANIS CPUARM CPUSTM32 EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-taranis${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# Taranis Plus 
-target_include_directories(opentx-taranisplus${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis)
-target_compile_definitions(opentx-taranisplus${SUFFIX}-simulator PRIVATE PCBTARANIS REVPLUS CPUARM CPUSTM32 EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-taranisplus${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-# Taranis X9E
-target_include_directories(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/taranis)
-target_compile_definitions(opentx-taranisx9e${SUFFIX}-simulator PRIVATE PCBTARANIS REVPLUS REV9E CPUARM CPUSTM32 STM32F40_41xxx EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-taranisx9e${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
-add_custom_target(opentx-simulators
-  DEPENDS ${OPENTX_LIBRARIES}
-)
-
-if(APPLE)
-  set(SIMULATOR_BUNDLES)
-  foreach(_file ${OPENTX_LIBRARIES})
-    set(SIMULATOR_BUNDLE "${_file}-bundle")
-    add_custom_target(${SIMULATOR_BUNDLE}
-      COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtCore.framework/Versions/4/QtCore @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore lib${_file}.dylib
-      COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtNetwork.framework/Versions/4/QtNetwork @executable_path/../Frameworks/QtNetwork.framework/Versions/4/QtNetwork lib${_file}.dylib
-      COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtXml.framework/Versions/4/QtXml @executable_path/../Frameworks/QtXml.framework/Versions/4/QtXml lib${_file}.dylib
-      COMMAND install_name_tool -change /opt/local/Library/Frameworks/QtGui.framework/Versions/4/QtGui @executable_path/../Frameworks/QtGui.framework/Versions/4/QtGui lib${_file}.dylib
-      COMMAND install_name_tool -change @rpath/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL lib${_file}.dylib
-      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-      COMMAND pwd
-      COMMAND cp lib${_file}.dylib companion.app/Contents/Resources/
-      DEPENDS ${_file}
-    )
-    list(APPEND SIMULATOR_BUNDLES ${SIMULATOR_BUNDLE})
-  endforeach()
-  add_custom_target(opentx-simulators-bundle DEPENDS ${SIMULATOR_BUNDLES})
-endif(APPLE)
-

companion/src/firmwares/opentx/simulator/opentxsimulator.cpp

@@ -1,535 +0,0 @@
-/*
- * 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 "opentxsimulator.h"
-#include <QDebug>
-#include <stdio.h>
-#include <exception>
-#include <map>
-#include <string>
-
-#define COMPANION
-#define SIMU
-#define SIMU_EXCEPTIONS
-#define GUI
-#define SPLASH
-#define FRSKY
-#define FRSKY_HUB
-#define GPS
-#define VARIO
-#define GAUGES
-#define PPM_UNIT_PERCENT_PREC1
-#define AUDIO
-#define PXX
-#define DSM2
-#define DSM2_PPM
-#define DBLKEYS
-#define AUTOSWITCH
-#define GRAPHICS
-#define CURVES
-#if defined(PCBTARANIS)
-  #define RTCLOCK
-  #define XCURVES
-  #define VIRTUALINPUTS
-  #define LUA
-  #define LUA_MODEL_SCRIPTS
-  #define LUAINPUTS 
-#else
-  #define BUZZER
-  #define TEMPLATES
-#endif
-#define BOLD_FONT
-#define HAPTIC
-#define THRTRACE
-
-#if defined(CPUARM)
-#define TIMERS 3
-#else
-#define TIMERS 2
-#endif
-
-#if defined(PCBSKY9X) && !defined(REVX)
-  #define ROTARY_ENCODERS 1
-#elif defined(PCBGRUVIN9X)
-  #define ROTARY_ENCODERS 2
-#endif
-
-#if defined(CPUARM)
-  #define FRSKY_SPORT
-#endif
-
-#if defined (PCBTARANIS)
-  #define MIXERS_MONITOR
-#endif
-
-#undef min
-#undef max
-
-namespace NAMESPACE {
-
-#if defined(CPUARM)
-#include "radio/src/pulses/ppm_arm.cpp"
-#include "radio/src/pulses/pxx_arm.cpp"
-#include "radio/src/pulses/dsm2_arm.cpp"
-#include "radio/src/main_arm.cpp"
-#include "radio/src/pulses/pulses_arm.cpp"
-#include "radio/src/tasks_arm.cpp"
-#include "radio/src/audio_arm.cpp"
-#include "radio/src/telemetry/telemetry.cpp"
-#include "radio/src/telemetry/frsky_sport.cpp"
-#include "radio/src/sbus.cpp"
-#else
-#include "radio/src/main_avr.cpp"
-#include "radio/src/audio_avr.cpp"
-#include "radio/src/pulses/pulses_avr.cpp"
-#endif
-
-#include "radio/src/eeprom_common.cpp"
-#if defined(EEPROM_RLC)
-#include "radio/src/eeprom_rlc.cpp"
-#else
-#include "radio/src/eeprom_raw.cpp"
-#endif
-
-#if defined(PCBTARANIS) || defined(PCBSKY9X)
-#include "radio/src/eeprom_conversions.cpp"
-#endif
-
-#include "radio/src/opentx.cpp"
-#include "radio/src/debug.cpp"
-#include "radio/src/strhelpers.cpp"
-#include "radio/src/switches.cpp"
-#include "radio/src/functions.cpp"
-#include "radio/src/curves.cpp"
-#include "radio/src/mixer.cpp"
-#if defined(SDCARD)
-#include "radio/src/sdcard.cpp"
-#endif
-#include "radio/src/timers.cpp"
-#include "radio/src/stamp.cpp"
-#include "radio/src/maths.cpp"
-#include "radio/src/vario.cpp"
-#include "radio/src/trainer_input.cpp"
-
-#if defined(PCBTARANIS)
-#include "radio/src/bmp.cpp"
-#include "radio/src/gui/Taranis/fonts.cpp"
-#include "radio/src/gui/Taranis/widgets.cpp"
-#include "radio/src/gui/Taranis/navigation.cpp"
-#include "radio/src/gui/Taranis/popups.cpp"
-#include "radio/src/gui/Taranis/helpers.cpp"
-#include "radio/src/gui/Taranis/menus.cpp"
-#include "radio/src/gui/Taranis/menu_model.cpp"
-#include "radio/src/gui/Taranis/menu_model_select.cpp"
-#include "radio/src/gui/Taranis/menu_model_setup.cpp"
-#include "radio/src/gui/Taranis/menu_model_heli.cpp"
-#include "radio/src/gui/Taranis/menu_model_flightmodes.cpp"
-#include "radio/src/gui/Taranis/menu_model_inputs_mixes.cpp"
-#include "radio/src/gui/Taranis/menu_model_curves.cpp"
-#include "radio/src/gui/Taranis/menu_model_logical_switches.cpp"
-#include "radio/src/gui/Taranis/menu_model_custom_functions.cpp"
-#include "radio/src/gui/Taranis/menu_model_custom_scripts.cpp"
-#include "radio/src/gui/Taranis/menu_model_gvars.cpp"
-#include "radio/src/gui/Taranis/menu_model_limits.cpp"
-#include "radio/src/gui/Taranis/menu_model_telemetry.cpp"
-#include "radio/src/gui/Taranis/menu_general.cpp"
-#include "radio/src/gui/Taranis/menu_general_setup.cpp"
-#include "radio/src/gui/Taranis/menu_general_sdmanager.cpp"
-#include "radio/src/gui/Taranis/menu_general_trainer.cpp"
-#include "radio/src/gui/Taranis/menu_general_version.cpp"
-#include "radio/src/gui/Taranis/menu_general_diagkeys.cpp"
-#include "radio/src/gui/Taranis/menu_general_diaganas.cpp"
-#include "radio/src/gui/Taranis/menu_general_hardware.cpp"
-#include "radio/src/gui/Taranis/menu_general_calib.cpp"
-#include "radio/src/gui/Taranis/view_main.cpp"
-#include "radio/src/gui/Taranis/view_statistics.cpp"
-#include "radio/src/gui/Taranis/view_channels.cpp"
-#include "radio/src/gui/Taranis/view_telemetry.cpp"
-#include "radio/src/gui/Taranis/view_text.cpp"
-#include "radio/src/gui/Taranis/view_about.cpp"
-#include "radio/src/gui/Taranis/lcd.cpp"
-#include "radio/src/gui/Taranis/splash.cpp"
-#else
-#include "radio/src/gui/9X/fonts.cpp"
-#include "radio/src/gui/9X/widgets.cpp"
-#include "radio/src/gui/9X/navigation.cpp"
-#include "radio/src/gui/9X/popups.cpp"
-#include "radio/src/gui/9X/helpers.cpp"
-#include "radio/src/gui/9X/menus.cpp"
-#include "radio/src/gui/9X/menu_model.cpp"
-#include "radio/src/gui/9X/menu_model_select.cpp"
-#include "radio/src/gui/9X/menu_model_setup.cpp"
-#include "radio/src/gui/9X/menu_model_heli.cpp"
-#include "radio/src/gui/9X/menu_model_flightmodes.cpp"
-#include "radio/src/gui/9X/menu_model_inputs_mixes.cpp"
-#include "radio/src/gui/9X/menu_model_curves.cpp"
-#include "radio/src/gui/9X/menu_model_logical_switches.cpp"
-#include "radio/src/gui/9X/menu_model_custom_functions.cpp"
-#include "radio/src/gui/9X/menu_model_limits.cpp"
-#include "radio/src/gui/9X/menu_model_telemetry.cpp"
-#include "radio/src/gui/9X/menu_model_templates.cpp"
-#include "radio/src/gui/9X/menu_general.cpp"
-#include "radio/src/gui/9X/menu_general_setup.cpp"
-#if defined(SDCARD)
-#include "radio/src/gui/9X/menu_general_sdmanager.cpp"
-#include "radio/src/gui/9X/view_text.cpp"
-#endif
-#include "radio/src/gui/9X/menu_general_trainer.cpp"
-#include "radio/src/gui/9X/menu_general_version.cpp"
-#include "radio/src/gui/9X/menu_general_diagkeys.cpp"
-#include "radio/src/gui/9X/menu_general_diaganas.cpp"
-#if defined(CPUARM)
-#include "radio/src/gui/9X/menu_general_hardware.cpp"
-#endif
-#include "radio/src/gui/9X/menu_general_calib.cpp"
-#include "radio/src/gui/9X/view_main.cpp"
-#include "radio/src/gui/9X/view_statistics.cpp"
-#include "radio/src/gui/9X/view_telemetry.cpp"
-#if !defined(CPUM64)
-#include "radio/src/gui/9X/view_about.cpp"
-#endif
-#include "radio/src/gui/9X/lcd.cpp"
-#include "radio/src/gui/9X/splash.cpp"
-#endif
-
-#if !defined(VIRTUALINPUTS)
-#include "radio/src/templates.cpp"
-#endif
-
-#if defined(SDCARD)
-#include "radio/src/logs.cpp"
-#endif
-
-#if defined(RTCLOCK)
-#include "radio/src/rtc.cpp"
-#endif
-
-#if defined(BUZZER)
-#include "radio/src/buzzer.cpp"
-#endif
-
-#if defined(PCBTARANIS)
-#include "radio/src/targets/taranis/board_taranis.cpp"
-#include "radio/src/targets/taranis/keys_driver.cpp"
-#include "radio/src/targets/taranis/audio_driver.cpp"
-#include "radio/src/targets/taranis/telemetry_driver.cpp"
-#include "radio/src/targets/taranis/haptic_driver.cpp"
-#if defined(REV9E)
-#include "radio/src/targets/taranis/top_lcd_driver.cpp"
-#endif
-#include "radio/src/targets/taranis/pulses_driver.cpp"
-#include "radio/src/targets/taranis/rtc_driver.cpp"
-#include "radio/src/targets/taranis/trainer_driver.cpp"
-#include "radio/src/targets/taranis/serial2_driver.cpp"
-#elif defined(PCBSKY9X)
-#include "radio/src/targets/sky9x/board_sky9x.cpp"
-#include "radio/src/targets/sky9x/telemetry_driver.cpp"
-#include "radio/src/targets/sky9x/pwr_driver.cpp"
-#include "radio/src/targets/sky9x/eeprom_driver.cpp"
-#include "radio/src/targets/sky9x/keys_driver.cpp"
-#include "radio/src/targets/sky9x/audio_driver.cpp"
-#include "radio/src/targets/sky9x/sdcard_driver.cpp"
-#include "radio/src/targets/sky9x/coproc_driver.cpp"
-#include "radio/src/targets/sky9x/haptic_driver.cpp"
-#include "radio/src/targets/sky9x/serial2_driver.cpp"
-#include "radio/src/targets/sky9x/pulses_driver.cpp"
-#elif defined(PCBGRUVIN9X)
-#include "radio/src/targets/gruvin9x/board_gruvin9x.cpp"
-#include "radio/src/targets/gruvin9x/somo14d.cpp"
-#elif defined(PCBMEGA2560)
-#include "radio/src/targets/mega2560/board_mega2560.cpp"
-#else
-#include "radio/src/targets/stock/board_stock.cpp"
-#endif
-
-#include "radio/src/keys.cpp"
-#include "radio/src/haptic.cpp"
-#include "radio/src/targets/simu/simpgmspace.cpp"
-#include "radio/src/translations.cpp"
-#include "radio/src/telemetry/frsky.cpp"
-#include "radio/src/telemetry/frsky_d.cpp"
-#include "radio/src/translations/tts_en.cpp"
-
-#if defined(CPUARM)
-#include "radio/src/translations/tts_cz.cpp"
-#include "radio/src/translations/tts_de.cpp"
-#include "radio/src/translations/tts_es.cpp"
-#include "radio/src/translations/tts_fr.cpp"
-#include "radio/src/translations/tts_hu.cpp"
-#include "radio/src/translations/tts_it.cpp"
-#include "radio/src/translations/tts_nl.cpp"
-#include "radio/src/translations/tts_pl.cpp"
-#include "radio/src/translations/tts_pt.cpp"
-#include "radio/src/translations/tts_se.cpp"
-#include "radio/src/translations/tts_sk.cpp"
-#endif
-
-#if defined(LUA)
-#include "radio/src/lua_api.cpp"
-#include "radio/src/thirdparty/Lua/src/lapi.c"
-#include "radio/src/thirdparty/Lua/src/lcode.c"
-#include "radio/src/thirdparty/Lua/src/lctype.c"
-#include "radio/src/thirdparty/Lua/src/ldebug.c"
-#include "radio/src/thirdparty/Lua/src/ldo.c"
-#include "radio/src/thirdparty/Lua/src/ldump.c"
-#include "radio/src/thirdparty/Lua/src/lfunc.c"
-#include "radio/src/thirdparty/Lua/src/lgc.c"
-#include "radio/src/thirdparty/Lua/src/llex.c"
-#include "radio/src/thirdparty/Lua/src/lmem.c"
-#include "radio/src/thirdparty/Lua/src/lobject.c"
-#include "radio/src/thirdparty/Lua/src/lopcodes.c"
-#include "radio/src/thirdparty/Lua/src/lparser.c"
-#include "radio/src/thirdparty/Lua/src/lstate.c"
-#include "radio/src/thirdparty/Lua/src/lstring.c"
-#include "radio/src/thirdparty/Lua/src/ltable.c"
-#include "radio/src/thirdparty/Lua/src/lrotable.c"
-#include "radio/src/thirdparty/Lua/src/ltm.c"
-#include "radio/src/thirdparty/Lua/src/lundump.c"
-#include "radio/src/thirdparty/Lua/src/lvm.c"
-#include "radio/src/thirdparty/Lua/src/lzio.c"
-#include "radio/src/thirdparty/Lua/src/lbaselib.c"
-#include "radio/src/thirdparty/Lua/src/linit.c"
-#include "radio/src/thirdparty/Lua/src/lmathlib.c"
-#include "radio/src/thirdparty/Lua/src/lbitlib.c"
-#include "radio/src/thirdparty/Lua/src/loadlib.c"
-#include "radio/src/thirdparty/Lua/src/lauxlib.c"
-#include "radio/src/thirdparty/Lua/src/ltablib.c"
-#include "radio/src/thirdparty/Lua/src/lcorolib.c"
-#include "radio/src/thirdparty/Lua/src/liolib.c"
-#endif
-
-int16_t g_anas[NUM_STICKS+NUM_POTS];
-
-uint16_t anaIn(uint8_t chan)
-{
-    return g_anas[chan];
-}
-
-bool hasExtendedTrims()
-{
-  return g_model.extendedTrims;
-}
-
-uint8_t getStickMode()
-{
-  return limit<uint8_t>(0, g_eeGeneral.stickMode, 3);
-}
-
-#if defined(PCBTARANIS)
-void resetTrims()
-{
-  TRIMS_GPIO_REG_RVD |= TRIMS_GPIO_PIN_RVD;
-  TRIMS_GPIO_REG_RVU |= TRIMS_GPIO_PIN_RVU;
-  TRIMS_GPIO_REG_RHL |= TRIMS_GPIO_PIN_RHL;
-  TRIMS_GPIO_REG_RHR |= TRIMS_GPIO_PIN_RHR;
-  TRIMS_GPIO_REG_LVD |= TRIMS_GPIO_PIN_LVD;
-  TRIMS_GPIO_REG_LVU |= TRIMS_GPIO_PIN_LVU;
-  TRIMS_GPIO_REG_LHL |= TRIMS_GPIO_PIN_LHL;
-  TRIMS_GPIO_REG_LHR |= TRIMS_GPIO_PIN_LHR;
-}
-#endif
-
-void delay_01us(::uint16_t nb)
-{
-}
-
-OpenTxSimulator::OpenTxSimulator()
-{
-}
-
-void OpenTxSimulator::setSdPath(const QString &sdPath)
-{
-#if defined(SDCARD)
-  strncpy(simuSdDirectory, sdPath.toAscii().constData(), sizeof(simuSdDirectory)-1);
-  simuSdDirectory[sizeof(simuSdDirectory)-1] = '\0';
-#endif
-}
-
-void OpenTxSimulator::setVolumeGain(int value)
-{
-  volumeGain = value;
-}
-
-bool OpenTxSimulator::timer10ms()
-{
-#define TIMER10MS_IMPORT
-#include "simulatorimport.h"
-}
-
-::uint8_t * OpenTxSimulator::getLcd()
-{
-#define GETLCD_IMPORT
-#include "simulatorimport.h"
-}
-
-bool OpenTxSimulator::lcdChanged(bool & lightEnable)
-{
-#define LCDCHANGED_IMPORT
-#include "simulatorimport.h"
-}
-
-void OpenTxSimulator::start(QByteArray & eeprom, bool tests)
-{
-  memcpy(NAMESPACE::eeprom, eeprom.data(), std::min<int>(sizeof(NAMESPACE::eeprom), eeprom.size()));
-  start((const char *)0, tests);
-}
-
-void OpenTxSimulator::start(const char * filename, bool tests)
-{
-#if defined(PCBSKY9X) && !defined(REVX)
-  g_rotenc[0] = 0;
-#elif defined(PCBGRUVIN9X)
-  g_rotenc[0] = 0;
-  g_rotenc[1] = 0;
-#endif
-
-  StartEepromThread(filename);
-  StartAudioThread(volumeGain);
-  StartMainThread(tests);
-}
-
-void OpenTxSimulator::stop()
-{
-  StopMainThread();
-#if defined(CPUARM)  
-  StopAudioThread();
-#endif
-  StopEepromThread();
-}
-
-void OpenTxSimulator::getValues(TxOutputs &outputs)
-{
-#define GETVALUES_IMPORT
-#define g_chans512 channelOutputs
-#include "simulatorimport.h"
-#if defined(PCBSKY9X)
-  outputs.beep = g_beepCnt;
-  g_beepCnt = 0;
-#endif
-}
-
-void OpenTxSimulator::setValues(TxInputs &inputs)
-{
-#define SETVALUES_IMPORT
-#include "simulatorimport.h"
-}
-
-void OpenTxSimulator::setTrim(unsigned int idx, int value)
-{
-  idx = NAMESPACE::modn12x3[4*getStickMode() + idx];
-  ::uint8_t phase = getTrimFlightPhase(getFlightMode(), idx);
-  setTrimValue(phase, idx, value);
-}
-
-void OpenTxSimulator::getTrims(Trims & trims)
-{
-  ::uint8_t phase = getFlightMode();
-  trims.extended = hasExtendedTrims();
-  for (::uint8_t idx=0; idx<4; idx++) {
-    trims.values[idx] = getTrimValue(getTrimFlightPhase(phase, idx), idx);
-  }
-
-  for (int i=0; i<2; i++) {
-    ::uint8_t idx = NAMESPACE::modn12x3[4*getStickMode() + i];
-    ::int16_t tmp = trims.values[i];
-    trims.values[i] = trims.values[idx];
-    trims.values[idx] = tmp;
-  }
-}
-
-void OpenTxSimulator::wheelEvent(int steps)
-{
-#if defined(REV9E)
-  if (steps == 255)
-    x9de_rotenc -= 2;
-  else
-    x9de_rotenc += 2;
-#elif defined(PCBSKY9X) && !defined(REVX)
-  g_rotenc[0] += steps*4;
-#elif defined(PCBGRUVIN9X)
-  g_rotenc[0] += steps;
-#endif
-}
-
-unsigned int OpenTxSimulator::getPhase()
-{
-  return getFlightMode();
-}
-
-const char * OpenTxSimulator::getPhaseName(unsigned int phase)
-{
-  static char buff[sizeof(g_model.flightModeData[0].name)+1];
-  zchar2str(buff, g_model.flightModeData[phase].name, sizeof(g_model.flightModeData[0].name));
-  return buff;
-}
-
-const char * OpenTxSimulator::getError()
-{
-#define GETERROR_IMPORT
-#include "simulatorimport.h"
-}
-
-void OpenTxSimulator::sendTelemetry(::uint8_t * data, unsigned int len)
-{
-#if defined(FRSKY_SPORT)
-  processSportPacket(data);
-#endif
-}
-
-void OpenTxSimulator::setTrainerInput(unsigned int inputNumber, ::int16_t value)
-{
-#define SETTRAINER_IMPORT
-#include "simulatorimport.h"
-}
-
-void OpenTxSimulator::installTraceHook(void (*callback)(const char *))
-{
-  traceCallback = callback;
-}
-
-class OpenTxSimulatorFactory: public SimulatorFactory
-{
-  public:
-    OpenTxSimulatorFactory()
-    {
-    }
-
-    virtual SimulatorInterface *create()
-    {
-      return new OpenTxSimulator();
-    }
-
-    virtual QString name()
-    {
-      return QString("opentx-" FLAVOUR SUFFIX);
-    }
-
-    virtual BoardEnum type()
-    {
-#if defined(PCBTARANIS)
-      return BOARD_TARANIS;
-#else
-      return BOARD_STOCK;
-#endif
-    }
-};
-
-}
-
-extern "C" DLLEXPORT SimulatorFactory *registerSimu()
-{
-  return new NAMESPACE::OpenTxSimulatorFactory();
-}

companion/src/firmwares/opentx/simulator/opentxsimulator.h

@@ -1,132 +0,0 @@
-/*
- * 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 opentx_taranis_simulator_h
-#define opentx_taranis_simulator_h
-
-#include "simulatorinterface.h"
-
-#if defined(PCBTARANIS) && defined(REV9E)
-  #define FLAVOUR "taranisx9e"
-  #define NAMESPACE TaranisX9E
-  #define EEPROM_VARIANT 0x8000
-#elif defined(PCBTARANIS) && defined(REVPLUS)
-  #define FLAVOUR "taranisplus"
-  #define NAMESPACE TaranisPlus
-  #define EEPROM_VARIANT 0
-#elif defined(PCBTARANIS)
-  #define FLAVOUR "taranis"
-  #define NAMESPACE Taranis
-  #define EEPROM_VARIANT 0
-#elif defined(PCBSKY9X) && defined(REVX)
-  #define FLAVOUR "9xrpro"
-  #define NAMESPACE Sky9xPro
-  #define EEPROM_VARIANT 0
-#elif defined(PCBSKY9X) && defined(AR9X)
-  #define FLAVOUR "ar9x"
-  #define NAMESPACE Ar9x
-  #define EEPROM_VARIANT 0
-#elif defined(PCBSKY9X)
-  #define FLAVOUR "sky9x"
-  #define NAMESPACE Sky9X
-  #define EEPROM_VARIANT 0
-#elif defined(PCBGRUVIN9X)
-  #define FLAVOUR "gruvin9x"
-  #define NAMESPACE Gruvin9X
-  #define EEPROM_VARIANT 0
-#elif defined(PCBMEGA2560)
-  #define FLAVOUR "mega2560"
-  #define NAMESPACE Mega2560
-  #define EEPROM_VARIANT 0
-#elif defined(PCB9XR) && defined(CPUM128)
-  #define FLAVOUR "9xr128"
-  #define NAMESPACE M128XR
-  #define EEPROM_VARIANT 0x8003
-#elif defined(PCB9X) && defined(CPUM128)
-  #define FLAVOUR "9x128"
-  #define NAMESPACE M128
-  #define EEPROM_VARIANT 0x8003
-#elif defined(PCB9XR) && defined(CPUM64)
-  #define FLAVOUR "9xr"
-  #define NAMESPACE M64XR
-  #define EEPROM_VARIANT 0x0003
-#elif defined(PCB9X) && defined(CPUM64)
-  #define FLAVOUR "9x"
-  #define NAMESPACE M64
-  #define EEPROM_VARIANT 0x0003
-#else
-#error "Unknown board"
-#endif
-
-#if defined __GNUC__
-  #define DLLEXPORT
-#else
-  #define DLLEXPORT __declspec(dllexport)
-#endif
-
-namespace NAMESPACE {
-
-class DLLEXPORT OpenTxSimulator : public SimulatorInterface {
-
-  private:
-    int volumeGain;
-
-  public:
-
-    OpenTxSimulator();
-
-    virtual void setSdPath(const QString &sdPath);
-
-    virtual void setVolumeGain(int value);
-
-    virtual void start(QByteArray & eeprom, bool tests=true);
-
-    virtual void start(const char * filename, bool tests=true);
-
-    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();
-
-    virtual const char * getPhaseName(unsigned int phase);
-
-    virtual void wheelEvent(int steps);
-
-    virtual const char * getError();
-
-    virtual void sendTelemetry(uint8_t * data, unsigned int len);
-
-    virtual void setTrainerInput(unsigned int inputNumber, int16_t value);
-
-    virtual void installTraceHook(void (*callback)(const char *));
-};
-
-}
-
-#endif

companion/src/firmwares/opentx/stamp-opentx.h.in

@@ -1,4 +0,0 @@
-// Automatically generated file (CMake) - do not edit
-#define DATE_STR  "@DATE@"
-#define TIME_STR  "@TIME@"
-#define VERS_STR  "@C9X_VERSION@"

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

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

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

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

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

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

companion/src/firmwares/th9x/th9xeeprom.cpp

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

companion/src/firmwares/th9x/th9xeeprom.h

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

companion/src/firmwares/th9x/th9xinterface.cpp

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

companion/src/firmwares/th9x/th9xinterface.h

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

companion/src/flasheepromdialog.cpp

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "flasheepromdialog.h"
 #include "ui_flasheepromdialog.h"
 #include "eeprominterface.h"
@@ -7,7 +27,7 @@
 #include "appdata.h"
 #include "progressdialog.h"
 #include "radiointerface.h"
-#include "converteeprom.h"
+#include "storage_eeprom.h"
 #include "splashlibrarydialog.h"
 
 FlashEEpromDialog::FlashEEpromDialog(QWidget *parent, const QString &filename):
@@ -58,7 +78,7 @@ void FlashEEpromDialog::updateUI()
       ui->patchCalibration->show();
       ui->patchHardwareSettings->show();
       // TODO I hardcode the number of pots here, should be dependant on the board?
-      if (!((calib.length()==(NUM_STICKS+3)*12) && (trainercalib.length()==16))) {
+      if (!((calib.length()==(CPN_MAX_STICKS+3)*12) && (trainercalib.length()==16))) {
         ui->patchCalibration->setDisabled(true);
       }
       if (!((DisplaySet.length()==6) && (BeeperSet.length()==4) && (HapticSet.length()==6) && (SpeakerSet.length()==6))) {
@@ -104,7 +124,7 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
 
   QByteArray eeprom(EESIZE_MAX, 0);
   int fileType = getFileType(filename);
-  
+
 #if 0
   if (fileType==FILE_TYPE_XML) {
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -125,7 +145,8 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
     bool xmlOK = doc.setContent(&file);
     if (xmlOK) {
       RadioData * radioData = new RadioData();
-      if (!loadEEpromXml(*radioData, doc)) {
+      std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEepromXml(*radioData, doc));
+      if (!errors.test(ALL_OK)) {
         QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings File %1").arg(filename));
       }
       else {
@@ -160,7 +181,8 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
   }
 
   RadioData * radioData = new RadioData();
-  if (eeprom_size == 0 || !loadEEprom(*radioData, (const uint8_t *)eeprom.data(), eeprom_size)) {
+  std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEeprom(*radioData, (const uint8_t *)eeprom.data(), eeprom_size));
+  if (eeprom_size == 0 || !errors.test(ALL_OK)) {
     QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings file %1").arg(filename));
   }
   else {
@@ -179,11 +201,11 @@ bool FlashEEpromDialog::patchCalibration()
   int8_t txCurrentCalibration=(int8_t) g.profile[g.id()].txCurrentCalibration();
   int8_t PPM_Multiplier=(int8_t) g.profile[g.id()].ppmMultiplier();
 
-  if ((calib.length()==(NUM_STICKS+potsnum)*12) && (trainercalib.length()==16)) {
+  if ((calib.length()==(CPN_MAX_STICKS+potsnum)*12) && (trainercalib.length()==16)) {
     QString Byte;
     int16_t byte16;
     bool ok;
-    for (int i=0; i<(NUM_STICKS+potsnum); i++) {
+    for (int i=0; i<(CPN_MAX_STICKS+potsnum); i++) {
       Byte=calib.mid(i*12,4);
       byte16=(int16_t)Byte.toInt(&ok,16);
       if (ok)
@@ -275,7 +297,7 @@ void FlashEEpromDialog::on_burnButton_clicked()
     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());
+    int eeprom_size = GetEepromInterface()->save(eeprom, *radioData, 0, GetCurrentFirmware()->getVariantNumber());
     if (!eeprom_size) {
       QMessageBox::warning(this, tr("Error"), tr("Cannot write file %1:\n%2.").arg(filename).arg(file.errorString()));
       return;
@@ -303,7 +325,7 @@ void FlashEEpromDialog::on_burnButton_clicked()
     backupPath = g.profile[g.id()].pBackupDir();
     if (backupPath.isEmpty()) {
       backupPath=g.backupDir();
-    }    
+    }
     backupFilename = backupPath + "/backup-" + QDateTime().currentDateTime().toString("yyyy-MM-dd-HHmmss") + ".bin";
   }
   else if (ui->checkFirmwareCompatibility->isChecked()) {

companion/src/flasheepromdialog.h

@@ -1,7 +1,27 @@
-#ifndef FLASHEEPROMDIALOG_H_
-#define FLASHEEPROMDIALOG_H_
+/*
+ * 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 <QDialog>
+#ifndef _FLASHEEPROMDIALOG_H_
+#define _FLASHEEPROMDIALOG_H_
+
+#include <QtWidgets>
 
 #define ER9X_EEPROM_FILE_TYPE          "ER9X_EEPROM_FILE"
 #define EEPE_EEPROM_FILE_HEADER        "EEPE EEPROM FILE"
@@ -43,4 +63,4 @@ private:
   RadioData *radioData;
 };
 
-#endif // FLASHEEPROMDIALOG_H_
+#endif // _FLASHEEPROMDIALOG_H_

companion/src/flasheepromdialog.ui

@@ -110,7 +110,7 @@
       </sizepolicy>
      </property>
      <property name="toolTip">
-      <string>Allows Companion to write to older version of the firmware</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Saves a dated copy of your eeprom to the backup folder you specified in the Companion settings before writing the current model to the radio.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="text">
       <string>Backup before Write</string>

companion/src/flashfirmwaredialog.cpp

@@ -1,7 +1,27 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "flashfirmwaredialog.h"
 #include "ui_flashfirmwaredialog.h"
 #include "appdata.h"
-#include "converteeprom.h"
+#include "storage_eeprom.h"
 #include "eeprominterface.h"
 #include "firmwareinterface.h"
 #include "process_flash.h"
@@ -37,7 +57,7 @@ fwName(g.profile[g.id()].fwName())
     ui->useProfileSplash->setDisabled(true);
   }
 
-  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+  if (IS_STM32(GetEepromInterface()->getBoard())) {
     // No backup on Taranis ... could be done if in massstorage
     ui->backupEEprom->hide();
     ui->backupEEprom->setCheckState(Qt::Unchecked);
@@ -115,7 +135,7 @@ void FlashFirmwareDialog::updateUI()
   }
 
   if (!image.isNull()) {
-    ui->splash->setPixmap(makePixMap(image, g.profile[g.id()].fwType()));
+    ui->splash->setPixmap(makePixMap(image));
   }
 }
 
@@ -124,7 +144,7 @@ void FlashFirmwareDialog::on_firmwareLoad_clicked()
   QString fileName = QFileDialog::getOpenFileName(this, tr("Open Firmware File"), g.flashDir(), FLASH_FILES_FILTER);
   if (!fileName.isEmpty()) {
     fwName = fileName;
-    if (!fwName.isEmpty() && !FirmwareInterface(fwName).isValid()) {
+    if (!fwName.isEmpty() && !fwName.endsWith(".dfu") && !FirmwareInterface(fwName).isValid()) {
       QMessageBox::warning(this, tr("Warning"), tr("%1 may not be a valid firmware file").arg(fwName));
     }
     updateUI();

companion/src/flashfirmwaredialog.h

@@ -1,17 +1,38 @@
-#ifndef FLASH_FIRMWARE_DIALOG_H
-#define FLASH_FIRMWARE_DIALOG_H
+/*
+ * 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 <QtGui>
-#include <QDialog>
+#ifndef _FLASHFIRMWAREDIALOG_H_
+#define _FLASHFIRMWAREDIALOG_H_
+
+#include <QtWidgets>
 #include "eeprominterface.h"
 #include "firmwareinterface.h"
 #include "xmlinterface.h"
 
 #define HEX_FILES_FILTER              "HEX files (*.hex);;"
 #define BIN_FILES_FILTER              "BIN files (*.bin);;"
+#define DFU_FILES_FILTER              "DFU files (*.dfu);;"
 #define EEPE_FILES_FILTER             "EEPE EEPROM files (*.eepe);;"
+#define OTX_FILES_FILTER              "OpenTX files (*.otx);;"
 #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 FLASH_FILES_FILTER            "FLASH files (*.bin *.hex *.dfu);;" BIN_FILES_FILTER HEX_FILES_FILTER DFU_FILES_FILTER
 #define EXTERNAL_EEPROM_FILES_FILTER  "EEPROM files (*.bin *.hex);;" BIN_FILES_FILTER HEX_FILES_FILTER
 #define ER9X_EEPROM_FILE_TYPE         "ER9X_EEPROM_FILE"
 #define EEPE_EEPROM_FILE_HEADER       "EEPE EEPROM FILE"
@@ -53,4 +74,4 @@ private:
   QString imageFile;
 };
 
-#endif // FLASH_FIRMWARE_DIALOG_H
+#endif // _FLASHFIRMWAREDIALOG_H_

companion/src/fusesdialog.cpp

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "fusesdialog.h"
 #include "ui_fusesdialog.h"
 #include "helpers.h"

companion/src/fusesdialog.h

@@ -1,5 +1,25 @@
-#ifndef FUSESDIALOG_H_
-#define FUSESDIALOG_H_
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _FUSESDIALOG_H_
+#define _FUSESDIALOG_H_
 
 #include <QDialog>
 
@@ -25,4 +45,4 @@ private:
 
 };
 
-#endif // FUSESDIALOG_H_
+#endif // _FUSESDIALOG_H_

companion/src/fusesdialog.ui

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

companion/src/fwpreferencesdialog.cpp

@@ -1,3 +1,23 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "fwpreferencesdialog.h"
 #include "ui_fwpreferencesdialog.h"
 #include "mainwindow.h"

companion/src/fwpreferencesdialog.h

@@ -1,5 +1,25 @@
-#ifndef FWPREFERENCESDIALOG_H
-#define FWPREFERENCESDIALOG_H
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef _FWPREFERENCESDIALOG_H_
+#define _FWPREFERENCESDIALOG_H_
 
 #include <QDialog>
 #include <QCheckBox>
@@ -29,4 +49,4 @@ class FirmwarePreferencesDialog : public QDialog
     void on_checkFWUpdates_clicked();
 };
 
-#endif // FWPREFERENCESDIALOG_H
+#endif // _FWPREFERENCESDIALOG_H_

companion/src/generaledit/CMakeLists.txt

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

companion/src/generaledit/calibration.cpp

@@ -1,429 +1,110 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <QVBoxLayout>
+#include <QHeaderView>
+#include <QSpinBox>
 #include "calibration.h"
-#include "ui_calibration.h"
 
-void CalibrationPanel::setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
-{
-  bool enabled = false;
-
-  if (IS_TARANIS(firmware->getBoard())) {
-    if (IS_TARANIS_X9E(firmware->getBoard())) {
-      enabled = true;
-      type->addItem(tr("None"), GeneralSettings::SWITCH_NONE);
-    }
-    else if (index < 8) {
-      enabled = true;
-    }
-  }
-
-  if (enabled) {
-    type->addItem(tr("2 Positions Toggle"), GeneralSettings::SWITCH_TOGGLE);
-    type->addItem(tr("2 Positions"), GeneralSettings::SWITCH_2POS);
-    type->addItem(tr("3 Positions"), GeneralSettings::SWITCH_3POS);
-    name->setField(generalSettings.switchName[index], 3, this);
-    type->setField(generalSettings.switchConfig[index], this);
-  }
-  else {
-    label->hide();
-    name->hide();
-    type->hide();
-  }
-}
-
-void CalibrationPanel::setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
-{
-  bool enabled = false;
-
-  if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
-    label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS).toString());
-    enabled = true;
-  }
-  else if (IS_TARANIS_PLUS(firmware->getBoard()) && index < 3) {
-    enabled = true;
-  }
-  else if (IS_TARANIS(firmware->getBoard()) && index < 2) {
-    enabled = true;
-  }
-
-  if (enabled) {
-    type->addItem(tr("None"), GeneralSettings::POT_NONE);
-    type->addItem(tr("Pot with detent"), GeneralSettings::POT_WITH_DETENT);
-    type->addItem(tr("Multipos switch"), GeneralSettings::POT_MULTIPOS_SWITCH);
-    type->addItem(tr("Pot without detent"), GeneralSettings::POT_WITHOUT_DETENT);
-    name->setField(generalSettings.potName[index], 3, this);
-    type->setField(generalSettings.potConfig[index], this);
-  }
-  else {
-    label->hide();
-    name->hide();
-    type->hide();
-  }
-}
-
-void CalibrationPanel::setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
-{
-  bool enabled = false;
-
-  if (IS_TARANIS(firmware->getBoard()) && index < 2) {
-    type->setEnabled(false);
-    enabled = true;
-  }
-  else if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
-    enabled = true;
-  }
-
-  if (IS_TARANIS_X9E(firmware->getBoard())) {
-    label->setText(RawSource(SOURCE_TYPE_STICK, index+NUM_STICKS+4).toString());
-  }
-
-  if (enabled) {
-    type->addItem(tr("None"), GeneralSettings::SLIDER_NONE);
-    type->addItem(tr("Slider with detent"), GeneralSettings::SLIDER_WITH_DETENT);
-    name->setField(generalSettings.sliderName[index], 3, this);
-    type->setField(generalSettings.sliderConfig[index], this);
-  }
-  else {
-    label->hide();
-    name->hide();
-    type->hide();
-  }
-}
 
 CalibrationPanel::CalibrationPanel(QWidget * parent, GeneralSettings & generalSettings, Firmware * firmware):
-  GeneralPanel(parent, generalSettings, firmware),
-  ui(new Ui::Calibration)
+  GeneralPanel(parent, generalSettings, firmware)
 {
-  ui->setupUi(this);
 
-  if (!firmware->getCapability(MultiposPots)) {
-    ui->potsTypeSeparator->hide();
+  tableWidget = new QTableWidget();
+  QVBoxLayout * layout = new QVBoxLayout();
+  layout->addWidget(tableWidget);
+  layout->setContentsMargins(0, 0, 0, 0);
+  this->setLayout(layout);
+
+  tableWidget->verticalHeader()->setSectionResizeMode(QHeaderView::ResizeToContents);
+  tableWidget->setColumnCount(3);
+  tableWidget->setShowGrid(false);
+  tableWidget->setSelectionMode(QAbstractItemView::NoSelection);
+  tableWidget->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
+  tableWidget->setStyleSheet("QTableWidget {background-color: transparent;}");
+  QStringList headerLabels;
+  headerLabels << QObject::tr("Negative span") << QObject::tr("Mid value") << QObject::tr("Positive span"); 
+  tableWidget->setHorizontalHeaderLabels(headerLabels);
+
+  int rows = CPN_MAX_STICKS + GetCurrentFirmware()->getCapability(Pots) + GetCurrentFirmware()->getCapability(Sliders);
+  tableWidget->setRowCount(rows);
+
+  for(int i = 0; i < rows; ++i) {
+
+    QTableWidgetItem *newItem = new QTableWidgetItem(firmware->getAnalogInputName(i));
+    newItem->setTextAlignment(Qt::AlignLeft);
+    tableWidget->setVerticalHeaderItem(i, newItem);
+
+    for(int j = 0; j < 3; ++j) {
+      QSpinBox * newItem = new QSpinBox();
+      newItem->setMinimum(-9999);
+      newItem->setMaximum(9999);
+      newItem->setSingleStep(1);
+      newItem->setValue(getCalibrationValue(i, j));
+      newItem->setProperty("row", i);
+      newItem->setProperty("column", j);
+      tableWidget->setCellWidget(i, j, newItem);
+      connect(newItem, SIGNAL(valueChanged(int)), this, SLOT(onCellChanged(int)));
+    }
   }
-
-  if (IS_TARANIS(firmware->getBoard())) {
-    ui->rudName->setField(generalSettings.stickName[0], 3, this);
-    ui->eleName->setField(generalSettings.stickName[1], 3, this);
-    ui->thrName->setField(generalSettings.stickName[2], 3, this);
-    ui->ailName->setField(generalSettings.stickName[3], 3, this);
-  }
-  else {
-    ui->rudLabel->hide();
-    ui->rudName->hide();
-    ui->eleLabel->hide();
-    ui->eleName->hide();
-    ui->thrLabel->hide();
-    ui->thrName->hide();
-    ui->ailLabel->hide();
-    ui->ailName->hide();
-  }
-
-  setupPotConfig(0, ui->pot1Label, ui->pot1Name, ui->pot1Type);
-  setupPotConfig(1, ui->pot2Label, ui->pot2Name, ui->pot2Type);
-  setupPotConfig(2, ui->pot3Label, ui->pot3Name, ui->pot3Type);
-  setupPotConfig(3, ui->pot4Label, ui->pot4Name, ui->pot4Type);
-
-  setupSliderConfig(0, ui->lsLabel, ui->lsName, ui->lsType);
-  setupSliderConfig(1, ui->rsLabel, ui->rsName, ui->rsType);
-  setupSliderConfig(2, ui->ls2Label, ui->ls2Name, ui->ls2Type);
-  setupSliderConfig(3, ui->rs2Label, ui->rs2Name, ui->rs2Type);
-
-  setupSwitchConfig(0, ui->saLabel, ui->saName, ui->saType);
-  setupSwitchConfig(1, ui->sbLabel, ui->sbName, ui->sbType);
-  setupSwitchConfig(2, ui->scLabel, ui->scName, ui->scType);
-  setupSwitchConfig(3, ui->sdLabel, ui->sdName, ui->sdType);
-  setupSwitchConfig(4, ui->seLabel, ui->seName, ui->seType);
-  setupSwitchConfig(5, ui->sfLabel, ui->sfName, ui->sfType);
-  setupSwitchConfig(6, ui->sgLabel, ui->sgName, ui->sgType);
-  setupSwitchConfig(7, ui->shLabel, ui->shName, ui->shType);
-  setupSwitchConfig(8, ui->siLabel, ui->siName, ui->siType);
-  setupSwitchConfig(9, ui->sjLabel, ui->sjName, ui->sjType);
-  setupSwitchConfig(10, ui->skLabel, ui->skName, ui->skType);
-  setupSwitchConfig(11, ui->slLabel, ui->slName, ui->slType);
-  setupSwitchConfig(12, ui->smLabel, ui->smName, ui->smType);
-  setupSwitchConfig(13, ui->snLabel, ui->snName, ui->snType);
-  setupSwitchConfig(14, ui->soLabel, ui->soName, ui->soType);
-  setupSwitchConfig(15, ui->spLabel, ui->spName, ui->spType);
-  setupSwitchConfig(16, ui->sqLabel, ui->sqName, ui->sqType);
-  setupSwitchConfig(17, ui->srLabel, ui->srName, ui->srType);
-
-  int potsCount = GetCurrentFirmware()->getCapability(Pots);
-  if (potsCount == 3) {
-    ui->ana8Neg->hide();
-    ui->ana8Mid->hide();
-    ui->ana8Pos->hide();
-  }
-
-  if (IS_TARANIS(firmware->getBoard())) {
-    ui->serialPortMode->setCurrentIndex(generalSettings.hw_uartMode);
-  }
-  else {
-    ui->serialPortMode->hide();
-    ui->serialPortLabel->hide();
-  }
-
-  if (!IS_SKY9X(firmware->getBoard())) {
-    ui->txCurrentCalibration->hide();
-    ui->txCurrentCalibrationLabel->hide();
-  }
-
-  if (IS_TARANIS_X9E(firmware->getBoard())) {
-    ui->bluetoothEnable->setChecked(generalSettings.bluetoothEnable);
-    ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
-  }
-  else {
-    ui->bluetoothLabel->hide();
-    ui->bluetoothEnable->hide();
-    ui->bluetoothName->hide();
-  }
-
   disableMouseScrolling();
-
-  setValues();
 }
 
-CalibrationPanel::~CalibrationPanel()
+void CalibrationPanel::onCellChanged(int value)
 {
-  delete ui;
-}
+  QSpinBox * sb = qobject_cast<QSpinBox*>(sender());
+  int row = sb->property("row").toInt();
+  int column = sb->property("column").toInt();
 
-/*void CalibrationPanel::update()
+  if (value != getCalibrationValue(row, column)) {
+    setCalibrationValue(row,column, value);
+    qDebug() << "CalibrationPanel::onCellChanged" << row << column << "to" << value;
+    emit modified();
+  }
+}
+    
+int CalibrationPanel::getCalibrationValue(int row, int column)
 {
+  switch(column) {
+    case 0:
+      return generalSettings.calibSpanNeg[row];
+    case 1:
+      return generalSettings.calibMid[row];
+    case 2:
+      return generalSettings.calibSpanPos[row];
+  }
+  return 0;
 }
-*/
-void CalibrationPanel::on_PPM_MultiplierDSB_editingFinished()
+
+void CalibrationPanel::setCalibrationValue(int row, int column, int value)
 {
-  generalSettings.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM1_editingFinished()
-{
-  generalSettings.trainer.calib[0] = ui->PPM1->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM2_editingFinished()
-{
-  generalSettings.trainer.calib[1] = ui->PPM2->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM3_editingFinished()
-{
-  generalSettings.trainer.calib[2] = ui->PPM3->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_PPM4_editingFinished()
-{
-  generalSettings.trainer.calib[3] = ui->PPM4->value();
-  emit modified();
-}
-
-
-void CalibrationPanel::on_txCurrentCalibration_editingFinished()
-{
-  generalSettings.txCurrentCalibration = ui->txCurrentCalibration->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_bluetoothEnable_stateChanged(int)
-{
-  generalSettings.bluetoothEnable = ui->bluetoothEnable->isChecked();
-  emit modified();
-}
-
-void CalibrationPanel::setValues()
-{
-  ui->txVoltageCalibration->setValue((double)generalSettings.txVoltageCalibration/10);
-  ui->txCurrentCalibration->setValue((double)generalSettings.txCurrentCalibration);
-
-  ui->ana1Neg->setValue(generalSettings.calibSpanNeg[0]);
-  ui->ana2Neg->setValue(generalSettings.calibSpanNeg[1]);
-  ui->ana3Neg->setValue(generalSettings.calibSpanNeg[2]);
-  ui->ana4Neg->setValue(generalSettings.calibSpanNeg[3]);
-  ui->ana5Neg->setValue(generalSettings.calibSpanNeg[4]);
-  ui->ana6Neg->setValue(generalSettings.calibSpanNeg[5]);
-  ui->ana7Neg->setValue(generalSettings.calibSpanNeg[6]);
-  ui->ana8Neg->setValue(generalSettings.calibSpanNeg[7]);
-
-  ui->ana1Mid->setValue(generalSettings.calibMid[0]);
-  ui->ana2Mid->setValue(generalSettings.calibMid[1]);
-  ui->ana3Mid->setValue(generalSettings.calibMid[2]);
-  ui->ana4Mid->setValue(generalSettings.calibMid[3]);
-  ui->ana5Mid->setValue(generalSettings.calibMid[4]);
-  ui->ana6Mid->setValue(generalSettings.calibMid[5]);
-  ui->ana7Mid->setValue(generalSettings.calibMid[6]);
-  ui->ana8Mid->setValue(generalSettings.calibMid[7]);
-
-  ui->ana1Pos->setValue(generalSettings.calibSpanPos[0]);
-  ui->ana2Pos->setValue(generalSettings.calibSpanPos[1]);
-  ui->ana3Pos->setValue(generalSettings.calibSpanPos[2]);
-  ui->ana4Pos->setValue(generalSettings.calibSpanPos[3]);
-  ui->ana5Pos->setValue(generalSettings.calibSpanPos[4]);
-  ui->ana6Pos->setValue(generalSettings.calibSpanPos[5]);
-  ui->ana7Pos->setValue(generalSettings.calibSpanPos[6]);
-  ui->ana8Pos->setValue(generalSettings.calibSpanPos[7]);
-
-  ui->PPM1->setValue(generalSettings.trainer.calib[0]);
-  ui->PPM2->setValue(generalSettings.trainer.calib[1]);
-  ui->PPM3->setValue(generalSettings.trainer.calib[2]);
-  ui->PPM4->setValue(generalSettings.trainer.calib[3]);
-  ui->PPM_MultiplierDSB->setValue((qreal)(generalSettings.PPM_Multiplier+10)/10);
-}
-
-void CalibrationPanel::on_txVoltageCalibration_editingFinished()
-{
-  generalSettings.txVoltageCalibration = ui->txVoltageCalibration->value()*10;
-  emit modified();
-}
-
-
-void CalibrationPanel::on_ana1Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[0] = ui->ana1Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana2Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[1] = ui->ana2Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana3Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[2] = ui->ana3Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana4Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[3] = ui->ana4Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana5Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[4] = ui->ana5Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana6Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[5] = ui->ana6Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana7Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[6] = ui->ana7Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana8Neg_editingFinished()
-{
-  generalSettings.calibSpanNeg[7] = ui->ana8Neg->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana1Mid_editingFinished()
-{
-  generalSettings.calibMid[0] = ui->ana1Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana2Mid_editingFinished()
-{
-  generalSettings.calibMid[1] = ui->ana2Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana3Mid_editingFinished()
-{
-  generalSettings.calibMid[2] = ui->ana3Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana4Mid_editingFinished()
-{
-  generalSettings.calibMid[3] = ui->ana4Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana5Mid_editingFinished()
-{
-  generalSettings.calibMid[4] = ui->ana5Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana6Mid_editingFinished()
-{
-  generalSettings.calibMid[5] = ui->ana6Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana7Mid_editingFinished()
-{
-  generalSettings.calibMid[6] = ui->ana7Mid->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana8Mid_editingFinished()
-{
-  generalSettings.calibMid[7] = ui->ana8Mid->value();
-  emit modified();
-}
-
-
-void CalibrationPanel::on_ana1Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[0] = ui->ana1Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana2Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[1] = ui->ana2Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana3Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[2] = ui->ana3Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana4Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[3] = ui->ana4Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana5Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[4] = ui->ana5Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana6Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[5] = ui->ana6Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana7Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[6] = ui->ana7Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_ana8Pos_editingFinished()
-{
-  generalSettings.calibSpanPos[7] = ui->ana8Pos->value();
-  emit modified();
-}
-
-void CalibrationPanel::on_serialPortMode_currentIndexChanged(int index)
-{
-  generalSettings.hw_uartMode = index;
-  emit modified();
+  switch(column) {
+    case 0:
+      generalSettings.calibSpanNeg[row] = value;
+      break;
+    case 1:
+      generalSettings.calibMid[row] = value;
+      break;
+    case 2:
+      generalSettings.calibSpanPos[row] = value;
+      break;
+  }
 }

companion/src/generaledit/calibration.h

@@ -1,6 +1,27 @@
-#ifndef CALIBRATION_H
-#define CALIBRATION_H
+/*
+ * 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 _CALIBRATION_H_
+#define _CALIBRATION_H_
+
+#include <QTableWidget>
 #include "generaledit.h"
 
 namespace Ui {
@@ -17,58 +38,16 @@ class CalibrationPanel : public GeneralPanel
 
   public:
     CalibrationPanel(QWidget *parent, GeneralSettings & generalSettings, Firmware * firmware);
-    virtual ~CalibrationPanel();
-    // virtual void update();
+    virtual ~CalibrationPanel() {};
 
   private slots:
-    void on_txVoltageCalibration_editingFinished();
-    void on_PPM1_editingFinished();
-    void on_PPM2_editingFinished();
-    void on_PPM3_editingFinished();
-    void on_PPM4_editingFinished();
-    void on_PPM_MultiplierDSB_editingFinished();
-
-    void on_txCurrentCalibration_editingFinished();
-    void on_bluetoothEnable_stateChanged(int);
-
-    void on_ana1Neg_editingFinished();
-    void on_ana2Neg_editingFinished();
-    void on_ana3Neg_editingFinished();
-    void on_ana4Neg_editingFinished();
-    void on_ana5Neg_editingFinished();
-    void on_ana6Neg_editingFinished();
-    void on_ana7Neg_editingFinished();
-    void on_ana8Neg_editingFinished();
-
-    void on_ana1Mid_editingFinished();
-    void on_ana2Mid_editingFinished();
-    void on_ana3Mid_editingFinished();
-    void on_ana4Mid_editingFinished();
-    void on_ana5Mid_editingFinished();
-    void on_ana6Mid_editingFinished();
-    void on_ana7Mid_editingFinished();
-    void on_ana8Mid_editingFinished();
-
-    void on_ana1Pos_editingFinished();
-    void on_ana2Pos_editingFinished();
-    void on_ana3Pos_editingFinished();
-    void on_ana4Pos_editingFinished();
-    void on_ana5Pos_editingFinished();
-    void on_ana6Pos_editingFinished();
-    void on_ana7Pos_editingFinished();
-    void on_ana8Pos_editingFinished();
-
-    void on_serialPortMode_currentIndexChanged(int index);
-
-  protected:
-    void setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
-    void setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
-    void setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
+    void onCellChanged(int value);
 
   private:
-    Ui::Calibration *ui;
+    QTableWidget * tableWidget;
 
-    void setValues();
+    int getCalibrationValue(int row, int column);
+    void setCalibrationValue(int row, int column, int value);
 };
 
-#endif // CALIBRATION_H
+#endif // _CALIBRATION_H_

companion/src/generaledit/generaledit.cpp

@@ -1,6 +1,23 @@
-#include <QDateTime>
-#include <QtGui>
-#include <QScrollArea>
+/*
+ * 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 "generaledit.h"
 #include "ui_generaledit.h"
 #include "helpers.h"
@@ -8,6 +25,7 @@
 #include "generalsetup.h"
 #include "trainer.h"
 #include "calibration.h"
+#include "hardware.h"
 #include "../modeledit/customfunctions.h"
 #include "verticalscrollarea.h"
 
@@ -42,7 +60,8 @@ GeneralEdit::GeneralEdit(QWidget * parent, RadioData & radioData, Firmware * fir
     addTab(new CustomFunctionsPanel(this, NULL, generalSettings, firmware), tr("Global Functions"));
   }
   addTab(new TrainerPanel(this, generalSettings, firmware), tr("Trainer"));
-  addTab(new CalibrationPanel(this, generalSettings, firmware), tr("Hardware / Calibration"));
+  addTab(new HardwarePanel(this, generalSettings, firmware), tr("Hardware"));
+  addTab(new CalibrationPanel(this, generalSettings, firmware), tr("Calibration"));
 
   ui->tabWidget->setCurrentIndex( g.generalEditTab() );
 }
@@ -82,12 +101,15 @@ void GeneralEdit::on_calretrieve_PB_clicked()
 {
   int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();
   QString calib=g.profile[profile_id].stickPotCalib();
-  int potsnum=GetCurrentFirmware()->getCapability(Pots);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
+  int numSwPots=GetCurrentFirmware()->getCapability(Switches)+GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
   if (calib.isEmpty()) {
     return;
   }
   else {
     QString trainercalib = g.profile[profile_id].trainerCalib();
+    QString hwtypes = g.profile[profile_id].controlTypes();
+    QString controlNames=g.profile[profile_id].controlNames();
     int8_t txVoltageCalibration = (int8_t)g.profile[profile_id].txVoltageCalibration();
     int8_t txCurrentCalibration = (int8_t)g.profile[profile_id].txCurrentCalibration();
     int8_t PPM_Multiplier = (int8_t)g.profile[profile_id].ppmMultiplier();
@@ -99,29 +121,25 @@ void GeneralEdit::on_calretrieve_PB_clicked()
     QString SpeakerSet = g.profile[profile_id].speaker();
     QString CountrySet = g.profile[profile_id].countryCode();
 
-    if ((calib.length()==(NUM_STICKS+potsnum)*12) && (trainercalib.length()==16)) {
+    if ((calib.length()==(CPN_MAX_STICKS+potsnum)*12) && (trainercalib.length()==16)) {
       QString Byte;
       int16_t byte16;
       bool ok;
-      for (int i=0; i<(NUM_STICKS+potsnum); i++) {
+      for (int i=0; i<(CPN_MAX_STICKS+potsnum); i++) {
         Byte=calib.mid(i*12,4);
         byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok)
-          generalSettings.calibMid[i]=byte16;
+        if (ok) generalSettings.calibMid[i]=byte16;
         Byte=calib.mid(4+i*12,4);
         byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok)
-          generalSettings.calibSpanNeg[i]=byte16;
+        if (ok) generalSettings.calibSpanNeg[i]=byte16;
         Byte=calib.mid(8+i*12,4);
         byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok)
-          generalSettings.calibSpanPos[i]=byte16;
+        if (ok) 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)
-          generalSettings.trainer.calib[i]=byte16;
+        if (ok) generalSettings.trainer.calib[i]=byte16;
       }
       generalSettings.txCurrentCalibration=txCurrentCalibration;
       generalSettings.txVoltageCalibration=txVoltageCalibration;
@@ -134,6 +152,48 @@ void GeneralEdit::on_calretrieve_PB_clicked()
     } else {
       QMessageBox::critical(this, tr("Warning"), tr("Wrong data in profile, radio calibration was not retrieved"));
     }
+    if (hwtypes.length()==numSwPots) {
+      QString Byte;
+      int16_t byte16;
+      QByteArray qba;
+      int16_t offset;
+      bool ok;
+      for (int i=0; i<CPN_MAX_STICKS; i++) {
+        qba = controlNames.mid(3*i,3).toLatin1();
+        strcpy(generalSettings.stickName[i], qba.data());
+      }
+      for (int i=0; i<(GetCurrentFirmware()->getCapability(Switches)); i++) {
+        Byte=hwtypes.mid(i,1);
+        byte16=(int16_t)Byte.toInt(&ok,16);
+        qba=controlNames.mid(3*(i+CPN_MAX_STICKS),3).toLatin1();
+        if (ok) {
+          generalSettings.switchConfig[i]=byte16;
+          strcpy(generalSettings.switchName[i], qba.data());
+        }
+      }
+      offset = GetCurrentFirmware()->getCapability(Switches);
+      for (int i=0; i<(GetCurrentFirmware()->getCapability(Pots)); i++) {
+        Byte=hwtypes.mid(i+offset,1);
+        byte16=(int16_t)Byte.toInt(&ok,16);
+        qba=controlNames.mid(3*(i+CPN_MAX_STICKS+offset),3).toLatin1();
+        if (ok) {
+          generalSettings.potConfig[i]=byte16;
+          strcpy(generalSettings.potName[i], qba.data());
+        }
+      }
+      offset += GetCurrentFirmware()->getCapability(Pots);
+      for (int i=0; i<(GetCurrentFirmware()->getCapability(Sliders)); i++) {
+        Byte=hwtypes.mid(i+offset,1);
+        byte16=(int16_t)Byte.toInt(&ok,16);
+        qba=controlNames.mid(3*(i+CPN_MAX_STICKS+offset),3).toLatin1();
+        if (ok) {
+          generalSettings.sliderConfig[i]=byte16;
+          strcpy(generalSettings.sliderName[i], qba.data());
+        }
+      }
+    } else {
+      QMessageBox::critical(this, tr("Warning"), tr("Wrong data in profile, Switch/pot config not retrieved"));
+    }
     if ((DisplaySet.length()==6) && (BeeperSet.length()==4) && (HapticSet.length()==6) && (SpeakerSet.length()==6)) {
       generalSettings.stickMode=GSStickMode;
       uint8_t byte8u;
@@ -141,48 +201,35 @@ void GeneralEdit::on_calretrieve_PB_clicked()
       QString chars;
       bool ok;
       byte8=(int8_t)DisplaySet.mid(0,2).toInt(&ok,16);
-      if (ok)
-        generalSettings.optrexDisplay=(byte8==1 ? true : false);
+      if (ok) generalSettings.optrexDisplay=(byte8==1 ? true : false);
       byte8u=(uint8_t)DisplaySet.mid(2,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.contrast=byte8u;
+      if (ok) generalSettings.contrast=byte8u;
       byte8u=(uint8_t)DisplaySet.mid(4,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.backlightBright=byte8u;
+      if (ok) generalSettings.backlightBright=byte8u;
       byte8=(int8_t)BeeperSet.mid(0,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.beeperMode = (GeneralSettings::BeeperMode)byte8;
+      if (ok) generalSettings.beeperMode = (GeneralSettings::BeeperMode)byte8;
       byte8=(int8_t)BeeperSet.mid(2,2).toInt(&ok,16);
-      if (ok)
-        generalSettings.beeperLength=byte8;
+      if (ok) generalSettings.beeperLength=byte8;
       byte8=(int8_t)HapticSet.mid(0,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.hapticMode=(GeneralSettings::BeeperMode)byte8;
+      if (ok) generalSettings.hapticMode=(GeneralSettings::BeeperMode)byte8;
       byte8=(int8_t)HapticSet.mid(2,2).toInt(&ok,16);
-      if (ok)
-        generalSettings.hapticStrength=byte8;
+      if (ok) generalSettings.hapticStrength=byte8;
       byte8=(int8_t)HapticSet.mid(4,2).toInt(&ok,16);
-      if (ok)
-        generalSettings.hapticLength=byte8;
+      if (ok) generalSettings.hapticLength=byte8;
       byte8u=(uint8_t)SpeakerSet.mid(0,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.speakerMode=byte8u;
+      if (ok) generalSettings.speakerMode=byte8u;
       byte8u=(uint8_t)SpeakerSet.mid(2,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.speakerPitch=byte8u;
+      if (ok) generalSettings.speakerPitch=byte8u;
       byte8u=(uint8_t)SpeakerSet.mid(4,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.speakerVolume=byte8u;
+      if (ok) generalSettings.speakerVolume=byte8u;
       if (CountrySet.length()==6) {
         byte8u=(uint8_t)CountrySet.mid(0,2).toUInt(&ok,16);
-        if (ok)
-          generalSettings.countryCode=byte8u;
+        if (ok) generalSettings.countryCode=byte8u;
         byte8u=(uint8_t)CountrySet.mid(2,2).toUInt(&ok,16);
-        if (ok)
-          generalSettings.imperial=byte8u;
+        if (ok) generalSettings.imperial=byte8u;
         chars=CountrySet.mid(4,2);
-        generalSettings.ttsLanguage[0]=chars[0].toAscii();
-        generalSettings.ttsLanguage[1]=chars[1].toAscii();
+        generalSettings.ttsLanguage[0]=chars[0].toLatin1();
+        generalSettings.ttsLanguage[1]=chars[1].toLatin1();
       }
     }
     else {
@@ -198,13 +245,15 @@ void GeneralEdit::on_calstore_PB_clicked()
   int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();
 
   QString name=g.profile[profile_id].name();
-  int potsnum=GetCurrentFirmware()->getCapability(Pots);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
   if (name.isEmpty()) {
     ui->calstore_PB->setDisabled(true);
     return;
   }
   else {
     QString calib=g.profile[profile_id].stickPotCalib();
+    QString hwtypes=g.profile[profile_id].controlTypes();
+    QString controlNames=g.profile[profile_id].controlNames();
     if (!(calib.isEmpty())) {
       int ret = QMessageBox::question(this, "Companion",
                       tr("Do you want to store calibration in %1 profile<br>overwriting existing calibration?").arg(name) ,
@@ -214,7 +263,7 @@ void GeneralEdit::on_calstore_PB_clicked()
       }
     }
     calib.clear();
-    for (int i=0; i< (NUM_STICKS+potsnum); i++) {
+    for (int i=0; i< (CPN_MAX_STICKS+potsnum); i++) {
       calib.append(QString("%1").arg((uint16_t)generalSettings.calibMid[i], 4, 16, QChar('0')));
       calib.append(QString("%1").arg((uint16_t)generalSettings.calibSpanNeg[i], 4, 16, QChar('0')));
       calib.append(QString("%1").arg((uint16_t)generalSettings.calibSpanPos[i], 4, 16, QChar('0')));
@@ -225,6 +274,25 @@ void GeneralEdit::on_calstore_PB_clicked()
       calib.append(QString("%1").arg((uint16_t)generalSettings.trainer.calib[i], 4, 16, QChar('0')));
     }
     g.profile[profile_id].trainerCalib( calib );
+    hwtypes.clear();
+    controlNames.clear();
+    for (int i=0; i<CPN_MAX_STICKS; i++) {
+      controlNames.append(QString("%1").arg(generalSettings.stickName[i], -3));
+    }
+    for (int i=0; i<(GetCurrentFirmware()->getCapability(Switches)); i++) {
+      hwtypes.append(QString("%1").arg((uint16_t)generalSettings.switchConfig[i], 1));
+      controlNames.append(QString("%1").arg(generalSettings.switchName[i], -3));
+    }
+    for (int i=0; i<(GetCurrentFirmware()->getCapability(Pots)); i++) {
+      hwtypes.append(QString("%1").arg((uint16_t)generalSettings.potConfig[i], 1));
+      controlNames.append(QString("%1").arg(generalSettings.potName[i], -3));
+    }
+    for (int i=0; i<(GetCurrentFirmware()->getCapability(Sliders)); i++) {
+      hwtypes.append(QString("%1").arg((uint16_t)generalSettings.sliderConfig[i], 1));
+      controlNames.append(QString("%1").arg(generalSettings.sliderName[i], -3));
+    }
+    g.profile[profile_id].controlTypes( hwtypes );
+    g.profile[profile_id].controlNames( controlNames );
     g.profile[profile_id].txVoltageCalibration( generalSettings.txVoltageCalibration );
     g.profile[profile_id].txCurrentCalibration( generalSettings.txCurrentCalibration );
     g.profile[profile_id].vBatWarn( generalSettings.vBatWarn );

companion/src/generaledit/generaledit.h

@@ -1,57 +1,77 @@
-#ifndef GENERALEDIT_H
-#define GENERALEDIT_H
-
-#include <QDialog>
-#include "eeprominterface.h"
-#include "genericpanel.h"
-
-namespace Ui {
-  class GeneralEdit;
-}
-
-class GeneralPanel : public GenericPanel
-{
-  public:
-    GeneralPanel(QWidget *parent, GeneralSettings & generalSettings, Firmware * firmware):
-      GenericPanel(parent, NULL, generalSettings, firmware)
-    {
-    }
-};
-
-class GeneralEdit : public QDialog
-{
-  Q_OBJECT
-
-  public:
-    GeneralEdit(QWidget * parent, RadioData & radioData, Firmware * firmware);
-    ~GeneralEdit();
-
-  private:
-    Ui::GeneralEdit *ui;
-    GeneralSettings & generalSettings;
-
-    bool switchDefPosEditLock;
-    bool voiceLangEditLock;
-    bool mavbaudEditLock;
-    void getGeneralSwitchDefPos(int i, bool val);
-    void setSwitchDefPos();
-    void updateVarioPitchRange();
-    
-  signals:
-    void modified();
-
-  private slots:
-    void onTabModified();
-    void on_tabWidget_currentChanged(int index);
-    void on_calretrieve_PB_clicked();
-    void on_calstore_PB_clicked();
-
-  private:
-    Firmware * firmware;
-    QVector<GenericPanel *> panels;
-    void addTab(GenericPanel *panel, QString text);
-    void closeEvent(QCloseEvent *event);
-
-};
-
-#endif // GENERALEDIT_H
+/*
+ * 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 _GENERALEDIT_H_
+#define _GENERALEDIT_H_
+
+#include <QtWidgets>
+#include "eeprominterface.h"
+#include "genericpanel.h"
+
+namespace Ui {
+  class GeneralEdit;
+}
+
+class GeneralPanel : public GenericPanel
+{
+  public:
+    GeneralPanel(QWidget *parent, GeneralSettings & generalSettings, Firmware * firmware):
+      GenericPanel(parent, NULL, generalSettings, firmware)
+    {
+    }
+};
+
+class GeneralEdit : public QDialog
+{
+  Q_OBJECT
+
+  public:
+    GeneralEdit(QWidget * parent, RadioData & radioData, Firmware * firmware);
+    ~GeneralEdit();
+
+  private:
+    Ui::GeneralEdit *ui;
+    GeneralSettings & generalSettings;
+
+    bool switchDefPosEditLock;
+    bool voiceLangEditLock;
+    bool mavbaudEditLock;
+    void getGeneralSwitchDefPos(int i, bool val);
+    void setSwitchDefPos();
+    void updateVarioPitchRange();
+    
+  signals:
+    void modified();
+
+  private slots:
+    void onTabModified();
+    void on_tabWidget_currentChanged(int index);
+    void on_calretrieve_PB_clicked();
+    void on_calstore_PB_clicked();
+
+  private:
+    Firmware * firmware;
+    QVector<GenericPanel *> panels;
+    void addTab(GenericPanel *panel, QString text);
+    void closeEvent(QCloseEvent *event);
+
+};
+
+#endif // _GENERALEDIT_H_

companion/src/generaledit/generalsetup.cpp

@@ -1,6 +1,25 @@
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "generalsetup.h"
 #include "ui_generalsetup.h"
-#include <QMessageBox>
 
 GeneralSetupPanel::GeneralSetupPanel(QWidget * parent, GeneralSettings & generalSettings, Firmware * firmware):
 GeneralPanel(parent, generalSettings, firmware),
@@ -275,8 +294,8 @@ void GeneralSetupPanel::populateBacklightCB()
 void GeneralSetupPanel::populateVoiceLangCB()
 {
   QComboBox * b = ui->voiceLang_CB;
-  QString strings[] = { QObject::tr("English"), QObject::tr("Finnish"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), NULL};
-  QString langcode[] = { "en", "fi","fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", NULL};
+  QString strings[] = { QObject::tr("English"), QObject::tr("Dutch"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), QObject::tr("Hungarian"), NULL};
+  QString langcode[] = { "en", "nl","fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", "hu", NULL};
 
   b->clear();
   for (int i=0; strings[i]!=NULL; i++) {
@@ -316,7 +335,7 @@ void GeneralSetupPanel::on_voiceLang_CB_currentIndexChanged(int index)
   if (!lock) {
     QString code = ui->voiceLang_CB->itemData(index).toString();
     for (int i=0; i<2; i++) {
-      generalSettings.ttsLanguage[i] = code.at(i).toAscii();
+      generalSettings.ttsLanguage[i] = code.at(i).toLatin1();
     }
     generalSettings.ttsLanguage[2] = '\0';
     emit modified();

companion/src/generaledit/generalsetup.h

@@ -1,5 +1,25 @@
-#ifndef GENERALSETUP_H
-#define GENERALSETUP_H
+/*
+ * 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 _GENERALSETUP_H_
+#define _GENERALSETUP_H_
 
 #include "generaledit.h"
 #include "eeprominterface.h"
@@ -75,4 +95,4 @@ class GeneralSetupPanel : public GeneralPanel
     void updateVarioPitchRange();
 };
 
-#endif // GENERALSETUP_H
+#endif // _GENERALSETUP_H_

companion/src/generaledit/generalsetup.ui

@@ -658,7 +658,7 @@
        <item>
         <widget class="QCheckBox" name="adjustRTC">
          <property name="toolTip">
-          <string>If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.</string>
+          <string>Automatically adjust the radio's clock if a GPS is connected to telemetry.</string>
          </property>
          <property name="layoutDirection">
           <enum>Qt::RightToLeft</enum>

companion/src/generaledit/hardware.cpp

@@ -0,0 +1,261 @@
+/*
+ * 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 "hardware.h"
+#include "ui_hardware.h"
+
+void HardwarePanel::setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos = true)
+{
+  bool enabled = false;
+
+  if (IS_TARANIS(firmware->getBoard())) {
+    if (IS_TARANIS_X9E(firmware->getBoard())) {
+      enabled = true;
+      type->addItem(tr("None"), Firmware::SWITCH_NONE);
+    }
+    else if (index < 8) {
+      enabled = true;
+    }
+  }
+
+  if (enabled) {
+    type->addItem(tr("2 Positions Toggle"), Firmware::SWITCH_TOGGLE);
+    type->addItem(tr("2 Positions"), Firmware::SWITCH_2POS);
+    if (threePos) type->addItem(tr("3 Positions"), Firmware::SWITCH_3POS);
+    name->setField(generalSettings.switchName[index], 3, this);
+    type->setField(generalSettings.switchConfig[index], this);
+  }
+  else {
+    label->hide();
+    name->hide();
+    type->hide();
+  }
+}
+
+void HardwarePanel::setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
+{
+  bool enabled = false;
+
+  if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
+    label->setText(RawSource(SOURCE_TYPE_STICK, index+CPN_MAX_STICKS).toString());
+    enabled = true;
+  }
+  else if (IS_TARANIS_PLUS(firmware->getBoard()) && index < 3) {
+    enabled = true;
+  }
+  else if (IS_TARANIS(firmware->getBoard()) && index < 2) {
+    enabled = true;
+  }
+
+  if (enabled) {
+    type->addItem(tr("None"), GeneralSettings::POT_NONE);
+    type->addItem(tr("Pot with detent"), GeneralSettings::POT_WITH_DETENT);
+    type->addItem(tr("Multipos switch"), GeneralSettings::POT_MULTIPOS_SWITCH);
+    type->addItem(tr("Pot without detent"), GeneralSettings::POT_WITHOUT_DETENT);
+    name->setField(generalSettings.potName[index], 3, this);
+    type->setField(generalSettings.potConfig[index], this);
+  }
+  else {
+    label->hide();
+    name->hide();
+    type->hide();
+  }
+}
+
+void HardwarePanel::setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
+{
+  bool enabled = false;
+
+  if (IS_TARANIS(firmware->getBoard()) && index < 2) {
+    type->setEnabled(false);
+    enabled = true;
+  }
+  else if (IS_TARANIS_X9E(firmware->getBoard()) && index < 4) {
+    enabled = true;
+  }
+
+  if (IS_TARANIS_X9E(firmware->getBoard())) {
+    label->setText(RawSource(SOURCE_TYPE_STICK, index+CPN_MAX_STICKS+4).toString());
+  }
+
+  if (enabled) {
+    type->addItem(tr("None"), GeneralSettings::SLIDER_NONE);
+    type->addItem(tr("Slider with detent"), GeneralSettings::SLIDER_WITH_DETENT);
+    name->setField(generalSettings.sliderName[index], 3, this);
+    type->setField(generalSettings.sliderConfig[index], this);
+  }
+  else {
+    label->hide();
+    name->hide();
+    type->hide();
+  }
+}
+
+HardwarePanel::HardwarePanel(QWidget * parent, GeneralSettings & generalSettings, Firmware * firmware):
+  GeneralPanel(parent, generalSettings, firmware),
+  ui(new Ui::Hardware)
+{
+  ui->setupUi(this);
+
+  if (IS_TARANIS(firmware->getBoard())) {
+    ui->rudName->setField(generalSettings.stickName[0], 3, this);
+    ui->eleName->setField(generalSettings.stickName[1], 3, this);
+    ui->thrName->setField(generalSettings.stickName[2], 3, this);
+    ui->ailName->setField(generalSettings.stickName[3], 3, this);
+  }
+  else {
+    ui->rudLabel->hide();
+    ui->rudName->hide();
+    ui->eleLabel->hide();
+    ui->eleName->hide();
+    ui->thrLabel->hide();
+    ui->thrName->hide();
+    ui->ailLabel->hide();
+    ui->ailName->hide();
+  }
+
+  setupPotConfig(0, ui->pot1Label, ui->pot1Name, ui->pot1Type);
+  setupPotConfig(1, ui->pot2Label, ui->pot2Name, ui->pot2Type);
+  setupPotConfig(2, ui->pot3Label, ui->pot3Name, ui->pot3Type);
+  setupPotConfig(3, ui->pot4Label, ui->pot4Name, ui->pot4Type);
+
+  setupSliderConfig(0, ui->lsLabel, ui->lsName, ui->lsType);
+  setupSliderConfig(1, ui->rsLabel, ui->rsName, ui->rsType);
+  setupSliderConfig(2, ui->ls2Label, ui->ls2Name, ui->ls2Type);
+  setupSliderConfig(3, ui->rs2Label, ui->rs2Name, ui->rs2Type);
+
+  setupSwitchConfig(0, ui->saLabel, ui->saName, ui->saType);
+  setupSwitchConfig(1, ui->sbLabel, ui->sbName, ui->sbType);
+  setupSwitchConfig(2, ui->scLabel, ui->scName, ui->scType);
+  setupSwitchConfig(3, ui->sdLabel, ui->sdName, ui->sdType);
+  setupSwitchConfig(4, ui->seLabel, ui->seName, ui->seType);
+  setupSwitchConfig(5, ui->sfLabel, ui->sfName, ui->sfType, false);   //switch does not support 3POS
+  setupSwitchConfig(6, ui->sgLabel, ui->sgName, ui->sgType);
+  setupSwitchConfig(7, ui->shLabel, ui->shName, ui->shType, false);   //switch does not support 3POS
+  setupSwitchConfig(8, ui->siLabel, ui->siName, ui->siType);
+  setupSwitchConfig(9, ui->sjLabel, ui->sjName, ui->sjType);
+  setupSwitchConfig(10, ui->skLabel, ui->skName, ui->skType);
+  setupSwitchConfig(11, ui->slLabel, ui->slName, ui->slType);
+  setupSwitchConfig(12, ui->smLabel, ui->smName, ui->smType);
+  setupSwitchConfig(13, ui->snLabel, ui->snName, ui->snType);
+  setupSwitchConfig(14, ui->soLabel, ui->soName, ui->soType);
+  setupSwitchConfig(15, ui->spLabel, ui->spName, ui->spType);
+  setupSwitchConfig(16, ui->sqLabel, ui->sqName, ui->sqType);
+  setupSwitchConfig(17, ui->srLabel, ui->srName, ui->srType);
+
+  if (IS_TARANIS(firmware->getBoard())) {
+    ui->serialPortMode->setCurrentIndex(generalSettings.hw_uartMode);
+  }
+  else {
+    ui->serialPortMode->hide();
+    ui->serialPortLabel->hide();
+  }
+
+  if (!IS_SKY9X(firmware->getBoard())) {
+    ui->txCurrentCalibration->hide();
+    ui->txCurrentCalibrationLabel->hide();
+  }
+
+  if (IS_TARANIS_X9E(firmware->getBoard())) {
+    ui->bluetoothEnable->setChecked(generalSettings.bluetoothEnable);
+    ui->bluetoothName->setField(generalSettings.bluetoothName, 10, this);
+  }
+  else {
+    ui->bluetoothLabel->hide();
+    ui->bluetoothEnable->hide();
+    ui->bluetoothName->hide();
+  }
+
+  disableMouseScrolling();
+
+  setValues();
+}
+
+HardwarePanel::~HardwarePanel()
+{
+  delete ui;
+}
+
+void HardwarePanel::on_PPM_MultiplierDSB_editingFinished()
+{
+  generalSettings.PPM_Multiplier = (int)(ui->PPM_MultiplierDSB->value()*10)-10;
+  emit modified();
+}
+
+void HardwarePanel::on_PPM1_editingFinished()
+{
+  generalSettings.trainer.calib[0] = ui->PPM1->value();
+  emit modified();
+}
+
+void HardwarePanel::on_PPM2_editingFinished()
+{
+  generalSettings.trainer.calib[1] = ui->PPM2->value();
+  emit modified();
+}
+
+void HardwarePanel::on_PPM3_editingFinished()
+{
+  generalSettings.trainer.calib[2] = ui->PPM3->value();
+  emit modified();
+}
+
+void HardwarePanel::on_PPM4_editingFinished()
+{
+  generalSettings.trainer.calib[3] = ui->PPM4->value();
+  emit modified();
+}
+
+
+void HardwarePanel::on_txCurrentHardware_editingFinished()
+{
+  generalSettings.txCurrentCalibration = ui->txCurrentCalibration->value();
+  emit modified();
+}
+
+void HardwarePanel::on_bluetoothEnable_stateChanged(int)
+{
+  generalSettings.bluetoothEnable = ui->bluetoothEnable->isChecked();
+  emit modified();
+}
+
+void HardwarePanel::setValues()
+{
+  ui->txVoltageCalibration->setValue((double)generalSettings.txVoltageCalibration/10);
+  ui->txCurrentCalibration->setValue((double)generalSettings.txCurrentCalibration);
+
+  ui->PPM1->setValue(generalSettings.trainer.calib[0]);
+  ui->PPM2->setValue(generalSettings.trainer.calib[1]);
+  ui->PPM3->setValue(generalSettings.trainer.calib[2]);
+  ui->PPM4->setValue(generalSettings.trainer.calib[3]);
+  ui->PPM_MultiplierDSB->setValue((qreal)(generalSettings.PPM_Multiplier+10)/10);
+}
+
+void HardwarePanel::on_txVoltageHardware_editingFinished()
+{
+  generalSettings.txVoltageCalibration = ui->txVoltageCalibration->value()*10;
+  emit modified();
+}
+
+void HardwarePanel::on_serialPortMode_currentIndexChanged(int index)
+{
+  generalSettings.hw_uartMode = index;
+  emit modified();
+}

companion/src/generaledit/hardware.h

@@ -0,0 +1,66 @@
+/*
+ * 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 _HARDWARE_H_
+#define _HARDWARE_H_
+
+#include "generaledit.h"
+
+namespace Ui {
+  class Hardware;
+}
+
+class QLabel;
+class AutoLineEdit;
+class AutoComboBox;
+
+class HardwarePanel : public GeneralPanel
+{
+    Q_OBJECT
+
+  public:
+    HardwarePanel(QWidget *parent, GeneralSettings & generalSettings, Firmware * firmware);
+    virtual ~HardwarePanel();
+
+  private slots:
+    void on_txVoltageHardware_editingFinished();
+    void on_PPM1_editingFinished();
+    void on_PPM2_editingFinished();
+    void on_PPM3_editingFinished();
+    void on_PPM4_editingFinished();
+    void on_PPM_MultiplierDSB_editingFinished();
+
+    void on_txCurrentHardware_editingFinished();
+    void on_bluetoothEnable_stateChanged(int);
+
+    void on_serialPortMode_currentIndexChanged(int index);
+
+  protected:
+    void setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
+    void setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
+    void setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos);
+
+  private:
+    Ui::Hardware *ui;
+
+    void setValues();
+};
+
+#endif // _HARDWARE_H_

companion/src/generaledit/trainer.cpp

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

companion/src/generaledit/trainer.h

@@ -1,5 +1,25 @@
-#ifndef TRAINER_H
-#define TRAINER_H
+/*
+ * 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 _TRAINER_H_
+#define _TRAINER_H_
 
 #include "generaledit.h"
 #include "eeprominterface.h"
@@ -36,4 +56,4 @@ class TrainerPanel : public GeneralPanel
     void setValues();
 };
 
-#endif // TRAINER_H
+#endif // _TRAINER_H_