Copy strings for multimode support from en.h.txt to other languages

Add FY326 protocol
Implement DSM2/DSMX frame format options
2016-03-27 22:46:53 +02:00 · 2016-03-27 22:45:24 +02:00 · 2016-03-27 22:45:21 +02:00 · 2016-03-27 22:31:56 +02:00 · 2016-03-27 22:20:41 +02:00 · 2016-01-04 22:52:22 +01:00
724 changed files with 16893 additions and 69208 deletions
@@ -1,4 +1,3 @@
-/.idea/
 /.*project
 /.settings
 /.autotools
@@ -7,6 +6,4 @@ radio/src/bootloader/bootloader_ramBoot*
 *.lbm
 *.o
 /doc/
-*.stamp
-radio/src/lua/lua_fields_*.txt
-radio/src/lua/lua_exports_*.txt
+*.inc
@@ -7,8 +7,8 @@ before_install:
    - sudo apt-get update    

 install:
-  - sudo apt-get install -y xvfb lcov cmake cmake-data bc curl gcc-arm-none-eabi gcc-avr avr-libc avrdude libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev libfox-1.6-dev libgtest-dev
+  - sudo apt-get install -y lcov cmake cmake-data bc curl gcc-arm-none-eabi gcc-avr avr-libc avrdude libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev libfox-1.6-dev libgtest-dev

 script:
  - radio/util/commit-tests.sh
-  - mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DPCB=TARANIS .. && cmake --build .
+  - mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug ../companion/src && cmake --build .
@@ -1,22 +0,0 @@
-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}")
-
-cmake_minimum_required(VERSION 2.8)
-
-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)
-
-add_subdirectory(${RADIO_SRC_DIRECTORY})
-add_subdirectory(${COMPANION_SRC_DIRECTORY})
@@ -48,11 +48,9 @@ R. Scott Page
 Johan Cronje
 Renato Aranghelovici
 Jeffrey Irvin
-John Rodgers
 Kenneth Crump
 Damjan Adamic
 Martin Wilson
-Joe Street
 John Holdsworth
 Daniel Schwartz
 Dean Church (monthly)
@@ -148,7 +146,6 @@ Mike Matheny
 Martin Sniedze
 Fernando Rimoldi
 Sidney Fisher
-Bruce Anderson
 John Rodgers
 Ed Pare
 Thomas Kilduff
@@ -850,3 +847,41 @@ Tadeusz Adamowski
 Andrew Newton
 Neil Horne
 Kerstin Appelqvist
+John Curran
+Gerald Thiel 
+Jürg Bingisser
+George Emer
+Jerzy Manarczyk
+Gerard Braakhuis
+Nicolas Leblond
+Burt Pickard-Richardson
+Jiri Petrzelka
+RK Custom Homes
+David Semeria
+Philip Lewis
+William Kim
+Dean Berg
+Tim Spurr
+Clifton Hipsher
+Mike Frizell
+Oliver Jacob
+Pawel Stepien
+Thomas Kilduff
+Barry Fox
+Anatoly Bakalenko
+Bruce Anderson
+Jeremy Cowgar
+Edward Hauser
+Stuart Brown
+Anton Glock
+Roger Ritchie
+George Carnie
+Philippe Stofleth
+Tim Dzugan 
+Illia Izotov
+Richard Miles (monthly)
+Attila Kapolnai
+Gilles Dando
+Denis Roussille
+Olivier Anken
+Michel Motte
@@ -1,9 +1,9 @@
-##OpenTX 2.2 Branch
+##OpenTX 2.1 Branch

 [![Build Status](https://travis-ci.org/opentx/opentx.svg?branch=master)](https://travis-ci.org/opentx/opentx)
 [![Join the chat at https://gitter.im/opentx/opentx](https://img.shields.io/badge/%E2%8A%AA%20GITTER%20-JOIN%20CHAT%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/opentx/opentx?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Donate using Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DJ9MASSKVW8WN)

-The ongoing development on 2.2.x is done in this branch.
+The ongoing development on 2.1.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.
@@ -1,25 +0,0 @@
-macro(add_bitmaps_target targetname filter width format)
-  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}
-      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_command(
-    OUTPUT ${target}.png
-    OUTPUT ${target}.specs
-    COMMAND ${RADIO_DIRECTORY}/util/font2png.py ${font} ${size} ${bold} ${target}
-    WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
-  )
-  add_custom_target(ttf_${radio}_${name} DEPENDS ${target}.png ${target}.specs)
-endmacro(add_truetype_font_target)
@@ -1,38 +0,0 @@
-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" "+%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 HEAD" OUTPUT_VARIABLE ${RESULT})
-    string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})
-  elseif(UNIX)
-    execute_process(COMMAND "git" "--git-dir=${PROJECT_SOURCE_DIR}/.git" "rev-parse" "HEAD" OUTPUT_VARIABLE ${RESULT})
-    string(REGEX REPLACE "(.*)\n" "\\1" ${RESULT} ${${RESULT}})
-  else(WIN32)
-    message(SEND_ERROR "Git ID implemented")
-    set(${RESULT} 0)
-  endif(WIN32)
-endmacro(git_id)
@@ -1,5 +1,28 @@
+<h2>Version 2.1.7 / 2016-01-04</h2>
+
+<ul>
+<li>Lua 'execute' failed in non-root directory (in Simulator) (<a href=https://github.com/opentx/opentx/issues/3024>#3024</a>)</li>
+<!-- this is disabled until the speed problem is fixed <li>Header line always visible in Outputs, Logical Switches and Special Functions (<a href=https://github.com/opentx/opentx/issues/2861>#2861</a>)</li> -->
+<li>LR12 changes: removed option for remote failsafe configuration, added in EU firmware variant</li>
+<li>Added Clear option to the flight mode context menu (right click on the Name label) (<a href=https://github.com/opentx/opentx/issues/3026>#3026</a>)</li>
+<li>New features for Telemetry Simulator: log replay, user friendly sensor values (<a href=https://github.com/opentx/opentx/issues/3124>#3124</a>)</li>
+<li>Added F7 key to reload LUA permanent scripts in radio simulator (<a href=https://github.com/opentx/opentx/issues/3141>#3141</a>)</li>
+<li>AR9X firmware flashing fall-back was wrong</li>
+<li>Command line options support added to standalone simulator (try "./simulator21 --help" on Linux and "simulator.exe /help" on Windows for usage) (<a href=https://github.com/opentx/opentx/issues/3160>#3160</a>)</li>
+<li>Various rounding problem fixed: Telemetry sensor Ratio parameter (<a href=https://github.com/opentx/opentx/issues/3117>#3117</a>),
+  Outputs Sub-trim, Min and Max values (<a href=https://github.com/opentx/opentx/issues/3156>#3156</a>)</li>
+<li>Fixed: telemetry sensors Ratio and Offset value increment/decrement step (<a href=https://github.com/opentx/opentx/issues/3121>#3121</a>)</li>
+<li>Hardware/Calibration tab split int two tabs (<a href=https://github.com/opentx/opentx/issues/2974>#2974</a>)</li>
+<li>Fixed Fahrenheit temperature conversion error (if PREC was not 0) (<a href=https://github.com/opentx/opentx/issues/3146>#3146</a>)</li>
+<li>Application Setting 'Enable automatic backup before writing firmware' was not saved (<a href=https://github.com/opentx/opentx/issues/3040>#3040</a>)</li>
+<li>Fixed RPM package problem on Fedora (<a href=https://github.com/opentx/opentx/issues/3130>#3130</a>)</li>
+<li>Fixed conversion errors when loading 2.0.x EEPE (<a href=https://github.com/opentx/opentx/issues/3177>#3177</a>)</li>
+<li>Various texts and translations corrections</li>
+</ul>
+
+
 <h2>Version 2.1.6 / 2015-11-11</h2>
-[Taranis]
+
 <ul>
 <li>Telemetry custom screen changes didn't emit modified signal (<a href=https://github.com/opentx/opentx/issues/3029>#3029</a>)</li>
 <li>Hide D8/LR12 when eu firmware option is selected</li>
@@ -1,115 +1,132 @@
-include(Macros)
+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 "7")
+SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})

-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(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})
+MESSAGE(STATUS "OpenTX Companion ${C9X_VERSION}")

-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)
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )

-option(TABLE_LAYOUT "Use QTableWidget for grid layouts") # Disabled by default
-if(TABLE_LAYOUT)
-  add_definitions(-DTABLE_LAYOUT)
-  message(STATUS "Using QTableWidget")
-endif(TABLE_LAYOUT)
+SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)

-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()
+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")

-message(STATUS "Looking for Xsd ")
-find_package(Xsd)
-if(XSD_FOUND)
-  include_directories(${XSD_INCLUDE_DIR})
-  message("XSD Include Path: " ${XSD_INCLUDE_DIR})
-else()
-  message(FATAL_ERROR "XSD not found! Please set XSD path ...")
-endif()
+OPTION(ALLOW_NIGHTLY_BUILDS "Allow nightly builds download / update") # Disabled by default 
+IF(ALLOW_NIGHTLY_BUILDS)
+	ADD_DEFINITIONS(-DALLOW_NIGHTLY_BUILDS)
+ENDIF(ALLOW_NIGHTLY_BUILDS)

-message(STATUS "Looking for 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()
+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)

-find_package(Qt4 4.8.1 REQUIRED)
-set(QT_USE_QTNETWORK True)
-set(QT_USE_QTXML True)
-include(${QT_USE_FILE})
+OPTION(TABLE_LAYOUT "Use QTableWidget for grid layouts") # Disabled by default
+IF(TABLE_LAYOUT)
+    ADD_DEFINITIONS( -DTABLE_LAYOUT)
+    MESSAGE( STATUS "Using QTableWidget" )
+ENDIF(TABLE_LAYOUT)

-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 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()

-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 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()

-add_definitions(-DQXT_STATIC)
+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()

-add_custom_command(
+FIND_PACKAGE(Qt4 4.8.1 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_DEFINITIONS(-DQXT_STATIC)
+
+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 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()
+IF( MSVC )
+  SET(CMAKE_CXX_FLAGS "/EHsc /LD")
+  set(INTTYPES_INCLUDE_OPTION -IC:/Programs/msinttypes)
+  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}/companion/src/simulation)
-set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/companion/src)
+IF( MSVC )
+  MESSAGE( STATUS "Adding include C:/Programs/dirent/include for dirent.h" )
+  INCLUDE_DIRECTORIES( C:/programs/dirent/include )
+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})

 include_directories(
-  ${CMAKE_BINARY_DIR}
  ${CMAKE_CURRENT_BINARY_DIR}
-  ${COMPANION_SRC_DIRECTORY}
-  ${COMPANION_SRC_DIRECTORY}/shared
+  ${PROJECT_SOURCE_DIR}/../..
+  ${PROJECT_SOURCE_DIR}/shared
  ${SIMU_SRC_DIRECTORY}
  ${XSD_INCLUDE_DIR}
-  ${COMPANION_SRC_DIRECTORY}/qxtcommandoptions
+  ${PROJECT_SOURCE_DIR}/qxtcommandoptions
 )

 add_subdirectory(shared)
@@ -137,7 +154,7 @@ set(common_SRCS
  firmwares/opentx/opentxinterface.cpp
  file.cpp
  appdata.cpp
-  )
+)

 qt4_wrap_cpp(common_SRCS)

@@ -182,7 +199,7 @@ set(companion_SRCS
  radionotfound.cpp
  wizarddata.cpp
  wizarddialog.cpp
-  )
+)

 set(companion_MOC_HDRS
  apppreferencesdialog.h
@@ -214,7 +231,7 @@ set(companion_MOC_HDRS
  wizarddialog.h
  modelprinter.h
  multimodelprinter.h
-  )
+)

 set(companion_UIS
  mdichild.ui
@@ -234,51 +251,77 @@ set(companion_UIS
  flashfirmwaredialog.ui
  flasheepromdialog.ui
  radionotfound.ui
-  )
+)

 set(companion_RCS
  companion.qrc
  ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc
-  )
+)

-today(DATE)
-now(TIME)
+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}/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( )

-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})
+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 )

-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()
+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})

@@ -288,14 +331,14 @@ 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})
+set( simu_SRCS ${simu_SRCS} )
+qt4_wrap_cpp(simu_SRCS ${simu_MOC_HDRS} )
 qt4_add_resources(simu_SRCS companion.qrc) # TODO not needed

 if(WIN32)
@@ -312,133 +355,137 @@ target_link_libraries(${SIMULATOR_NAME} simulation common qxtcommandoptions ${QT

 ############# Packaging ####################

-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(${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/companion-windows.exe
-    COMMAND "${NSIS_EXE}" ARGS ${PROJECT_BINARY_DIR}/companion/companion.nsi
-    DEPENDS companion simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion/companion.nsi
-    COMMENT "Companion Windows NSIS Installer")
+  ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/companion-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/simulator-install.exe
-    COMMAND "${NSIS_EXE}" ARGS ${PROJECT_BINARY_DIR}/companion/simulator.nsi
-    DEPENDS simulator opentx-simulators ${PROJECT_BINARY_DIR}/companion/simulator.nsi
-    COMMENT "Simulator 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_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()
+  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( )

-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()
+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( 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( makedmg
+                     COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
+                     WORKING_DIRECTORY ${WORK_DIR}
+                     DEPENDS addframeworks opentx-simulators-bundle)
+ENDIF( )

-if(LUPDATE_FOUND)
-  add_custom_target(translations
+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
    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
-    )
-else()
-  add_custom_target(translations
+  )
+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)

 # 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( CPACK_STRIP_FILES FALSE )

 find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
 if(DPKG_PROGRAM)
-  set(CPACK_GENERATOR "DEB")
+  SET(CPACK_GENERATOR "DEB")
  execute_process(
    COMMAND ${DPKG_PROGRAM} --print-architecture
    OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
    OUTPUT_STRIP_TRAILING_WHITESPACE
  )
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}_${VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-  set(CPACK_DEBIAN_PACKAGE_MAINTAINER "Bertrand Songis <bsongis-nosp@m-gmail.com>")
-  set(CPACK_DEBIAN_PACKAGE_VERSION ${VERSION})
-  set(CPACK_DEBIAN_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
-  set(CPACK_DEBIAN_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
-  set(CPACK_DEBIAN_ARCHITECTURE $(CMAKE_SYSTEM_PROCESSOR))
-  set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+  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)
 else(DPKG_PROGRAM)
-  set(CPACK_GENERATOR "RPM")
-  set(CPACK_RPM_PACKAGE_VERSION ${VERSION})
-  set(CPACK_RPM_PACKAGE_DESCRIPTION ${CPACK_PACKAGE_DESCRIPTION_SUMMARY})
-  set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}-${VERSION}-${CMAKE_SYSTEM_PROCESSOR}")
+  SET(CPACK_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_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib /lib/udev /lib/udev/rules.d")
 endif(DPKG_PROGRAM)

-include(CPack)
+INCLUDE(CPack)
@@ -604,28 +604,8 @@ AppData::AppData()
    for (int i=0; i<MAX_JOYSTICKS; i++)
        joystick[i].init( i );

+    // Copy existing 2.0.16 settings if present
    QSettings settings(COMPANY, PRODUCT);
-
-    // Copy existing 2.1 settings if present
-    if (profile[0].name().isEmpty())
-    {
-        QSettings settings21("OpenTX", "Companion 2.1");
-
-        QStringList keys = settings21.allKeys();
-        for (QStringList::iterator i=keys.begin(); i!=keys.end(); i++)
-        {
-            if (settings21.value(*i) != QString("") && settings21.value(*i) != QString("Start Menu Folder"))
-            {
-                settings.setValue(*i, settings21.value(*i));
-            }
-        }
-
-        //Reload profiles
-        for (int i=0; i<MAX_PROFILES; i++)
-            profile[i].init( i );
-    }
-
-    // Copy existing 2.0 settings if present
    if (profile[0].name().isEmpty())
    {
        QSettings settings20("OpenTX", "Companion 2.0");
@@ -25,7 +25,7 @@
 #include <QSettings>

 #define COMPANY "OpenTX"
-#define PRODUCT "Companion 2.2"
+#define PRODUCT "Companion 2.1"

 #define MAX_PROFILES 15
 #define MAX_JOYSTICKS 8
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])

  QStringList strl = QApplication::arguments();
  if (strl.contains("--version")) {
-    printf("%s\n", VERSION);
+    printf("%s\n", C9X_VERSION);
    fflush(stdout);
    exit(0);
  }
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Type=Application
 Encoding=UTF-8
-Name=Companion @VERSION@
+Name=Companion @C9X_VERSION@
 GenericName=Transmitter Companion App
 Comment=The Ultimate Transmitter Companion
 Icon=@COMPANION_NAME@
@@ -5,54 +5,39 @@
    <file>../../CREDITS.txt</file>
    <file>../../DONATIONS.txt</file>
    <file>../releasenotes.txt</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/9xdb.png</file>
+    <file>images/9xdl.png</file>
+    <file>images/9xdr.png</file>
+    <file>images/9xdt.png</file>
+    <file>images/9xdb-bl.png</file>
+    <file>images/9xdl-bl.png</file>
+    <file>images/9xdr-bl.png</file>
+    <file>images/9xdt-bl.png</file>
+    <file>images/9xdb-gr.png</file>
+    <file>images/9xdl-gr.png</file>
+    <file>images/9xdr-gr.png</file>
+    <file>images/9xdt-gr.png</file>
+    <file>images/9xdb-or.png</file>
+    <file>images/9xdl-or.png</file>
+    <file>images/9xdr-or.png</file>
+    <file>images/9xdt-or.png</file>
+    <file>images/9xdb-yl.png</file>
+    <file>images/9xdl-yl.png</file>
+    <file>images/9xdr-yl.png</file>
+    <file>images/9xdt-yl.png</file>
+    <file>images/9xdb-rd.png</file>
+    <file>images/9xdl-rd.png</file>
+    <file>images/9xdr-rd.png</file>
+    <file>images/9xdt-rd.png</file>
+    <file>images/9xmenu.png</file>
+    <file>images/9xmenumenu.png</file>
+    <file>images/9xmenuexit.png</file>
+    <file>images/9xcurs.png</file>
+    <file>images/9xcursup.png</file>
+    <file>images/9xcursplus.png</file>
+    <file>images/9xcursmin.png</file>
+    <file>images/9xcursdown.png</file>
+    <file>images/9xcursphoto.png</file>
    <file>images/screenshot.png</file>
    <file>images/splash-9x.png</file>
    <file>images/splash-9xrpro.png</file>
@@ -62,18 +47,18 @@
    <file>images/maps.png</file>
    <file>images/track.png</file>
    <file>images/track0.png</file>
-    <file>images/simulator/Taranis/x9b0.png</file>
-    <file>images/simulator/Taranis/x9l0.png</file>
-    <file>images/simulator/Taranis/x9l1.png</file>
-    <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/x9b0.png</file>
+    <file>images/x9l0.png</file>
+    <file>images/x9l1.png</file>
+    <file>images/x9l2.png</file>
+    <file>images/x9l3.png</file>
+    <file>images/x9l4.png</file>
+    <file>images/x9r0.png</file>
+    <file>images/x9r1.png</file>
+    <file>images/x9r2.png</file>
+    <file>images/x9r3.png</file>
+    <file>images/x9s0.png</file>
+    <file>images/x9t0.png</file>
    <file>images/taranison.png</file>    
    <file>images/wizard/ailerons.png</file>
    <file>images/wizard/airbrakes.png</file>
@@ -11,9 +11,7 @@ enum BoardEnum {
  BOARD_AR9X,
  BOARD_TARANIS,
  BOARD_TARANIS_PLUS,
-  BOARD_TARANIS_X9E,
-  BOARD_FLAMENCO,
-  BOARD_HORUS
+  BOARD_TARANIS_X9E
 };

 #define C9X_MAX_MODELS            60
@@ -27,7 +25,7 @@ enum BoardEnum {
 #define C9X_MAX_GVARS             9
 #define C9X_MAX_ENCODERS          2
 #define C9X_NUM_CHNOUT            32 // number of real output channels
-#define C9X_NUM_CSW               64 // number of custom switches
+#define C9X_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
@@ -475,6 +475,13 @@ 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("----");
  }
@@ -501,7 +508,7 @@ QString RawSource::toString(const ModelData * model) const
    case SOURCE_TYPE_SWITCH:
      return (IS_TARANIS(GetEepromInterface()->getBoard()) ? CHECK_IN_ARRAY(switchesX9D, index) : CHECK_IN_ARRAY(switches9X, index));
    case SOURCE_TYPE_CUSTOM_SWITCH:
-      return QObject::tr("L%1").arg(index+1);
+      return logicalSwitches[index];
    case SOURCE_TYPE_CYC:
      return QObject::tr("CYC%1").arg(index+1);
    case SOURCE_TYPE_PPM:
@@ -583,6 +590,13 @@ QString RawSwitch::toString() const
    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")
  };
@@ -620,7 +634,7 @@ QString RawSwitch::toString() const
        else
          return CHECK_IN_ARRAY(switches9X, index-1);
      case SWITCH_TYPE_VIRTUAL:
-        return QObject::tr("L%1").arg(index);
+        return CHECK_IN_ARRAY(logicalSwitches, index-1);
      case SWITCH_TYPE_MULTIPOS_POT:
        return CHECK_IN_ARRAY(multiposPots, index-1);
      case SWITCH_TYPE_TRIM:
@@ -36,6 +36,7 @@ eepromFatHeader(NULL)
 #define EEPROM_BLOCK_SIZE     (4*1024)
 #define EEPROM_MARK           0x84697771 /* thanks ;) */
 #define EEPROM_ZONE_SIZE      (8*1024)
+#define EEPROM_BUFFER_SIZE    256
 #define EEPROM_FAT_SIZE       128
 #define EEPROM_MAX_ZONES      (EEPROM_SIZE / EEPROM_ZONE_SIZE)
 #define EEPROM_MAX_FILES      (EEPROM_MAX_ZONES - 1)
@@ -172,7 +172,8 @@ bool Er9xSimulator::timer10ms()

 uint8_t * Er9xSimulator::getLcd()
 {
-  return (::uint8_t *)simuLcdBuf;
+#define GETLCD_IMPORT
+#include "simulatorimport.h"
 }

 bool Er9xSimulator::lcdChanged(bool & lightEnable)
@@ -194,7 +194,8 @@ bool Ersky9xSimulator::timer10ms()

 uint8_t * Ersky9xSimulator::getLcd()
 {
-  return (::uint8_t *)simuLcdBuf;
+#define GETLCD_IMPORT
+#include "simulatorimport.h"
 }

 bool Ersky9xSimulator::lcdChanged(bool & lightEnable)
@@ -22,13 +22,12 @@
 #define MAX_MIXERS(board, version)            (IS_ARM(board) ? 64 : 32)
 #define MAX_CHANNELS(board, version)          (IS_ARM(board) ? 32 : 16)
 #define MAX_EXPOS(board, version)             (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 216) ? 64 : 32) : (IS_DBLRAM(board, version) ? 16 : 14))
-#define MAX_LOGICAL_SWITCHES(board, version)  (IS_ARM(board) ? (version >= 218 ? 64 : 32) : ((IS_DBLEEPROM(board, version) && version<217) ? 15 : 12))
+#define MAX_CUSTOM_SWITCHES(board, version)   (IS_ARM(board) ? 32 : ((IS_DBLEEPROM(board, version) && version<217) ? 15 : 12))
 #define MAX_CUSTOM_FUNCTIONS(board, version)  (IS_ARM(board) ? (version >= 216 ? 64 : 32) : (IS_DBLEEPROM(board, version) ? 24 : 16))
 #define MAX_CURVES(board, version)            (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 216) ? 32 : 16) : 8)
 #define MAX_GVARS(board, version)             ((IS_ARM(board) && version >= 216) ? 9 : 5)
 #define MAX_SENSORS(board, version)           (32)
 #define NUM_PPM_INPUTS(board, version)        ((IS_ARM(board) && version >= 216) ? 16 : 8)
-#define ROTENC_COUNT(board, version)          (IS_ARM(board) ? ((IS_TARANIS(board) && version >= 218) ? 0 : 1) : (IS_2560(board) ? 2 : 0))

 #define IS_AFTER_RELEASE_21_MARCH_2013(board, version) (version >= 214 || (!IS_ARM(board) && version >= 213))
 #define IS_AFTER_RELEASE_23_MARCH_2013(board, version) (version >= 214 || (board==BOARD_STOCK && version >= 213))
@@ -101,7 +100,7 @@ class SwitchesConversionTable: public ConversionTable {
        }
      }

-      for (int i=1; i<=MAX_LOGICAL_SWITCHES(board, version); i++) {
+      for (int i=1; i<=MAX_CUSTOM_SWITCHES(board, version); i++) {
        addConversion(RawSwitch(SWITCH_TYPE_VIRTUAL, -i), -val+offset);
        addConversion(RawSwitch(SWITCH_TYPE_VIRTUAL, i), val++);
      }
@@ -126,7 +125,7 @@ class SwitchesConversionTable: public ConversionTable {
          addConversion(RawSwitch(SWITCH_TYPE_SWITCH, s), val++);
        }

-        for (int i=1; i<=MAX_LOGICAL_SWITCHES(board, version); i++) {
+        for (int i=1; i<=MAX_CUSTOM_SWITCHES(board, version); i++) {
          addConversion(RawSwitch(SWITCH_TYPE_VIRTUAL, i), val++);
        }

@@ -264,7 +263,7 @@ class SourcesConversionTable: public ConversionTable {
              addConversion(RawSource(SOURCE_TYPE_SWITCH, i), val++);
          }
        }
-        for (int i=0; i<MAX_LOGICAL_SWITCHES(board, version); i++) {
+        for (int i=0; i<MAX_CUSTOM_SWITCHES(board, version); i++) {
          addConversion(RawSource(SOURCE_TYPE_CUSTOM_SWITCH, i), val++);
        }
      }
@@ -297,7 +296,7 @@ class SourcesConversionTable: public ConversionTable {
            addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
          }
        }
-        else  {
+        else {
          if (afterrelease21March2013) {
            if ((board != BOARD_STOCK && (board!=BOARD_M128 || version<215)) || (variant & GVARS_VARIANT)) {
              for (int i=0; i<MAX_GVARS(board, version); i++) {
@@ -306,25 +305,25 @@ class SourcesConversionTable: public ConversionTable {
            }
          }

-          for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
-            if (version < 216) {
-              if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPEED || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
+          if (IS_ARM(board)) {
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 0), val++); // BATT
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 1), val++); // TIME
+            val += 5;
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 2), val++); // Timer1
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 3), val++); // Timer2
+          }
+          else {
+            for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
+              if (version < 216) {
+                if (i == TELEMETRY_SOURCE_TX_TIME || i == TELEMETRY_SOURCE_SWR || i == TELEMETRY_SOURCE_A3 ||
+                    i == TELEMETRY_SOURCE_A4 || i == TELEMETRY_SOURCE_ASPEED || i == TELEMETRY_SOURCE_DTE ||
+                    i == TELEMETRY_SOURCE_CELL_MIN || i == TELEMETRY_SOURCE_CELLS_MIN || i == TELEMETRY_SOURCE_VFAS_MIN)
+                  continue;
+              }
+              if (i == TELEMETRY_SOURCE_TX_TIME || i == TELEMETRY_SOURCE_SWR || i == TELEMETRY_SOURCE_A3 ||
+                  i == TELEMETRY_SOURCE_A4 || i == TELEMETRY_SOURCE_A3_MIN || i == TELEMETRY_SOURCE_A4_MIN)
                continue;
-            }
-            if (!IS_ARM(board)) {
-              if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_A3_MIN || i==TELEMETRY_SOURCE_A4_MIN)
-                continue;
-            }
-            addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
-            if (version >= 216 && IS_ARM(board)) {
-              if (i==TELEMETRY_SOURCE_RSSI_RX)
-                val += 1;
-              if (i==TELEMETRY_SOURCE_TX_TIME)
-                val += 5;
-              if (i==TELEMETRY_SOURCE_DTE)
-                val += 5;
-              if (i==TELEMETRY_SOURCE_POWER_MAX)
-                val += 5;
+              addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
            }
          }
        }
@@ -784,7 +783,7 @@ class FlightModeField: public TransformedField {
      index(index),
      board(board),
      version(version),
-      rotencCount(ROTENC_COUNT(board, version))
+      rotencCount(IS_ARM(board) ? 1 : (IS_2560(board) ? 2 : 0))
    {
      if (board == BOARD_STOCK || (board==BOARD_M128 && version>=215)) {
        // On stock we use 10bits per trim
@@ -804,21 +803,13 @@ class FlightModeField: public TransformedField {
          internalField.Append(new SignedField<16>(trimBase[i]));
        }
      }
-      if (IS_ARM(board) && version >= 218) {
-        if (HAS_LARGE_LCD(board))
-          internalField.Append(new ZCharField<10>(phase.name));
-        else
-          internalField.Append(new ZCharField<6>(phase.name));
-        internalField.Append(new SwitchField<9>(phase.swtch, board, version));
-        internalField.Append(new SpareBitsField<7>());
-      }
-      else {
-        internalField.Append(new SwitchField<8>(phase.swtch, board, version));
-        if (HAS_LARGE_LCD(board))
-          internalField.Append(new ZCharField<10>(phase.name));
-        else
-          internalField.Append(new ZCharField<6>(phase.name));
-      }
+
+      internalField.Append(new SwitchField<8>(phase.swtch, board, version));
+      if (HAS_LARGE_LCD(board))
+        internalField.Append(new ZCharField<10>(phase.name));
+      else
+        internalField.Append(new ZCharField<6>(phase.name));
+
      if (IS_ARM(board) && version >= 214) {
        internalField.Append(new UnsignedField<8>(phase.fadeIn));
        internalField.Append(new UnsignedField<8>(phase.fadeOut));
@@ -931,25 +922,7 @@ class MixField: public TransformedField {
      version(version),
      model(model)
    {
-      if (IS_TARANIS(board) && version >= 218) {
-        internalField.Append(new SignedField<11>(_weight));
-        internalField.Append(new UnsignedField<5>(_destCh));
-        internalField.Append(new SourceField<10>(mix.srcRaw, board, version, FLAG_NOTELEMETRY));
-        internalField.Append(new UnsignedField<1>((unsigned int &)mix.carryTrim));
-        internalField.Append(new UnsignedField<2>(mix.mixWarn));
-        internalField.Append(new UnsignedField<2>((unsigned int &)mix.mltpx));
-        internalField.Append(new SpareBitsField<1>());
-        internalField.Append(new SignedField<14>(_offset));
-        internalField.Append(new SwitchField<9>(mix.swtch, board, version));
-        internalField.Append(new UnsignedField<9>(mix.flightModes));
-        internalField.Append(new CurveReferenceField(mix.curve, board, version));
-        internalField.Append(new UnsignedField<8>(mix.delayUp));
-        internalField.Append(new UnsignedField<8>(mix.delayDown));
-        internalField.Append(new UnsignedField<8>(mix.speedUp));
-        internalField.Append(new UnsignedField<8>(mix.speedDown));
-        internalField.Append(new ZCharField<8>(mix.name));
-      }
-      else if (IS_TARANIS(board) && version >= 217) {
+      if (IS_TARANIS(board) && version >= 217) {
        internalField.Append(new UnsignedField<8>(_destCh));
        internalField.Append(new UnsignedField<9>(mix.flightModes));
        internalField.Append(new UnsignedField<2>((unsigned int &)mix.mltpx));
@@ -1217,21 +1190,7 @@ class InputField: public TransformedField {
      board(board),
      version(version)
    {
-      if (IS_TARANIS(board) && version >= 218) {
-        internalField.Append(new UnsignedField<2>(expo.mode, "Mode"));
-        internalField.Append(new UnsignedField<14>(expo.scale, "Scale"));
-        internalField.Append(new SourceField<10>(expo.srcRaw, board, version, 0));
-        internalField.Append(new SignedField<6>(expo.carryTrim, "CarryTrim"));
-        internalField.Append(new UnsignedField<5>(expo.chn, "Channel"));
-        internalField.Append(new SwitchField<9>(expo.swtch, board, version));
-        internalField.Append(new UnsignedField<9>(expo.flightModes));
-        internalField.Append(new SignedField<8>(_weight, "Weight"));
-        internalField.Append(new SpareBitsField<1>());
-        internalField.Append(new ZCharField<8>(expo.name));
-        internalField.Append(new SignedField<8>(_offset, "Offset"));
-        internalField.Append(new CurveReferenceField(expo.curve, board, version));
-      }
-      else if (IS_TARANIS(board) && version >= 217) {
+      if (IS_TARANIS(board) && version >= 217) {
        internalField.Append(new SourceField<10>(expo.srcRaw, board, version, 0));
        internalField.Append(new UnsignedField<14>(expo.scale, "Scale"));
        internalField.Append(new UnsignedField<8>(expo.chn, "Channel"));
@@ -1636,7 +1595,7 @@ class AndSwitchesConversionTable: public ConversionTable {
          addConversion(RawSwitch(SWITCH_TYPE_SWITCH, -s), -val);
          addConversion(RawSwitch(SWITCH_TYPE_SWITCH, s), val++);
        }
-        for (int i=1; i<=MAX_LOGICAL_SWITCHES(board, version); i++) {
+        for (int i=1; i<=MAX_CUSTOM_SWITCHES(board, version); i++) {
          addConversion(RawSwitch(SWITCH_TYPE_VIRTUAL, -i), -val);
          addConversion(RawSwitch(SWITCH_TYPE_VIRTUAL, i), val++);
        }
@@ -1647,7 +1606,7 @@ class AndSwitchesConversionTable: public ConversionTable {
          addConversion(RawSwitch(SWITCH_TYPE_SWITCH, -s), -val);
          addConversion(RawSwitch(SWITCH_TYPE_SWITCH, s), val++);
        }
-        for (int i=1; i<=MAX_LOGICAL_SWITCHES(board, version); i++) {
+        for (int i=1; i<=MAX_CUSTOM_SWITCHES(board, version); i++) {
          addConversion(RawSwitch(SWITCH_TYPE_VIRTUAL, -i), -val);
          addConversion(RawSwitch(SWITCH_TYPE_VIRTUAL, i), val++);
        }
@@ -1712,16 +1671,7 @@ class LogicalSwitchField: public TransformedField {
      v2(0),
      v3(0)
    {
-      if (IS_ARM(board) && version >= 218) {
-        internalField.Append(new ConversionField< UnsignedField<8> >(csw.func, &functionsConversionTable, "Function"));
-        internalField.Append(new SignedField<10>(v1));
-        internalField.Append(new SignedField<10>(v3));
-        internalField.Append(new ConversionField< SignedField<9> >((int &)csw.andsw, andswitchesConversionTable, "AND switch"));
-        internalField.Append(new SpareBitsField<1>()); // TODO extra switch mode
-        internalField.Append(new SpareBitsField<2>());
-        internalField.Append(new SignedField<16>(v2));
-      }
-      else if (IS_ARM(board) && version >= 217) {
+      if (IS_ARM(board) && version >= 217) {
        internalField.Append(new ConversionField< UnsignedField<6> >(csw.func, &functionsConversionTable, "Function"));
        internalField.Append(new SignedField<10>(v1));
        internalField.Append(new SignedField<16>(v2));
@@ -1756,7 +1706,7 @@ class LogicalSwitchField: public TransformedField {
        int scale = (version >= 216 ? 0 : 5);
        internalField.Append(new ConversionField< UnsignedField<8> >(csw.delay, 0, scale));
        internalField.Append(new ConversionField< UnsignedField<8> >(csw.duration, 0, scale));
-        if (version >= 214 && version <= 217) {
+        if (version >= 214) {
          internalField.Append(new ConversionField< SignedField<8> >((int &)csw.andsw, andswitchesConversionTable, "AND switch"));
        }
      }
@@ -2079,14 +2029,8 @@ class ArmCustomFunctionField: public TransformedField {
    {
      memset(_param, 0, sizeof(_param));

-      if (version >= 218) {
-        internalField.Append(new SwitchField<9>(fn.swtch, board, version));
-        internalField.Append(new ConversionField< UnsignedField<7> >(_func, &functionsConversionTable, "Function", ::QObject::tr("OpenTX on this board doesn't accept this function")));
-      }
-      else {
-        internalField.Append(new SwitchField<8>(fn.swtch, board, version));
-        internalField.Append(new ConversionField< UnsignedField<8> >(_func, &functionsConversionTable, "Function", ::QObject::tr("OpenTX on this board doesn't accept this function")));
-      }
+      internalField.Append(new SwitchField<8>(fn.swtch, board, version));
+      internalField.Append(new ConversionField< UnsignedField<8> >(_func, &functionsConversionTable, "Function", ::QObject::tr("OpenTX on this board doesn't accept this function")));

      if (IS_TARANIS(board) && version >= 216)
        internalField.Append(new CharField<8>(_param, false));
@@ -2267,8 +2211,9 @@ class ArmCustomFunctionField: public TransformedField {
        }
      }
      else if (fn.func == FuncPlayValue) {
-        if (version >= 213)
+        if (version >= 213) {
          sourcesConversionTable->importValue(value, (int &)fn.param);
+        }
        else
          SourcesConversionTable::getInstance(board, version, variant, FLAG_NONONE|FLAG_NOSWITCHES)->importValue(value, (int &)fn.param);
      }
@@ -2961,21 +2906,8 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  }

  for (int i=0; i<MAX_TIMERS(board, version); i++) {
-    if (IS_ARM(board) && version >= 218) {
-      internalField.Append(new SwitchField<9>(modelData.timers[i].mode, board, version, true));
-      internalField.Append(new UnsignedField<23>(modelData.timers[i].val));
-      internalField.Append(new SignedField<24>(modelData.timers[i].pvalue));
-      internalField.Append(new UnsignedField<2>(modelData.timers[i].countdownBeep));
-      internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep));
-      internalField.Append(new UnsignedField<2>(modelData.timers[i].persistent));
-      internalField.Append(new SpareBitsField<3>());
-      if (IS_TARANIS(board))
-        internalField.Append(new ZCharField<8>(modelData.timers[i].name));
-      else
-        internalField.Append(new ZCharField<3>(modelData.timers[i].name));
-    }
-    else if (IS_ARM(board) && version >= 217) {
-      internalField.Append(new SwitchField<8>(modelData.timers[i].mode, board, version, true));
+    internalField.Append(new SwitchField<8>(modelData.timers[i].mode, board, version, true));
+    if (IS_ARM(board) && version >= 217) {
      internalField.Append(new UnsignedField<24>(modelData.timers[i].val));
      internalField.Append(new SignedField<24>(modelData.timers[i].pvalue));
      internalField.Append(new UnsignedField<2>(modelData.timers[i].countdownBeep));
@@ -2988,7 +2920,6 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
        internalField.Append(new ZCharField<3>(modelData.timers[i].name));
    }
    else if ((IS_ARM(board) || IS_2560(board)) && version >= 216) {
-      internalField.Append(new SwitchField<8>(modelData.timers[i].mode, board, version, true));
      internalField.Append(new UnsignedField<16>(modelData.timers[i].val));
      internalField.Append(new UnsignedField<2>(modelData.timers[i].countdownBeep));
      internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep));
@@ -2997,7 +2928,6 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
      internalField.Append(new SignedField<16>(modelData.timers[i].pvalue));
    }
    else if (afterrelease21March2013) {
-      internalField.Append(new SwitchField<8>(modelData.timers[i].mode, board, version, true));
      internalField.Append(new UnsignedField<12>(modelData.timers[i].val));
      internalField.Append(new BoolField<1>((bool &)modelData.timers[i].countdownBeep));
      internalField.Append(new BoolField<1>(modelData.timers[i].minuteBeep));
@@ -3011,7 +2941,6 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
      }
    }
    else {
-      internalField.Append(new SwitchField<8>(modelData.timers[i].mode, board, version, true));
      internalField.Append(new UnsignedField<16>(modelData.timers[i].val));
      if (HAS_PERSISTENT_TIMERS(board)) {
        internalField.Append(new UnsignedField<1>(modelData.timers[i].persistent));
@@ -3071,7 +3000,7 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
  for (int i=0; i<MAX_EXPOS(board, version); i++)
    internalField.Append(new InputField(modelData.expoData[i], board, version));
  internalField.Append(new CurvesField(modelData.curves, board, version));
-  for (int i=0; i<MAX_LOGICAL_SWITCHES(board, version); i++)
+  for (int i=0; i<MAX_CUSTOM_SWITCHES(board, version); i++)
    internalField.Append(new LogicalSwitchField(modelData.logicalSw[i], board, version, variant, &modelData));
  for (int i=0; i<MAX_CUSTOM_FUNCTIONS(board, version); i++) {
    if (IS_ARM(board))
@@ -3080,9 +3009,8 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
      internalField.Append(new AvrCustomFunctionField(modelData.customFn[i], board, version, variant));
  }
  internalField.Append(new HeliField(modelData.swashRingData, board, version, variant));
-  for (int i=0; i<MAX_FLIGHT_MODES(board, version); i++) {
+  for (int i=0; i<MAX_FLIGHT_MODES(board, version); i++)
    internalField.Append(new FlightModeField(modelData.flightModeData[i], i, board, version));
-  }

  if (!IS_ARM(board) || version < 216) {
    internalField.Append(new SignedField<8>(modelData.moduleData[0].ppmFrameLength));
@@ -23,8 +23,8 @@
 #include "file.h"
 #include "appdata.h"

-#define OPENTX_FIRMWARE_DOWNLOADS        "http://downloads-22.open-tx.org/firmware"
-#define OPENTX_NIGHT_FIRMWARE_DOWNLOADS  "http://downloads-22.open-tx.org/nightly/firmware"
+#define OPENTX_FIRMWARE_DOWNLOADS        "http://downloads-21.open-tx.org/firmware"
+#define OPENTX_NIGHT_FIRMWARE_DOWNLOADS  "http://downloads-21.open-tx.org/nightly/firmware"

 #define FILE_TYP_GENERAL 1
 #define FILE_TYP_MODEL   2
@@ -75,10 +75,6 @@ const char * OpenTxEepromInterface::getName()
      return "OpenTX for 9XR-PRO";
    case BOARD_AR9X:
      return "OpenTX for ar9x board / 9X";
-    case BOARD_FLAMENCO:
-      return "OpenTX for Flamenco experimental";
-    case BOARD_HORUS:
-      return "OpenTX for FrSky Horus";
    default:
      return "OpenTX for an unknown board";
  }
@@ -102,8 +98,6 @@ const int OpenTxEepromInterface::getEEpromSize()
    case BOARD_TARANIS:
    case BOARD_TARANIS_PLUS:
    case BOARD_TARANIS_X9E:
-    case BOARD_FLAMENCO:
-    case BOARD_HORUS:
      return EESIZE_TARANIS;
    default:
      return 0;
@@ -409,9 +403,7 @@ int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t
      case BOARD_SKY9X:
      case BOARD_AR9X:
      case BOARD_9XRPRO:
-      case BOARD_FLAMENCO:
-      case BOARD_HORUS:
-        version = 218;
+        version = 217;
        break;
      case BOARD_GRUVIN9X:
      case BOARD_MEGA2560:
@@ -644,7 +636,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
      return id.contains("nooverridech") ? 0 : 1;
    case LogicalSwitches:
      if (IS_ARM(board))
-        return 64;
+        return 32;
      else
        return 12;
    case CustomAndSwitches:
@@ -964,10 +956,10 @@ EepromLoadErrors OpenTxEepromInterface::checkVersion(unsigned int version)
      // M128 revert because too much RAM used!
    case 216:
      // A lot of things (first github release)
+      return OLD_VERSION;
+      break;
    case 217:
      // 3 logical switches removed on M128 / gruvin9x boards
-      return OLD_VERSION;
-    case 218:
      break;
    default:
      return NOT_OPENTX;
@@ -1442,14 +1434,6 @@ void registerOpenTxFirmwares()
  addOpenTxCommonOptions(firmware);
  firmwares.push_back(firmware);

-  /* Horus board */
-  firmware = new OpenTxFirmware("opentx-horus", QObject::tr("FrSky Horus"), BOARD_HORUS);
-  firmware->addOption("noheli", QObject::tr("Disable HELI menu and cyclic mix support"));
-  firmware->addOption("nogvars", QObject::tr("Disable Global variables"));
-  firmware->addOption("lua", QObject::tr("Support for Lua model scripts"));
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
  default_firmware_variant = GetFirmware("opentx-taranisplus-en");
  current_firmware_variant = default_firmware_variant;
 }
@@ -1,19 +1,46 @@
-today(DATE)
-now(TIME)
-git_id(GIT_STR)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})

-configure_file(${RADIO_SRC_DIRECTORY}/stamp.h.in ${RADIO_SRC_DIRECTORY}/stamp.h @ONLY)
+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)
+
+macro(add_lua_export_target target)
+  add_custom_command(
+    OUTPUT ${RADIO_SRC_DIRECTORY}/lua/lua_exports_${target}.inc
+    COMMAND ${CMAKE_C_COMPILER} -E ${ARGN} -DEXPORT ${INTTYPES_INCLUDE_OPTION} myeeprom.h | grep LEXP > lua_exports_${target}.txt
+    COMMAND python ../util/luaexport.py ${C9X_VERSION} lua_exports_${target}.txt lua/lua_exports_${target}.inc lua_fields_${target}.txt
+    WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
+  )
+  add_custom_target(lua_export_${target} DEPENDS ${RADIO_SRC_DIRECTORY}/lua/lua_exports_${target}.inc)
+endmacro(add_lua_export_target)
+
+add_lua_export_target(taranis -DPCBTARANIS -DLUA -DVIRTUALINPUTS)
+add_lua_export_target(taranis_x9e -DPCBTARANIS -DREVPLUS -DREV9E -DLUA -DVIRTUALINPUTS)

 set(OPENTX_SRC_FILES
  opentxsimulator.cpp
-  )
+)

 include_directories(
-  ${CMAKE_BINARY_DIR}/radio/src
  ${CMAKE_CURRENT_BINARY_DIR}
-  ${RADIO_BIN_DIRECTORY}
  ${PROJECT_SOURCE_DIR}
-  ${COMPANION_SRC_DIRECTORY}/firmwares/opentx
+  ${PROJECT_SOURCE_DIR}/firmwares/opentx
  ${RADIO_SRC_DIRECTORY}
  ${RADIO_SRC_DIRECTORY}/fonts/std
  ${RADIO_SRC_DIRECTORY}/lua/src
@@ -37,21 +64,21 @@ endif()

 set(COMMON_DEFINITIONS
  ${COMMON_DEFINITIONS}
-  SUFFIX="${SUFFIX}"
+  SUFFIX="${SUFFIX}" 
  HELI
  GVARS
  FLIGHT_MODES
  PPM_CENTER_ADJUSTABLE
  PPM_LIMITS_SYMETRICAL
-  OVERRIDE_CHANNEL_FUNCTION
+  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})
@@ -65,24 +92,19 @@ 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_library(opentx-horus${SUFFIX}-simulator SHARED ${OPENTX_SRC_FILES})

-set(dependencies_9x 9x_bitmaps firmware_translations)
-add_dependencies(opentx-9x${SUFFIX}-simulator ${dependencies_9x})
-add_dependencies(opentx-9xr${SUFFIX}-simulator ${dependencies_9x})
-add_dependencies(opentx-9x128${SUFFIX}-simulator ${dependencies_9x})
-add_dependencies(opentx-9xr128${SUFFIX}-simulator ${dependencies_9x})
-add_dependencies(opentx-gruvin9x${SUFFIX}-simulator ${dependencies_9x})
-add_dependencies(opentx-mega2560${SUFFIX}-simulator ${dependencies_9x})
-add_dependencies(opentx-sky9x${SUFFIX}-simulator ${dependencies_9x})
-add_dependencies(opentx-9xrpro${SUFFIX}-simulator ${dependencies_9x})
-add_dependencies(opentx-ar9x${SUFFIX}-simulator ${dependencies_9x})
-set(dependencies_taranis taranis_bitmaps firmware_translations)
-add_dependencies(opentx-taranis${SUFFIX}-simulator ${dependencies_taranis} lua_export_taranis)
-add_dependencies(opentx-taranisplus${SUFFIX}-simulator ${dependencies_taranis} lua_export_taranis)
-add_dependencies(opentx-taranisx9e${SUFFIX}-simulator ${dependencies_taranis} lua_export_taranis_x9e)
-
-add_dependencies(opentx-horus${SUFFIX}-simulator horus_bitmaps horus_fonts firmware_translations lua_export_horus)
+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_export_taranis)
+add_dependencies(opentx-taranisplus${SUFFIX}-simulator about_lbm_taranis commondeps lua_export_taranis)
+add_dependencies(opentx-taranisx9e${SUFFIX}-simulator about_lbm_taranis commondeps lua_export_taranis_x9e)

 set(OPENTX_LIBRARIES
  opentx-9x${SUFFIX}-simulator
@@ -97,81 +119,75 @@ set(OPENTX_LIBRARIES
  opentx-taranis${SUFFIX}-simulator
  opentx-taranisplus${SUFFIX}-simulator
  opentx-taranisx9e${SUFFIX}-simulator
-  opentx-horus${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/9x PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/9x)
-target_compile_definitions(opentx-9x${SUFFIX}-simulator PRIVATE PCBSTD PCB9X CPUM64 EEPROM EEPROM_RLC ${COMMON_DEFINITIONS})
+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/9x PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/9x)
-target_compile_definitions(opentx-9xr${SUFFIX}-simulator PRIVATE PCBSTD PCB9XR CPUM64 EEPROM EEPROM_RLC ${COMMON_DEFINITIONS})
+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/9x PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/9x)
-target_compile_definitions(opentx-9x128${SUFFIX}-simulator PRIVATE PCBSTD PCB9X CPUM128 EEPROM EEPROM_RLC ${COMMON_DEFINITIONS})
+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/9x PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/9x)
-target_compile_definitions(opentx-9xr128${SUFFIX}-simulator PRIVATE PCBSTD PCB9XR CPUM128 EEPROM EEPROM_RLC ${COMMON_DEFINITIONS})
+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 PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/9x)
-target_compile_definitions(opentx-gruvin9x${SUFFIX}-simulator PRIVATE PCBGRUVIN9X CPUM2560 EEPROM EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
+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 PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/9x)
-target_compile_definitions(opentx-mega2560${SUFFIX}-simulator PRIVATE PCBMEGA2560 CPUM2560 EEPROM EEPROM_RLC SDCARD ROTARY_ENCODERS=2 ${COMMON_DEFINITIONS})
+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 PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/9x)
-target_compile_definitions(opentx-sky9x${SUFFIX}-simulator PRIVATE PCBSKY9X CPUARM VOICE EEPROM SDCARD ${COMMON_DEFINITIONS})
+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 PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/9x)
-target_compile_definitions(opentx-9xrpro${SUFFIX}-simulator PRIVATE PCBSKY9X REVX CPUARM VOICE EEPROM SDCARD ${COMMON_DEFINITIONS})
+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 PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/9x)
-target_compile_definitions(opentx-ar9x${SUFFIX}-simulator PRIVATE PCBSKY9X AR9X CPUARM VOICE EEPROM SDCARD ${COMMON_DEFINITIONS})
+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 PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/taranis)
-target_compile_definitions(opentx-taranis${SUFFIX}-simulator PRIVATE PCBTARANIS CPUARM CPUSTM32 EEPROM EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
+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 PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/taranis)
-target_compile_definitions(opentx-taranisplus${SUFFIX}-simulator PRIVATE PCBTARANIS REVPLUS CPUARM CPUSTM32 EEPROM EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
+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 PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/taranis)
-target_compile_definitions(opentx-taranisx9e${SUFFIX}-simulator PRIVATE PCBTARANIS REVPLUS REV9E CPUARM CPUSTM32 STM32F40_41xxx EEPROM EEPROM_RLC VOICE SDCARD ${COMMON_DEFINITIONS})
+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})

-# Horus
-target_include_directories(opentx-horus${SUFFIX}-simulator PRIVATE ${RADIO_SRC_DIRECTORY}/targets/horus PRIVATE ${RADIO_SRC_DIRECTORY}/fonts/horus PRIVATE ${CMAKE_BINARY_DIR}/radio/src/bitmaps/horus)
-target_compile_definitions(opentx-horus${SUFFIX}-simulator PRIVATE PCBHORUS CPUARM CPUSTM32 STM32F40_41xxx COLORLCD VOICE SDCARD ${COMMON_DEFINITIONS})
-target_link_libraries(opentx-horus${SUFFIX}-simulator PRIVATE ${COMMON_LIBRARIES})
-
 add_custom_target(opentx-simulators
  DEPENDS ${OPENTX_LIBRARIES}
-  )
+)

 if(APPLE)
  set(SIMULATOR_BUNDLES)
@@ -187,7 +203,7 @@ if(APPLE)
      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})
@@ -15,7 +15,6 @@
 */

 #include "opentxsimulator.h"
-#include <QDebug>
 #include <stdio.h>
 #include <exception>
 #include <map>
@@ -40,11 +39,7 @@
 #define AUTOSWITCH
 #define GRAPHICS
 #define CURVES
-#if defined(PCBFLAMENCO)
-  #define RTCLOCK
-  #define XCURVES
-  #define VIRTUALINPUTS
-#elif defined(PCBTARANIS) || defined(PCBHORUS)
+#if defined(PCBTARANIS)
  #define RTCLOCK
  #define XCURVES
  #define VIRTUALINPUTS
@@ -102,19 +97,15 @@ namespace NAMESPACE {
 #include "radio/src/pulses/pulses_avr.cpp"
 #endif

-#include "radio/src/storage/storage_common.cpp"
+#include "radio/src/eeprom_common.cpp"
 #if defined(EEPROM_RLC)
-#include "radio/src/storage/eeprom_common.cpp"
-#include "radio/src/storage/eeprom_rlc.cpp"
-#elif defined(EEPROM)
-#include "radio/src/storage/eeprom_common.cpp"
-#include "radio/src/storage/eeprom_raw.cpp"
-#elif defined(SDCARD)
-#include "radio/src/storage/sdcard_raw.cpp"
+#include "radio/src/eeprom_rlc.cpp"
+#else
+#include "radio/src/eeprom_raw.cpp"
 #endif

 #if defined(PCBTARANIS) || defined(PCBSKY9X)
-#include "radio/src/storage/eeprom_conversions.cpp"
+#include "radio/src/eeprom_conversions.cpp"
 #endif

 #include "radio/src/opentx.cpp"
@@ -133,159 +124,85 @@ namespace NAMESPACE {
 #include "radio/src/vario.cpp"
 #include "radio/src/trainer_input.cpp"

-#if defined(PCBHORUS)
+#if defined(PCBTARANIS)
 #include "radio/src/bmp.cpp"
-#include "radio/src/gui/horus/bitmaps.cpp"
-#include "radio/src/gui/horus/curves.cpp"
-#include "radio/src/gui/horus/fonts.cpp"
-#include "radio/src/gui/horus/widgets.cpp"
-#include "radio/src/gui/horus/navigation.cpp"
-#include "radio/src/gui/horus/popups.cpp"
-#include "radio/src/gui/horus/helpers.cpp"
-#include "radio/src/gui/horus/menus.cpp"
-#include "radio/src/gui/horus/menu_model.cpp"
-#include "radio/src/gui/horus/menu_model_select.cpp"
-#include "radio/src/gui/horus/menu_model_setup.cpp"
-#include "radio/src/gui/horus/menu_model_heli.cpp"
-#include "radio/src/gui/horus/menu_model_flightmodes.cpp"
-#include "radio/src/gui/horus/menu_model_inputs_mixes.cpp"
-#include "radio/src/gui/horus/menu_model_curves.cpp"
-#include "radio/src/gui/horus/menu_model_logical_switches.cpp"
-#include "radio/src/gui/horus/menu_model_custom_functions.cpp"
-#include "radio/src/gui/horus/menu_model_custom_scripts.cpp"
-#include "radio/src/gui/horus/menu_model_gvars.cpp"
-#include "radio/src/gui/horus/menu_model_limits.cpp"
-#include "radio/src/gui/horus/menu_model_telemetry.cpp"
-#include "radio/src/gui/horus/menu_general.cpp"
-#include "radio/src/gui/horus/menu_general_setup.cpp"
-#include "radio/src/gui/horus/menu_general_sdmanager.cpp"
-#include "radio/src/gui/horus/menu_general_trainer.cpp"
-#include "radio/src/gui/horus/menu_general_version.cpp"
-// #include "radio/src/gui/horus/menu_general_hardware.cpp"
-#include "radio/src/gui/horus/menu_general_calib.cpp"
-#include "radio/src/gui/horus/view_main.cpp"
-#include "radio/src/gui/horus/view_statistics.cpp"
-#include "radio/src/gui/horus/view_channels.cpp"
-#include "radio/src/gui/horus/view_telemetry.cpp"
-#include "radio/src/gui/horus/view_text.cpp"
-#include "radio/src/gui/horus/view_about.cpp"
-#include "radio/src/gui/horus/lcd.cpp"
-#include "radio/src/gui/horus/splash.cpp"
-#elif defined(PCBFLAMENCO)
-#include "radio/src/gui/Flamenco/fonts.cpp"
-#include "radio/src/gui/Flamenco/widgets.cpp"
-#include "radio/src/gui/Flamenco/navigation.cpp"
-#include "radio/src/gui/Flamenco/popups.cpp"
-#include "radio/src/gui/Flamenco/helpers.cpp"
-#include "radio/src/gui/Flamenco/menus.cpp"
-#include "radio/src/gui/Flamenco/menu_model.cpp"
-#include "radio/src/gui/Flamenco/menu_model_select.cpp"
-#include "radio/src/gui/Flamenco/menu_model_setup.cpp"
-#include "radio/src/gui/Flamenco/menu_model_heli.cpp"
-#include "radio/src/gui/Flamenco/menu_model_flightmodes.cpp"
-#include "radio/src/gui/Flamenco/menu_model_inputs_mixes.cpp"
-#include "radio/src/gui/Flamenco/menu_model_curves.cpp"
-#include "radio/src/gui/Flamenco/menu_model_logical_switches.cpp"
-#include "radio/src/gui/Flamenco/menu_model_custom_functions.cpp"
-// #include "radio/src/gui/Flamenco/menu_model_custom_scripts.cpp"
-#include "radio/src/gui/Flamenco/menu_model_gvars.cpp"
-#include "radio/src/gui/Flamenco/menu_model_limits.cpp"
-#include "radio/src/gui/Flamenco/menu_model_telemetry.cpp"
-#include "radio/src/gui/Flamenco/menu_general.cpp"
-#include "radio/src/gui/Flamenco/menu_general_setup.cpp"
-#include "radio/src/gui/Flamenco/menu_general_sdmanager.cpp"
-#include "radio/src/gui/Flamenco/menu_general_trainer.cpp"
-#include "radio/src/gui/Flamenco/menu_general_version.cpp"
-// #include "radio/src/gui/Flamenco/menu_general_hardware.cpp"
-#include "radio/src/gui/Flamenco/menu_general_calib.cpp"
-#include "radio/src/gui/Flamenco/view_main.cpp"
-#include "radio/src/gui/Flamenco/view_statistics.cpp"
-#include "radio/src/gui/Flamenco/view_channels.cpp"
-#include "radio/src/gui/Flamenco/view_telemetry.cpp"
-#include "radio/src/gui/Flamenco/view_text.cpp"
-#include "radio/src/gui/Flamenco/view_about.cpp"
-#include "radio/src/gui/Flamenco/lcd.cpp"
-#include "radio/src/gui/Flamenco/splash.cpp"
-#include "radio/src/targets/flamenco/tw8823_driver.cpp"
-#elif 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"
+#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"
+#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"
+#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"
+#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"
+#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"
+#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"
+#include "radio/src/gui/9X/view_about.cpp"
 #endif
-#include "radio/src/gui/9x/lcd.cpp"
-#include "radio/src/gui/9x/splash.cpp"
+#include "radio/src/gui/9X/lcd.cpp"
+#include "radio/src/gui/9X/splash.cpp"
 #endif

 #if !defined(VIRTUALINPUTS)
@@ -304,27 +221,7 @@ namespace NAMESPACE {
 #include "radio/src/buzzer.cpp"
 #endif

-#if defined(PCBHORUS)
-#include "radio/src/targets/horus/board_horus.cpp"
-#include "radio/src/targets/horus/keys_driver.cpp"
-#include "radio/src/targets/horus/audio_driver.cpp"
-#include "radio/src/targets/horus/telemetry_driver.cpp"
-#include "radio/src/targets/horus/haptic_driver.cpp"
-#include "radio/src/targets/horus/pulses_driver.cpp"
-#include "radio/src/targets/taranis/rtc_driver.cpp"
-#include "radio/src/targets/horus/trainer_driver.cpp"
-#include "radio/src/targets/horus/serial2_driver.cpp"
-#elif defined(PCBFLAMENCO)
-#include "radio/src/targets/flamenco/board_flamenco.cpp"
-#include "radio/src/targets/flamenco/keys_driver.cpp"
-#include "radio/src/targets/flamenco/audio_driver.cpp"
-#include "radio/src/targets/flamenco/telemetry_driver.cpp"
-#include "radio/src/targets/flamenco/eeprom_driver.cpp"
-// #include "radio/src/targets/flamenco/haptic_driver.cpp"
-#include "radio/src/targets/flamenco/pulses_driver.cpp"
-#include "radio/src/targets/flamenco/rtc_driver.cpp"
-#include "radio/src/targets/flamenco/trainer_driver.cpp"
-#elif defined(PCBTARANIS)
+#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"
@@ -355,11 +252,7 @@ namespace NAMESPACE {
 #elif defined(PCBMEGA2560)
 #include "radio/src/targets/mega2560/board_mega2560.cpp"
 #else
-#include "radio/src/targets/9x/board_stock.cpp"
-#endif
-
-#if defined(CPUARM)
-#include "radio/src/gui/gui_helpers.cpp"
+#include "radio/src/targets/stock/board_stock.cpp"
 #endif

 #include "radio/src/keys.cpp"
@@ -486,7 +379,8 @@ bool OpenTxSimulator::timer10ms()

 ::uint8_t * OpenTxSimulator::getLcd()
 {
-  return (::uint8_t *)simuLcdBuf;
+#define GETLCD_IMPORT
+#include "simulatorimport.h"
 }

 bool OpenTxSimulator::lcdChanged(bool & lightEnable)
@@ -566,16 +460,11 @@ void OpenTxSimulator::getTrims(Trims & trims)

 void OpenTxSimulator::wheelEvent(int steps)
 {
-#if defined(PCBHORUS) || defined(PCBFLAMENCO)
-  if (steps > 0)
-    rotencValue -= 2;
-  else
-    rotencValue += 2;
-#elif defined(REV9E)
+#if defined(REV9E)
  if (steps == 255)
-    rotencValue -= 2;
+    x9de_rotenc -= 2;
  else
-    rotencValue += 2;
+    x9de_rotenc += 2;
 #elif defined(PCBSKY9X) && !defined(REVX)
  g_rotenc[0] += steps*4;
 #elif defined(PCBGRUVIN9X)
@@ -638,19 +527,20 @@ uint16_t OpenTxSimulator::getSensorRatio(uint16_t id)
  return 0;
 }

+void OpenTxSimulator::setLuaStateReloadPermanentScripts()
+{
+#if defined(LUA)
+  luaState = INTERPRETER_RELOAD_PERMANENT_SCRIPTS;
+#endif
+}
+
+
 void OpenTxSimulator::setTrainerInput(unsigned int inputNumber, ::int16_t value)
 {
 #define SETTRAINER_IMPORT
 #include "simulatorimport.h"
 }

-void OpenTxSimulator::setLuaStateReloadPermanentScripts()
-{
-#if defined(LUA)
-    luaState = INTERPRETER_RELOAD_PERMANENT_SCRIPTS;
-#endif
-}
-
 void OpenTxSimulator::installTraceHook(void (*callback)(const char *))
 {
  traceCallback = callback;
@@ -675,11 +565,7 @@ class OpenTxSimulatorFactory: public SimulatorFactory

    virtual BoardEnum type()
    {
-#if defined(PCBHORUS)
-      return BOARD_HORUS;
-#elif defined(PCBFLAMENCO)
-      return BOARD_FLAMENCO;
-#elif defined(PCBTARANIS)
+#if defined(PCBTARANIS)
      return BOARD_TARANIS;
 #else
      return BOARD_STOCK;
@@ -19,15 +19,7 @@

 #include "simulatorinterface.h"

-#if defined(PCBHORUS)
-  #define FLAVOUR "horus"
-  #define NAMESPACE HORUS
-  #define EEPROM_VARIANT 0
-#elif defined(PCBFLAMENCO)
-  #define FLAVOUR "flamenco"
-  #define NAMESPACE FLAMENCO
-  #define EEPROM_VARIANT 0
-#elif defined(PCBTARANIS) && defined(REV9E)
+#if defined(PCBTARANIS) && defined(REV9E)
  #define FLAVOUR "taranisx9e"
  #define NAMESPACE TaranisX9E
  #define EEPROM_VARIANT 0x8000
@@ -139,6 +131,7 @@ class DLLEXPORT OpenTxSimulator : public SimulatorInterface {
    virtual void installTraceHook(void (*callback)(const char *));

    virtual void setLuaStateReloadPermanentScripts();
+
 };

 }
@@ -175,7 +175,8 @@ bool Th9xSimulator::timer10ms()

 uint8_t * Th9xSimulator::getLcd()
 {
-  return (::uint8_t *)simuLcdBuf;
+#define GETLCD_IMPORT
+#include "simulatorimport.h"
 }

 bool Th9xSimulator::lcdChanged(bool & lightEnable)
@@ -790,13 +790,7 @@ void startSimulation(QWidget * parent, RadioData & radioData, int modelIdx)
    }
    BoardEnum board = GetCurrentFirmware()->getBoard();
    SimulatorDialog * sd;
-    if (board == BOARD_HORUS) {
-      sd = new SimulatorDialogHorus(parent, si, flags);
-    }
-    else if (board == BOARD_FLAMENCO) {
-      sd = new SimulatorDialogFlamenco(parent, si, flags);
-    }
-    else if (IS_TARANIS(board)) {
+    if (IS_TARANIS(board)) {
      for (int i=0; i<GetCurrentFirmware()->getCapability(Pots); i++) {
        if (radioData.generalSettings.isPotAvailable(i)) {
          flags |= (SIMULATOR_FLAGS_S1 << i);
@@ -70,8 +70,8 @@
 #include "radiointerface.h"
 #include "progressdialog.h"

-#define OPENTX_COMPANION_DOWNLOADS        "http://downloads-22.open-tx.org/companion"
-#define OPENTX_NIGHT_COMPANION_DOWNLOADS  "http://downloads-22.open-tx.org/nightly/companion"
+#define OPENTX_COMPANION_DOWNLOADS        "http://downloads-21.open-tx.org/companion"
+#define OPENTX_NIGHT_COMPANION_DOWNLOADS  "http://downloads-21.open-tx.org/nightly/companion"
 #define DONATE_STR                        "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QUZ48K4SEXDP2"

 #ifdef __APPLE__
@@ -278,7 +278,7 @@ void MainWindow::closeUpdatesWaitDialog()
 void MainWindow::checkForCompanionUpdateFinished(QNetworkReply * reply)
 {
    QByteArray qba = reply->readAll();
-    int i = qba.indexOf("VERSION");
+    int i = qba.indexOf("C9X_VERSION");
    if (i>0) {
      QString version = qba.mid(i+14, qba.indexOf("\"", i+14)-i-14);

@@ -288,7 +288,7 @@ void MainWindow::checkForCompanionUpdateFinished(QNetworkReply * reply)

      int vnum = version2index(version);

-      QString c9xversion = QString(VERSION);
+      QString c9xversion = QString(C9X_VERSION);
      int c9xver = version2index(c9xversion);

      if (c9xver < vnum) {
@@ -822,7 +822,7 @@ void MainWindow::writeBackup()
  cd->exec();
 }

-int MainWindow::getFileType(const QString & fullFileName)
+int MainWindow::getFileType(const QString &fullFileName)
 {
    if(QFileInfo(fullFileName).suffix().toUpper()=="HEX")  return FILE_TYPE_HEX;
    if(QFileInfo(fullFileName).suffix().toUpper()=="BIN")  return FILE_TYPE_BIN;
@@ -899,7 +899,7 @@ void MainWindow::about()
    aboutStr.append("<br/><br/>");
    aboutStr.append(tr("If you've found this program useful, please support by <a href='%1'>donating</a>").arg(DONATE_STR));
    aboutStr.append("<br/><br/>");
-    aboutStr.append(QString("Version %1, %2").arg(VERSION).arg(__DATE__));
+    aboutStr.append(QString("Version %1, %2").arg(C9X_VERSION).arg(__DATE__));
    aboutStr.append("<br/><br/>");
    aboutStr.append(tr("Copyright OpenTX Team") + "<br/>&copy; 2011-2015<br/>");
    QMessageBox msgBox(this);
@@ -930,7 +930,7 @@ void MainWindow::updateMenus()
    updateLanguageActions();
    updateIconSizeActions();
    updateIconThemeActions();
-    setWindowTitle(tr("OpenTX Companion %1 - Radio: %2 - Profile: %3").arg(VERSION).arg(GetCurrentFirmware()->getName()).arg(g.profile[g.id()].name()));
+    setWindowTitle(tr("OpenTX Companion %1 - Radio: %2 - Profile: %3").arg(C9X_VERSION).arg(GetCurrentFirmware()->getName()).arg(g.profile[g.id()].name()));
 }

 MdiChild *MainWindow::createMdiChild()
@@ -184,19 +184,19 @@ class MainWindow : public QMainWindow
    void updateLanguageActions();
    void updateIconThemeActions();

-    int getFileType(const QString & fullFileName);
+    int getFileType(const QString &fullFileName);
    QString Theme;
    QString ISize;
-    QString strippedName(const QString & fullFileName);
+    QString strippedName(const QString &fullFileName);

    MdiChild *activeMdiChild();
-    QMdiSubWindow *findMdiChild(const QString & fileName);
+    QMdiSubWindow *findMdiChild(const QString &fileName);
    int getEpromVersion(QString fileName);

-    bool readEepromFromRadio(const QString & filename);
-    bool writeEepromToRadio(const QString & filename);
-    bool readFirmwareFromRadio(const QString & filename);
-    bool writeFirmwareToRadio(const QString & filename);
+    bool readEepromFromRadio(const QString &filename);
+    bool writeEepromToRadio(const QString &filename);
+    bool readFirmwareFromRadio(const QString &filename);
+    bool writeFirmwareToRadio(const QString &filename);

    QMdiArea *mdiArea;
    QSignalMapper *windowMapper;
@@ -1,8 +1,4 @@
-include_directories(
-  ${CMAKE_SOURCE_DIR}
-  ${COMPANION_SRC_DIRECTORY}
-  ${CMAKE_CURRENT_BINARY_DIR}
-)
+include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})

 set(modeledit_NAMES
  modeledit
@@ -9,8 +9,6 @@ set(simulation_SRCS
 set(simulation_UIS
  simulatordialog-9x.ui
  simulatordialog-taranis.ui
-  simulatordialog-horus.ui
-  simulatordialog-flamenco.ui
  telemetrysimu.ui
  trainersimu.ui
  debugoutput.ui
@@ -18,9 +16,11 @@ set(simulation_UIS

 set(simulation_HDRS
  simulatordialog.h
-  # lcdwidget.h
-  buttonswidget.h
-  sliderwidget.h
+  cursorwidget.h
+  menuwidget.h
+  xcursorwidget.h
+  xmenuwidget.h
+  myslider.h
  telemetrysimu.h
  trainersimu.h
  debugoutput.h
@@ -48,8 +48,8 @@ endif()
 include_directories(
  ${CMAKE_CURRENT_BINARY_DIR}
  ${PROJECT_SOURCE_DIR}
+  ${PROJECT_SOURCE_DIR}/../..
  ${COMPANION_SRC_DIRECTORY}
-  ${COMPANION_SRC_DIRECTORY}/simulation
  ${RADIO_SRC_DIRECTORY}/fonts/std
 )

@@ -1,122 +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 _BUTTONSWIDGET_H_
-#define _BUTTONSWIDGET_H_
-
-#include <QWidget>
-#include <QtGui>
-
-class ButtonsWidget : public QWidget
-{
-
-  Q_OBJECT
-
-  public:
-
-    explicit ButtonsWidget(QWidget * parent):
-      QWidget(parent)
-    {
-    }
-
-
-    virtual void setStyleSheet(const QString & sheet)
-    {
-      defaultStyleSheet = sheet;
-      QWidget::setStyleSheet(sheet);
-    }
-
-    void addArea(int x1, int y1, int x2, int y2, int key, const char * bitmap)
-    {
-      QPolygon polygon;
-      polygon.setPoints(4, x1, y1, x1, y2, x2, y2, x2, y1);
-      addArea(polygon, key, bitmap);
-    }
-
-    void addArea(const QPolygon & polygon, int key, const char * bitmap)
-    {
-      areas.push_back(Area(polygon, key, bitmap));
-    }
-
-  protected:
-  
-    class Area {
-      public:
-        Area(const QPolygon & polygon, int key, const char * bitmap):
-          polygon(polygon),
-          key(key),
-          bitmap(bitmap)
-        {
-        }
-        bool contains(int x, int y)
-        {
-          return polygon.containsPoint(QPoint(x, y), Qt::OddEvenFill);
-        }
-      public:
-        QPolygon polygon;
-        int key;
-        const char * bitmap;
-    };
-      
-    void setBitmap(const char * bitmap)
-    {
-      if (bitmap) {
-        QWidget::setStyleSheet(QString("background:url(:/images/simulator/%1);").arg(bitmap));
-      }
-    }
-    
-    virtual void mousePressEvent(QMouseEvent * event)
-    {
-      int x = event->x();
-      int y = event->y();
-      setFocus();
-      if (event->button() == Qt::LeftButton) {
-        foreach(Area area, areas) {
-          if (area.contains(x, y)) {
-            setBitmap(area.bitmap);
-            emit buttonPressed(area.key);
-            break;
-          }
-        }
-      }
-    }
-    
-    virtual void mouseReleaseEvent(QMouseEvent * event)
-    {
-      QWidget::setStyleSheet(defaultStyleSheet);
-      setFocus();
-      emit buttonPressed(0);
-    }
-
-    void paintEvent(QPaintEvent *)
-    {
-      QStyleOption opt;
-      opt.init(this);
-      QPainter p(this);
-      style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-    }
-
-  signals:
-  
-    void buttonPressed(int button);
-    
-  protected:
-
-    QList<Area> areas;
-    QString defaultStyleSheet;
-};
-
-#endif	/* _BUTTONSWIDGET_H_ */
@@ -0,0 +1,106 @@
+/*
+ * 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 CURSORWIDGET_H
+#define	CURSORWIDGET_H
+
+#include <QWidget>
+#include <QtGui>
+
+class cursorWidget : public QWidget {
+
+  Q_OBJECT
+
+  public:
+
+    explicit cursorWidget(QWidget * parent = 0):
+      QWidget(parent)
+    {
+    }
+
+  protected:
+
+    virtual void mousePressEvent(QMouseEvent * event)
+    {
+        float upx[] = {68,28,51,83,105,68};
+        float upy[] = {83,45,32,32,45,83};
+        float minx[] = {74,114,127,127,114,74};
+        float miny[] = {90,51,80,106,130,90};
+        float dox[] = {68,28,51,83,105,68};
+        float doy[] = {98,137,151,151,137,98};
+        float plusx[] = { 80,20,7,7,20,80};
+        float plusy[] = {90,51,80,106,130,90};
+
+        int x=event->x();
+        int y=event->y();
+        setFocus();
+        if (event->button()==Qt::LeftButton) {
+          if (pnpoly(6,upx,upy,(float)x,(float)y)==1) {
+            setStyleSheet("background:url(:/images/9xcursup.png);");
+            emit buttonPressed(Qt::Key_Up);
+          }
+          else if (pnpoly(6,minx,miny,(float)x,(float)y)==1) {
+            setStyleSheet("background:url(:/images/9xcursmin.png);");
+            emit buttonPressed(Qt::Key_Right);
+          }
+          else if (pnpoly(6,dox,doy,(float)x,(float)y)==1) {
+            setStyleSheet("background:url(:/images/9xcursdown.png);");
+            emit buttonPressed(Qt::Key_Down);
+          }
+          else if (pnpoly(6,plusx,plusy,(float)x,(float)y)==1) {
+            setStyleSheet("background:url(:/images/9xcursplus.png);");
+            emit buttonPressed(Qt::Key_Left);
+          } else if (sqrt(((float)x-22)*((float)x-22)+((float)y-165)*((float)y-165))<17) {
+            setStyleSheet("background:url(:/images/9xcursphoto.png);");
+            emit buttonPressed(Qt::Key_Print);
+          }
+        }
+        // QWidget::mousePressEvent(event);
+    }
+    
+    virtual void mouseReleaseEvent(QMouseEvent * event)
+    {
+      setStyleSheet("background:url(:/images/9xcurs.png);");
+      emit buttonPressed(0);
+      setFocus();
+      //QWidget::mouseReleaseEvent(event);
+    }
+
+    void paintEvent(QPaintEvent *)
+    {
+      QStyleOption opt;
+      opt.init(this);
+      QPainter p(this);
+      style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
+    }
+    
+    inline int pnpoly(int nvert, float *vertx, float *verty, float testx, float testy)
+    {
+        int i, j, c = 0;
+        for (i = 0, j = nvert-1; i < nvert; j = i++) {
+            if ( ((verty[i]>testy) != (verty[j]>testy)) &&  (testx < (vertx[j]-vertx[i]) * (testy-verty[i]) / (verty[j]-verty[i]) + vertx[i]) )
+               c = !c;
+        }
+        return c;
+    }
+
+  signals:
+    void buttonPressed(int button);
+
+};
+
+
+#endif	/* CURSORWIDGET_H */
+
--- a/Show More
+++ b/Show More