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

Specifying a custom prtocol is useful if OpenTX firmware is older than the multi module firmware
and the protocol in question is not yet in the protocol list of the OpenTX firmware.

.gitignore

@@ -6,3 +6,4 @@ radio/src/bootloader/bootloader_ramBoot*
 *.lbm
 *.o
 /doc/
+*.inc

.travis.yml

@@ -0,0 +1,14 @@
+language: cpp
+
+before_install:
+    - sudo apt-get remove cmake cmake-data --yes
+    - sudo add-apt-repository ppa:george-edison55/precise-backports --yes
+    - sudo add-apt-repository ppa:terry.guo/gcc-arm-embedded --yes
+    - sudo apt-get update    
+
+install:
+  - 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 ../companion/src && cmake --build .

DONATIONS.txt

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

README.md

@@ -1,5 +1,9 @@
 ##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.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.

companion/releasenotes.txt

@@ -1,3 +1,67 @@
+<h2>Version 2.1.7 / 2016-01-04</h2>
+
+<ul>
+<li>Lua 'execute' failed in non-root directory (in Simulator) (<a href=https://github.com/opentx/opentx/issues/3024>#3024</a>)</li>
+<!-- this is disabled until the speed problem is fixed <li>Header line always visible in Outputs, Logical Switches and Special Functions (<a href=https://github.com/opentx/opentx/issues/2861>#2861</a>)</li> -->
+<li>LR12 changes: removed option for remote failsafe configuration, added in EU firmware variant</li>
+<li>Added Clear option to the flight mode context menu (right click on the Name label) (<a href=https://github.com/opentx/opentx/issues/3026>#3026</a>)</li>
+<li>New features for Telemetry Simulator: log replay, user friendly sensor values (<a href=https://github.com/opentx/opentx/issues/3124>#3124</a>)</li>
+<li>Added F7 key to reload LUA permanent scripts in radio simulator (<a href=https://github.com/opentx/opentx/issues/3141>#3141</a>)</li>
+<li>AR9X firmware flashing fall-back was wrong</li>
+<li>Command line options support added to standalone simulator (try "./simulator21 --help" on Linux and "simulator.exe /help" on Windows for usage) (<a href=https://github.com/opentx/opentx/issues/3160>#3160</a>)</li>
+<li>Various rounding problem fixed: Telemetry sensor Ratio parameter (<a href=https://github.com/opentx/opentx/issues/3117>#3117</a>),
+  Outputs Sub-trim, Min and Max values (<a href=https://github.com/opentx/opentx/issues/3156>#3156</a>)</li>
+<li>Fixed: telemetry sensors Ratio and Offset value increment/decrement step (<a href=https://github.com/opentx/opentx/issues/3121>#3121</a>)</li>
+<li>Hardware/Calibration tab split int two tabs (<a href=https://github.com/opentx/opentx/issues/2974>#2974</a>)</li>
+<li>Fixed Fahrenheit temperature conversion error (if PREC was not 0) (<a href=https://github.com/opentx/opentx/issues/3146>#3146</a>)</li>
+<li>Application Setting 'Enable automatic backup before writing firmware' was not saved (<a href=https://github.com/opentx/opentx/issues/3040>#3040</a>)</li>
+<li>Fixed RPM package problem on Fedora (<a href=https://github.com/opentx/opentx/issues/3130>#3130</a>)</li>
+<li>Fixed conversion errors when loading 2.0.x EEPE (<a href=https://github.com/opentx/opentx/issues/3177>#3177</a>)</li>
+<li>Various texts and translations corrections</li>
+</ul>
+
+
+<h2>Version 2.1.6 / 2015-11-11</h2>
+
+<ul>
+<li>Telemetry custom screen changes didn't emit modified signal (<a href=https://github.com/opentx/opentx/issues/3029>#3029</a>)</li>
+<li>Hide D8/LR12 when eu firmware option is selected</li>
+</ul>
+
+
+<h2>Version 2.1.5 / 2015-11-05</h2>
+
+Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrSky's release of OpenTX 2.1.4
+
+<ul>
+<li>Fixed: changing any setting on the telemetry panel does not set the file as being modified (<a href=https://github.com/opentx/opentx/issues/2875>#2875</a>)</li>
+<li>Print model fix for "Play value.... not on startup" (<a href=https://github.com/opentx/opentx/issues/2736>#2736</a>)</li>
+<li>Top LCD Timer could not be selected for X9E  (<a href=https://github.com/opentx/opentx/issues/2850>#2850</a>)</li>
+<li>More informative error/info messages when openin eepe files (<a href=https://github.com/opentx/opentx/issues/2778>#2778</a>)</li>
+<li>Print model fix for curves (<a href=https://github.com/opentx/opentx/issues/2896>#2896</a>)</li>
+<li>Added missing special functions (bind, range check, set failsafe) (<a href=https://github.com/opentx/opentx/issues/2753>#2753</a>)</li>
+<li>Some defaults missing when changing telemetry formula, update propagation issues (<a href=https://github.com/opentx/opentx/issues/2928>#2928</a>)</li>
+<li>Fixed wrong import of Logical switches from OpenTX 2.0.x version (<a href=https://github.com/opentx/opentx/issues/2942>#2942</a>)</li>
+<li>Fixed a problem with updates path on Windows (<a href=https://github.com/opentx/opentx/issues/2876>#2876</a>)</li>
+<li>Edge representation unified (changed from "no release" to "instant") (<a href=https://github.com/opentx/opentx/issues/2837>#2837</a>)</li>
+<li>Added channel names on failsafe sliders (<a href=https://github.com/opentx/opentx/issues/3021>#3021</a>)</li>
+<li>Corrected failsafe mapping when using Custom failsafe mode, D16 protocol and channel range different from from 1-8. 
+  Users with such setups are advised to re-check their failsafe settings (<a href=https://github.com/opentx/opentx/issues/2975>#2975</a>)</li>
+<li>Various texts and translations corrections</li>
+<li>Various small bug-fixes: <a href=https://github.com/opentx/opentx/issues/2994>#2994</a>, 
+                             <a href=https://github.com/opentx/opentx/issues/3016>#3016</a>,
+                             <a href=https://github.com/opentx/opentx/issues/3012>#3012</a>
+</li>
+</ul>
+
+
+<h2>Version 2.1.3 / 2015-09-09</h2>
+
+<ul>
+<li>Fix missing translations in inputs/mixes tabs, print and compare dialogs (<a href=https://github.com/opentx/opentx/issues/2847>#2847</a>)</li>
+</ul>
+
+
 <h2>Version 2.1.2 / 2015-09-07</h2>
 
 <ul>

companion/src/CMakeLists.txt

@@ -2,13 +2,13 @@ PROJECT( companion )
 
 SET(C9X_VERSION_MAJOR "2")
 SET(C9X_VERSION_MINOR "1")
-SET(C9X_VERSION_REVISION "2")
+SET(C9X_VERSION_REVISION "7")
 SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
 
 SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})
 MESSAGE(STATUS "OpenTX Companion ${C9X_VERSION}")
 
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
@@ -33,6 +33,12 @@ IF(DEBUG_IMPORT)
     MESSAGE( STATUS "EEPROM import debugging enabled" )
 ENDIF(DEBUG_IMPORT)
 
+OPTION(TABLE_LAYOUT "Use QTableWidget for grid layouts") # Disabled by default
+IF(TABLE_LAYOUT)
+    ADD_DEFINITIONS( -DTABLE_LAYOUT)
+    MESSAGE( STATUS "Using QTableWidget" )
+ENDIF(TABLE_LAYOUT)
+
 MESSAGE( STATUS "Looking for XercesC " )
 FIND_PACKAGE(XercesC)
 IF ( XERCESC_FOUND )
@@ -62,7 +68,7 @@ ELSE()
     MESSAGE( "SDL not found! Joysticks support will be disabled. Simulator audio will not work." )
 ENDIF()
 
-FIND_PACKAGE(Qt4 4.8.4 REQUIRED)
+FIND_PACKAGE(Qt4 4.8.1 REQUIRED)
 SET( QT_USE_QTNETWORK True )
 SET( QT_USE_QTXML True )
 INCLUDE( ${QT_USE_FILE} )
@@ -85,6 +91,8 @@ 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
@@ -93,6 +101,7 @@ ADD_CUSTOM_COMMAND(
 
 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 )
@@ -102,6 +111,11 @@ ELSE( )
   LINK_DIRECTORIES( /usr/local/lib )
 ENDIF( )
 
+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})
@@ -112,6 +126,7 @@ include_directories(
   ${PROJECT_SOURCE_DIR}/shared
   ${SIMU_SRC_DIRECTORY}
   ${XSD_INCLUDE_DIR}
+  ${PROJECT_SOURCE_DIR}/qxtcommandoptions
 )
 
 add_subdirectory(shared)
@@ -120,6 +135,7 @@ add_subdirectory(generaledit)
 add_subdirectory(simulation)
 add_subdirectory(firmwares/opentx/simulator)
 add_subdirectory(qcustomplot)
+add_subdirectory(qxtcommandoptions)
 
 set(common_SRCS
   eeprominterface.cpp
@@ -213,6 +229,8 @@ set(companion_MOC_HDRS
   radionotfound.h
   helpers.h
   wizarddialog.h
+  modelprinter.h
+  multimodelprinter.h
 )
 
 set(companion_UIS
@@ -271,7 +289,6 @@ NOW(TIME)
 
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
 CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/translations.qrc.in ${CMAKE_CURRENT_BINARY_DIR}/translations.qrc @ONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/firmwares/opentx/stamp-opentx.h.in ${CMAKE_CURRENT_BINARY_DIR}/stamp-opentx.h @ONLY)
 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)
 
@@ -334,7 +351,7 @@ else()
   add_executable(${SIMULATOR_NAME} WIN32 ${simu_SRCS})
 endif()
 
-target_link_libraries(${SIMULATOR_NAME} simulation common ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} ${OPENTX_SIMULATOR_LIBS})
+target_link_libraries(${SIMULATOR_NAME} simulation common qxtcommandoptions ${QT_LIBRARIES} ${QT_QTMAIN_LIBRARY} ${PTHREAD_LIBRARY} ${SDL_LIBRARY} ${PHONON_LIBS} ${OPENTX_SIMULATOR_LIBS})
 
 ############# Packaging ####################
 
@@ -432,7 +449,7 @@ ADD_CUSTOM_TARGET( stamp
 IF( LUPDATE_FOUND )
   ADD_CUSTOM_TARGET( translations
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -ts ${companion_TS}
+    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
   )
 ELSE()
   ADD_CUSTOM_TARGET( translations
@@ -443,7 +460,11 @@ ENDIF()
 SET(CPACK_PACKAGE_NAME "companion${C9X_NAME_SUFFIX}")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
 string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
-SET( CPACK_STRIP_FILES TRUE )
+
+# The file stripping is deliberately disabled, with the stripped file we get 
+# very poor trace-backs from the users when they report Companion crash
+SET( CPACK_STRIP_FILES FALSE )
+
 find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
 if(DPKG_PROGRAM)
   SET(CPACK_GENERATOR "DEB")
@@ -464,6 +485,7 @@ else(DPKG_PROGRAM)
   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)

companion/src/appdata.cpp

@@ -737,7 +737,7 @@ AppData::AppData()
     getset( _updatesDir,      "lastUpdatesDir"          ,"" );
 
     getset( _outputDisplayDetails,  "outputDisplayDetails"     ,false );
-    getset( _enableBackup,    "backupEnable"            ,false );
+    getset( _enableBackup,    "enableBackup"            ,false );
     getset( _backupOnFlash,   "backupOnFlash"           ,true  );
     getset( _checkHardwareCompatibility,   "checkHardwareCompatibility"           ,true  );
 

companion/src/apppreferencesdialog.ui

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

companion/src/companion.cpp

@@ -53,6 +53,7 @@
   #undef main
 #endif
 #include "mainwindow.h"
+#include "version.h"
 #include "eeprominterface.h"
 #include "appdata.h"
 
@@ -87,6 +88,13 @@ int main(int argc, char *argv[])
   app.setOrganizationDomain("open-tx.org");
   app.setAttribute(Qt::AA_DontShowIconsInMenus, false);
 
+  QStringList strl = QApplication::arguments();
+  if (strl.contains("--version")) {
+    printf("%s\n", C9X_VERSION);
+    fflush(stdout);
+    exit(0);
+  }
+
 #ifdef __APPLE__
   app.setStyle(new MyProxyStyle);
 #endif
@@ -148,7 +156,8 @@ int main(int argc, char *argv[])
   delete splash;
   delete mainWin;
 
-  unregisterFirmwares();
+  unregisterSimulators();
+  unregisterOpenTxFirmwares();
   unregisterEEpromInterfaces();
 
 #if defined(JOYSTICKS) || defined(SIMU_AUDIO)

companion/src/comparedialog.cpp

@@ -101,7 +101,7 @@ void CompareDialog::dropEvent(QDropEvent *event)
   if (model1Valid && model2Valid) {
     multimodelprinter.setModel(0, model1);
     multimodelprinter.setModel(1, model2);
-    ui->textEdit->setHtml(multimodelprinter.print());
+    ui->textEdit->setHtml(multimodelprinter.print(ui->textEdit->document()));
   }
 }
 

companion/src/converteeprom.cpp

@@ -26,8 +26,11 @@ bool convertEEprom(const QString &sourceEEprom, const QString &destinationEEprom
   sourceFile.close();
 
   QSharedPointer<RadioData> radioData = QSharedPointer<RadioData>(new RadioData());
-  if (!loadEEprom(*radioData, (uint8_t *)eeprom.data(), eeprom_size) || !currentFirmware->saveEEPROM((uint8_t *)eeprom.data(), *radioData, variant, version))
+  std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEeprom(*radioData, (uint8_t *)eeprom.data(), eeprom_size));
+  if (!errors.test(NO_ERROR)
+    || !currentFirmware->saveEEPROM((uint8_t *)eeprom.data(), *radioData, variant, version)) {
     return false;
+  }
 
   QFile destinationFile(destinationEEprom);
   if (!destinationFile.open(QIODevice::WriteOnly))

companion/src/eeprominterface.cpp

@@ -481,7 +481,7 @@ QString RawSource::toString(const ModelData * model) const
     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("----");
   }
@@ -528,7 +528,7 @@ QString RawSource::toString(const ModelData * model) const
         return CHECK_IN_ARRAY(telemetry, index);
       }
     case SOURCE_TYPE_GVAR:
-      return QObject::tr("GV%1").arg(index+1);      
+      return QObject::tr("GV%1").arg(index+1);
     default:
       return QObject::tr("----");
   }
@@ -536,15 +536,15 @@ QString RawSource::toString(const ModelData * model) const
 
 bool RawSource::isPot() const
 {
-  return (type == SOURCE_TYPE_STICK && 
-          index >= NUM_STICKS && 
+  return (type == SOURCE_TYPE_STICK &&
+          index >= NUM_STICKS &&
           index < NUM_STICKS+GetCurrentFirmware()->getCapability(Pots));
 }
 
 bool RawSource::isSlider() const
 {
-  return (type == SOURCE_TYPE_STICK && 
-          index >= NUM_STICKS+GetCurrentFirmware()->getCapability(Pots) && 
+  return (type == SOURCE_TYPE_STICK &&
+          index >= NUM_STICKS+GetCurrentFirmware()->getCapability(Pots) &&
           index < NUM_STICKS+GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders));
 }
 
@@ -797,7 +797,7 @@ QString CustomFunctionData::funcToString() const
   else if (func == FuncPlayScript)
     return QObject::tr("Play Script");
   else if (func == FuncLogs)
-    return QObject::tr("Start Logs");
+    return QObject::tr("SD Logs");
   else if (func == FuncVolume)
     return QObject::tr("Volume");
   else if (func == FuncBacklight)
@@ -810,6 +810,18 @@ QString CustomFunctionData::funcToString() const
     return QObject::tr("Background Music Pause");
   else if (func >= FuncAdjustGV1 && func <= FuncAdjustGVLast)
     return QObject::tr("Adjust GV%1").arg(func-FuncAdjustGV1+1);
+  else if (func == FuncSetFailsafeInternalModule)
+    return QObject::tr("SetFailsafe Int. Module");
+  else if (func == FuncSetFailsafeExternalModule)
+    return QObject::tr("SetFailsafe Ext. Module");
+  else if (func == FuncRangeCheckInternalModule)
+    return QObject::tr("RangeCheck Int. Module");
+  else if (func == FuncRangeCheckExternalModule)
+    return QObject::tr("RangeCheck Ext. Module");
+  else if (func == FuncBindInternalModule)
+    return QObject::tr("Bind Int. Module");
+  else if (func == FuncBindExternalModule)
+    return QObject::tr("Bind Ext. Module");
   else {
     return QString("???"); // Highlight unknown functions with output of question marks.(BTW should not happen that we do not know what a function is)
   }
@@ -858,7 +870,7 @@ void CustomFunctionData::populatePlaySoundParams(QStringList & qs)
   qs << "SciFi" << "Robot" << "Chirp" << "Tada" << "Crickt"  << "AlmClk"  ;
 }
 
-void CustomFunctionData::populateHapticParams(QStringList & qs) 
+void CustomFunctionData::populateHapticParams(QStringList & qs)
 {
   qs << "0" << "1" << "2" << "3";
 }
@@ -892,7 +904,7 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
     int pos = cb.findData(param);
     if (pos >= 0)
       return cb.itemText(pos);
-    else 
+    else
       return QObject::tr("<font color=red><b>Inconsistent parameter</b></font>");
   }
   else if ((func==FuncVolume)|| (func==FuncPlayValue)) {
@@ -924,12 +936,15 @@ QString CustomFunctionData::paramToString(const ModelData * model) const
 
 QString CustomFunctionData::repeatToString() const
 {
-  if (repeatParam==0) {
+  if (repeatParam == -1) {
+    return QObject::tr("played once, not during startup");
+  }
+  else if (repeatParam == 0) {
     return "";
   }
   else {
     unsigned int step = IS_ARM(GetEepromInterface()->getBoard()) ? 1 : 10;
-    return QObject::tr("repeat") + QString("(%1").arg(step*repeatParam) + QObject::tr("s") + ")";
+    return QObject::tr("repeat(%1s)").arg(step*repeatParam);
   }
 }
 
@@ -1605,7 +1620,7 @@ void registerEEpromInterfaces()
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_SKY9X));
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_9XRPRO));
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS));
-  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_PLUS));  
+  eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_PLUS));
   eepromInterfaces.push_back(new OpenTxEepromInterface(BOARD_TARANIS_X9E));
   eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_STOCK));
   eepromInterfaces.push_back(new Gruvin9xInterface(BOARD_GRUVIN9X));
@@ -1619,7 +1634,7 @@ void unregisterEEpromInterfaces()
   foreach(EEPROMInterface * intf, eepromInterfaces) {
     // qDebug() << "UnregisterEepromInterfaces(): deleting " <<  QString::number( reinterpret_cast<uint64_t>(intf), 16 );
     delete intf;
-  } 
+  }
   OpenTxEepromCleanup();
 }
 
@@ -1627,42 +1642,116 @@ QList<Firmware *> firmwares;
 Firmware * default_firmware_variant;
 Firmware * current_firmware_variant;
 
-void unregisterFirmwares()
+void ShowEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound)
 {
-  foreach (Firmware * f, firmwares) {
-    delete f;
+  std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
+  QStringList errorsList;
+
+  errorsList << QT_TRANSLATE_NOOP("EepromInterface", "Possible causes for this:");
+
+  if (errors.test(UNSUPPORTED_NEWER_VERSION)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is from a newer version of OpenTX"); }
+  if (errors.test(NOT_OPENTX)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from OpenTX"); }
+  if (errors.test(NOT_TH9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from Th9X"); }
+  if (errors.test(NOT_GRUVIN9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from Gruvin9X"); }
+  if (errors.test(NOT_ERSKY9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from ErSky9X"); }
+  if (errors.test(NOT_ER9X)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is not from Er9X"); }
+  if (errors.test(WRONG_SIZE)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom size is invalid"); }
+  if (errors.test(WRONG_FILE_SYSTEM)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom file system is invalid"); }
+  if (errors.test(UNKNOWN_BOARD)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is from a unknown board"); }
+  if (errors.test(WRONG_BOARD)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom is from the wrong board"); }
+  if (errors.test(BACKUP_NOT_SUPPORTED)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Eeprom backup not supported"); }
+
+  if (errors.test(UNKNOWN_ERROR)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Something that couldn't be guessed, sorry"); }
+
+  if (errors.test(HAS_WARNINGS)) {
+    errorsList << QT_TRANSLATE_NOOP("EepromInterface", "Warning:");
+    if (errors.test(WARNING_WRONG_FIRMWARE)) { errorsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"); }
   }
+
+  QMessageBox msgBox(parent);
+  msgBox.setWindowTitle(title);
+  msgBox.setIcon(QMessageBox::Critical);
+  msgBox.setText(mainMessage);
+  msgBox.setInformativeText(errorsList.join("\n"));
+  msgBox.setStandardButtons(QMessageBox::Ok);
+  msgBox.exec();
 }
 
-bool loadEEprom(RadioData &radioData, const uint8_t *eeprom, const int size)
+void ShowEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound)
 {
-  foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
-    if (eepromInterface->load(radioData, eeprom, size))
-      return true;
-  }
+  std::bitset<NUM_ERRORS> errors((unsigned long long)errorsFound);
+  QStringList warningsList;
+  if (errors.test(WARNING_WRONG_FIRMWARE)) { warningsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"); }
+  if (errors.test(OLD_VERSION)) { warningsList << QT_TRANSLATE_NOOP("EepromInterface", "- Your eeprom is from an old version of OpenTX, upgrading!\n You should 'save as' to keep the old file as a backup."); }
 
-  return false;
+  QMessageBox msgBox(parent);
+  msgBox.setWindowTitle(title);
+  msgBox.setIcon(QMessageBox::Warning);
+  msgBox.setText(QT_TRANSLATE_NOOP("EepromInterface", "Warnings!"));
+  msgBox.setInformativeText(warningsList.join("\n"));
+  msgBox.setStandardButtons(QMessageBox::Ok);
+  msgBox.exec();
 }
 
-bool loadBackup(RadioData &radioData, uint8_t *eeprom, int size, int index)
+unsigned long LoadEeprom(RadioData &radioData, const uint8_t *eeprom, const int size)
 {
+  std::bitset<NUM_ERRORS> errors;
+
   foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
-    if (eepromInterface->loadBackup(radioData, eeprom, size, index))
-      return true;
+    std::bitset<NUM_ERRORS> result((unsigned long long)eepromInterface->load(radioData, eeprom, size));
+    if (result.test(NO_ERROR)) {
+      return result.to_ulong();
+    }
+    else {
+      errors |= result;
+    }
   }
 
-  return false;
+  if (errors.none()) {
+    errors.set(UNKNOWN_ERROR);
+  }
+  return errors.to_ulong();
+}
+
+unsigned long LoadBackup(RadioData & radioData, uint8_t * eeprom, int size, int index)
+{
+  std::bitset<NUM_ERRORS> errors;
+
+  foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
+    std::bitset<NUM_ERRORS> result((unsigned long long)eepromInterface->loadBackup(radioData, eeprom, size, index));
+    if (result.test(NO_ERROR)) {
+      return result.to_ulong();
+    }
+    else {
+      errors |= result;
+    }
+  }
+
+  if (errors.none()) {
+    errors.set(UNKNOWN_ERROR);
+  }
+  return errors.to_ulong();
 }
 
 
-bool loadEEpromXml(RadioData &radioData, QDomDocument &doc)
+unsigned long LoadEepromXml(RadioData & radioData, QDomDocument & doc)
 {
+  std::bitset<NUM_ERRORS> errors;
+
   foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
-    if (eepromInterface->loadxml(radioData, doc))
-      return true;
+    std::bitset<NUM_ERRORS> result((unsigned long long)eepromInterface->loadxml(radioData, doc));
+    if (result.test(NO_ERROR)) {
+      return result.to_ulong();
+    }
+    else {
+      errors |= result;
+    }
   }
 
-  return false;
+  if (errors.none()) {
+    errors.set(UNKNOWN_ERROR);
+  }
+  return errors.to_ulong();
 }
 
 QString getBoardName(BoardEnum board)

companion/src/eeprominterface.h

@@ -24,6 +24,7 @@
 #include <QtXml>
 #include <QComboBox>
 #include <iostream>
+#include <bitset>
 #include "constants.h"
 #include "simulatorinterface.h"
 
@@ -597,6 +598,12 @@ enum AssignFunc {
   FuncBackgroundMusicPause,
   FuncAdjustGV1,
   FuncAdjustGVLast = FuncAdjustGV1+C9X_MAX_GVARS-1,
+  FuncSetFailsafeInternalModule,
+  FuncSetFailsafeExternalModule,
+  FuncRangeCheckInternalModule,
+  FuncRangeCheckExternalModule,
+  FuncBindInternalModule,
+  FuncBindExternalModule,
   FuncCount,
   FuncReserve = -1
 };
@@ -748,6 +755,22 @@ enum TelemetryCurrentSources {
   TELEMETRY_CURRENT_SOURCE_FAS
 };
 
+enum UartModes {
+  UART_MODE_NONE,
+  UART_MODE_TELEMETRY_MIRROR,
+  UART_MODE_TELEMETRY,
+  UART_MODE_SBUS_TRAINER,
+  UART_MODE_DEBUG
+};
+
+enum TrainerMode {
+  TRAINER_MODE_MASTER_TRAINER_JACK,
+  TRAINER_MODE_SLAVE,
+  TRAINER_MODE_MASTER_SBUS_EXTERNAL_MODULE,
+  TRAINER_MODE_MASTER_CPPM_EXTERNAL_MODULE,
+  TRAINER_MODE_MASTER_BATTERY_COMPARTMENT,
+};
+
 class FrSkyData {
   public:
     FrSkyData() { clear(); }
@@ -818,6 +841,7 @@ enum PulsesProtocol {
   PULSES_PXX_XJT_D8,
   PULSES_PXX_XJT_LR12,
   PULSES_PXX_DJT,
+  PULSES_CROSSFIRE,
   PULSES_PROTOCOL_LAST
 };
 
@@ -841,7 +865,7 @@ class ModuleData {
     int          failsafeChannels[C9X_NUM_CHNOUT];
     int          ppmDelay;
     bool         ppmPulsePol;           // false = positive
-    bool         ppmOutputType;         // false = open drain, true = push pull 
+    bool         ppmOutputType;         // false = open drain, true = push pull
     int          ppmFrameLength;
     void clear() { memset(this, 0, sizeof(ModuleData)); }
     QString polarityToString() const { return ppmPulsePol ? QObject::tr("Positive") : QObject::tr("Negative"); } // TODO ModelPrinter
@@ -1041,6 +1065,8 @@ class ModelData {
 
     SensorData sensorData[C9X_MAX_SENSORS];
 
+    unsigned int toplcdTimer;
+
     void clear();
     bool isEmpty() const;
     void setDefaultInputs(const GeneralSettings & settings);
@@ -1275,7 +1301,6 @@ enum Capability {
   HasExpoNames,
   HasNoExpo,
   HasMixerNames,
-  HasChNames,
   HasCvNames,
   HasPxxCountry,
   HasPPMStart,
@@ -1317,6 +1342,7 @@ enum Capability {
   LCDWidth,
   GetThrSwitch,
   HasDisplayText,
+  HasTopLcd,
   GlobalFunctions,
   VirtualInputs,
   TrainerInputs,
@@ -1336,7 +1362,8 @@ enum Capability {
   HasInputDiff,
   HasMixerExpo,
   MixersMonitor,
-  HasBatMeterRange
+  HasBatMeterRange,
+  DangerousFunctions,
 };
 
 class SimulatorInterface;
@@ -1353,11 +1380,11 @@ class EEPROMInterface
 
     inline BoardEnum getBoard() { return board; }
 
-    virtual bool load(RadioData &radioData, const uint8_t *eeprom, int size) = 0;
+    virtual unsigned long load(RadioData &radioData, const uint8_t *eeprom, int size) = 0;
 
-    virtual bool loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index) = 0;
+    virtual unsigned long loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index) = 0;
 
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc) = 0;
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc) = 0;
 
     virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0) = 0;
 
@@ -1365,8 +1392,6 @@ class EEPROMInterface
 
     virtual int getSize(const GeneralSettings &) = 0;
 
-    virtual int isAvailable(PulsesProtocol proto, int port=0) = 0;
-
     virtual const int getEEpromSize() = 0;
 
     virtual const int getMaxModels() = 0;
@@ -1478,11 +1503,37 @@ inline void applyStickModeToModel(ModelData &model, unsigned int mode)
 void registerEEpromInterfaces();
 void unregisterEEpromInterfaces();
 void registerOpenTxFirmwares();
-void unregisterFirmwares();
+void unregisterOpenTxFirmwares();
 
-bool loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index);
-bool loadEEprom(RadioData &radioData, const uint8_t *eeprom, int size);
-bool loadEEpromXml(RadioData &radioData, QDomDocument &doc);
+enum EepromLoadErrors {
+  NO_ERROR,
+
+  UNKNOWN_ERROR,
+  UNSUPPORTED_NEWER_VERSION,
+  WRONG_SIZE,
+  WRONG_FILE_SYSTEM,
+  NOT_OPENTX,
+  NOT_TH9X,
+  NOT_GRUVIN9X,
+  NOT_ERSKY9X,
+  NOT_ER9X,
+  UNKNOWN_BOARD,
+  WRONG_BOARD,
+  BACKUP_NOT_SUPPORTED,
+
+  HAS_WARNINGS,
+  OLD_VERSION,
+  WARNING_WRONG_FIRMWARE,
+
+  NUM_ERRORS
+};
+
+void ShowEepromErrors(QWidget *parent, const QString &title, const QString &mainMessage, unsigned long errorsFound);
+void ShowEepromWarnings(QWidget *parent, const QString &title, unsigned long errorsFound);
+
+unsigned long LoadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index);
+unsigned long LoadEeprom(RadioData &radioData, const uint8_t *eeprom, int size);
+unsigned long LoadEepromXml(RadioData &radioData, QDomDocument &doc);
 
 struct Option {
   const char * name;
@@ -1576,6 +1627,8 @@ class Firmware {
 
     virtual bool isTelemetrySourceAvailable(int source) = 0;
 
+    virtual int isAvailable(PulsesProtocol proto, int port=0) = 0;
+
   public:
     QList<const char *> languages;
     QList<const char *> ttslanguages;

companion/src/file.cpp

@@ -122,20 +122,16 @@ PACK(struct EepromFileHeader
 
 bool RleFile::searchFat()
 {
-  int bestFatIndex = -1;
+  eepromFatHeader = NULL;
+  uint32_t bestFatIndex = 0;
   for (int i=0; i<EEPROM_ZONE_SIZE/EEPROM_FAT_SIZE; i++) {
     EepromHeader * header = (EepromHeader *)(eeprom+i*EEPROM_FAT_SIZE);
     if (header->mark == EEPROM_MARK && (int)header->index >= bestFatIndex) {
-      bestFatIndex = i;
+      eepromFatHeader = header;
+      bestFatIndex = header->index;
     }
   }
-  if (bestFatIndex >= 0) {
-    eepromFatHeader = (EepromHeader *)(eeprom+bestFatIndex*EEPROM_FAT_SIZE);;
-    return true;
-  }
-  else {
-    return false;
-  }
+  return (eepromFatHeader != NULL);
 }
 
 bool RleFile::EeFsOpen(uint8_t *eeprom, int size, BoardEnum board)

companion/src/firmwares/er9x/er9xinterface.cpp

@@ -89,14 +89,17 @@ inline void applyStickModeToModel(Er9xModelData & model, unsigned int mode)
   model.swashCollectiveSource = applyStickMode(model.swashCollectiveSource, mode);
 }
 
-bool Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
   std::cout << "trying er9x xml import... ";
 
+  std::bitset<NUM_ERRORS> errors;
+
   Er9xGeneral er9xGeneral;
   memset(&er9xGeneral,0,sizeof(er9xGeneral));
   if(!loadGeneralDataXML(&doc, &er9xGeneral)) {
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   } else {
     radioData.generalSettings=er9xGeneral;
     std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
@@ -111,21 +114,26 @@ bool Er9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
     }
   }
   std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }
 
-bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
   std::cout << "trying er9x import... ";
 
+  std::bitset<NUM_ERRORS> errors;
+
   if (size != getEEpromSize()) {
     std::cout << "wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
   }
 
   if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
     std::cout << "wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
   }
     
   efile->openRd(FILE_GENERAL);
@@ -133,7 +141,8 @@ bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 
   if (efile->readRlc1((uint8_t*)&er9xGeneral, 1) != 1) {
     std::cout << "no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
 
   std::cout << "version " << (unsigned int)er9xGeneral.myVers << " ";
@@ -151,13 +160,16 @@ bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
       break;
     default:
       std::cout << "not er9x\n";
-      return false;
+      errors.set(NOT_ER9X);
+      return errors.to_ulong();
   }
 
   efile->openRd(FILE_GENERAL);
   if (!efile->readRlc1((uint8_t*)&er9xGeneral, sizeof(Er9xGeneral))) {
     std::cout << "ko\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
+
   }
   radioData.generalSettings = er9xGeneral;
   
@@ -174,12 +186,15 @@ bool Er9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
   }
 
   std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }
 
-bool Er9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long Er9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }
 
 int Er9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)

companion/src/firmwares/er9x/er9xinterface.h

@@ -1,6 +1,6 @@
 /*
  * 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
@@ -29,21 +29,21 @@ class Er9xInterface : public EEPROMInterface
     virtual ~Er9xInterface();
 
     virtual const char * getName();
-    
+
     virtual const int getEEpromSize();
 
     virtual const int getMaxModels();
 
-    virtual bool load(RadioData &, const uint8_t * eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t * eeprom, int size);
 
-    virtual bool loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
-    
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
     virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
 
     virtual int getSize(const ModelData &);
-    
+
     virtual int getSize(const GeneralSettings &settings);
 
     virtual int isAvailable(PulsesProtocol proto, int port=0);
@@ -54,17 +54,17 @@ class Er9xInterface : public EEPROMInterface
 
   private:
     void appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value);
-    
+
     void appendNumberElement(QDomDocument * qdoc, QDomElement * pe,QString name, int value, bool forceZeroWrite = false);
-    
+
     void appendCDATAElement(QDomDocument * qdoc, QDomElement * pe,QString name, const char * data, int size);
-    
+
     QDomElement getGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen);   //parse out data to XML format
-    
+
     QDomElement getModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum, int mdver); //parse out data to XML format
-    
+
     bool loadGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen); // get data from XML
-    
+
     bool loadModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum = -1); // get data from XML
 
 };

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

@@ -54,8 +54,14 @@ class Er9xSimulator : public SimulatorInterface {
 
     virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
 
+    virtual uint8_t getSensorInstance(uint16_t id) { return 0; };
+
+    virtual uint16_t getSensorRatio(uint16_t id) { return 0; };
+
     virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
 
+    virtual void setLuaStateReloadPermanentScripts() {};
+
   protected:
 
     Er9xInterface * er9xInterface;

companion/src/firmwares/ersky9x/ersky9xinterface.cpp

@@ -15,7 +15,6 @@
  */
 
 #include <iostream>
-#include <QMessageBox>
 #include "ersky9xinterface.h"
 #include "ersky9xeeprom.h"
 #include "simulator/ersky9xsimulator.h"
@@ -120,14 +119,17 @@ inline void applyStickModeToModel(Ersky9xModelData_v11 & model, unsigned int mod
   model.swashCollectiveSource = applyStickMode(model.swashCollectiveSource, mode);
 }
 
-bool Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
   std::cout << "trying ersky9x xml import... ";
 
+  std::bitset<NUM_ERRORS> errors;
+
   Ersky9xGeneral ersky9xGeneral;
   memset(&ersky9xGeneral,0,sizeof(ersky9xGeneral));
   if(!loadGeneralDataXML(&doc, &ersky9xGeneral)) {
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
   else {
     radioData.generalSettings=ersky9xGeneral;
@@ -137,32 +139,39 @@ bool Ersky9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
     if (ersky9xGeneral.myVers == 10) {
       if (!loadModelDataXML<Ersky9xModelData_v10>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
         std::cout << "ko\n";
-        return false;
+        errors.set(UNKNOWN_ERROR);
+        return errors.to_ulong();
       }
     }
     else {
       if (!loadModelDataXML<Ersky9xModelData_v11>(&doc, &radioData.models[i], i, radioData.generalSettings.stickMode+1)) {
         std::cout << "ko\n";
-        return false;
+        errors.set(UNKNOWN_ERROR);
+        return errors.to_ulong();
       }
     }
   }
   std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }
 
-bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
   std::cout << "trying ersky9x import... ";
 
+  std::bitset<NUM_ERRORS> errors;
+
   if (size != EESIZE_SKY9X) {
     std::cout << "wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
   }
 
   if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_SKY9X)) {
     std::cout << "wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
   }
     
   efile->openRd(FILE_GENERAL);
@@ -170,7 +179,8 @@ bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int siz
 
   if (efile->readRlc2((uint8_t*)&ersky9xGeneral, 1) != 1) {
     std::cout << "no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
 
   std::cout << "version " << (unsigned int)ersky9xGeneral.myVers << " ";
@@ -182,12 +192,14 @@ bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int siz
       break;
     default:
       std::cout << "not ersky9x\n";
-      return false;
+      errors.set(NOT_ERSKY9X);
+      return errors.to_ulong();
   }
   efile->openRd(FILE_GENERAL);
   if (!efile->readRlc2((uint8_t*)&ersky9xGeneral, sizeof(Ersky9xGeneral))) {
     std::cout << "ko\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
   radioData.generalSettings = ersky9xGeneral;
   
@@ -218,12 +230,15 @@ bool Ersky9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int siz
   }
 
   std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }
 
-bool Ersky9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long Ersky9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }
 
 int Ersky9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)

companion/src/firmwares/ersky9x/ersky9xinterface.h

@@ -34,11 +34,11 @@ class Ersky9xInterface : public EEPROMInterface
 
     virtual const int getMaxModels();
 
-    virtual bool load(RadioData &, const uint8_t * eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t * eeprom, int size);
 
-    virtual bool loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
+    virtual unsigned long loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
 
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
     virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
 

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

@@ -54,8 +54,14 @@ class Ersky9xSimulator : public SimulatorInterface {
 
     virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
 
+    virtual uint8_t getSensorInstance(uint16_t id) { return 0; };
+
+    virtual uint16_t getSensorRatio(uint16_t id) { return 0; };
+
     virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
 
+    virtual void setLuaStateReloadPermanentScripts() {};
+
   protected:
 
     Ersky9xInterface * ersky9xInterface;

companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp

@@ -93,24 +93,30 @@ bool Gruvin9xInterface::loadGeneral(GeneralSettings &settings, int version)
   return false;
 }
 
-bool Gruvin9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long Gruvin9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }
 
 
-bool Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
   std::cout << "trying " << getName() << " import... ";
 
+  std::bitset<NUM_ERRORS> errors;
+
   if (size != this->getEEpromSize()) {
     std::cout << "wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
   }
 
   if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
     std::cout << "wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
   }
 
   efile->openRd(FILE_GENERAL);
@@ -118,14 +124,16 @@ bool Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int si
   uint8_t version;
   if (efile->readRlc2(&version, 1) != 1) {
     std::cout << "no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
 
   if (version == 0) {
     efile->openRd(FILE_GENERAL);
     if (efile->readRlc1(&version, 1) != 1) {
       std::cout << "no\n";
-      return false;
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
     }
   }
 
@@ -145,25 +153,33 @@ bool Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int si
       break;
     default:
       std::cout << "not gruvin9x\n";
-      return false;
+      errors.set(NOT_GRUVIN9X);
+      return errors.to_ulong();
   }
 
   efile->openRd(FILE_GENERAL);
   if (version == 5) {
-    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings, 1))
-      return false;
+    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings, 1)) {
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
   }
   else if (version < 104) {
-    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings))
-      return false;
+    if (!loadGeneral<Gruvin9xGeneral_v103>(radioData.generalSettings)) {
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
   }
   else if (version <= 106) {
-    if (!loadGeneral<Gruvin9xGeneral_v104>(radioData.generalSettings))
-      return false;
+    if (!loadGeneral<Gruvin9xGeneral_v104>(radioData.generalSettings)) {
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
+    }
   }
   else {
     std::cout << "ko\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
   
   for (int i=0; i<getMaxModels(); i++) {
@@ -185,17 +201,21 @@ bool Gruvin9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int si
     }
     else {
       std::cout << "ko\n";
-      return false;
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
     }
   }
 
   std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }
 
-bool Gruvin9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long Gruvin9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }
 
 int Gruvin9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)

companion/src/firmwares/gruvin9x/gruvin9xinterface.h

@@ -1,6 +1,6 @@
 /*
  * 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
@@ -30,21 +30,22 @@ class Gruvin9xInterface : public EEPROMInterface
     virtual ~Gruvin9xInterface();
 
     virtual const char * getName();
-    
+
     virtual const int  getEEpromSize();
 
     virtual const int getMaxModels();
 
-    virtual bool load(RadioData &, const uint8_t *eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);
 
-    virtual bool loadBackup(RadioData &, uint8_t *eeprom,int esize, int index);
-    
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom,int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
     virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
 
     virtual int getSize(const ModelData &);
-    
+
     virtual int getSize(const GeneralSettings & settings);
 
     virtual int isAvailable(PulsesProtocol proto, int port=0);

companion/src/firmwares/opentx/opentxeeprom.cpp

@@ -269,15 +269,18 @@ class SourcesConversionTable: public ConversionTable {
       }
 
       if (!afterrelease21March2013) {
-        for (int i=0; i<3; i++)
+        for (int i=0; i<3; i++) {
           addConversion(RawSource(SOURCE_TYPE_CYC, i), val++);
+        }
       }
 
-      for (int i=0; i<NUM_PPM_INPUTS(board, version); i++)
+      for (int i=0; i<NUM_PPM_INPUTS(board, version); i++) {
         addConversion(RawSource(SOURCE_TYPE_PPM, i), val++);
+      }
 
-      for (int i=0; i<MAX_CHANNELS(board, version); i++)
+      for (int i=0; i<MAX_CHANNELS(board, version); i++) {
         addConversion(RawSource(SOURCE_TYPE_CH, i), val++);
+      }
 
       if (!(flags & FLAG_NOTELEMETRY)) {
         if (IS_ARM(board) && version >= 217) {
@@ -293,33 +296,34 @@ 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++)
+              for (int i=0; i<MAX_GVARS(board, version); i++) {
                 addConversion(RawSource(SOURCE_TYPE_GVAR, i), val++);
+              }
             }
           }
 
-          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++);
             }
           }
         }
@@ -387,8 +391,8 @@ template <int N>
 class SwitchField: public ConversionField< SignedField<N> > {
   public:
     SwitchField(RawSwitch & sw, BoardEnum board, unsigned int version, unsigned long flags=0):
-      ConversionField< SignedField<N> >(_switch, SwitchesConversionTable::getInstance(board, version, flags), "Switch",
-          "Switch "+ sw.toString()+" cannot be exported on this board!"),
+      ConversionField< SignedField<N> >(_switch, SwitchesConversionTable::getInstance(board, version, flags),  QObject::tr("Switch").toAscii(),
+          QObject::tr("Switch ").toAscii()+ sw.toString()+  QObject::tr(" cannot be exported on this board!").toAscii()),
       sw(sw),
       _switch(0)
     {
@@ -1679,12 +1683,6 @@ class LogicalSwitchField: public TransformedField {
         internalField.Append(new SignedField<16>(v3));
         internalField.Append(new ConversionField< UnsignedField<8> >(csw.func, &functionsConversionTable, "Function"));
       }
-      else if (IS_ARM(board) && version >= 216) {
-        internalField.Append(new SignedField<8>(v1));
-        internalField.Append(new SignedField<16>(v2));
-        internalField.Append(new SignedField<16>(v3));
-        internalField.Append(new ConversionField< UnsignedField<8> >(csw.func, &functionsConversionTable, "Function"));
-      }
       else if (IS_ARM(board) && version >= 215) {
         internalField.Append(new SignedField<16>(v1));
         internalField.Append(new SignedField<16>(v2));
@@ -1785,7 +1783,7 @@ class LogicalSwitchField: public TransformedField {
         }
       }
       else if (csw.func != LS_FN_OFF) {
-        if (IS_ARM(board)) {
+        if (IS_ARM(board) && version >= 217) {
           sourcesConversionTable->importValue((uint32_t)v1, csw.val1);
         }
         else {
@@ -1919,9 +1917,12 @@ class CustomFunctionsConversionTable: public ConversionTable {
         val++;
         if (IS_ARM(board)) {
           addConversion(FuncVolume, val++);
-          addConversion(FuncReserve, val++);
-          addConversion(FuncReserve, val++);
-          addConversion(FuncReserve, val++);
+          addConversion(FuncSetFailsafeInternalModule, val);
+          addConversion(FuncSetFailsafeExternalModule, val++);
+          addConversion(FuncRangeCheckInternalModule, val);
+          addConversion(FuncRangeCheckExternalModule, val++);
+          addConversion(FuncBindInternalModule, val);
+          addConversion(FuncBindExternalModule, val++);
         }
         addConversion(FuncPlaySound, val++);
         addConversion(FuncPlayPrompt, val++);
@@ -2080,6 +2081,21 @@ class ArmCustomFunctionField: public TransformedField {
             *((uint8_t *)(_param+3)) = fn.func - FuncSetTimer1;
           }
         }
+        else if (fn.func >= FuncSetFailsafeInternalModule && fn.func <= FuncSetFailsafeExternalModule) {
+          if (version >= 216) {
+            *((uint16_t *)_param) = fn.func - FuncSetFailsafeInternalModule;
+          }
+        }
+        else if (fn.func >= FuncRangeCheckInternalModule && fn.func <= FuncRangeCheckExternalModule) {
+          if (version >= 216) {
+            *((uint16_t *)_param) = fn.func - FuncRangeCheckInternalModule;
+          }
+        }
+        else if (fn.func >= FuncBindInternalModule && fn.func <= FuncBindExternalModule) {
+          if (version >= 216) {
+            *((uint16_t *)_param) = fn.func - FuncBindInternalModule;
+          }
+        }
         else if (fn.func == FuncPlayPrompt || fn.func == FuncBackgroundMusic || fn.func == FuncPlayScript) {
           memcpy(_param, fn.paramarm, sizeof(_param));
         }
@@ -2195,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);
       }
@@ -3177,6 +3194,10 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
       internalField.Append(new SensorField(modelData.sensorData[i], board, version));
     }
   }
+
+  if (IS_TARANIS_X9E(board)) {
+    internalField.Append(new UnsignedField<8>(modelData.toplcdTimer));
+  }
 }
 
 void OpenTxModelData::beforeExport()

companion/src/firmwares/opentx/opentxeeprom.h

@@ -81,6 +81,9 @@ class ProtocolsConversionTable: public ConversionTable
         addConversion(PULSES_DSM2, val++);
         addConversion(PULSES_DSMX, val++);
       }
+      if (IS_TARANIS(board)) {
+    	addConversion(PULSES_CROSSFIRE, val++);
+      }
     }
 };
 

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -307,15 +307,19 @@ bool OpenTxEepromInterface::saveModel(unsigned int index, ModelData &model, unsi
   return (sz == eeprom.size());
 }
 
-bool OpenTxEepromInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long OpenTxEepromInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }
 
-bool OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
   std::cout << "trying " << getName() << " import...";
 
+  std::bitset<NUM_ERRORS> errors;
+
   if (size != getEEpromSize()) {
     if (size==4096) {
       int notnull=false;
@@ -326,21 +330,25 @@ bool OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, in
       }
       if (notnull) {
         std::cout << " wrong size (" << size << ")\n";
-        return false;
+        errors.set(WRONG_SIZE);
+        return errors.to_ulong();
       }
       else {
-        QMessageBox::warning(NULL, "companion", QObject::tr("Your radio probably uses a wrong firmware,\n eeprom size is 4096 but only the first 2048 are used"));
+        errors.set(HAS_WARNINGS);
+        errors.set(WARNING_WRONG_FIRMWARE);
         size=2048;
       }
     } else {
       std::cout << " wrong size (" << size << "/" << getEEpromSize() << ")\n";
-      return false;
+      errors.set(WRONG_SIZE);
+      return errors.to_ulong();
     }
   }
 
   if (!efile->EeFsOpen((uint8_t *)eeprom, size, board)) {
     std::cout << " wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
   }
 
   efile->openRd(FILE_GENERAL);
@@ -348,30 +356,39 @@ bool OpenTxEepromInterface::load(RadioData &radioData, const uint8_t *eeprom, in
   uint8_t version;
   if (efile->readRlc2(&version, 1) != 1) {
     std::cout << " no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
 
   std::cout << " version " << (unsigned int)version;
 
-  if (!checkVersion(version)) {
+  EepromLoadErrors version_error = checkVersion(version);
+  if (version_error == OLD_VERSION) {
+    errors.set(version_error);
+    errors.set(HAS_WARNINGS);
+  } else if (version_error == NOT_OPENTX) {
     std::cout << " not open9x\n";
-    return false;
+    errors.set(version_error);
+    return errors.to_ulong();
   }
 
   if (!loadGeneral<OpenTxGeneralData>(radioData.generalSettings, version)) {
     std::cout << " ko\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
 
   std::cout << " variant " << radioData.generalSettings.variant;
   for (int i=0; i<getMaxModels(); i++) {
     if (!loadModel(version, radioData.models[i], NULL, i, radioData.generalSettings.variant, radioData.generalSettings.stickMode+1)) {
       std::cout << " ko\n";
-      return false;
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
     }
   }
   std::cout << " ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }
 
 int OpenTxEepromInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)
@@ -561,8 +578,6 @@ int OpenTxFirmware::getCapability(const Capability capability)
       return (IS_TARANIS(board) ? 10 : 6);
     case GvarsName:
       return (IS_9X(board) ? 0 : 6);
-    case HasChNames:
-      return (IS_TARANIS(board) ? 1 : 0);
     case GvarsInCS:
     case HasFAIMode:
       return 1;
@@ -574,7 +589,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
     case OffsetWeight:
       return (IS_ARM(board) ? 500 : 245);
     case Timers:
-      return (IS_ARM(board) ? 3 : 2);
+      return ((IS_ARM(board) && id.contains("timer3")) ? 3 : 2);
     case TimersName:
       return (IS_TARANIS(board) ? 8 : (IS_ARM(board) ? 3 : 0));
     case PermTimers:
@@ -711,7 +726,7 @@ int OpenTxFirmware::getCapability(const Capability capability)
     case HasFailsafe:
       return (IS_ARM(board) ? 32 : 0);
     case NumModules:
-      return (IS_ARM(board) && !IS_9XRPRO(board)) ? 2 : 1;
+      return (IS_ARM(board) ? 2 : 1);
     case HasPPMStart:
       return (IS_ARM(board) ? true : false);
     case HastxCurrentCalibration:
@@ -736,6 +751,8 @@ int OpenTxFirmware::getCapability(const Capability capability)
       return (IS_TARANIS(board) ? SWITCH_SF1 : SWITCH_THR) ;
     case HasDisplayText:
       return IS_ARM(board) ? 1 : 0;
+    case HasTopLcd:
+      return IS_TARANIS_X9E(board) ? 1 : 0;
     case GlobalFunctions:
       return IS_ARM(board) ? 64 : 0;
     case VirtualInputs:
@@ -780,7 +797,9 @@ int OpenTxFirmware::getCapability(const Capability capability)
     case MixersMonitor:
       return id.contains("mixersmon") ? 1 : 0;
     case HasBatMeterRange:
-      return (IS_TARANIS(board) ? true : false);
+      return (IS_TARANIS(board) ? true : id.contains("battgraph"));
+    case DangerousFunctions:
+      return id.contains("danger") ? 1 : 0;
     default:
       return 0;
   }
@@ -797,7 +816,7 @@ bool OpenTxFirmware::isTelemetrySourceAvailable(int source)
   return true;
 }
 
-int OpenTxEepromInterface::isAvailable(PulsesProtocol proto, int port)
+int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
 {
   if (IS_TARANIS(board)) {
     switch (port) {
@@ -805,9 +824,12 @@ int OpenTxEepromInterface::isAvailable(PulsesProtocol proto, int port)
         switch (proto) {
           case PULSES_OFF:
           case PULSES_PXX_XJT_X16:
-          case PULSES_PXX_XJT_D8:
           case PULSES_PXX_XJT_LR12:
             return 1;
+          case PULSES_PXX_XJT_D8:
+            return id.contains("eu") ? 0 : 1;
+          case PULSES_PPM:
+            return id.contains("internalppm") ? 1 : 0;
           default:
             return 0;
         }
@@ -823,6 +845,7 @@ int OpenTxEepromInterface::isAvailable(PulsesProtocol proto, int port)
           case PULSES_LP45:
           case PULSES_DSM2:
           case PULSES_DSMX:
+          case PULSES_CROSSFIRE:
             return 1;
           default:
             return 0;
@@ -874,7 +897,7 @@ int OpenTxEepromInterface::isAvailable(PulsesProtocol proto, int port)
       case PULSES_DSMX:
       case PULSES_LP45:
       case PULSES_DSM2:
-      case PULSES_PXX_DJT:
+      // case PULSES_PXX_DJT:     // Unavailable for now
       case PULSES_PPM16:
       case PULSES_PPMSIM:
         return 1;
@@ -889,73 +912,60 @@ size_t getSizeA(T (&)[SIZE]) {
     return SIZE;
 }
 
-bool OpenTxEepromInterface::checkVersion(unsigned int version)
+EepromLoadErrors OpenTxEepromInterface::checkVersion(unsigned int version)
 {
   switch(version) {
     case 201:
       // first version
-      break;
     case 202:
       // channel order is now always RUD - ELE - THR - AIL
       // changes in timers
       // ppmFrameLength added
       // thrTraceSrc added
-      break;
     case 203:
       // mixers changed (for the trims use for change the offset of a mix)
       // telemetry offset raised to -127 +127
       // function switches now have a param on 4 bits
-      break;
     case 204:
       // telemetry changes (bars)
-      break;
     case 205:
       // mixer changes (differential, negative curves)...
-      break;
     // case 206:
     case 207:
       // V4: Rotary Encoders position in FlightModes
-      break;
     case 208:
       // Trim value in 16bits
       // FrSky A1/A2 offset on 12bits
       // ARM: More Mixers / Expos / CSW / FSW / CHNOUT
-      break;
     case 209:
       // Add TrmR, TrmE, TrmT, TrmA as Mix sources
       // Trims are now OFF / ON / Rud / Ele / Thr / Ail
-      break;
     case 210:
       // Add names in Mixes / Expos
       // Add a new telemetry screen
       // Add support for Play Track <filename>
-      break;
     case 211:
       // Curves big change
-      break;
     case 212:
       // Big changes in mixers / limitse
-      break;
     case 213:
       // GVARS / Variants introduction
-      break;
     case 214:
       // Massive EEPROM change!
-      break;
     case 215:
       // M128 revert because too much RAM used!
-      break;
     case 216:
       // A lot of things (first github release)
+      return OLD_VERSION;
       break;
     case 217:
       // 3 logical switches removed on M128 / gruvin9x boards
       break;
     default:
-      return false;
+      return NOT_OPENTX;
   }
 
-  return true;
+  return NO_ERROR;
 }
 
 bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int variant)
@@ -991,13 +1001,16 @@ bool OpenTxEepromInterface::checkVariant(unsigned int version, unsigned int vari
   return true;
 }
 
-bool OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
+  std::bitset<NUM_ERRORS> errors;
+
   std::cout << "trying " << getName() << " backup import...";
 
   if (esize < 8 || memcmp(eeprom, "o9x", 3) != 0) {
     std::cout << " no\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
   }
 
   BoardEnum backupBoard = (BoardEnum)-1;
@@ -1013,12 +1026,14 @@ bool OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, in
       break;
     default:
       std::cout << " unknown board\n";
-      return false;
+      errors.set(UNKNOWN_BOARD);
+      return errors.to_ulong();
   }
 
   if (backupBoard != board) {
     std::cout << " not right board\n";
-    return false;
+    errors.set(WRONG_BOARD);
+    return errors.to_ulong();
   }
 
   uint8_t version = eeprom[4];
@@ -1028,29 +1043,38 @@ bool OpenTxEepromInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, in
 
   std::cout << " version " << (unsigned int)version << " ";
 
-  if (!checkVersion(version)) {
+  EepromLoadErrors version_error = checkVersion(version);
+  if (version_error == OLD_VERSION) {
+    errors.set(version_error);
+    errors.set(HAS_WARNINGS);
+  } else if (version_error == NOT_OPENTX) {
     std::cout << " not open9x\n";
-    return false;
+    errors.set(version_error);
+    return errors.to_ulong();
   }
 
   if (size > esize-8) {
     std::cout << " wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
   }
 
   if (bcktype=='M') {
     if (!loadModel(version, radioData.models[index], &eeprom[8], size, variant)) {
       std::cout << " ko\n";
-      return false;
+      errors.set(UNKNOWN_ERROR);
+      return errors.to_ulong();
     }
   }
   else {
     std::cout << " backup type not supported\n";
-    return false;
+    errors.set(BACKUP_NOT_SUPPORTED);
+    return errors.to_ulong();
   }
 
   std::cout << " ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }
 
 QString OpenTxFirmware::getFirmwareBaseUrl()
@@ -1346,7 +1370,7 @@ void registerOpenTxFirmwares()
   firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
   addOpenTxCommonOptions(firmware);
   firmwares.push_back(firmware);
-  
+
   /* ar9x board */
   firmware = new OpenTxFirmware("opentx-ar9x", QObject::tr("ar9x board / 9X"), BOARD_AR9X);
   firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
@@ -1414,3 +1438,9 @@ void registerOpenTxFirmwares()
   current_firmware_variant = default_firmware_variant;
 }
 
+void unregisterOpenTxFirmwares()
+{
+  foreach (Firmware * f, firmwares) {
+    delete f;
+  }
+}

companion/src/firmwares/opentx/opentxinterface.h

@@ -1,6 +1,6 @@
 /*
  * 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
@@ -33,25 +33,23 @@ class OpenTxEepromInterface : public EEPROMInterface
 
     virtual const int getMaxModels();
 
-    virtual bool load(RadioData &, const uint8_t *eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);
 
-    virtual bool loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
-    
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
     virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
 
     virtual int getSize(const ModelData &);
 
     virtual int getSize(const GeneralSettings &);
-    
-    virtual int isAvailable(PulsesProtocol proto, int port=0);
-    
+
   protected:
 
     const char * getName();
 
-    bool checkVersion(unsigned int version);
+    EepromLoadErrors checkVersion(unsigned int version);
 
     bool checkVariant(unsigned int version, unsigned int variant);
 
@@ -112,7 +110,7 @@ class OpenTxFirmware: public Firmware {
     }
 
     virtual Firmware * getFirmwareVariant(const QString & id);
-    
+
     virtual QString getStampUrl();
 
     virtual QString getReleaseNotesUrl();
@@ -122,7 +120,9 @@ class OpenTxFirmware: public Firmware {
     virtual int getCapability(const Capability);
 
     virtual bool isTelemetrySourceAvailable(int source);
-    
+
+    virtual int isAvailable(PulsesProtocol proto, int port=0);
+
   protected:
 
     QString getFirmwareBaseUrl();
@@ -130,5 +130,6 @@ class OpenTxFirmware: public Firmware {
 };
 
 void registerOpenTxFirmwares();
+void unregisterOpenTxFirmwares();
 
 #endif

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

@@ -20,10 +20,18 @@ add_custom_target(commondeps
 
 set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES ${RADIO_SRC_DIRECTORY}/stamp-opentx.h)
 
-add_custom_target(lua_exports 
-  make PCB=TARANIS lua_exports.inc
-  WORKING_DIRECTORY ${RADIO_SRC_DIRECTORY}
-)
+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
@@ -94,9 +102,9 @@ add_dependencies(opentx-mega2560${SUFFIX}-simulator about_lbm_9x commondeps)
 add_dependencies(opentx-sky9x${SUFFIX}-simulator about_lbm_9x commondeps)
 add_dependencies(opentx-9xrpro${SUFFIX}-simulator about_lbm_9x commondeps)
 add_dependencies(opentx-ar9x${SUFFIX}-simulator about_lbm_9x commondeps)
-add_dependencies(opentx-taranis${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
-add_dependencies(opentx-taranisplus${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
-add_dependencies(opentx-taranisx9e${SUFFIX}-simulator about_lbm_taranis commondeps lua_exports)
+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

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

@@ -15,7 +15,6 @@
  */
 
 #include "opentxsimulator.h"
-#include <QDebug>
 #include <stdio.h>
 #include <exception>
 #include <map>
@@ -91,6 +90,7 @@ namespace NAMESPACE {
 #include "radio/src/telemetry/telemetry.cpp"
 #include "radio/src/telemetry/frsky_sport.cpp"
 #include "radio/src/sbus.cpp"
+#include "radio/src/crc16.cpp"
 #else
 #include "radio/src/main_avr.cpp"
 #include "radio/src/audio_avr.cpp"
@@ -260,7 +260,11 @@ namespace NAMESPACE {
 #include "radio/src/targets/simu/simpgmspace.cpp"
 #include "radio/src/translations.cpp"
 #include "radio/src/telemetry/frsky.cpp"
-#include "radio/src/telemetry/frsky_d.cpp"
+#if defined(CPUARM)
+  #include "radio/src/telemetry/frsky_d_arm.cpp"
+#else
+  #include "radio/src/telemetry/frsky_d.cpp"
+#endif
 #include "radio/src/translations/tts_en.cpp"
 
 #if defined(CPUARM)
@@ -278,7 +282,10 @@ namespace NAMESPACE {
 #endif
 
 #if defined(LUA)
-#include "radio/src/lua_api.cpp"
+#include "radio/src/lua/interface.cpp"
+#include "radio/src/lua/api_general.cpp"
+#include "radio/src/lua/api_lcd.cpp"
+#include "radio/src/lua/api_model.cpp"
 #include "radio/src/thirdparty/Lua/src/lapi.c"
 #include "radio/src/thirdparty/Lua/src/lcode.c"
 #include "radio/src/thirdparty/Lua/src/lctype.c"
@@ -309,6 +316,7 @@ namespace NAMESPACE {
 #include "radio/src/thirdparty/Lua/src/ltablib.c"
 #include "radio/src/thirdparty/Lua/src/lcorolib.c"
 #include "radio/src/thirdparty/Lua/src/liolib.c"
+#include "radio/src/thirdparty/Lua/src/lstrlib.c"
 #endif
 
 int16_t g_anas[NUM_STICKS+NUM_POTS];
@@ -489,6 +497,44 @@ void OpenTxSimulator::sendTelemetry(::uint8_t * data, unsigned int len)
 #endif
 }
 
+uint8_t OpenTxSimulator::getSensorInstance(uint16_t id)
+{
+#if defined(FRSKY_SPORT)
+  for (int i = 0; i<MAX_SENSORS; i++) {
+    if (isTelemetryFieldAvailable(i)) {
+      TelemetrySensor * sensor = &g_model.telemetrySensors[i];
+      if (sensor->id == id) {
+        return sensor->instance;
+      }
+    }
+  }
+#endif
+  return 0;
+}
+
+uint16_t OpenTxSimulator::getSensorRatio(uint16_t id)
+{
+#if defined(FRSKY_SPORT)
+  for (int i = 0; i<MAX_SENSORS; i++) {
+    if (isTelemetryFieldAvailable(i)) {
+      TelemetrySensor * sensor = &g_model.telemetrySensors[i];
+      if (sensor->id == id) {
+        return sensor->custom.ratio;
+      }
+    }
+  }
+#endif
+  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

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

@@ -122,9 +122,16 @@ class DLLEXPORT OpenTxSimulator : public SimulatorInterface {
 
     virtual void sendTelemetry(uint8_t * data, unsigned int len);
 
+    virtual uint8_t getSensorInstance(uint16_t id);
+
+    virtual uint16_t getSensorRatio(uint16_t id);
+
     virtual void setTrainerInput(unsigned int inputNumber, int16_t value);
 
     virtual void installTraceHook(void (*callback)(const char *));
+
+    virtual void setLuaStateReloadPermanentScripts();
+
 };
 
 }

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

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

companion/src/firmwares/th9x/th9xinterface.cpp

@@ -57,23 +57,29 @@ const int Th9xInterface::getMaxModels()
   return 16;
 }
 
-bool Th9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
+unsigned long Th9xInterface::loadxml(RadioData &radioData, QDomDocument &doc)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }
 
-bool Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
+unsigned long Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 {
   std::cout << "trying th9x import... ";
 
+  std::bitset<NUM_ERRORS> errors;
+
   if (size != getEEpromSize()) {
     std::cout << "wrong size\n";
-    return false;
+    errors.set(WRONG_SIZE);
+    return errors.to_ulong();
   }
 
   if (!efile->EeFsOpen((uint8_t *)eeprom, size, BOARD_STOCK)) {
     std::cout << "wrong file system\n";
-    return false;
+    errors.set(WRONG_FILE_SYSTEM);
+    return errors.to_ulong();
   }
     
   efile->openRd(FILE_GENERAL);
@@ -81,7 +87,8 @@ bool Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
 
   if (efile->readRlc2((uint8_t*)&th9xGeneral, 1) != 1) {
     std::cout << "no\n";
-    return false;
+    errors.set(UNKNOWN_ERROR);
+    return errors.to_ulong();
   }
 
   std::cout << "version " << (unsigned int)th9xGeneral.myVers << " ";
@@ -91,14 +98,16 @@ bool Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
       break;
     default:
       std::cout << "not th9x\n";
-      return false;
+      errors.set(NOT_TH9X);
+      return errors.to_ulong();
   }
 
   efile->openRd(FILE_GENERAL);
   int len = efile->readRlc2((uint8_t*)&th9xGeneral, sizeof(Th9xGeneral));
   if (len != sizeof(Th9xGeneral)) {
     std::cout << "not th9x\n";
-    return false;
+    errors.set(NOT_TH9X);
+    return errors.to_ulong();
   }
   radioData.generalSettings = th9xGeneral;
   
@@ -114,12 +123,15 @@ bool Th9xInterface::load(RadioData &radioData, const uint8_t *eeprom, int size)
   }
 
   std::cout << "ok\n";
-  return true;
+  errors.set(NO_ERROR);
+  return errors.to_ulong();
 }
 
-bool Th9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
+unsigned long Th9xInterface::loadBackup(RadioData &radioData, uint8_t *eeprom, int esize, int index)
 {
-  return false;
+  std::bitset<NUM_ERRORS> errors;
+  errors.set(UNKNOWN_ERROR);
+  return errors.to_ulong();
 }
 
 int Th9xInterface::save(uint8_t *eeprom, RadioData &radioData, uint32_t variant, uint8_t version)

companion/src/firmwares/th9x/th9xinterface.h

@@ -34,11 +34,11 @@ class Th9xInterface : public EEPROMInterface
 
     virtual const int getMaxModels();
 
-    virtual bool load(RadioData &, const uint8_t *eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);
 
-    virtual bool loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
 
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
     virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
 

companion/src/flasheepromdialog.cpp

@@ -104,7 +104,7 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
 
   QByteArray eeprom(EESIZE_MAX, 0);
   int fileType = getFileType(filename);
-  
+
 #if 0
   if (fileType==FILE_TYPE_XML) {
     if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
@@ -125,7 +125,8 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
     bool xmlOK = doc.setContent(&file);
     if (xmlOK) {
       RadioData * radioData = new RadioData();
-      if (!loadEEpromXml(*radioData, doc)) {
+      std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEepromXml(*radioData, doc));
+      if (!errors.test(NO_ERROR)) {
         QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings File %1").arg(filename));
       }
       else {
@@ -160,7 +161,8 @@ int FlashEEpromDialog::getEEpromVersion(const QString &filename)
   }
 
   RadioData * radioData = new RadioData();
-  if (eeprom_size == 0 || !loadEEprom(*radioData, (const uint8_t *)eeprom.data(), eeprom_size)) {
+  std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEeprom(*radioData, (const uint8_t *)eeprom.data(), eeprom_size));
+  if (eeprom_size == 0 || !errors.test(NO_ERROR)) {
     QMessageBox::warning(this, tr("Error"), tr("Invalid Models and Settings file %1").arg(filename));
   }
   else {
@@ -303,7 +305,7 @@ void FlashEEpromDialog::on_burnButton_clicked()
     backupPath = g.profile[g.id()].pBackupDir();
     if (backupPath.isEmpty()) {
       backupPath=g.backupDir();
-    }    
+    }
     backupFilename = backupPath + "/backup-" + QDateTime().currentDateTime().toString("yyyy-MM-dd-HHmmss") + ".bin";
   }
   else if (ui->checkFirmwareCompatibility->isChecked()) {

companion/src/flasheepromdialog.ui

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

companion/src/generaledit/CMakeLists.txt

@@ -4,13 +4,15 @@ set(generaledit_NAMES
   generaledit
   generalsetup
   trainer
-  calibration
+  hardware
 )
 
 set(generaledit_SRCS
+  calibration.cpp
 )
 
 set(generaledit_HDRS
+  calibration.h
 )
 
 set(generaledit_UIS

companion/src/generaledit/calibration.cpp

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

companion/src/generaledit/calibration.h

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

companion/src/generaledit/generaledit.cpp

@@ -8,6 +8,7 @@
 #include "generalsetup.h"
 #include "trainer.h"
 #include "calibration.h"
+#include "hardware.h"
 #include "../modeledit/customfunctions.h"
 #include "verticalscrollarea.h"
 
@@ -42,7 +43,8 @@ GeneralEdit::GeneralEdit(QWidget * parent, RadioData & radioData, Firmware * fir
     addTab(new CustomFunctionsPanel(this, NULL, generalSettings, firmware), tr("Global Functions"));
   }
   addTab(new TrainerPanel(this, generalSettings, firmware), tr("Trainer"));
-  addTab(new CalibrationPanel(this, generalSettings, firmware), tr("Hardware / Calibration"));
+  addTab(new HardwarePanel(this, generalSettings, firmware), tr("Hardware"));
+  addTab(new CalibrationPanel(this, generalSettings, firmware), tr("Calibration"));
 
   ui->tabWidget->setCurrentIndex( g.generalEditTab() );
 }

companion/src/generaledit/hardware.cpp

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

companion/src/generaledit/hardware.h

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

companion/src/helpers.cpp

@@ -12,6 +12,8 @@
 #include "simulatorinterface.h"
 #include "firmwareinterface.h"
 
+Stopwatch gStopwatch("global");
+
 const QColor colors[C9X_MAX_CURVES] = {
   QColor(0,0,127),
   QColor(0,127,0),
@@ -173,7 +175,7 @@ void GVarGroup::valuesChanged()
     else if (sb)
       weight = sb->value();
     else
-      weight = dsb->value()/step;
+      weight = round(dsb->value()/step);
   }
 }
 
@@ -995,3 +997,92 @@ QStringList extractLatLon(const QString & position)
   }
   return result;
 }
+
+TableLayout::TableLayout(QWidget * parent, int rowCount, const QStringList & headerLabels)
+{
+#if defined(TABLE_LAYOUT)
+  tableWidget = new QTableWidget(parent);
+  QVBoxLayout * layout = new QVBoxLayout();
+  layout->addWidget(tableWidget);
+  layout->setContentsMargins(0, 0, 0, 0);
+  parent->setLayout(layout);
+
+  tableWidget->setRowCount(rowCount);
+  tableWidget->setColumnCount(headerLabels.size());
+  tableWidget->setShowGrid(false);
+  tableWidget->verticalHeader()->setVisible(false);
+  tableWidget->setSelectionBehavior(QAbstractItemView::SelectRows);
+  tableWidget->setSelectionMode(QAbstractItemView::NoSelection);
+  tableWidget->setFrameStyle(QFrame::NoFrame | QFrame::Plain);
+  tableWidget->setStyleSheet("QTableWidget {background-color: transparent;}");
+  tableWidget->setHorizontalHeaderLabels(headerLabels);
+#else
+  gridWidget = new QGridLayout(parent);
+
+  int col = 0;
+  foreach(QString text, headerLabels) {
+    QLabel *label = new QLabel();
+    label->setFrameShape(QFrame::Panel);
+    label->setFrameShadow(QFrame::Raised);
+    label->setMidLineWidth(0);
+    label->setAlignment(Qt::AlignCenter);
+    label->setMargin(5);
+    label->setText(text);
+    // if (!minimize)
+    //   label->setMinimumWidth(100);
+    gridWidget->addWidget(label, 0, col++);
+  }
+#endif
+}
+
+void TableLayout::addWidget(int row, int column, QWidget * widget)
+{
+#if defined(TABLE_LAYOUT)
+  QHBoxLayout * layout = new QHBoxLayout(tableWidget);
+  layout->addWidget(widget);
+  addLayout(row, column, layout);
+#else
+  gridWidget->addWidget(widget, row + 1, column);
+#endif
+}
+
+void TableLayout::addLayout(int row, int column, QLayout * layout)
+{
+#if defined(TABLE_LAYOUT)
+  layout->setContentsMargins(1, 3, 1, 3);
+  QWidget * containerWidget = new QWidget(tableWidget);
+  containerWidget->setLayout(layout);
+  tableWidget->setCellWidget(row, column, containerWidget);
+#else
+  gridWidget->addLayout(layout, row + 1, column);
+#endif
+}
+
+void TableLayout::resizeColumnsToContents() 
+{
+#if defined(TABLE_LAYOUT)
+  tableWidget->resizeColumnsToContents();
+#else
+#endif
+}
+
+void TableLayout::setColumnWidth(int col, int width) 
+{
+#if defined(TABLE_LAYOUT)
+  tableWidget->setColumnWidth(col, width);
+#else
+#endif
+}
+
+void TableLayout::pushRowsUp(int row) 
+{
+#if defined(TABLE_LAYOUT)
+#else
+  // Push the rows up
+  QSpacerItem * spacer = new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding );
+  gridWidget->addItem(spacer, row, 0);
+#endif
+  // Push rows upward
+  // addDoubleSpring(gridLayout, 5, num_fsw+1);
+
+}

companion/src/helpers.h

@@ -2,6 +2,9 @@
 #define HELPERS_H
 
 #include <QtGui>
+#include <QTableWidget>
+#include <QGridLayout>
+#include <QDebug>
 #include "eeprominterface.h"
 
 extern const QColor colors[C9X_MAX_CURVES];
@@ -201,4 +204,60 @@ private:
 double toDecimalCoordinate(const QString & value);
 QStringList extractLatLon(const QString & position);
 
+class TableLayout
+{
+public:
+  TableLayout(QWidget * parent, int rowCount, const QStringList & headerLabels);
+  // ~TableLayout() ;
+
+  void addWidget(int row, int column, QWidget * widget);
+  void addLayout(int row, int column, QLayout * layout);
+
+  void resizeColumnsToContents();
+  void setColumnWidth(int col, int width);
+  void pushRowsUp(int row); 
+
+private:
+#if defined(TABLE_LAYOUT)
+  QTableWidget * tableWidget; 
+#else
+  QGridLayout * gridWidget; 
+#endif
+};
+
+
+class Stopwatch
+{
+public:
+  Stopwatch(const QString & name) :
+    name(name), total(0) {
+    timer.start();
+  };
+  ~Stopwatch() {};
+
+  void restart() {
+    total = 0;
+    timer.restart();
+  };
+
+  void report() {
+    qint64 elapsed = timer.restart();
+    total += elapsed;
+    qDebug() << name << QString("%1 ms [%2 ms]").arg(elapsed).arg(total);
+  };
+
+  void report(const QString & text) {
+    qint64 elapsed = timer.restart();
+    total += elapsed;
+    qDebug() << name << text << QString("%1 ms [%2 ms]").arg(elapsed).arg(total);
+  };
+
+private:
+  QString name;
+  QElapsedTimer timer;
+  qint64 total;
+};
+
+extern Stopwatch gStopwatch;
+
 #endif // HELPERS_H

companion/src/mainwindow.cpp

@@ -115,12 +115,12 @@ MainWindow::MainWindow():
     this->setIconSize(QSize(32, 32));
     QNetworkProxyFactory::setUseSystemConfiguration(true);
     setAcceptDrops(true);
-    
+
     // give time to the splash to disappear and main window to open before starting updates
     int updateDelay = 1000;
     bool showSplash = g.showSplash();
     if (showSplash) {
-      updateDelay += (SPLASH_TIME*1000); 
+      updateDelay += (SPLASH_TIME*1000);
     }
     QTimer::singleShot(updateDelay, this, SLOT(doAutoUpdates()));
     QTimer::singleShot(updateDelay, this, SLOT(displayWarnings()));
@@ -158,13 +158,13 @@ MainWindow::MainWindow():
             child->show();
           }
           else {
-            child->show();            
+            child->show();
             child->print(model,printfilename);
             child->close();
           }
         }
       }
-    } 
+    }
     if (printing) {
       QTimer::singleShot(0, this, SLOT(autoClose()));
     }
@@ -185,7 +185,7 @@ void MainWindow::displayWarnings()
     }
   }
   else if (warnId==0) {
-    g.warningId(WARNING_ID);    
+    g.warningId(WARNING_ID);
   }
 }
 
@@ -292,17 +292,14 @@ void MainWindow::checkForCompanionUpdateFinished(QNetworkReply * reply)
       int c9xver = version2index(c9xversion);
 
       if (c9xver < vnum) {
-#if defined WIN32 || !defined __GNUC__ // || defined __APPLE__  // OSX should only notify of updates since no update packages are available. 
+#if defined WIN32 || !defined __GNUC__ // || defined __APPLE__  // OSX should only notify of updates since no update packages are available.
         int ret = QMessageBox::question(this, "Companion", tr("A new version of Companion is available (version %1)<br>"
                                                             "Would you like to download it?").arg(version) ,
                                         QMessageBox::Yes | QMessageBox::No);
 
         if (ret == QMessageBox::Yes) {
-#if defined __APPLE__          
-          QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.updatesDir() + QString(COMPANION_INSTALLER).arg(version));
-#else            
-          QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.updatesDir() + QString(COMPANION_INSTALLER).arg(version), tr("Executable (*.exe)"));
-#endif
+          QDir dir(g.updatesDir());
+          QString fileName = QFileDialog::getSaveFileName(this, tr("Save As"), dir.absoluteFilePath(QString(COMPANION_INSTALLER).arg(version)), tr("Executable (*.exe)"));
           if (!fileName.isEmpty()) {
             g.updatesDir(QFileInfo(fileName).dir().absolutePath());
             downloadDialog * dd = new downloadDialog(this, QString("%1/%2").arg(getCompanionUpdateBaseUrl()).arg(QString(COMPANION_INSTALLER).arg(version)), fileName);
@@ -313,7 +310,7 @@ void MainWindow::checkForCompanionUpdateFinished(QNetworkReply * reply)
         }
 #else
         QMessageBox::warning(this, tr("New release available"), tr("A new release of Companion is available, please check the OpenTX website!"));
-#endif            
+#endif
       }
       else {
         if (downloadDialog_forWait && checkForUpdatesState==0) {
@@ -539,19 +536,19 @@ void MainWindow::closeEvent(QCloseEvent *event)
 }
 
 void MainWindow::setLanguage(const QString & langString)
-{    
+{
   g.locale(langString);
   QMessageBox::information(this, tr("Companion"), tr("The selected language will be used the next time you start Companion."));
 }
 
 void  MainWindow::setTheme(int index)
-{    
+{
   g.theme(index);
   QMessageBox::information(this, tr("Companion"), tr("The new theme will be loaded the next time you start Companion."));
 }
 
 void  MainWindow::setIconThemeSize(int index)
-{    
+{
   g.iconSize(index);
   QMessageBox::information(this, tr("Companion"), tr("The icon size will be used the next time you start Companion."));
 }
@@ -705,7 +702,7 @@ void MainWindow::fwchangelog()
 }
 
 void MainWindow::customizeSplash()
-{    
+{
   customizeSplashDialog * dialog = new customizeSplashDialog(this);
   dialog->exec();
 }
@@ -763,7 +760,7 @@ void MainWindow::readEeprom()
 
     EEPROMInterface *eepromInterface = GetEepromInterface();
 
-    if (IS_ARM(eepromInterface->getBoard())) 
+    if (IS_ARM(eepromInterface->getBoard()))
       tempFile = generateProcessUniqueTempFileName("temp.bin");
     else
       tempFile += generateProcessUniqueTempFileName("temp.hex");
@@ -920,7 +917,7 @@ void MainWindow::updateMenus()
     pasteAct->setEnabled(hasMdiChild ? activeMdiChild()->hasPasteData() : false);
     writeEepromAct->setEnabled(hasMdiChild);
     separatorAct->setVisible(hasMdiChild);
-    
+
     bool hasSelection = (activeMdiChild() && activeMdiChild()->hasSelection());
     cutAct->setEnabled(hasSelection);
     copyAct->setEnabled(hasSelection);
@@ -962,7 +959,7 @@ QAction * MainWindow::addAct(const QString & icon, const QString & sName, const
   QAction * newAction = new QAction( this );
   if (!icon.isEmpty())
     newAction->setIcon(CompanionIcon(icon));
-  if (!sName.isEmpty()) 
+  if (!sName.isEmpty())
     newAction->setText(sName);
   if (!lName.isEmpty())
     newAction->setStatusTip(lName);
@@ -983,7 +980,7 @@ QAction * MainWindow::addAct(QActionGroup *aGroup, const QString & sName, const
 {
   QAction *action = addAct("", sName, lName, QKeySequence::UnknownKey, slot);
   action->setCheckable(true);
-  aGroup->addAction(action);   
+  aGroup->addAction(action);
   return action;
 }
 
@@ -1017,7 +1014,7 @@ void MainWindow::createActions()
     cutAct =             addAct("cut.png",    tr("Cut Model"),              tr("Cut current model to the clipboard"),    QKeySequence::Cut,    SLOT(cut()));
     copyAct =            addAct("copy.png",   tr("Copy Model"),             tr("Copy current model to the clipboard"),   QKeySequence::Copy,   SLOT(copy()));
     pasteAct =           addAct("paste.png",  tr("Paste Model"),            tr("Paste model from clipboard"),            QKeySequence::Paste,  SLOT(paste()));
- 
+
     QActionGroup *themeAlignGroup = new QActionGroup(this);
     classicThemeAct =    addAct( themeAlignGroup,    tr("Classical"),       tr("The classic companion9x icon theme"),   SLOT(setClassicTheme()));
     yericoThemeAct =     addAct( themeAlignGroup,    tr("Yerico"),          tr("Yellow round honey sweet icon theme"),  SLOT(setYericoTheme()));
@@ -1072,7 +1069,7 @@ void MainWindow::createActions()
     readBackupToFileAct = addAct("read_eeprom_file.png", tr("Backup Radio to File"), tr("Save a complete backup file of all settings and model data in the Radio"), SLOT(readBackup()));
     contributorsAct =    addAct("contributors.png",  tr("Contributors..."), tr("A tribute to those who have contributed to OpenTX and Companion"), SLOT(contributors()));
     sdsyncAct =          addAct("sdsync.png",        tr("Synchronize SD"),          tr("SD card synchronization"),            SLOT(sdsync()));
-    
+
     compareAct->setEnabled(false);
     simulateAct->setEnabled(false);
     printAct->setEnabled(false);
@@ -1156,7 +1153,7 @@ void MainWindow::createMenus()
     burnMenu->addSeparator();
     burnMenu->addSeparator();
     EEPROMInterface *eepromInterface = GetEepromInterface();
-    if (!IS_ARM(eepromInterface->getBoard())) {    
+    if (!IS_ARM(eepromInterface->getBoard())) {
       burnMenu->addAction(burnFusesAct);
       burnMenu->addAction(burnListAct);
     }
@@ -1173,7 +1170,7 @@ void MainWindow::createMenus()
     helpMenu->addSeparator();
     helpMenu->addAction(contributorsAct);
 }
- 
+
 QMenu *MainWindow::createRecentFileMenu()
 {
     QMenu *recentFileMenu = new QMenu(this);
@@ -1214,7 +1211,7 @@ void MainWindow::createToolBars()
         break;
       default:
         size=QSize(24,24);
-        break;        
+        break;
     }
     fileToolBar = addToolBar(tr("File"));
     fileToolBar->setIconSize(size);
@@ -1260,7 +1257,7 @@ void MainWindow::createToolBars()
     editToolBar->addAction(cutAct);
     editToolBar->addAction(copyAct);
     editToolBar->addAction(pasteAct);
-    
+
     burnToolBar = new QToolBar(tr("Write"));
     addToolBar( Qt::LeftToolBarArea, burnToolBar );
     burnToolBar->setIconSize(size);
@@ -1317,7 +1314,7 @@ void MainWindow::setActiveSubWindow(QWidget *window)
 void MainWindow::updateRecentFileActions()
 {
     int i, numRecentFiles;
- 
+
     //  Hide all document slots
     for ( i=0 ; i < g.historySize(); i++)
       recentFileActs[i]->setVisible(false);
@@ -1325,7 +1322,7 @@ void MainWindow::updateRecentFileActions()
     // Fill slots with content and unhide them
     QStringList files = g.recentFiles();
     numRecentFiles = qMin(files.size(), g.historySize());
- 
+
     for ( i = 0; i < numRecentFiles; i++)  {
       QString text = strippedName(files[i]);
       if (!text.trimmed().isEmpty())
@@ -1352,33 +1349,33 @@ void MainWindow::updateLanguageActions()
 {
   QString langId = g.locale();
 
-  if (langId=="") 
+  if (langId=="")
     sysLangAct->setChecked(true);
-  else if (langId=="cs_CZ") 
+  else if (langId=="cs_CZ")
     czechLangAct->setChecked(true);
-  else if (langId=="de_DE") 
+  else if (langId=="de_DE")
     germanLangAct->setChecked(true);
-  else if (langId=="en") 
+  else if (langId=="en")
     englishLangAct->setChecked(true);
-  else if (langId=="fi_FI") 
+  else if (langId=="fi_FI")
     finnishLangAct->setChecked(true);
-  else if (langId=="fr_FR") 
+  else if (langId=="fr_FR")
     frenchLangAct->setChecked(true);
-  else if (langId=="it_IT") 
+  else if (langId=="it_IT")
     italianLangAct->setChecked(true);
-  // else if (langId=="he_IL") 
+  // else if (langId=="he_IL")
   //   hebrewLangAct->setChecked(true);
-  else if (langId=="pl_PL") 
+  else if (langId=="pl_PL")
     polishLangAct->setChecked(true);
-  // else if (langId=="pt_PT") 
+  // else if (langId=="pt_PT")
   //   portugueseLangAct->setChecked(true);
   else if (langId=="es_ES")
     spanishLangAct->setChecked(true);
-  else if (langId=="sv_SE") 
+  else if (langId=="sv_SE")
     swedishLangAct->setChecked(true);
-  // else if (langId=="ru_RU") 
+  // else if (langId=="ru_RU")
   //   russianLangAct->setChecked(true);
-  // else if (langId=="nl_NL") 
+  // else if (langId=="nl_NL")
   //   dutchLangAct->setChecked(true);
 }
 
@@ -1396,9 +1393,9 @@ void MainWindow::updateIconThemeActions()
 
 void MainWindow::updateProfilesActions()
 {
-  for (int i=0; i<MAX_PROFILES; i++) 
+  for (int i=0; i<MAX_PROFILES; i++)
   {
-    if (g.profile[i].existsOnDisk()) 
+    if (g.profile[i].existsOnDisk())
     {
       QString text = tr("%2").arg(g.profile[i].name());
       profileActs[i]->setText(text);
@@ -1406,8 +1403,8 @@ void MainWindow::updateProfilesActions()
       profileActs[i]->setVisible(true);
       if (i == g.id())
         profileActs[i]->setChecked(true);
-    } 
-    else 
+    }
+    else
     {
       profileActs[i]->setVisible(false);
     }
@@ -1421,7 +1418,7 @@ void MainWindow::createProfile()
     ;
   if (i==MAX_PROFILES)  //Failed to find free slot
     return;
- 
+
   // Copy current profile to new and give it a new name
   g.profile[i] = g.profile[g.id()];
   g.profile[i].name(tr("New Radio"));

companion/src/mdichild.cpp

@@ -81,7 +81,7 @@ MdiChild::MdiChild():
   }
 }
 
-MdiChild::~MdiChild() 
+MdiChild::~MdiChild()
 {
   delete ui;
 }
@@ -174,16 +174,21 @@ void MdiChild::modelEdit()
 
   if (row == 0){
     generalEdit();
-  } 
+  }
   else {
     QApplication::setOverrideCursor(Qt::WaitCursor);
     checkAndInitModel( row );
     ModelData &model = radioData.models[row - 1];
+    gStopwatch.restart();
+    gStopwatch.report("ModelEdit creation");
     ModelEdit *t = new ModelEdit(this, radioData, (row - 1), GetCurrentFirmware()/*firmware*/);
+    gStopwatch.report("ModelEdit created");
     t->setWindowTitle(tr("Editing model %1: ").arg(row) + model.name);
     connect(t, SIGNAL(modified()), this, SLOT(setModified()));
+    gStopwatch.report("STARTING MODEL EDIT");
     t->show();
     QApplication::restoreOverrideCursor();
+    gStopwatch.report("ModelEdit shown");
   }
 }
 
@@ -251,7 +256,7 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
       XmlInterface(inputStream).load(radioData);
     }
     else
-#endif 
+#endif
     if (fileType==FILE_TYPE_HEX || fileType==FILE_TYPE_EEPE) { //read HEX file
       if (!file.open(QIODevice::ReadOnly | QIODevice::Text)) {  //reading HEX TEXT file
           QMessageBox::critical(this, tr("Error"),
@@ -260,18 +265,19 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
                                .arg(file.errorString()));
           return false;
       }
-        
+
       QDomDocument doc(ER9X_EEPROM_FILE_TYPE);
       bool xmlOK = doc.setContent(&file);
       if(xmlOK) {
-        if (loadEEpromXml(radioData, doc)){
+        std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEepromXml(radioData, doc));
+        if (errors.test(NO_ERROR)) {
           ui->modelsList->refreshList();
           if(resetCurrentFile) setCurrentFile(fileName);
           return true;
         }
       }
       file.reset();
-      
+
       QTextStream inputStream(&file);
 
       if (fileType==FILE_TYPE_EEPE) {  // read EEPE file header
@@ -294,12 +300,14 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
 
       file.close();
 
-      if (!loadEEprom(radioData, (uint8_t *)eeprom.data(), eeprom_size)) {
-        QMessageBox::critical(this, tr("Error"),
-            tr("Invalid EEPROM File %1")
-            .arg(fileName));
+      std::bitset<NUM_ERRORS> errors((unsigned long long)LoadEeprom(radioData, (uint8_t *)eeprom.data(), eeprom_size));
+      if (!errors.test(NO_ERROR)) {
+        ShowEepromErrors(this, tr("Error"), tr("Invalid EEPROM File %1").arg(fileName), errors.to_ulong());
         return false;
       }
+      if (errors.test(HAS_WARNINGS)) {
+        ShowEepromWarnings(this, tr("Warning"), errors.to_ulong());
+      }
 
       ui->modelsList->refreshList();
       if(resetCurrentFile) setCurrentFile(fileName);
@@ -330,11 +338,18 @@ bool MdiChild::loadFile(const QString &fileName, bool resetCurrentFile)
           return false;
       }
 
-      if (!loadEEprom(radioData, eeprom, eeprom_size) && !::loadBackup(radioData, eeprom, eeprom_size, 0)) {
-        QMessageBox::critical(this, tr("Error"),
-            tr("Invalid binary EEPROM File %1")
-            .arg(fileName));
-        return false;
+      std::bitset<NUM_ERRORS> errorsEeprom((unsigned long long)LoadEeprom(radioData, eeprom, eeprom_size));
+      if (!errorsEeprom.test(NO_ERROR)) {
+        std::bitset<NUM_ERRORS> errorsBackup((unsigned long long)LoadBackup(radioData, eeprom, eeprom_size, 0));
+        if (!errorsBackup.test(NO_ERROR)) {
+          ShowEepromErrors(this, tr("Error"), tr("Invalid binary EEPROM File %1").arg(fileName), (errorsEeprom | errorsBackup).to_ulong());
+          return false;
+        }
+        if (errorsBackup.test(HAS_WARNINGS)) {
+          ShowEepromWarnings(this, tr("Warning"), errorsBackup.to_ulong());
+        }
+      } else if (errorsEeprom.test(HAS_WARNINGS)) {
+        ShowEepromWarnings(this, tr("Warning"), errorsEeprom.to_ulong());
       }
 
       ui->modelsList->refreshList();
@@ -367,7 +382,7 @@ bool MdiChild::saveAs(bool isNew)
       fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName());
 #else
       fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(BIN_FILES_FILTER));
-#endif      
+#endif
     }
     else {
       QFileInfo fi(curFile);
@@ -375,14 +390,14 @@ bool MdiChild::saveAs(bool isNew)
       fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName());
 #else
       fileName = QFileDialog::getSaveFileName(this, tr("Save As"), g.eepromDir() + "/" +fi.fileName(), tr(EEPROM_FILES_FILTER));
-#endif      
+#endif
     }
     if (fileName.isEmpty())
       return false;
     g.eepromDir( QFileInfo(fileName).dir().absolutePath() );
     if (isNew)
       return saveFile(fileName);
-    else 
+    else
       return saveFile(fileName,true);
 }
 
@@ -505,7 +520,7 @@ void MdiChild::setCurrentFile(const QString &fileName)
   files.prepend(fileName);
   while (files.size() > MaxRecentFiles)
       files.removeLast();
- 
+
   g.recentFiles( files );
 }
 
@@ -544,7 +559,7 @@ void MdiChild::print(int model, QString filename)
   else if (getCurrentRow() > 0) {
     pd = new PrintDialog(this, GetCurrentFirmware()/*firmware*/, radioData.generalSettings, radioData.models[getCurrentRow()-1]);
   }
-    
+
   if (pd) {
     pd->setAttribute(Qt::WA_DeleteOnClose, true);
     pd->show();
@@ -601,12 +616,14 @@ bool MdiChild::loadBackup()
     return false;
   }
 
-  if (!::loadBackup(radioData, (uint8_t *)eeprom.data(), eeprom_size, index)) {
-    QMessageBox::critical(this, tr("Error"),
-        tr("Invalid binary backup File %1")
-        .arg(fileName));
-    return false;
-  }
+    std::bitset<NUM_ERRORS> errorsEeprom((unsigned long long)LoadBackup(radioData, (uint8_t *)eeprom.data(), eeprom_size, index));
+    if (!errorsEeprom.test(NO_ERROR)) {
+      ShowEepromErrors(this, tr("Error"), tr("Invalid binary backup File %1").arg(fileName), (errorsEeprom).to_ulong());
+      return false;
+    }
+    if (errorsEeprom.test(HAS_WARNINGS)) {
+      ShowEepromWarnings(this, tr("Warning"), errorsEeprom.to_ulong());
+    }
 
   ui->modelsList->refreshList();
 

companion/src/modeledit/channels.cpp

@@ -7,7 +7,7 @@
 #include <QCheckBox>
 #include <QDoubleSpinBox>
 
-LimitsGroup::LimitsGroup(Firmware * firmware, QGridLayout *gridLayout, int row, int col, int & value, int min, int max, int deflt):
+LimitsGroup::LimitsGroup(Firmware * firmware, TableLayout *tableLayout, int row, int col, int & value, int min, int max, int deflt):
   firmware(firmware),
   spinbox(new QDoubleSpinBox()),
   value(value),
@@ -39,14 +39,17 @@ LimitsGroup::LimitsGroup(Firmware * firmware, QGridLayout *gridLayout, int row,
   }
   
   spinbox->setSingleStep(displayStep*internalStep);
+  spinbox->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
 
   QHBoxLayout * horizontalLayout = new QHBoxLayout();
   QCheckBox * gv = new QCheckBox(QObject::tr("GV"));
+  gv->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
   horizontalLayout->addWidget(gv);
   QComboBox * cb = new QComboBox();
+  cb->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
   horizontalLayout->addWidget(cb);
   horizontalLayout->addWidget(spinbox);
-  gridLayout->addLayout(horizontalLayout, row, col, 1, 1);
+  tableLayout->addLayout(row, col, horizontalLayout);
   gvarGroup = new GVarGroup(gv, spinbox, cb, value, deflt, min, max, displayStep, allowGVars);
 }
 
@@ -74,55 +77,55 @@ void LimitsGroup::updateMinMax(int max)
 Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, Firmware * firmware):
   ModelPanel(parent, model, generalSettings, firmware)
 {
-  QGridLayout * gridLayout = new QGridLayout(this);
-  bool minimize = false;
+  Stopwatch s1("Channels");
 
-  int col = 1;
-  if (firmware->getCapability(ChannelsName)) {
-    minimize=true;
-    addLabel(gridLayout, tr("Name"), col++);
+  int channelNameMaxLen = firmware->getCapability(ChannelsName);
+
+  QStringList headerLabels;
+  headerLabels << "#";
+  if (channelNameMaxLen > 0) {
+    headerLabels << tr("Name");
   }
-  addLabel(gridLayout, tr("Subtrim"), col++, minimize);
-  addLabel(gridLayout, tr("Min"), col++, minimize);
-  addLabel(gridLayout, tr("Max"), col++, minimize);
-  addLabel(gridLayout, tr("Direction"), col++, minimize);
+  headerLabels << tr("Subtrim") << tr("Min") << tr("Max") << tr("Direction");
   if (IS_TARANIS(GetEepromInterface()->getBoard()))
-    addLabel(gridLayout, tr("Curve"), col++, minimize);
+    headerLabels << tr("Curve");
   if (firmware->getCapability(PPMCenter))
-    addLabel(gridLayout, tr("PPM Center"), col++, minimize);
+    headerLabels << tr("PPM Center");
   if (firmware->getCapability(SYMLimits))
-    addLabel(gridLayout, tr("Linear Subtrim"), col++, true);
+    headerLabels << tr("Linear Subtrim");
+  TableLayout * tableLayout = new TableLayout(this, firmware->getCapability(LogicalSwitches), headerLabels);
+
+  s1.report("header");
 
   for (int i=0; i<firmware->getCapability(Outputs); i++) {
-    col = 0;
+    int col = 0;
 
     // Channel label
     QLabel *label = new QLabel(this);
-    label->setText(tr("Channel %1").arg(i+1));
+    label->setText(tr("CH%1").arg(i+1));
     label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
-    gridLayout->addWidget(label, i+1, col++, 1, 1);
+    tableLayout->addWidget(i, col++, label);
 
     // Channel name
-    int nameLen = firmware->getCapability(ChannelsName);
-    if (nameLen > 0) {
+    if (channelNameMaxLen > 0) {
       QLineEdit * name = new QLineEdit(this);
       name->setProperty("index", i);
-      name->setMaxLength(nameLen);
+      name->setMaxLength(channelNameMaxLen);
       QRegExp rx(CHAR_FOR_NAMES_REGEX);
       name->setValidator(new QRegExpValidator(rx, this));
       name->setText(model.limitData[i].name);
       connect(name, SIGNAL(editingFinished()), this, SLOT(nameEdited()));
-      gridLayout->addWidget(name, i+1, col++, 1, 1);
+      tableLayout->addWidget(i, col++, name);
     }
 
     // Channel offset
-    limitsGroups << new LimitsGroup(firmware, gridLayout, i+1, col++, model.limitData[i].offset, -1000, 1000, 0);
+    limitsGroups << new LimitsGroup(firmware, tableLayout, i, col++, model.limitData[i].offset, -1000, 1000, 0);
 
     // Channel min
-    limitsGroups << new LimitsGroup(firmware, gridLayout, i+1, col++, model.limitData[i].min, -model.getChannelsMax()*10, 0, -1000);
+    limitsGroups << new LimitsGroup(firmware, tableLayout, i, col++, model.limitData[i].min, -model.getChannelsMax()*10, 0, -1000);
 
     // Channel max
-    limitsGroups << new LimitsGroup(firmware, gridLayout, i+1, col++, model.limitData[i].max, 0, model.getChannelsMax()*10, 1000);
+    limitsGroups << new LimitsGroup(firmware, tableLayout, i, col++, model.limitData[i].max, 0, model.getChannelsMax()*10, 1000);
 
     // Channel inversion
     QComboBox * invCB = new QComboBox(this);
@@ -130,7 +133,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
     invCB->setProperty("index", i);
     invCB->setCurrentIndex((model.limitData[i].revert) ? 1 : 0);
     connect(invCB, SIGNAL(currentIndexChanged(int)), this, SLOT(invEdited()));
-    gridLayout->addWidget(invCB, i+1, col++, 1, 1);
+    tableLayout->addWidget(i, col++, invCB);
 
     // Curve
     if (IS_TARANIS(GetEepromInterface()->getBoard())) {
@@ -142,7 +145,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
       }
       curveCB->setCurrentIndex(model.limitData[i].curve.value+numcurves);
       connect(curveCB, SIGNAL(currentIndexChanged(int)), this, SLOT(curveEdited()));
-      gridLayout->addWidget(curveCB, i+1, col++, 1, 1);
+      tableLayout->addWidget(i, col++, curveCB);
     }
 
     // PPM center
@@ -157,7 +160,7 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
       center->setValue(1500);
       center->setValue(model.limitData[i].ppmCenter + 1500);
       connect(center, SIGNAL(editingFinished()), this, SLOT(ppmcenterEdited()));
-      gridLayout->addWidget(center, i+1, col++, 1, 1);
+      tableLayout->addWidget(i, col++, center);
     }
 
     // Symetrical limits
@@ -166,14 +169,15 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera
       symlimits->setProperty("index", i);
       symlimits->setChecked(model.limitData[i].symetrical);
       connect(symlimits, SIGNAL(toggled(bool)), this, SLOT(symlimitsEdited()));
-      gridLayout->addWidget(symlimits, i+1, col++, 1, 1);
+      tableLayout->addWidget(i, col++, symlimits);
     }
   }
-
-  // Push the rows up
-  addVSpring(gridLayout, 0,firmware->getCapability(Outputs)+1);
+  s1.report("add elements");
 
   disableMouseScrolling();
+  tableLayout->resizeColumnsToContents();
+  tableLayout->pushRowsUp(firmware->getCapability(Outputs)+1);
+  s1.report("end");
 }
 
 Channels::~Channels()

companion/src/modeledit/channels.h

@@ -1,6 +1,7 @@
 #ifndef CHANNELS_H
 #define CHANNELS_H
 
+#include "helpers.h"
 #include "modeledit.h"
 #include <QSpinBox>
 
@@ -9,7 +10,7 @@ class GVarGroup;
 class LimitsGroup
 {
   public:
-    LimitsGroup(Firmware * firmware, QGridLayout *gridLayout, int row, int col, int & value, int min, int max, int deflt);
+    LimitsGroup(Firmware * firmware, TableLayout *tableLayout, int row, int col, int & value, int min, int max, int deflt);
     ~LimitsGroup();
 
     void updateMinMax(int max);

companion/src/modeledit/customfunctions.cpp

@@ -43,8 +43,7 @@ void RepeatComboBox::update()
 
 CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model, GeneralSettings & generalSettings, Firmware * firmware):
   GenericPanel(parent, model, generalSettings, firmware),
-  functions(model ? model->customFn : generalSettings.customFn),
-  initialized(false)
+  functions(model ? model->customFn : generalSettings.customFn)
 #if defined(PHONON)
   ,
   phononCurrent(-1),
@@ -52,14 +51,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
   clickOutput(NULL)
 #endif
 {
-  QGridLayout * gridLayout = new QGridLayout(this);
-
-  addLabel(gridLayout, tr("Switch"), 1);
-  addLabel(gridLayout, tr("Action"), 2);
-  addLabel(gridLayout, tr("Parameters"), 3);
-  addLabel(gridLayout, tr("Enable"), 4, true );
-  addEmptyLabel(gridLayout, 5 );
-
+  Stopwatch s1("CustomFunctionsPanel - populate"); 
   lock = true;
   int num_fsw = model ? firmware->getCapability(CustomFunctions) : firmware->getCapability(GlobalFunctions);
 
@@ -75,6 +67,8 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
     }
   }
 
+  s1.report("get tracks");
+
   if (IS_TARANIS(firmware->getBoard())) {
     scriptsSet = getFilesSet(g.profile[g.id()].sdPath() + "/SCRIPTS", QStringList() << "*.lua", firmware->getCapability(VoicesMaxLength));
     for (int i=0; i<num_fsw; i++) {
@@ -86,9 +80,14 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
       }
     }
   }
+  s1.report("get scripts");
 
   CompanionIcon playIcon("play.png");
 
+  QStringList headerLabels;
+  headerLabels << "#" << tr("Switch") << tr("Action") << tr("Parameters") << tr("Enable");
+  TableLayout * tableLayout = new TableLayout(this, num_fsw, headerLabels);
+
   for (int i=0; i<num_fsw; i++) {
     // The label
     QLabel * label = new QLabel(this);
@@ -101,28 +100,35 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
       label->setText(tr("GF%1").arg(i+1));
     label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
     connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(fsw_customContextMenuRequested(QPoint)));
-    gridLayout->addWidget(label, i+1, 0);
+    tableLayout->addWidget(i, 0, label);
+    // s1.report("label");
 
     // The switch
     fswtchSwtch[i] = new QComboBox(this);
     fswtchSwtch[i]->setProperty("index", i);
+    populateSwitchCB(fswtchSwtch[i], functions[i].swtch, generalSettings, model ? SpecialFunctionsContext : GlobalFunctionsContext);
     fswtchSwtch[i]->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Minimum);
     fswtchSwtch[i]->setMaxVisibleItems(10);
     connect(fswtchSwtch[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
-    gridLayout->addWidget(fswtchSwtch[i], i+1, 1);
+    tableLayout->addWidget(i, 1, fswtchSwtch[i]);
+    // s1.report("switch");
 
     // The function
     fswtchFunc[i] = new QComboBox(this);
     fswtchFunc[i]->setProperty("index", i);
+    populateFuncCB(fswtchFunc[i], functions[i].func);
     connect(fswtchFunc[i], SIGNAL(currentIndexChanged(int)), this, SLOT(functionEdited()));
-    gridLayout->addWidget(fswtchFunc[i], i+1, 2);
+    tableLayout->addWidget(i, 2, fswtchFunc[i]);
+    // s1.report("func");
 
     // The parameters
-    QHBoxLayout *paramLayout = new QHBoxLayout();
-    gridLayout->addLayout(paramLayout, i+1, 3);
+    QHBoxLayout * paramLayout = new QHBoxLayout();
+    tableLayout->addLayout(i, 3, paramLayout);
 
     fswtchGVmode[i] = new QComboBox(this);
     fswtchGVmode[i]->setProperty("index", i);
+    populateGVmodeCB(fswtchGVmode[i], functions[i].adjustMode);
+    fswtchGVmode[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
     connect(fswtchGVmode[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
     paramLayout->addWidget(fswtchGVmode[i]);
 
@@ -149,12 +155,15 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
 
     fswtchParamT[i] = new QComboBox(this);
     fswtchParamT[i]->setProperty("index", i);
+    populateFuncParamCB(fswtchParamT[i], functions[i].func, functions[i].param, functions[i].adjustMode);
     paramLayout->addWidget(fswtchParamT[i]);
+    fswtchParamT[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
     connect(fswtchParamT[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
 
     fswtchParamArmT[i] = new QComboBox(this);
     fswtchParamArmT[i]->setProperty("index", i);
     fswtchParamArmT[i]->setEditable(true);
+    fswtchParamArmT[i]->setSizeAdjustPolicy(QComboBox::AdjustToContents);
     paramLayout->addWidget(fswtchParamArmT[i]);
 
     connect(fswtchParamArmT[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
@@ -171,14 +180,15 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
 
 #ifdef PHONON
     playBT[i] = new QPushButton(this);
+    playBT[i]->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
     playBT[i]->setProperty("index", i);
     playBT[i]->setIcon(playIcon);
     paramLayout->addWidget(playBT[i]);
     connect(playBT[i], SIGNAL(pressed()), this, SLOT(playMusic()));
 #endif
 
-    QHBoxLayout *repeatLayout = new QHBoxLayout();
-    gridLayout->addLayout(repeatLayout, i+1, 4);
+    QHBoxLayout * repeatLayout = new QHBoxLayout();
+    tableLayout->addLayout(i, 4, repeatLayout);
     fswtchRepeat[i] = new RepeatComboBox(this, functions[i].repeatParam);
     repeatLayout->addWidget(fswtchRepeat[i], i+1);
     connect(fswtchRepeat[i], SIGNAL(modified()), this, SLOT(onChildModified()));
@@ -186,17 +196,24 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData * model,
     fswtchEnable[i] = new QCheckBox(this);
     fswtchEnable[i]->setProperty("index", i);
     fswtchEnable[i]->setText(tr("ON"));
-    fswtchEnable[i]->setFixedWidth( 80 );
+    fswtchEnable[i]->setFixedWidth(200);
     repeatLayout->addWidget(fswtchEnable[i], i+1);
     connect(fswtchEnable[i], SIGNAL(stateChanged(int)), this, SLOT(customFunctionEdited()));
   }
-
-  // Push rows upward
-  addDoubleSpring(gridLayout, 5, num_fsw+1);
+  s1.report("add items");
 
   disableMouseScrolling();
+  s1.report("disableMouseScrolling");
 
   lock = false;
+
+  update();
+  s1.report("update");
+  tableLayout->resizeColumnsToContents();
+  s1.report("resizeColumnsToContents");
+  tableLayout->setColumnWidth(3, 300);
+  tableLayout->pushRowsUp(num_fsw+1);
+  s1.report("end");
 }
 
 CustomFunctionsPanel::~CustomFunctionsPanel()
@@ -383,13 +400,16 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
       populateFuncParamCB(fswtchParamT[i], func, cfn.param);
       widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE;
     }
-    else if (func>=FuncSetTimer1 && func<=FuncSetTimer2) {
+    else if (func>=FuncSetTimer1 && func<=FuncSetTimer3) {
       if (modified) cfn.param = QTimeS(fswtchParamTime[i]->time()).seconds();
       fswtchParamTime[i]->setMinimumTime(QTime(0, 0, 0));
       fswtchParamTime[i]->setMaximumTime(QTime(0, 59, 59));
       fswtchParamTime[i]->setTime(QTimeS(cfn.param));
       widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE;
     }
+    else if (func>=FuncSetFailsafeInternalModule && func<=FuncBindExternalModule) {
+      widgetsMask |= CUSTOM_FUNCTION_ENABLE;
+    }
     else if (func==FuncVolume) {
       if (modified) cfn.param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
       populateFuncParamCB(fswtchParamT[i], func, cfn.param);
@@ -516,15 +536,8 @@ void CustomFunctionsPanel::update()
   lock = true;
   int num_fsw = model ? firmware->getCapability(CustomFunctions) : firmware->getCapability(GlobalFunctions);
   for (int i=0; i<num_fsw; i++) {
-    if (!initialized) {
-      populateSwitchCB(fswtchSwtch[i], functions[i].swtch, generalSettings, model ? SpecialFunctionsContext : GlobalFunctionsContext);
-      populateFuncCB(fswtchFunc[i], functions[i].func);
-      populateGVmodeCB(fswtchGVmode[i], functions[i].adjustMode);
-      populateFuncParamCB(fswtchParamT[i], functions[i].func, functions[i].param, functions[i].adjustMode);
-    }
     refreshCustomFunction(i);
   }
-  initialized = true;
   lock = false;
 }
 
@@ -604,6 +617,8 @@ void CustomFunctionsPanel::populateFuncCB(QComboBox *b, unsigned int value)
         ((i==FuncPlayHaptic) && !firmware->getCapability(Haptic)) ||
         ((i==FuncPlayBoth) && !firmware->getCapability(HasBeeper)) ||
         ((i==FuncLogs) && !firmware->getCapability(HasSDLogs)) ||
+        ((i==FuncSetTimer3) && firmware->getCapability(Timers) < 3) ||
+        ((i>=FuncRangeCheckInternalModule && i<=FuncBindExternalModule) && (!model || !firmware->getCapability(DangerousFunctions))) ||
         ((i>=FuncAdjustGV1 && i<=FuncAdjustGVLast) && !firmware->getCapability(Gvars))
         ) {
       // skipped

companion/src/modeledit/customfunctions.h

@@ -66,7 +66,6 @@ class CustomFunctionsPanel : public GenericPanel
     void populateGVmodeCB(QComboBox *b, unsigned int value);
     void populateFuncParamCB(QComboBox *b, uint function, unsigned int value, unsigned int adjustmode=0);
 
-    bool initialized;
     QSet<QString> tracksSet;
     QSet<QString> scriptsSet;
     int phononCurrent;

companion/src/modeledit/flightmode.ui

@@ -52,7 +52,7 @@
       </widget>
      </item>
      <item row="0" column="0">
-      <widget class="QLabel" name="label">
+      <widget class="QLabel" name="labelName">
        <property name="text">
         <string>Name</string>
        </property>

companion/src/modeledit/flightmodes.cpp

@@ -15,6 +15,9 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
 {
   ui->setupUi(this);
 
+  ui->labelName->setContextMenuPolicy(Qt::CustomContextMenu);
+  connect(ui->labelName, SIGNAL(customContextMenuRequested(const QPoint &)), this, SLOT(name_customContextMenuRequested(const QPoint &)));
+
   int modesCount = firmware->getCapability(FlightModes);
 
   // Phase name
@@ -426,6 +429,29 @@ void FlightModePanel::phaseTrimSlider_valueChanged()
   }
 }
 
+void FlightModePanel::name_customContextMenuRequested(const QPoint & pos)
+{
+    QLabel *label = (QLabel *)sender();
+    QPoint globalPos = label->mapToGlobal(pos);
+    QMenu contextMenu;
+    contextMenu.addAction(CompanionIcon("clear.png"), tr("&Clear"),this,SLOT(fmClear()),tr("Clear"));
+    contextMenu.exec(globalPos);
+}
+
+void FlightModePanel::fmClear()
+{
+  int res = QMessageBox::question(this, "Companion", tr("Clear all current Flight Mode properties?"), QMessageBox::Yes | QMessageBox::No);
+  if (res == QMessageBox::Yes) {
+    phase.clear();
+    for(int i=0; i < 4; ++i) {
+      model->setTrimValue(phaseIdx, i, 0);
+    }
+    update();
+    emit modified();
+    emit nameModified();
+  }
+}
+
 /**********************************************************/
 
 FlightModesPanel::FlightModesPanel(QWidget * parent, ModelData & model, GeneralSettings & generalSettings, Firmware * firmware):

companion/src/modeledit/flightmodes.h

@@ -41,6 +41,8 @@ class FlightModePanel : public ModelPanel
     void phaseGVPopupToggled(bool checked);
     void phaseREValue_editingFinished();
     void phaseREUse_currentIndexChanged(int index);
+    void name_customContextMenuRequested(const QPoint & pos);
+    void fmClear();
 
   private:
     Ui::FlightMode *ui;

companion/src/modeledit/logicalswitches.cpp

@@ -11,19 +11,18 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
   ModelPanel(parent, model, generalSettings, firmware),
   selectedSwitch(0)
 {
+  Stopwatch s1("LogicalSwitchesPanel"); 
+
   int channelsMax = model.getChannelsMax(true);
 
-  QGridLayout * gridLayout = new QGridLayout(this);
-
-  int col = 1;
-  addLabel(gridLayout, tr("Function"), col++);
-  addLabel(gridLayout, tr("V1"), col++);
-  addLabel(gridLayout, tr("V2"), col++);
-  addLabel(gridLayout, tr("AND Switch"), col++);
+  QStringList headerLabels;
+  headerLabels << "#" << tr("Function") << tr("V1") << tr("V2") << tr("AND Switch");
   if (firmware->getCapability(LogicalSwitchesExt)) {
-    addLabel(gridLayout, tr("Duration"), col++);
-    addLabel(gridLayout, tr("Delay"), col++);
+    headerLabels << tr("Duration") << tr("Delay");
   }
+  TableLayout * tableLayout = new TableLayout(this, firmware->getCapability(LogicalSwitches), headerLabels);
+
+  s1.report("header");
 
   lock = true;
   for (int i=0; i<firmware->getCapability(LogicalSwitches); i++) {
@@ -35,19 +34,20 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
     label->setMouseTracking(true);
     label->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Minimum);
     connect(label, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(csw_customContextMenuRequested(QPoint)));
-    gridLayout->addWidget(label, i+1, 0);
+    tableLayout->addWidget(i, 0, label);
 
     // The function
     csw[i] = new QComboBox(this);
     csw[i]->setProperty("index", i);
     connect(csw[i], SIGNAL(currentIndexChanged(int)), this, SLOT(edited()));
-    gridLayout->addWidget(csw[i], i+1, 1);
+    tableLayout->addWidget(i, 1, csw[i]);
 
     // V1
+    QHBoxLayout *v1Layout = new QHBoxLayout();
     cswitchSource1[i] = new QComboBox(this);
     cswitchSource1[i]->setProperty("index",i);
     connect(cswitchSource1[i], SIGNAL(currentIndexChanged(int)), this, SLOT(v1Edited(int)));
-    gridLayout->addWidget(cswitchSource1[i], i+1, 2);
+    v1Layout->addWidget(cswitchSource1[i]);
     cswitchSource1[i]->setVisible(false);
     cswitchValue[i] = new QDoubleSpinBox(this);
     cswitchValue[i]->setMaximum(channelsMax);
@@ -56,8 +56,9 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
     cswitchValue[i]->setDecimals(0);
     cswitchValue[i]->setProperty("index", i);
     connect(cswitchValue[i], SIGNAL(valueChanged(double)), this, SLOT(edited()));
-    gridLayout->addWidget(cswitchValue[i], i+1, 2);
+    v1Layout->addWidget(cswitchValue[i]);
     cswitchValue[i]->setVisible(false);
+    tableLayout->addLayout(i, 2, v1Layout);
 
     // V2
     QHBoxLayout *v2Layout = new QHBoxLayout();
@@ -90,13 +91,13 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
     connect(cswitchTOffset[i],SIGNAL(editingFinished()),this,SLOT(edited()));
     v2Layout->addWidget(cswitchTOffset[i]);
     cswitchTOffset[i]->setVisible(false);
-    gridLayout->addLayout(v2Layout, i+1, 3);
+    tableLayout->addLayout(i, 3, v2Layout);
 
     // AND
     cswitchAnd[i] = new QComboBox(this);
     cswitchAnd[i]->setProperty("index", i);
     connect(cswitchAnd[i], SIGNAL(currentIndexChanged(int)), this, SLOT(andEdited(int)));
-    gridLayout->addWidget(cswitchAnd[i], i+1, 4);
+    tableLayout->addWidget(i, 4, cswitchAnd[i]);
 
     if (firmware->getCapability(LogicalSwitchesExt)) {
       // Duration
@@ -108,7 +109,7 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
       cswitchDuration[i]->setAccelerated(true);
       cswitchDuration[i]->setDecimals(1);
       connect(cswitchDuration[i], SIGNAL(valueChanged(double)), this, SLOT(durationEdited(double)));
-      gridLayout->addWidget(cswitchDuration[i], i+1, 5);
+      tableLayout->addWidget(i, 5, cswitchDuration[i]);
 
       // Delay
       cswitchDelay[i] = new QDoubleSpinBox(this);
@@ -119,15 +120,18 @@ LogicalSwitchesPanel::LogicalSwitchesPanel(QWidget * parent, ModelData & model,
       cswitchDelay[i]->setAccelerated(true);
       cswitchDelay[i]->setDecimals(1);
       connect(cswitchDelay[i], SIGNAL(valueChanged(double)), this, SLOT(delayEdited(double)));
-      gridLayout->addWidget(cswitchDelay[i], i+1, 6);
+      tableLayout->addWidget(i, 6, cswitchDelay[i]);
     }
   }
-  // Push rows upward
-  addVSpring(gridLayout,0,firmware->getCapability(LogicalSwitches)+1);
+
+  s1.report("added elements");
 
   disableMouseScrolling();
-
   lock = false;
+  update();
+  tableLayout->resizeColumnsToContents();
+  tableLayout->pushRowsUp(firmware->getCapability(LogicalSwitches)+1);
+  s1.report("end");
 }
 
 LogicalSwitchesPanel::~LogicalSwitchesPanel()
@@ -240,7 +244,7 @@ void LogicalSwitchesPanel::edited()
         updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.1);
         break;
       case LS_FAMILY_EDGE:
-        cswitchOffset2[i]->setSpecialValueText(tr("(no release)"));
+        cswitchOffset2[i]->setSpecialValueText(tr("(instant)"));
         if (sender() == cswitchOffset[i]) {
           model->logicalSw[i].val2 = TimToVal(cswitchOffset[i]->value());
           updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0);
@@ -339,7 +343,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
       populateSwitchCB(cswitchSource1[i], RawSwitch(model->logicalSw[i].val1), generalSettings, LogicalSwitchesContext);
       updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0);
       updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1));
-      cswitchOffset2[i]->setSpecialValueText(tr("(no release)"));
+      cswitchOffset2[i]->setSpecialValueText(tr("(instant)"));
       if (model->logicalSw[i].val3 == 0) {
         cswitchOffset2[i]->setSuffix(tr("(infinite)"));
       }

companion/src/modeledit/modeledit.cpp

@@ -23,6 +23,9 @@ ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, Firmw
   generalSettings(radioData.generalSettings),
   firmware(firmware)
 {
+  Stopwatch s1("ModelEdit");
+  gStopwatch.report("ModelEdit start constructor");
+
   ui->setupUi(this);
   setWindowIcon(CompanionIcon("edit.png"));
   restoreGeometry(g.modelEditGeo());  
@@ -33,16 +36,23 @@ ModelEdit::ModelEdit(QWidget * parent, RadioData & radioData, int modelId, Firmw
     addTab(new HeliPanel(this, model, generalSettings, firmware), tr("Heli"));
   addTab(new FlightModesPanel(this, model, generalSettings, firmware), tr("Flight Modes"));
   addTab(new InputsPanel(this, model, generalSettings, firmware), tr("Inputs"));
+  s1.report("inputs");
   addTab(new MixesPanel(this, model, generalSettings, firmware), tr("Mixes"));
+  s1.report("Mixes");
   Channels * chnPanel = new Channels(this, model, generalSettings, firmware);
   addTab(chnPanel, tr("Outputs"));
+  s1.report("Outputs");
   addTab(new Curves(this, model, generalSettings, firmware), tr("Curves"));
   addTab(new LogicalSwitchesPanel(this, model, generalSettings, firmware), tr("Logical Switches"));
+  s1.report("LS");
   addTab(new CustomFunctionsPanel(this, &model, generalSettings, firmware), tr("Special Functions"));
+  s1.report("CF");
   if (firmware->getCapability(Telemetry) & TM_HASTELEMETRY)
     addTab(new TelemetryPanel(this, model, generalSettings, firmware), tr("Telemetry"));
     
   connect(setupPanel, SIGNAL(extendedLimitsToggled()), chnPanel, SLOT(refreshExtendedLimits()));
+  s1.report("end");
+  gStopwatch.report("ModelEdit end constructor");
 }
 
 ModelEdit::~ModelEdit()

companion/src/modeledit/setup.cpp

@@ -6,7 +6,7 @@
 #include "appdata.h"
 #include "modelprinter.h"
 
-TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware, QWidget *prevFocus):
+TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, Firmware * firmware, QWidget * prevFocus):
   ModelPanel(parent, model, generalSettings, firmware),
   timer(timer),
   ui(new Ui::Timer)
@@ -137,6 +137,9 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module
   QString label;
   if (moduleIdx < 0) {
     label = tr("Trainer Port");
+    if (generalSettings.hw_uartMode != UART_MODE_SBUS_TRAINER) {
+      ui->trainerMode->setItemData(TRAINER_MODE_MASTER_BATTERY_COMPARTMENT, 0, Qt::UserRole - 1);
+    }
     ui->trainerMode->setCurrentIndex(model.trainerMode);
     if (!IS_TARANIS(firmware->getBoard())) {
       ui->label_trainerMode->hide();
@@ -168,7 +171,7 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module
 
   // The protocols available on this board
   for (int i=0; i<PULSES_PROTOCOL_LAST; i++) {
-    if (GetEepromInterface()->isAvailable((PulsesProtocol)i, moduleIdx)) {
+    if (firmware->isAvailable((PulsesProtocol)i, moduleIdx)) {
       ui->protocol->addItem(ModelPrinter::printModuleProtocol(i), (QVariant)i);
       if (i == module.protocol) ui->protocol->setCurrentIndex(ui->protocol->count()-1);
     }
@@ -190,12 +193,12 @@ ModulePanel::ModulePanel(QWidget *parent, ModelData & model, ModuleData & module
       spinbox->setDecimals(1);
       label->setProperty("index", i);
       spinbox->setProperty("index", i);
-      failsafeSpins << spinbox;
       ui->failsafesLayout->addWidget(label, 3*(i/8), i%8, Qt::AlignHCenter);
       ui->failsafesLayout->addWidget(combo, 1+3*(i/8), i%8, Qt::AlignHCenter);
       ui->failsafesLayout->addWidget(spinbox, 2+3*(i/8), i%8, Qt::AlignHCenter);
       failsafeGroups[i].combo = combo;
       failsafeGroups[i].spinbox = spinbox;
+      failsafeGroups[i].label = label;
       updateFailsafe(i);
       connect(combo, SIGNAL(currentIndexChanged(int)), this, SLOT(onFailsafeComboIndexChanged(int)));
       connect(spinbox, SIGNAL(valueChanged(double)), this, SLOT(onFailsafeSpinChanged(double)));
@@ -234,7 +237,8 @@ void ModulePanel::update()
       case PULSES_PXX_XJT_LR12:
       case PULSES_PXX_DJT:
         mask |= MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
-        if ((protocol==PULSES_PXX_XJT_X16) || (protocol==PULSES_PXX_XJT_LR12)) mask |= MASK_FAILSAFES | MASK_RX_NUMBER;
+        if (protocol==PULSES_PXX_XJT_X16) mask |= MASK_FAILSAFES | MASK_RX_NUMBER;
+        if (protocol==PULSES_PXX_XJT_LR12) mask |= MASK_RX_NUMBER;
         break;
       case PULSES_LP45:
       case PULSES_DSM2:
@@ -243,6 +247,10 @@ void ModulePanel::update()
         module.channelsCount = 6;
         max_rx_num = 20;
         break;
+      case PULSES_CROSSFIRE:
+        mask |= MASK_CHANNELS_RANGE;
+        module.channelsCount = 16;
+        break;
       case PULSES_PPM:
         mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE| MASK_CHANNELS_COUNT;
         if (IS_9XRPRO(firmware->getBoard())) {
@@ -255,15 +263,8 @@ void ModulePanel::update()
     }
   }
   else if (IS_TARANIS(firmware->getBoard())) {
-    switch(model->trainerMode) {
-      case TRAINER_MASTER_JACK:
-        break;
-      case TRAINER_SLAVE_JACK:
-        mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
-        break;
-      default:
-        mask |= MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
-        break;
+    if (model->trainerMode == TRAINER_SLAVE_JACK) {
+      mask |= MASK_PPM_FIELDS | MASK_CHANNELS_RANGE | MASK_CHANNELS_COUNT;
     }
   }
   else if (model->trainerMode != TRAINER_MASTER_JACK) {
@@ -306,6 +307,17 @@ void ModulePanel::update()
     ui->failsafeMode->setVisible(mask & MASK_FAILSAFES);
     ui->failsafeMode->setCurrentIndex(module.failsafeMode);
     ui->failsafesFrame->setEnabled(module.failsafeMode == FAILSAFE_CUSTOM);
+    if (firmware->getCapability(ChannelsName) > 0) {
+      for(int i=0; i<maxChannels;i++) {
+        QString name = QString(model->limitData[i+module.channelsStart].name).trimmed();
+        if (!name.isEmpty()) {
+          failsafeGroups[i].label->setText(name);
+        }
+        else {
+          failsafeGroups[i].label->setText(QString::number(i+1));
+        }
+      }
+    }
   }
   else {
     mask = 0;
@@ -313,6 +325,11 @@ void ModulePanel::update()
 
   ui->failsafesLayoutLabel->setVisible(mask & MASK_FAILSAFES);
   ui->failsafesFrame->setVisible(mask & MASK_FAILSAFES);
+
+  if (mask & MASK_CHANNELS_RANGE) {
+    ui->channelsStart->setMaximum(32 - ui->channelsCount->value());
+    ui->channelsCount->setMaximum(qMin(16, 32-ui->channelsStart->value()));
+  }
 }
 
 void ModulePanel::on_trainerMode_currentIndexChanged(int index)
@@ -516,6 +533,19 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
     }
   }
 
+  if (firmware->getCapability(HasTopLcd)) {
+    ui->toplcdTimer->setField(model.toplcdTimer, this);
+    for (int i=0; i<C9X_MAX_TIMERS; i++) {
+      if (i<firmware->getCapability(Timers)) {
+        ui->toplcdTimer->addItem(tr("Timer %1").arg(i+1), i);
+      }
+    }
+  }
+  else {
+    ui->toplcdTimerLabel->hide();
+    ui->toplcdTimer->hide();
+  }
+
   if (!firmware->getCapability(HasDisplayText)) {
     ui->displayText->hide();
   }
@@ -643,6 +673,7 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
   if (firmware->getCapability(ModelTrainerEnable)) {
     modules[C9X_NUM_MODULES] = new ModulePanel(this, model, model.moduleData[C9X_NUM_MODULES], generalSettings, firmware, -1);
     ui->modulesLayout->addWidget(modules[C9X_NUM_MODULES]);
+    connect(modules[C9X_NUM_MODULES], SIGNAL(modified()), this, SLOT(onChildModified()));
   }
 
   disableMouseScrolling();

companion/src/modeledit/setup.h

@@ -45,6 +45,7 @@ class ModulePanel : public ModelPanel
   struct ChannelFailsafeWidgetsGroup {
     QComboBox * combo;
     QDoubleSpinBox * spinbox;
+    QLabel * label;
   };
 
     Q_OBJECT
@@ -75,7 +76,6 @@ class ModulePanel : public ModelPanel
     ModuleData & module;
     int moduleIdx;
     Ui::Module *ui;
-    QVector<QDoubleSpinBox *> failsafeSpins;
     ChannelFailsafeWidgetsGroup failsafeGroups[maxChannels];
 };
 

companion/src/modeledit/setup.ui

@@ -16,22 +16,6 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_timer3">
-       <property name="font">
-        <font>
-         <weight>50</weight>
-         <bold>false</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Timer 3</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
      <item row="1" column="0">
       <widget class="QLabel" name="label_timer1">
        <property name="font">
@@ -48,8 +32,8 @@
        </property>
       </widget>
      </item>
-     <item row="2" column="0" alignment="Qt::AlignRight|Qt::AlignVCenter">
-      <widget class="QLabel" name="label_timer2">
+     <item row="4" column="0">
+      <widget class="QLabel" name="toplcdTimerLabel">
        <property name="font">
         <font>
          <weight>50</weight>
@@ -57,14 +41,307 @@
         </font>
        </property>
        <property name="text">
-        <string>Timer 2</string>
+        <string>Top LCD Timer</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
-     <item row="5" column="1">
+     <item row="0" column="1">
+      <layout class="QVBoxLayout" name="verticalLayout_5">
+       <item>
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QLineEdit" name="name">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="maxLength">
+            <number>10</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+         <item>
+          <widget class="QLabel" name="modelImage_label">
+           <property name="text">
+            <string>Model Image</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="imagePreview">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="minimumSize">
+            <size>
+             <width>64</width>
+             <height>32</height>
+            </size>
+           </property>
+           <property name="maximumSize">
+            <size>
+             <width>64</width>
+             <height>32</height>
+            </size>
+           </property>
+           <property name="frameShape">
+            <enum>QFrame::Panel</enum>
+           </property>
+           <property name="frameShadow">
+            <enum>QFrame::Raised</enum>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="scaledContents">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="image"/>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_26">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>40</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <widget class="Line" name="line">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item row="10" column="0" alignment="Qt::AlignLeft|Qt::AlignTop">
+      <widget class="QLabel" name="swwarn_label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Warnings</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="10" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_8">
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_6">
+         <item>
+          <widget class="QLabel" name="label_3">
+           <property name="text">
+            <string>Switch Warnings</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <layout class="QGridLayout" name="switchesStartupLayout" rowstretch="0" columnstretch="0">
+           <property name="sizeConstraint">
+            <enum>QLayout::SetMinimumSize</enum>
+           </property>
+           <property name="topMargin">
+            <number>0</number>
+           </property>
+           <property name="bottomMargin">
+            <number>6</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>6</number>
+           </property>
+          </layout>
+         </item>
+         <item>
+          <spacer name="verticalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>40</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <layout class="QVBoxLayout" name="verticalLayout_7">
+         <item alignment="Qt::AlignTop">
+          <widget class="QLabel" name="label_potWarning">
+           <property name="text">
+            <string>Pot Warnings</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <layout class="QGridLayout" name="potWarningLayout">
+           <item row="0" column="0" alignment="Qt::AlignTop">
+            <widget class="QComboBox" name="potWarningMode">
+             <item>
+              <property name="text">
+               <string>OFF</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Manual</string>
+              </property>
+             </item>
+             <item>
+              <property name="text">
+               <string>Auto</string>
+              </property>
+             </item>
+            </widget>
+           </item>
+           <item row="1" column="0">
+            <spacer name="verticalSpacer">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>40</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_3">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item row="0" column="0" alignment="Qt::AlignLeft|Qt::AlignTop">
+      <widget class="QLabel" name="label">
+       <property name="font">
+        <font>
+         <weight>75</weight>
+         <bold>true</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Model</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_7">
+       <item>
+        <layout class="QGridLayout" name="centerBeepLayout"/>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer_4">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item row="9" column="0" colspan="2">
+      <widget class="Line" name="line_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="8" column="0">
+      <widget class="QLabel" name="label_12">
+       <property name="font">
+        <font>
+         <weight>50</weight>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Center beep</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="7" column="1">
+      <widget class="Line" name="line_4">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+      </widget>
+     </item>
+     <item row="6" column="1">
       <layout class="QGridLayout" name="gridLayout_2">
        <item row="1" column="2">
         <widget class="QCheckBox" name="extendedTrims">
@@ -224,7 +501,7 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
        </item>
       </layout>
      </item>
-     <item row="5" column="0">
+     <item row="6" column="0">
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item alignment="Qt::AlignRight">
         <widget class="QLabel" name="label_ttrace">
@@ -276,42 +553,15 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
        </item>
       </layout>
      </item>
-     <item row="4" column="1">
+     <item row="5" column="1">
       <widget class="Line" name="line_2">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
        </property>
       </widget>
      </item>
-     <item row="7" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_7">
-       <item>
-        <layout class="QGridLayout" name="centerBeepLayout"/>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item row="8" column="0" colspan="2">
-      <widget class="Line" name="line_3">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-      </widget>
-     </item>
-     <item row="7" column="0">
-      <widget class="QLabel" name="label_12">
+     <item row="2" column="0" alignment="Qt::AlignRight|Qt::AlignVCenter">
+      <widget class="QLabel" name="label_timer2">
        <property name="font">
         <font>
          <weight>50</weight>
@@ -319,261 +569,37 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
         </font>
        </property>
        <property name="text">
-        <string>Center beep</string>
+        <string>Timer 2</string>
        </property>
        <property name="alignment">
         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
-     <item row="6" column="1">
-      <widget class="Line" name="line_4">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+     <item row="3" column="0">
+      <widget class="QLabel" name="label_timer3_2">
+       <property name="font">
+        <font>
+         <weight>50</weight>
+         <bold>false</bold>
+        </font>
+       </property>
+       <property name="text">
+        <string>Timer 3</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
-     <item row="0" column="1">
-      <layout class="QVBoxLayout" name="verticalLayout_5">
-       <item>
-        <layout class="QHBoxLayout" name="horizontalLayout">
-         <item>
-          <widget class="QLineEdit" name="name">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="maxLength">
-            <number>10</number>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeType">
-            <enum>QSizePolicy::Fixed</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-         <item>
-          <widget class="QLabel" name="modelImage_label">
-           <property name="text">
-            <string>Model Image</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QLabel" name="imagePreview">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="minimumSize">
-            <size>
-             <width>64</width>
-             <height>32</height>
-            </size>
-           </property>
-           <property name="maximumSize">
-            <size>
-             <width>64</width>
-             <height>32</height>
-            </size>
-           </property>
-           <property name="frameShape">
-            <enum>QFrame::Panel</enum>
-           </property>
-           <property name="frameShadow">
-            <enum>QFrame::Raised</enum>
-           </property>
-           <property name="text">
-            <string/>
-           </property>
-           <property name="scaledContents">
-            <bool>true</bool>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <widget class="QComboBox" name="image"/>
-         </item>
-         <item>
-          <spacer name="horizontalSpacer_26">
-           <property name="orientation">
-            <enum>Qt::Horizontal</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>40</width>
-             <height>20</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <widget class="Line" name="line">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
-     <item row="9" column="0" alignment="Qt::AlignLeft|Qt::AlignTop">
-      <widget class="QLabel" name="swwarn_label">
+     <item row="4" column="1">
+      <widget class="AutoComboBox" name="toplcdTimer">
        <property name="sizePolicy">
-        <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
        </property>
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Warnings</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="9" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_8">
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_6">
-         <item>
-          <widget class="QLabel" name="label_3">
-           <property name="text">
-            <string>Switch Warnings</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QGridLayout" name="switchesStartupLayout" rowstretch="0" columnstretch="0">
-           <property name="sizeConstraint">
-            <enum>QLayout::SetMinimumSize</enum>
-           </property>
-           <property name="topMargin">
-            <number>0</number>
-           </property>
-           <property name="bottomMargin">
-            <number>6</number>
-           </property>
-           <property name="verticalSpacing">
-            <number>6</number>
-           </property>
-          </layout>
-         </item>
-         <item>
-          <spacer name="verticalSpacer_2">
-           <property name="orientation">
-            <enum>Qt::Vertical</enum>
-           </property>
-           <property name="sizeHint" stdset="0">
-            <size>
-             <width>20</width>
-             <height>40</height>
-            </size>
-           </property>
-          </spacer>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <layout class="QVBoxLayout" name="verticalLayout_7">
-         <item alignment="Qt::AlignTop">
-          <widget class="QLabel" name="label_potWarning">
-           <property name="text">
-            <string>Pot Warnings</string>
-           </property>
-          </widget>
-         </item>
-         <item>
-          <layout class="QGridLayout" name="potWarningLayout">
-           <item row="0" column="0" alignment="Qt::AlignTop">
-            <widget class="QComboBox" name="potWarningMode">
-             <item>
-              <property name="text">
-               <string>OFF</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Manual</string>
-              </property>
-             </item>
-             <item>
-              <property name="text">
-               <string>Auto</string>
-              </property>
-             </item>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <spacer name="verticalSpacer">
-             <property name="orientation">
-              <enum>Qt::Vertical</enum>
-             </property>
-             <property name="sizeHint" stdset="0">
-              <size>
-               <width>20</width>
-               <height>40</height>
-              </size>
-             </property>
-            </spacer>
-           </item>
-          </layout>
-         </item>
-        </layout>
-       </item>
-       <item>
-        <spacer name="horizontalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </item>
-     <item row="0" column="0" alignment="Qt::AlignLeft|Qt::AlignTop">
-      <widget class="QLabel" name="label">
-       <property name="font">
-        <font>
-         <weight>75</weight>
-         <bold>true</bold>
-        </font>
-       </property>
-       <property name="text">
-        <string>Model</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
       </widget>
      </item>
     </layout>

companion/src/modeledit/setup_module.ui

@@ -67,12 +67,12 @@
       <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
      </property>
      <layout class="QGridLayout" name="gridLayout_69" rowstretch="0,0,0,0,0,0,0,0,0" columnstretch="0,0,0,0,0,0,0">
-      <property name="verticalSpacing">
-       <number>6</number>
-      </property>
       <property name="margin">
        <number>0</number>
       </property>
+      <property name="verticalSpacing">
+       <number>6</number>
+      </property>
       <item row="2" column="3" alignment="Qt::AlignLeft">
        <widget class="QSpinBox" name="channelsStart">
         <property name="maximumSize">
@@ -353,7 +353,7 @@
          <string/>
         </property>
         <property name="minimum">
-         <number>1</number>
+         <number>4</number>
         </property>
         <property name="maximum">
          <number>16</number>

companion/src/modeledit/telemetry.cpp

@@ -580,14 +580,18 @@ void TelemetrySensorPanel::update()
 
     if (sensor.unit == SensorData::UNIT_RPMS) {
       ui->offset->setDecimals(0);
+      ui->offset->setSingleStep(1);
       ui->ratio->setDecimals(0);
+      ui->ratio->setSingleStep(1);
       ui->autoOffset->hide();
       ui->ratio->setMinimum(1);
       ui->offset->setMinimum(1);
     }
     else {
       ui->offset->setDecimals(sensor.prec);
+      ui->offset->setSingleStep(pow(0.1, (int)sensor.prec));
       ui->ratio->setDecimals(1);
+      ui->ratio->setSingleStep(0.1);
     }
   }
 
@@ -645,7 +649,7 @@ void TelemetrySensorPanel::on_name_editingFinished()
 {
   if (!lock) {
     strcpy(sensor.label, ui->name->text().toAscii());
-    emit nameModified();
+    emit dataModified();
     emit modified();
   }
 }
@@ -667,7 +671,15 @@ void TelemetrySensorPanel::on_formula_currentIndexChanged(int index)
       sensor.prec = 2;
       sensor.unit = SensorData::UNIT_VOLTS;
     }
-    update();
+    else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION) {
+      sensor.prec = 0;
+      sensor.unit = SensorData::UNIT_MAH;
+    }
+    else if (sensor.formula == SensorData::TELEM_FORMULA_DIST) {
+      sensor.prec = 0;
+      sensor.unit = SensorData::UNIT_METERS;
+    }
+    emit dataModified();
     emit modified();
   }
 }
@@ -676,6 +688,9 @@ void TelemetrySensorPanel::on_unit_currentIndexChanged(int index)
 {
   if (!lock) {
     sensor.unit = index;
+    if (sensor.unit == SensorData::UNIT_FAHRENHEIT) {
+      sensor.prec = 0;
+    }
     update();
     emit modified();
   }
@@ -685,7 +700,7 @@ void TelemetrySensorPanel::on_prec_valueChanged()
 {
   if (!lock) {
     sensor.prec = ui->prec->value();
-    update();
+    emit dataModified();
     emit modified();
   }
 }
@@ -709,7 +724,8 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
       TelemetrySensorPanel * panel = new TelemetrySensorPanel(this, model.sensorData[i], model, generalSettings, firmware);
       ui->sensorsLayout->addWidget(panel);
       sensorPanels[i] = panel;
-      connect(panel, SIGNAL(nameModified()), this, SLOT(update()));
+      connect(panel, SIGNAL(dataModified()), this, SLOT(update()));
+      connect(panel, SIGNAL(modified()), this, SLOT(onModified()));
     }
   }
   else {
@@ -719,14 +735,14 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
     connect(analogs[0], SIGNAL(modified()), this, SLOT(onAnalogModified()));
     analogs[1] = new TelemetryAnalog(this, model.frsky.channels[1], model, generalSettings, firmware);
     ui->A2Layout->addWidget(analogs[1]);
-    connect(analogs[1], SIGNAL(modified()), this, SLOT(onAnalogModified()));
+    connect(analogs[1], SIGNAL(modified()), this, SLOT(onModified()));
   }
 
   if (IS_TARANIS(firmware->getBoard())) {
-    ui->voltsSource->setField(model.frsky.voltsSource);
-    ui->altitudeSource->setField(model.frsky.altitudeSource);
-    ui->varioSource->setField(model.frsky.varioSource);
-    ui->varioCenterSilent->setField(model.frsky.varioCenterSilent);
+    ui->voltsSource->setField(model.frsky.voltsSource, this);
+    ui->altitudeSource->setField(model.frsky.altitudeSource, this);
+    ui->varioSource->setField(model.frsky.varioSource, this);
+    ui->varioCenterSilent->setField(model.frsky.varioCenterSilent, this);
   }
   else {
     ui->topbarGB->hide();
@@ -736,6 +752,7 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
     TelemetryCustomScreen * tab = new TelemetryCustomScreen(this, model, model.frsky.screens[i], generalSettings, firmware);
     ui->customScreens->addTab(tab, tr("Telemetry screen %1").arg(i+1));
     telemetryCustomScreens[i] = tab;
+    connect(tab, SIGNAL(modified()), this, SLOT(onModified()));
   }
 
   disableMouseScrolling();
@@ -937,7 +954,7 @@ void TelemetryPanel::on_telemetryProtocol_currentIndexChanged(int index)
   }
 }
 
-void TelemetryPanel::onAnalogModified()
+void TelemetryPanel::onModified()
 {
   emit modified();
 }

companion/src/modeledit/telemetry.h

@@ -89,7 +89,7 @@ class TelemetrySensorPanel: public ModelPanel
     void update();
 
   signals:
-    void nameModified();
+    void dataModified();
 
   protected slots:
     void on_name_editingFinished();
@@ -118,7 +118,7 @@ class TelemetryPanel : public ModelPanel
 
   private slots:
     void on_telemetryProtocol_currentIndexChanged(int index);
-    void onAnalogModified();
+    void onModified();
     void on_frskyProtoCB_currentIndexChanged(int index);
     void on_bladesCount_editingFinished();
     void on_rssiAlarm1CB_currentIndexChanged(int index);

companion/src/modelprinter.cpp

@@ -17,9 +17,6 @@ ModelPrinter::ModelPrinter(Firmware * firmware, const GeneralSettings & generalS
 
 ModelPrinter::~ModelPrinter()
 {
-  foreach(QString filename, curvefiles) {
-    qunlink(filename);
-  }
 }
 
 void debugHtml(const QString & html)
@@ -60,7 +57,7 @@ QString ModelPrinter::printChannelName(int idx)
 QString ModelPrinter::printOutputName(int idx)
 {
   QString name = QString(model.limitData[idx].name).trimmed();
-  if (firmware->getCapability(HasChNames) && !name.isEmpty()) {
+  if (firmware->getCapability(ChannelsName) > 0 && !name.isEmpty()) {
     return name;
   }
   else {
@@ -93,13 +90,15 @@ QString ModelPrinter::printThrottleTrimMode()
 
 QString ModelPrinter::printModuleProtocol(unsigned int protocol)
 {
-  static const char *strings[] = { "OFF",
-                                   "PPM",
-                                   "Silverlit A", "Silverlit B", "Silverlit C",
-                                   "CTP1009",
-                                   "LP45", "DSM2", "DSMX",
-                                   "PPM16", "PPMsim",
-                                   "FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
+  static const char * strings[] = {
+      "OFF",
+	  "PPM",
+	  "Silverlit A", "Silverlit B", "Silverlit C",
+	  "CTP1009",
+	  "LP45", "DSM2", "DSMX",
+	  "PPM16", "PPMsim",
+	  "FrSky XJT (D16)", "FrSky XJT (D8)", "FrSky XJT (LR12)", "FrSky DJT",
+	  "Crossfire"
   };
 
   return CHECK_IN_ARRAY(strings, protocol);
@@ -187,7 +186,7 @@ QString ModelPrinter::printTimer(const TimerData & timer)
   QStringList result;
   if (firmware->getCapability(TimersName) && timer.name[0]) 
     result += tr("Name(%1)").arg(timer.name);
-  result += tr("%1:%2").arg(timer.val/60, 2, 10, QChar('0')).arg(timer.val%60, 2, 10, QChar('0'));
+  result += QString("%1:%2").arg(timer.val/60, 2, 10, QChar('0')).arg(timer.val%60, 2, 10, QChar('0'));
   result += timer.mode.toString();
   if (timer.persistent)
     result += tr("Persistent");
@@ -316,7 +315,7 @@ QString ModelPrinter::printInputLine(const ExpoData & input)
 QString ModelPrinter::printMixerName(int curDest)
 {
   QString str = printChannelName(curDest-1) + " ";
-  if (firmware->getCapability(HasChNames)) {
+  if (firmware->getCapability(ChannelsName) > 0) {
     QString name = model.limitData[curDest-1].name;
     if (!name.isEmpty()) {
       name = QString("(") + name + QString(")");
@@ -353,30 +352,33 @@ QString ModelPrinter::printMixerLine(const MixData & mix, bool showMultiplex, in
   }
   str += " " + source;
 
-  str += " " + Qt::escape(tr("Weight")) + QString("(%1)").arg(getGVarString(mix.weight, true));
+  str += " " + Qt::escape(tr("Weight(%1)").arg(getGVarString(mix.weight, true)));
 
   QString flightModesStr = printFlightModes(mix.flightModes);
-  if (!flightModesStr.isEmpty()) str += " " + Qt::escape(flightModesStr);
+  if (!flightModesStr.isEmpty())
+    str += " " + Qt::escape(flightModesStr);
 
-  if (mix.swtch.type != SWITCH_TYPE_NONE) {
-    str += " " + Qt::escape(tr("Switch")) + QString("(%1)").arg(mix.swtch.toString());
-  }
+  if (mix.swtch.type != SWITCH_TYPE_NONE)
+    str += " " + Qt::escape(tr("Switch(%1)").arg(mix.swtch.toString()));
 
-  if (mix.carryTrim>0)      str += " " + Qt::escape(tr("NoTrim"));
-  else if (mix.carryTrim<0) str += " " + RawSource(SOURCE_TYPE_TRIM, (-(mix.carryTrim)-1)).toString(&model);
-
-  if (firmware->getCapability(HasNoExpo) && mix.noExpo) str += " " + Qt::escape(tr("No DR/Expo"));
-  if (mix.sOffset)     str += " " + Qt::escape(tr("Offset")
-  ) + QString("(%1)").arg(getGVarString(mix.sOffset));
-  if (mix.curve.value) str += " " + Qt::escape(mix.curve.toString());
+  if (mix.carryTrim > 0)
+    str += " " + Qt::escape(tr("NoTrim"));
+  else if (mix.carryTrim < 0)
+    str += " " + RawSource(SOURCE_TYPE_TRIM, (-(mix.carryTrim)-1)).toString(&model);
 
+  if (firmware->getCapability(HasNoExpo) && mix.noExpo)
+    str += " " + Qt::escape(tr("No DR/Expo"));
+  if (mix.sOffset)
+    str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(mix.sOffset)));
+  if (mix.curve.value)
+    str += " " + Qt::escape(mix.curve.toString());
   int scale = firmware->getCapability(SlowScale);
   if (scale == 0)
     scale = 1;
   if (mix.delayDown || mix.delayUp)
-    str += " " + Qt::escape(tr("Delay")) + QString("(u%1:d%2)").arg((double)mix.delayUp/scale).arg((double)mix.delayDown/scale);
+    str += " " + Qt::escape(tr("Delay(u%1:d%2)").arg((double)mix.delayUp/scale).arg((double)mix.delayDown/scale));
   if (mix.speedDown || mix.speedUp)
-    str += " " + Qt::escape(tr("Slow")) + QString("(u%1:d%2)").arg((double)mix.speedUp/scale).arg((double)mix.speedDown/scale);
+    str += " " + Qt::escape(tr("Slow(u%1:d%2)").arg((double)mix.speedUp/scale).arg((double)mix.speedDown/scale));
   if (mix.mixWarn)
     str += " " + Qt::escape(tr("Warn(%1)").arg(mix.mixWarn));
   if (firmware->getCapability(HasMixerNames) && mix.name[0]) 
@@ -443,7 +445,7 @@ QString ModelPrinter::printLogicalSwitchLine(int idx)
   }
   switch (ls.getFunctionFamily()) {
     case LS_FAMILY_EDGE:
-      result += tr("Edge(%1, [%2:%3])").arg(RawSwitch(ls.val1).toString()).arg(ValToTim(ls.val2)).arg(ValToTim(ls.val2+ls.val3));
+      result += tr("Edge(%1, [%2:%3])").arg(RawSwitch(ls.val1).toString()).arg(ValToTim(ls.val2)).arg(ls.val3<0 ? tr("instant") : QString("%1").arg(ValToTim(ls.val2+ls.val3)));
       break;
     case LS_FAMILY_STICKY:
       result += tr("Sticky(%1, %2)").arg(RawSwitch(ls.val1).toString()).arg(RawSwitch(ls.val2).toString());
@@ -617,29 +619,12 @@ void CurveImage::drawCurve(const CurveData & curve, QColor color)
   }
 }
 
-void CurveImage::save(const QString & filename)
-{
-  image.save(filename, "png", 100);
-}
-
-QString ModelPrinter::createCurveImage(int idx)
+QString ModelPrinter::createCurveImage(int idx, QTextDocument * document)
 {
   CurveImage image;
   image.drawCurve(model.curves[idx], colors[idx]);
-  QString filename = generateProcessUniqueTempFileName(QString("curve-%1-%2.png").arg((uint64_t)this).arg(idx));
-  image.save(filename);
-  curvefiles << filename;
-  return filename;
-}
-
-QString ModelPrinter::createCurvesImage()
-{
-  CurveImage image;
-  for (int idx=0; idx<firmware->getCapability(NumCurves); idx++) {
-    image.drawCurve(model.curves[idx], colors[idx]);
-  }
-  QString filename = generateProcessUniqueTempFileName(QString("curves-%1.png").arg((uint64_t)this));
-  image.save(filename);
-  curvefiles << filename;
-  return filename;
+  QString filename = QString("curve-%1-%2.png").arg((uint64_t)this).arg(idx);
+  if (document) document->addResource(QTextDocument::ImageResource, QUrl(filename), image.get());
+  // qDebug() << "ModelPrinter::createCurveImage()" << idx << filename;
+  return ":" + filename;
 }

companion/src/modelprinter.h

@@ -4,6 +4,7 @@
 #include <QString>
 #include <QStringList>
 #include <QPainter>
+#include <QTextDocument>
 #include "eeprominterface.h"
 
 QString changeColor(const QString & input, const QString & to, const QString & from = "grey");
@@ -17,7 +18,7 @@ class CurveImage
   public:
     CurveImage();
     void drawCurve(const CurveData & curve, QColor color);
-    void save(const QString & filename);
+    const QImage & get() const { return image; };
 
   protected:
     int size;
@@ -27,6 +28,8 @@ class CurveImage
 
 class ModelPrinter: public QObject
 {
+  Q_OBJECT
+
   public:
     ModelPrinter(Firmware * firmware, const GeneralSettings & generalSettings, const ModelData & model);
     virtual ~ModelPrinter();
@@ -57,14 +60,12 @@ class ModelPrinter: public QObject
     static QString printChannelName(int idx);
     QString printOutputName(int idx);
     QString printCurve(int idx);
-    QString createCurvesImage();
-    QString createCurveImage(int idx);
+    QString createCurveImage(int idx, QTextDocument * document);
 
   private:
     Firmware * firmware;
     const GeneralSettings & generalSettings;
     const ModelData & model;
-    QStringList curvefiles;
 
 };
 

companion/src/mountlist.cpp

@@ -922,4 +922,19 @@ read_file_system_list (bool need_fs_type)
   }
 }
 
+void free_file_system_list(struct mount_entry * mount_list)
+{
+  struct mount_entry * me;
+  while (mount_list)
+  {
+    me = mount_list->me_next;
+    free (mount_list->me_devname);
+    free (mount_list->me_mountdir);
+    if (mount_list->me_type_malloced)
+      free (mount_list->me_type);
+    free (mount_list);
+    mount_list = me;
+  }
+}
+
 #endif

companion/src/mountlist.h

@@ -49,4 +49,6 @@ struct mount_entry
 
 struct mount_entry *read_file_system_list (bool need_fs_type);
 
+void free_file_system_list(struct mount_entry * mount_list);
+
 #endif

companion/src/multimodelprinter.cpp

@@ -122,8 +122,10 @@ void MultiModelPrinter::setModel(int idx, const ModelData & model)
   modelPrinters[idx] = new ModelPrinter(firmware, defaultSettings, model);
 }
 
-QString MultiModelPrinter::print()
+QString MultiModelPrinter::print(QTextDocument * document)
 {
+  if (document) document->clear();
+
   QString str = "<table border='1' cellspacing='0' cellpadding='3' width='100%' style='font-family: monospace;'>";
   str += printSetup();
   if (firmware->getCapability(FlightModes))
@@ -131,7 +133,7 @@ QString MultiModelPrinter::print()
   str += printInputs();
   str += printMixers();
   str += printLimits();
-  str += printCurves();
+  str += printCurves(document);
   if (firmware->getCapability(Gvars) && !firmware->getCapability(GvarsFlightModes))
     str += printGvars();
   str += printLogicalSwitches();
@@ -268,7 +270,7 @@ QString MultiModelPrinter::printLimits()
   columns.append("<table border='0' cellspacing='0' cellpadding='1' width='100%'>" \
                  "<tr>" \
                  " <td><b>" + tr("Channel") + "</b></td>" \
-                 " <td><b>" + (firmware->getCapability(HasChNames) ? tr("Name") : "") + "</b></td>" \
+                 " <td><b>" + (firmware->getCapability(ChannelsName) > 0 ? tr("Name") : "") + "</b></td>" \
                  " <td><b>" + tr("Offset") + "</b></td>" \
                  " <td><b>" + tr("Min") + "</b></td>" \
                  " <td><b>" + tr("Max") + "</b></td>" \
@@ -366,7 +368,7 @@ QString MultiModelPrinter::printMixers()
   return str;
 }
 
-QString MultiModelPrinter::printCurves()
+QString MultiModelPrinter::printCurves(QTextDocument * document)
 {
   QString str;
   MultiColumns columns(models.size());
@@ -385,7 +387,7 @@ QString MultiModelPrinter::printCurves()
       columns.append("<tr><td width='20%'><b>" + tr("CV%1").arg(i+1) + "</b></td><td>");
       COMPARE(modelPrinter->printCurve(i));
       for (int k=0; k<models.size(); k++)
-        columns.append(k, QString("<br/><img src='%1' border='0' />").arg(modelPrinters[k]->createCurveImage(i)));
+        columns.append(k, QString("<br/><img src='%1' border='0' />").arg(modelPrinters[k]->createCurveImage(i, document)));
       columns.append("</td></tr>");
     }
   }

companion/src/multimodelprinter.h

@@ -2,17 +2,20 @@
 #define _MULTIMODELPRINTER_H
 
 #include <QObject>
+#include <QTextDocument>
 #include "eeprominterface.h"
 #include "modelprinter.h"
 
 class MultiModelPrinter: public QObject
 {
+  Q_OBJECT
+
   public:
     MultiModelPrinter(Firmware * firmware);
     virtual ~MultiModelPrinter();
     
     void setModel(int idx, const ModelData & model);
-    QString print();
+    QString print(QTextDocument * document);
 
   protected:
     class MultiColumns {
@@ -44,7 +47,7 @@ class MultiModelPrinter: public QObject
     QString printLimits();
     QString printInputs();
     QString printMixers();
-    QString printCurves();
+    QString printCurves(QTextDocument * document);
     QString printGvars();
     QString printLogicalSwitches();
     QString printCustomFunctions();

companion/src/printdialog.cpp

@@ -21,7 +21,7 @@ PrintDialog::PrintDialog(QWidget *parent, Firmware * firmware, GeneralSettings &
   setWindowIcon(CompanionIcon("print.png"));
   setWindowTitle(model.name);
   multimodelprinter.setModel(0, model);
-  ui->textEdit->setHtml(multimodelprinter.print());
+  ui->textEdit->setHtml(multimodelprinter.print(ui->textEdit->document()));
   if (!printfilename.isEmpty()) {
     printToFile();
     QTimer::singleShot(0, this, SLOT(autoClose()));

companion/src/qxtcommandoptions/AUTHORS

@@ -0,0 +1,7 @@
+Arvid Picciani	<aep@libqxt.org> 
+Adam Higerd     <ahigerd@libqxt.org> 
+J-P Nurmi       <jpnurmi@libqxt.org> 
+Benjamin Zeller <zbenjamin@libqxt.org>
+Thomas Mueller  <deepdiver@libqxt.org>
+
+thanks for all the minor contributions, bug reports, beta tests, and the free beer :-)

companion/src/qxtcommandoptions/CHANGES

@@ -0,0 +1,230 @@
+LibQxt 0.6.2 contains improvements and bug fixes to the 0.6.x series. For more
+details, see the documentation included in this package or online at
+http://docs.libqxt.org.
+
+0.6.2
+-----
+
+    * QxtWindowSystem:
+        - X11 implementation cleanup/overhaul
+        - Fixed #85 QxtWindowSystem::windowGeometry issue
+    * QxtSpanSlider: Improved span drawing on Mac
+    * QxtGlobalShortcut:
+        - Fixed #51 QxtGlobalShortcut doesn't send signal
+        - Fixed #131 QxtGlobalShortcutKey unregistered other's shortcut key by mistake
+    * QxtZeroconf: Fixed a bug in the custom AvahiPoll introduced by a timestamp wrap-around that accured just last week.
+    * QxtCrumbView:
+        - Don't render delegate for invalid indexes
+        - Remove unnecessary padding
+    * QxtDataStreamSignalSerializer:
+        - Handle incomplete length
+        - Added cast to eliminate a compiler warning
+    * QxtMailMessage:
+        - Fix some encoding issues, support explicit transfer encodings
+        - Handle lines with only one word
+    * QxtJSON:
+        - Add support for long long ints
+        - Handle control characters in QxtJSON::stringify
+        - Fix \u decoding
+        - Fixed a error in json parsing code. Nested arrays were incorrectly combined into one big array.
+    * Build system
+        - Various enhancements
+        - Fixed #130 DEPENTPATH = DEPENDPATH?
+    * QxtLogger: Fixed the incorrect association of log level string names to their enumerations
+    * QxtAbstractHttpConnector: remove request disconnected on (QHash)"requests"
+    * QxtWebContent: Fix comparison on size
+    * QxtLanguageBox:
+        - Fixed #124 QxtLanguageBox logic maybe bug
+        - Fixed #125 QxtLanguageBox improvment in logic
+
+0.6.1
+-----
+
+- Improvements
+    * Revised configure.bat:
+        - added -make-bin option
+        - removed -msvc from help
+        - added build_all config for -debug_and_release
+        - cleaned up possible mkdir/move output
+    * Added -I, -i and -L options to configure
+    * Revised QxtConfig.cmake, based on a proposal from zeke (thanks!)
+    * QxtGlobalShortcut/Mac: removed the extra route via QApplication::macEventFilter() - use qxt_mac_handle_hot_key() directly
+    * tests/other/app: changed the shortcut to "ctrl+alt+s" (ie. "cmd+alt+s" on mac)
+    * examples/jsonrpcclient: added CONFIG+=console to make windows users happy
+    * Configure: added -nomake docs
+    * Configure: added -no-openssl to -help
+    * Added MediaKeys to qxtglobalshortcut_win
+    * Added mod4 support in qxtglobalshortcut_x11
+    * Added QXT_RPCSERVICE_DEBUG environment variable for convenient network debugging
+    * Improved QxtSlotMapper docs
+    * Fixed qmake deprecation warnings
+
+- Bug fixes
+    * #48 Won't build using Qt 4.4.3 b/c of QVariant::Hash
+    * #6 QxtFileLockTest::rw_same() does not pass on Windows
+    * Fixed QxtFileLock docs
+    * Fixed examples/jsonrpcclient: exit properly with no arguments set
+    * Fixed config.tests/db version check to respect MAJOR>4
+    * #69 Documentation errors
+    * #46 Install on Mac
+    * #62 QxtXMLFileLoggerEngine vs QxtXmlFileLoggerEngine
+    * #60 including <QxtBasicFileLoggerEngine> doens't work
+    * #63 QxtCheckComboBox display not correct
+    * Fixed qdoc3 tags in QxtZeroConf docs
+    * QxtSerialDevice: fixed r/w in open, disable ionotifier on error
+    * #77 QxtXmlRpcCall: default type not handled
+    * #78 Case of an empty string as return parameter without type specified
+    * #79 Missing <value> element inside <param> element in XML-RPC
+    * #65 QxtCountryComboBox
+    * #70 QxtConfigWidget display not correct
+    * QxtAbstractHttpConnector: don't add null devices to buffer list
+    * QxtZeroconf: Fixed the avahipoll so that the avahi mdns implementation work
+
+0.6.0
+-----
+- General
+    * Revised the build system
+    * Revised docs (now based on qdoc3)
+    * QxtConfig.cmake
+
+- Bug fixes
+    * #4 QxtDaemon::daemonize() compilation warning
+    * #24 QxtFlowView::currentIndex()
+    * #29 qxtwecore
+    * #33 Problem in QxtMailMessage
+    * #34 Debug PDB files
+    * #36 QxtCommandoptions on Windows wrong option parsing
+    * #41 Compilation issue on Mac
+
+- QxtCore
+    * Added QxtModelSerializer
+    * Removed obsolete QxtSemaphore
+    * Added QxtJSON
+
+- QxtGui
+    * Added rich text support to QxtItemDelegate
+    * Removed obsolete QxtTabWidget::TabMovementMode & QxtTabBar
+    * Removed obsolete QxtDockWidget
+    * Revised QxtConfigDialog & QxtConfigWidget
+    * Enhanced QxtWindowSystem::idleTime() to resolve libXss at run-time
+    * Added QxtCrumbView::crumbDelegate()
+    * Added QxtFilterDialog and QxtLookupLineEdit
+
+- QxtNetwork
+    * Added QxtXmlRpc
+    * Added QxtMainAttachment::fromFile()
+    * Revised QxtSmtp
+    * Added QxtJSONRpcClient and QxtJSONRpcCall
+
+- Added QxtZeroConf module
+
+0.5.2
+-----
+
+- Bug fixes
+    * QxtSerialDevice: update QIODevice status when device is closed
+    * QxtSerialDevice: destroy QSocketNotifier when device is closed
+    * Modified QxtGlobalShortcut to use XSetErrorHandler() to catch X(Un)GrabKey() errors on X11
+
+0.5.1
+-----
+
+- Bug fixes
+    * #3 [Vista/Qt 4.5.0] - static build issue
+    * #9 QxtCheckComboBox display is inconsistent
+    * #10 qxtwindowsystem_win.cpp(105) : error C2065: 'LASTINPUTINFO': undeclared identifier
+    * #16 Static lib linkage problem in Qt Creator
+    * #17 QxtPushButton::minimumSizeHint returns wrong value
+    * Fixed QxtGlobalShortcut to allow NumLock on X11
+    * Fixed compilation problems with the GCC-4.4.X series
+    * Fixed QxtGlobalShortcut::shortcut()
+
+0.5.0
+-----
+
+- General
+    * Added LGPL license option
+    * Run Krazy checks and fixed found issues
+    * Improved configure.bat
+    * Added missing export macros
+    * Added missing convenience headers
+    * Improved compatibility
+        - QT_FORWARD_DECLARE_CLASS
+        - Q_SLOTS, Q_SIGNALS & Q_FOREACH in headers
+        - interface
+
+- QxtCore
+    * Revised QxtFifo
+    * Added QxtAlgorithms
+    * Added QxtSerialDevice
+    * Added QxtSlotMapper
+    
+- QxtCrypto
+    * Revised QxtBlowfish
+
+- QxtGui
+    * Added QxtWindowSystem::idleTime()
+    * Added QxtCrumbView
+    * Improved QxtScheduleView
+    * Added QxtSortFilterProxyModel
+    * Improved QxtSpanSlider
+        - Added QxtSpanSlider::HandleMovementMode
+    * Improved QxtItemDelegate
+        - Added ProgressMinimumRole & ProgressMaximumRole
+        - Added support for busy indicator mode
+    * Improved QxtLetterBoxWidget
+        - Added QxtLetterBoxWidget::margin
+        - Added QxtLetterBoxWidget::resizeWidget 
+
+- QxtWeb
+    * Added QxtWebCgiService
+
+0.4.0
+-----
+
+- QxtCore
+    * Added QxtDeplex
+    * Added QxtLocale
+    * Added QxtPointerList
+    * Added QxtMultiSignalWaiter
+    * Added QxtSignalGroup
+    * Added QxtCommandOptions
+    * Added QxtLogger
+    * Added QxtAbstractConnectionManager
+    * Added QxtDataStreamSignalSerializer
+    * Added QxtAbstractSignalSerializer
+
+- QxtCrypto
+    * Added QxtHmac
+
+- QxtGui
+    * Added QxtItemEditorCreatorBase
+    * Added QxtStandardItemEditorCreator
+    * Added QxtItemEditorCreator
+    * Added QxtBaseSpinBox
+    * Added QxtCountryComboBox
+    * Added QxtCountryModel
+    * Added QxtLanguageComboBox
+    * Added QxtScheduleView
+    * Added QxtTabBar
+    * Added QxtFlowView
+    * Added QxtLetterBoxWidget
+    * Improved QxtTabWidget
+        - Added QxtTabWidget::alwaysShowTabBar
+        - Added QxtTabWidget::tabAnimation
+        - Added QxtTabWidget::tabMovementMode
+    * Improved QxtConfirmationMessage
+        - Added QxtConfirmationMessage::settingsFormat
+        - Added QxtConfirmationMessage::rememberOnReject
+        - Added QxtConfirmationMessage::overrideSettingsApplication
+        - Added QxtConfirmationMessage::overrideSettingsKey
+        - Added QxtConfirmationMessage::overrideSettingsOrganization
+
+- QxtBerkeley
+    * Added QxtBdbTree
+
+- QxtWeb
+    * Revised the whole module
+
+- QxtNetwork
+    * Added QxtTcpConnectionManager

companion/src/qxtcommandoptions/CMakeLists.txt

@@ -0,0 +1,11 @@
+set(qxtcommandoptions_SRCS
+  qxtcommandoptions.cpp
+)
+
+set(qxtcommandoptions_HDRS
+  qxtcommandoptions.h
+)
+
+qt4_wrap_cpp(qxtcommandoptions_SRCS ${qxtcommandoptions_HDRS})
+
+add_library(qxtcommandoptions ${qxtcommandoptions_SRCS})

companion/src/qxtcommandoptions/LICENSE

@@ -0,0 +1,89 @@
+Qt Extension Library 
+Copyright (C) 2007 Qxt Foundation
+
+------------------- Disclaimer ------------------------------------------------
+
+Until the Qxt Foundation is legally established, copyright for the
+source code falls back to the original contributor. For information about the
+status of the Qxt Foundation, or about the copyright status of any part of Qxt,
+contact the Qxt project maintainers at <foundation@libqxt.org>
+
+Once the Qxt Foundation has been legally established, all contributors must
+transfer all copyright interest to the Qxt Foundation before their submissions
+will be added to the project.
+
+------------------- License ---------------------------------------------------
+
+This library is free software; you can redistribute it and/or modify it
+under the terms of the Common Public License, version 1.0, as published by IBM 
+or under  the terms of the  GNU Lesser General Public License, version 2.1, 
+as published by the Free Software Foundation
+
+This file is provided "AS IS", without WARRANTIES OR CONDITIONS OF ANY
+KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
+WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR
+FITNESS FOR A PARTICULAR PURPOSE.
+
+You should have received a copy of the CPL along with this file.
+See the LICENSE file and the cpl1.0.txt file included with the source
+distribution for more information. If you did not receive a copy of the
+license, contact the Qxt Foundation.
+
+You should have received a copy of the LGPL along with this file.
+See the LICENSE file and the lgpl-2.1.txt file included with the source
+distribution for more information. If you did not receive a copy of the
+license, contact the Qxt Foundation.
+
+Parts of Qxt depend on Qt 4 and/or other libraries that have their own
+licenses. Qxt is independent of these licenses; however, use of these other
+libraries is subject to their respective license agreements.
+
+------------------- Intent ----------------------------------------------------
+
+The following section describes the opinions and intent of the Qxt Foundation
+with regards to the licensing and use of the Qxt source code and library. In
+the event that the CPL is found to be illegal or invalid, or if any application
+or clause of the license is subjected to question or abuse, this section is a
+general statement of the desired interpretation.
+
+This section has no legal standing and the statements made here are strictly
+subject to the text of the CPL; that is, if this section and the CPL are in
+disagreement, the text of the CPL takes precedence. In no way does this
+intent grant you any additional rights or impose any additional restrictions.
+
+If you have questions about licensing, contact the maintainers.
+
+Qxt is built and supported by open-source enthusiasts.
+- Please respect the open-source background of the contributors. The code is
+  provided for everyone's use; you may not restrict the rights of anyone to
+  use it.
+      - No individual may claim ownership of any part of the code. It belongs
+        to the community.
+      - You may modify the source code to suit your needs, but these changes
+        must be made free. If you distribute a modified form of Qxt, you must
+        also distribute the entire source code of the modified form.
+      - Digital Rights Management (DRM) puts unfair, unfree restrictions on
+        users and developers. It is the opposite of Free Software. We can't
+        stop you from using it, but please don't use the Qxt name for software
+        restricted by DRM.
+- Please respect the time and effort put into the project by the developers.
+      - If you find Qxt useful, it would be appreciated if you would include
+        text in your application (for instance, in the About dialog) giving
+        acknowledgement to Qxt.
+      - If you make modifications to the source code, you must not call the
+        modified version "Qxt." It's okay to include "Qxt" in the name, but
+        anyone who receives the modified version needs to know that it's not
+        the same as the version distributed by the Qxt Foundation.
+- We want everyone to be able to use Qxt without restrictions.
+      - If you distribute Qxt in compiled binary form, please ensure that
+        everyone who receives it can get the source code used to create it.
+      - You are free to use Qxt in closed-source applications as long as you
+        distribute Qxt in an open-source fashion. This does not require you
+        to make your entire application open-source.
+- The Qxt Foundation is a non-profit, non-political organization.
+      - Please don't use the Qxt name in any political or semi-political
+        propaganda or publication. We don't like it.
+- Qxt is distributed "as-is," with no warranty.
+      - If it makes your program crash, your computer blow up, or tiny demons
+        fly out of your nose, please don't sue us.
+

companion/src/qxtcommandoptions/cpl1.0.txt

@@ -0,0 +1,213 @@
+
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC
+LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM
+CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and
+documentation distributed under this Agreement, and
+
+b) in the case of each subsequent Contributor:
+
+i) changes to the Program, and
+
+ii) additions to the Program;
+
+where such changes and/or additions to the Program originate from and are
+distributed by that particular Contributor. A Contribution 'originates' from a
+Contributor if it was added to the Program by such Contributor itself or anyone
+acting on such Contributor's behalf. Contributions do not include additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are not
+derivative works of the Program.
+
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents " mean patent claims licensable by a Contributor which are
+necessarily infringed by the use or sale of its Contribution alone or when
+combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement,
+including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free copyright license to
+reproduce, prepare derivative works of, publicly display, publicly perform,
+distribute and sublicense the Contribution of such Contributor, if any, and such
+derivative works, in source code and object code form.
+
+b) Subject to the terms of this Agreement, each Contributor hereby grants
+Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed
+Patents to make, use, sell, offer to sell, import and otherwise transfer the
+Contribution of such Contributor, if any, in source code and object code form.
+This patent license shall apply to the combination of the Contribution and the
+Program if, at the time the Contribution is added by the Contributor, such
+addition of the Contribution causes such combination to be covered by the
+Licensed Patents. The patent license shall not apply to any other combinations
+which include the Contribution. No hardware per se is licensed hereunder.
+
+c) Recipient understands that although each Contributor grants the licenses
+to its Contributions set forth herein, no assurances are provided by any
+Contributor that the Program does not infringe the patent or other intellectual
+property rights of any other entity. Each Contributor disclaims any liability to
+Recipient for claims brought by any other entity based on infringement of
+intellectual property rights or otherwise. As a condition to exercising the
+rights and licenses granted hereunder, each Recipient hereby assumes sole
+responsibility to secure any other intellectual property rights needed, if any.
+For example, if a third party patent license is required to allow Recipient to
+distribute the Program, it is Recipient's responsibility to acquire that license
+before distributing the Program.
+
+d) Each Contributor represents that to its knowledge it has sufficient
+copyright rights in its Contribution, if any, to grant the copyright license set
+forth in this Agreement.
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its
+own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+
+b) its license agreement:
+
+i) effectively disclaims on behalf of all Contributors all warranties and
+conditions, express and implied, including warranties or conditions of title and
+non-infringement, and implied warranties or conditions of merchantability and
+fitness for a particular purpose;
+
+ii) effectively excludes on behalf of all Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits;
+
+iii) states that any provisions which differ from this Agreement are offered
+by that Contributor alone and not by any other party; and
+
+iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on or
+through a medium customarily used for software exchange.
+
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+
+b) a copy of this Agreement must be included with each copy of the Program.
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with
+respect to end users, business partners and the like. While this license is
+intended to facilitate the commercial use of the Program, the Contributor who
+includes the Program in a commercial product offering should do so in a manner
+which does not create potential liability for other Contributors. Therefore, if
+a Contributor includes the Program in a commercial product offering, such
+Contributor ("Commercial Contributor") hereby agrees to defend and indemnify
+every other Contributor ("Indemnified Contributor") against any losses, damages
+and costs (collectively "Losses") arising from claims, lawsuits and other legal
+actions brought by a third party against the Indemnified Contributor to the
+extent caused by the acts or omissions of such Commercial Contributor in
+connection with its distribution of the Program in a commercial product
+offering. The obligations in this section do not apply to any claims or Losses
+relating to any actual or alleged intellectual property infringement. In order
+to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
+Contributor in writing of such claim, and b) allow the Commercial Contributor to
+control, and cooperate with the Commercial Contributor in, the defense and any
+related settlement negotiations. The Indemnified Contributor may participate in
+any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product
+offering, Product X. That Contributor is then a Commercial Contributor. If that
+Commercial Contributor then makes performance claims, or offers warranties
+related to Product X, those performance claims and warranties are such
+Commercial Contributor's responsibility alone. Under this section, the
+Commercial Contributor would have to defend claims against the other
+Contributors related to those performance claims and warranties, and if a court
+requires any other Contributor to pay any damages as a result, the Commercial
+Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR
+IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE,
+NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each
+Recipient is solely responsible for determining the appropriateness of using and
+distributing the Program and assumes all risks associated with its exercise of
+rights under this Agreement, including but not limited to the risks and costs of
+program errors, compliance with applicable laws, damage to or loss of data,
+programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY
+CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST
+PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS
+GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable
+law, it shall not affect the validity or enforceability of the remainder of the
+terms of this Agreement, and without further action by the parties hereto, such
+provision shall be reformed to the minimum extent necessary to make such
+provision valid and enforceable.
+
+If Recipient institutes patent litigation against a Contributor with respect to
+a patent applicable to software (including a cross-claim or counterclaim in a
+lawsuit), then any patent licenses granted by that Contributor to such Recipient
+under this Agreement shall terminate as of the date such litigation is filed. In
+addition, if Recipient institutes patent litigation against any entity
+(including a cross-claim or counterclaim in a lawsuit) alleging that the Program
+itself (excluding combinations of the Program with other software or hardware)
+infringes such Recipient's patent(s), then such Recipient's rights granted under
+Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to
+comply with any of the material terms or conditions of this Agreement and does
+not cure such failure in a reasonable period of time after becoming aware of
+such noncompliance. If all Recipient's rights under this Agreement terminate,
+Recipient agrees to cease use and distribution of the Program as soon as
+reasonably practicable. However, Recipient's obligations under this Agreement
+and any licenses granted by Recipient relating to the Program shall continue and
+survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in
+order to avoid inconsistency the Agreement is copyrighted and may only be
+modified in the following manner. The Agreement Steward reserves the right to
+publish new versions (including revisions) of this Agreement from time to time.
+No one other than the Agreement Steward has the right to modify this Agreement.
+IBM is the initial Agreement Steward. IBM may assign the responsibility to serve
+as the Agreement Steward to a suitable separate entity. Each new version of the
+Agreement will be given a distinguishing version number. The Program (including
+Contributions) may always be distributed subject to the version of the Agreement
+under which it was received. In addition, after a new version of the Agreement
+is published, Contributor may elect to distribute the Program (including its
+Contributions) under the new version. Except as expressly stated in Sections
+2(a) and 2(b) above, Recipient receives no rights or licenses to the
+intellectual property of any Contributor under this Agreement, whether
+expressly, by implication, estoppel or otherwise. All rights in the Program not
+expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial in
+any resulting litigation.

companion/src/qxtcommandoptions/lgpl-2.1.txt

@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE
+		       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+		  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+  
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+			    NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+

companion/src/qxtcommandoptions/qxtcommandoptions.cpp

@@ -0,0 +1,914 @@
+/****************************************************************************
+ **
+ ** Copyright (C) Qxt Foundation. Some rights reserved.
+ **
+ ** This file is part of the QxtCore module of the Qxt library.
+ **
+ ** This library is free software; you can redistribute it and/or modify it
+ ** under the terms of the Common Public License, version 1.0, as published
+ ** by IBM, and/or under the terms of the GNU Lesser General Public License,
+ ** version 2.1, as published by the Free Software Foundation.
+ **
+ ** This file is provided "AS IS", without WARRANTIES OR CONDITIONS OF ANY
+ ** KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
+ ** WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR
+ ** FITNESS FOR A PARTICULAR PURPOSE.
+ **
+ ** You should have received a copy of the CPL and the LGPL along with this
+ ** file. See the LICENSE file and the cpl1.0.txt/lgpl-2.1.txt files
+ ** included with the source distribution for more information.
+ ** If you did not receive a copy of the licenses, contact the Qxt Foundation.
+ **
+ ** <http://libqxt.org>  <foundation@libqxt.org>
+ **
+ ****************************************************************************/
+
+#include "qxtcommandoptions.h"
+
+#include <QTextStream>
+#include <QIODevice>
+#include <QtDebug>
+#include <QDir>
+
+/*!
+\class QxtCommandOptions
+
+\inmodule QxtCore
+
+\brief The QxtCommandOptions class is a Parser for command-line options
+
+This class is used by applications that need to accept command-line arguments.  It can
+also automatically generate help text, which keeps it from accidentally falling out of
+sync with the supported options, and it can produce warnings for common errors.
+
+It accepts Windows-style ("/option"), UNIX-style ("-option"), and GNU-style
+("--option") options. By default, QxtCommandOptions uses Windows-style options
+(QxtCommandOptions::Slash) on Windows and GNU-style options (QxtCommandOptions::DoubleDash)
+on UNIX and Mac. When using GNU-style options, single-character option names only
+require a single leading dash and can be grouped together, for example, "-abc".
+
+Any parameter that does not start with the option prefix is considered a positional
+parameter. Most applications treat positional parameters as filenames. When using
+GNU- or UNIX-style options, use a double dash ("--") alone to force the remaining
+parameters to be interpreted as positional parameters.
+
+To use QxtCommandOptions, first add the supported options using the add() and alias()
+methods, then process the command line using the parse() method, and finally retrieve
+the processed options using the positional(), count(), value() and/or parameters()
+methods.
+
+Mutually-exclusive options can be specified by using the \a group parameter to add().
+Only one option in a group will be accepted on the command line; if multiple options
+are provided, only the last one takes effect.
+
+Some options may accept an optional or required parameter. Depending on the value
+of the paramStyle() property, the parameter may be separated from the option by
+an equals sign ("/option=value") or by a space ("-option value"). By default,
+Windows uses an equals sign and UNIX and Mac accept both an equals sign and a
+space. Optional parameters always require an equals sign. Note that, when using
+GNU-style options, single-character options cannot have optional parameters.
+
+A simple archiving application might use code similar to this:
+\code
+QxtCommandOptions options;
+options.add("compress", "create a new archive");
+options.alias("compress", "c");
+options.add("extract", "extract files from an archive");
+options.alias("extract", "x");
+options.add("level", "set the compression level (0-9)", QxtCommandOptions::Required);
+options.alias("level", "l");
+options.add("verbose", "show more information about the process; specify twice for more detail", QxtCommandOptions::AllowMultiple);
+options.alias("verbose", "v");
+options.add("help", "show this help text");
+options.alias("help", "h");
+options.parse(QCoreApplication::arguments());
+if(options.count("help") || options.showUnrecognizedWarning()) {
+    options.showUsage();
+    return -1;
+}
+bool verbose = options.count("verbose");
+int level = 5;
+if(options.count("level")) {
+    level = options.value("level").toInt();
+}
+\endcode
+
+\sa QCoreApplication::arguments()
+*/
+
+static const char* qxt_qt_options[] =
+{
+    "=style",       QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the application GUI style"),
+    "=stylesheet",  QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the application stylesheet"),
+    "=session",     QT_TRANSLATE_NOOP("QxtCommandOptions", "restores the application from an earlier session"),
+    "widgetcount",  QT_TRANSLATE_NOOP("QxtCommandOptions", "displays debugging information about widgets"),
+    "reverse",      QT_TRANSLATE_NOOP("QxtCommandOptions", "use right-to-left layout"),
+#ifdef QT_DEBUG
+    "nograb",       QT_TRANSLATE_NOOP("QxtCommandOptions", "never grab the mouse or keyboard"),
+#endif
+#if defined(QT_DEBUG) && defined(Q_WS_X11)
+    "dograb",       QT_TRANSLATE_NOOP("QxtCommandOptions", "grab the mouse/keyboard even in a debugger"),
+    "sync",         QT_TRANSLATE_NOOP("QxtCommandOptions", "run in synchronous mode for debugging"),
+#endif
+#ifdef Q_WS_WIN
+    "direct3d",     QT_TRANSLATE_NOOP("QxtCommandOptions", "use Direct3D by default"),
+#endif
+#ifdef Q_WS_X11
+    "=display",     QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the X11 display"),
+    "=geometry",    QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the geometry of the first window"),
+    "=font",        "",
+    "=fn",          QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the default font"),
+    "=background",  "",
+    "=bg",          QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the default background color"),
+    "=foreground",  "",
+    "=fg",          QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the default foreground color"),
+    "=button",      "",
+    "=btn",         QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the default button color"),
+    "=name",        QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the application name"),
+    "=title",       QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the application title"),
+    "=visual",      QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the X11 visual type"),
+    "=ncols",       QT_TRANSLATE_NOOP("QxtCommandOptions", "limit the number of colors on an 8-bit display"),
+    "cmap",         QT_TRANSLATE_NOOP("QxtCommandOptions", "use a private color map"),
+    "=im",          QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the input method server"),
+    "noxim",        QT_TRANSLATE_NOOP("QxtCommandOptions", "disable the X Input Method"),
+    "=inputstyle",  QT_TRANSLATE_NOOP("QxtCommandOptions", "sets the style used by the input method"),
+#endif
+    0,              0
+};
+
+/*
+ * This function is used to check to see if a parameter
+ * is used by Qt.
+ */
+static int isQtOption(const QString& param)
+{
+    // Qt options all start with a single dash regardless of platform
+    if (param.length() < 2) return 0;
+    if (param[0] != '-') return 0;
+    if (param[1] == '-') return 0;
+#ifdef Q_OS_MAC
+    if (param.left(5) == "-psn_") return 1;
+#endif
+    QString name = param.mid(1), value;
+    bool hasEquals;
+
+    // Separate the option and the value, if present
+    if (name.indexOf('=') != -1)
+    {
+        value = param.section('=', 1);
+        name = param.section('=', 0, 0);
+        hasEquals = true;
+    }
+    else
+    {
+        value = "";
+        hasEquals = false;
+    }
+
+    const char* option;
+    bool optionHasValue;
+    for (int i = 0; qxt_qt_options[i]; i += 2)
+    {
+        option = qxt_qt_options[i];
+        // In the table above, options that require parameters start with =
+        if (option[0] == '=')
+        {
+            optionHasValue = true;
+            option = option + 1; // pointer math to skip =
+        }
+        else
+        {
+            optionHasValue = false;
+        }
+
+        // The return value indicates how many parameters to skip
+        if (name == option)
+        {
+            if (optionHasValue) return 2;
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
+// Storage structure for option data
+struct QxtCommandOption
+{
+    QStringList names;      // aliases accepted at the command line
+    QString canonicalName;  // name used for alias()/count()/value()
+    QString desc;           // documentation string
+    QStringList values;     // values passed on command line
+    QxtCommandOptions::ParamTypes paramType;    // flags
+    quint16 group;          // mutual exclusion group
+};
+
+class QxtCommandOptionsPrivate : public QxtPrivate<QxtCommandOptions>
+{
+    Q_DECLARE_TR_FUNCTIONS(QxtCommandOptions)
+public:
+    QXT_DECLARE_PUBLIC(QxtCommandOptions)
+
+    QList<QxtCommandOption> options;
+    QHash<QString, QxtCommandOption*> lookup;       // cache structure to simplify processing
+    QHash<int, QList<QxtCommandOption*> > groups;   // cache structure to simplify processing
+    QxtCommandOptions::FlagStyle flagStyle;
+    QxtCommandOptions::ParamStyle paramStyle;
+    QStringList positional;                         // prefixless parameters
+    QStringList unrecognized;                       // prefixed parameters not in recognized options
+    QStringList missingParams;                      // parameters with required values missing
+    int screenWidth;
+    bool parsed;
+
+    QxtCommandOption* findOption(const QString& name);
+    const QxtCommandOption* findOption(const QString& name) const;
+    void setOption(QxtCommandOption* option, const QString& value = QString());
+    void parse(const QStringList& params);
+};
+
+/* Looks up an option in qxt_d().options by canonical name */
+QxtCommandOption* QxtCommandOptionsPrivate::findOption(const QString& name)
+{
+    // The backwards loop will find what we're looking for more quickly in the
+    // typical use case, where you add aliases immediately after adding the option.
+    for (int i = options.count() - 1; i >= 0; --i)
+    {
+        if (options[i].canonicalName == name) return &options[i];
+    }
+    qWarning() << qPrintable(QString("QxtCommandOptions: ") + tr("option \"%1\" not found").arg(name));
+    return 0;
+}
+
+/* Looks up an option in qxt_d().options by canonical name
+ * This is a const overload for const functions */
+const QxtCommandOption* QxtCommandOptionsPrivate::findOption(const QString& name) const
+{
+    // The backwards loop will find what we're looking for more quickly in the
+    // typical use case, where you add aliases immediately after adding the option.
+    for (int i = options.count() - 1; i >= 0; --i)
+    {
+        if (options[i].canonicalName == name) return &(options.at(i));
+    }
+    qWarning() << qPrintable(QString("QxtCommandOptions: ") + tr("option \"%1\" not found").arg(name));
+    return 0;
+}
+
+/*!
+ * Constructs a QxtCommandOptions object.
+ */
+QxtCommandOptions::QxtCommandOptions()
+{
+    QXT_INIT_PRIVATE(QxtCommandOptions);
+    qxt_d().screenWidth = 80;
+    qxt_d().parsed = false;
+#ifdef Q_OS_WIN
+    setFlagStyle(Slash);
+    setParamStyle(Equals);
+#else
+    setFlagStyle(DoubleDash);
+    setParamStyle(SpaceAndEquals);
+#endif
+}
+
+/*!
+ * Sets which prefix is used to identify options. The default value is Slash on Windows
+ * and DoubleDash on all other platforms.
+ *
+ * Note that Qt's built-in options (see QApplication) always use a single dash,
+ * regardless of this setting.
+ */
+void QxtCommandOptions::setFlagStyle(FlagStyle style)
+{
+    qxt_d().flagStyle = style;
+}
+
+/*!
+ * Gets which prefix is used to identify options.
+ */
+QxtCommandOptions::FlagStyle QxtCommandOptions::flagStyle() const
+{
+    return qxt_d().flagStyle;
+}
+
+/*!
+ * Sets which value separator is used for options that accept parameters.
+ * The default value is Equals on Windows and SpaceAndEquals on all other
+ * platforms.
+ *
+ * Single-letter options with optional parameters in DoubleDash mode
+ * always use an equals sign, regardless of this setting.
+ *
+ * Qt's built-in options always behave as SpaceAndEquals, regardless of
+ * this setting.
+ */
+void QxtCommandOptions::setParamStyle(ParamStyle style)
+{
+    qxt_d().paramStyle = style;
+}
+
+/*!
+ * Sets which value separator is used for options that accept parameters.
+ */
+QxtCommandOptions::ParamStyle QxtCommandOptions::paramStyle() const
+{
+    return qxt_d().paramStyle;
+}
+
+/*!
+ * Sets the width of the screen, in characters. This is used for word-wrapping
+ * the automatically-generated help text to the size of the screen. The default
+ * value is 80 characters. Pass 0 to disable word-wrapping.
+ */
+void QxtCommandOptions::setScreenWidth(quint16 width)
+{
+    qxt_d().screenWidth = width;
+}
+
+/*!
+ * Gets the width of the screen, in characters.
+ */
+quint16 QxtCommandOptions::screenWidth() const
+{
+    return qxt_d().screenWidth;
+}
+
+/*!
+ * Adds a section separator. Section separators are only used in generating
+ * help text, and can be used to visually separate related groups of
+ * options.
+ */
+void QxtCommandOptions::addSection(const QString& name)
+{
+    QxtCommandOption option;
+    option.canonicalName.clear();
+    option.desc = name;
+    qxt_d().options.append(option);
+}
+
+/*!
+ * Adds an option to the parser.
+ *
+ * The name parameter defines the name that will be used by the alias(),
+ * count(), value(), and parameters() methods. Additional names for the
+ * same option can be defined using the alias() method.
+ *
+ * The group parameter, if used, defines a set of mutually-exclusive options.
+ * If more than one option in the same group is passed on the command line,
+ * only the last one takes effect.
+ */
+void QxtCommandOptions::add(const QString& name, const QString& desc, ParamTypes paramType, int group)
+{
+    QxtCommandOption option;
+    option.canonicalName = name;
+    option.desc = desc;
+    option.paramType = paramType;
+    option.group = group;
+    qxt_d().options.append(option);
+    if (group != -1)
+        qxt_d().groups[group].append(&(qxt_d().options.last()));
+    // Connect the canonical name to a usable name
+    alias(name, name);
+}
+
+/*!
+ * Provides an alias for an option. An alias is another name for the option that can be
+ * given on the command line. Aliases cannot be used as parameters to alias(), count()
+ * or value() nor can single-letter aliases be created for options with an optional value.
+ *
+ * The from parameter must be a name has previously been added with the add() method.
+ */
+void QxtCommandOptions::alias(const QString& from, const QString& to)
+{
+    QxtCommandOption* option = qxt_d().findOption(from);
+    if (!option) return; // findOption outputs the warning
+    option->names.append(to);
+    qxt_d().lookup[to] = option;
+    if (option->paramType & ValueOptional && qxt_d().flagStyle == DoubleDash && to.length() == 1)
+        qWarning() << qPrintable(QString("QxtCommandOptions: ") + tr("Short options cannot have optional parameters"));
+}
+
+/*!
+ * Returns the positional parameters from the command line, that is, the arguments that
+ * do not begin with the option prefix.
+ *
+ * \sa flagStyle()
+ */
+QStringList QxtCommandOptions::positional() const
+{
+    if (!qxt_d().parsed)
+        qWarning() << qPrintable(QString("QxtCommandOptions: ") + tr("positional() called before parse()"));
+    return qxt_d().positional;
+}
+
+/*!
+ * Returns the options that could not be parsed.
+ *
+ * An argument is unrecognized if it begins with the option prefix but was never
+ * defined using the add() or alias() methods, or if it requires a value but the
+ * user did not provide one.
+ */
+QStringList QxtCommandOptions::unrecognized() const
+{
+    if (!qxt_d().parsed)
+        qWarning() << qPrintable(QString("QxtCommandOptions: ") + tr("unrecognized() called before parse()"));
+    return qxt_d().unrecognized + qxt_d().missingParams;
+}
+
+/*!
+ * Returns the number of times an option was passed on the command line.
+ *
+ * This function will only return 0 or 1 for options that were not created with the
+ * QxtCommandOptions::AllowMultiple flag set.
+ */
+int QxtCommandOptions::count(const QString& name) const
+{
+    if (!qxt_d().parsed)
+        qWarning() << qPrintable(QString("QxtCommandOptions: ") + tr("count() called before parse()"));
+    const QxtCommandOption* option = qxt_d().findOption(name);
+    if (!option) return 0; // findOption outputs the warning
+    return option->values.count();
+}
+
+/*!
+ * Returns the value or values for an option passed on the command line.
+ *
+ * If the option was not passed on the command line, this function returns a null QVariant.
+ * If the option was created with the QxtCommandOptions::AllowMultiple flag, and the option
+ * was passed more than once, this function returns a QStringList containing the values.
+ * Otherwise, this function returns the last (or only) value given to the option on the
+ * command line.  When an option allowing an optional value is provided on the command
+ * line and for which no value is provided, an empty but non-null QString will be returned
+ * in the QVariant.
+ */
+QVariant QxtCommandOptions::value(const QString& name) const
+{
+    if (!qxt_d().parsed)
+        qWarning() << qPrintable(QString("QxtCommandOptions: ") + tr("value() called before parse()"));
+    const QxtCommandOption* option = qxt_d().findOption(name);
+    if (!option) return QVariant(); // findOption outputs the warning
+    int ct = option->values.count();
+    if (ct == 0) return QVariant();
+    if (ct == 1) return option->values.first();
+    return option->values;
+}
+
+/*!
+ * Returns all of the recognized options passed on the command line.
+ */
+QMultiHash<QString, QVariant> QxtCommandOptions::parameters() const
+{
+    if (!qxt_d().parsed)
+        qWarning() << qPrintable(QString("QxtCommandOptions: ") + tr("parameters() called before parse()"));
+    QMultiHash<QString, QVariant> params;
+    int ct;
+    foreach(const QxtCommandOption& option, qxt_d().options)
+    {
+        ct = option.values.count();
+        if (!ct)
+        {
+            continue;
+        }
+        else if (!(option.paramType & (ValueOptional | ValueRequired)))
+        {
+            // Valueless options are really a true/false flag
+            params.insert(option.canonicalName, true);
+        }
+        else
+        {
+            foreach(const QVariant& value, option.values)
+                params.insert(option.canonicalName, value);
+        }
+    }
+    return params;
+}
+
+/*!
+ * This is an overloaded member function, provided for convenience.
+ *
+ * Process a set of command-line options. This overload accepts a number of
+ * arguments and a pointer to the list of arguments.
+ *
+ * Note that parse() may be invoked multiple times to handle arguments from
+ * more than one source.
+ */
+void QxtCommandOptions::parse(int argc, char** argv)
+{
+    QStringList args;
+    for (int i = 0; i < argc; i++)
+        args << argv[i];
+    parse(args);
+}
+
+/*!
+ * Process a set of command-line options. This overload accepts a QStringList
+ * containing the command-line options, such as the one returned by
+ * QCoreApplication::arguments().
+ *
+ * Note that parse() may be invoked multiple times to handle arguments from
+ * more than one source.
+ *
+ * \sa QCoreApplication::arguments()
+ */
+void QxtCommandOptions::parse(QStringList params)
+{
+    qxt_d().parse(params);
+    qxt_d().parsed = true;
+}
+
+/* Update the internal data structures with an option from the command line. */
+void QxtCommandOptionsPrivate::setOption(QxtCommandOption* option, const QString& value)
+{
+    if (groups.contains(option->group))
+    {
+        // Clear mutually-exclusive options
+        QList<QxtCommandOption*>& others = groups[option->group];
+        foreach(QxtCommandOption* other, others)
+        {
+            if (other != option) other->values.clear();
+        }
+    }
+    // Clear all previous values if multiples are not accepted
+    if (!(option->paramType & QxtCommandOptions::AllowMultiple))
+        option->values.clear();
+    option->values.append(value);
+}
+
+/* Do the work of parsing the command line */
+void QxtCommandOptionsPrivate::parse(const QStringList& params)
+{
+    int pos = 1;    // 0 is the application name
+    int ct = params.count();
+    int skip = 0;
+    bool endFlags = false;
+    bool notUnrecognized, hasEquals;
+    QString name, param, value;
+
+    while (pos < ct)
+    {
+        // Ignore Qt built-in options
+        while ((skip = isQtOption(params[pos])))
+        {
+            pos += skip;
+            if (pos >= ct)
+                return;
+        }
+
+        param = params[pos];
+        pos++;
+
+        if (!endFlags && ((flagStyle == QxtCommandOptions::Slash && param[0] == '/') ||
+                          (flagStyle != QxtCommandOptions::Slash && param[0] == '-')))
+        {
+            // tagged argument
+            if (param.length() == 1)
+            {
+                // "-" or "/" alone can't possibly match a flag, so use positional.
+                positional.append(param);
+                continue;
+            }
+            notUnrecognized = false;
+
+            if (flagStyle != QxtCommandOptions::Slash && param == "--")
+            {
+                // End of parameters flag
+                endFlags = true;
+            }
+            else if (flagStyle == QxtCommandOptions::DoubleDash && param[1] != '-')
+            {
+                // Handle short-form options
+                int len = param.length();
+                QxtCommandOption* option;
+                for (int i = 1; i < len; i++)
+                {
+                    QString ch(param[i]);
+                    if (ch == "-")
+                    {
+                        endFlags = true;
+                    }
+                    else
+                    {
+                        option = lookup.value(ch, 0);
+                        if (!option)
+                        {
+                            // single-letter flag has no known equivalent
+                            unrecognized.append(QString("-") + param[i]);
+                        }
+                        else
+                        {
+                            if (option->paramType & QxtCommandOptions::ValueRequired)
+                            {
+                                // Check for required parameters
+                                // Short options can't have optional parameters
+                                if (pos >= params.count())
+                                {
+                                    missingParams.append(param);
+                                    break;
+                                }
+                                value = params[pos];
+                            }
+                            else
+                            {
+                                value = "";
+                            }
+                            setOption(option, value);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                // Break apart a value
+                if (param.indexOf('=') != -1)
+                {
+                    value = param.section('=', 1);
+                    param = param.section('=', 0, 0);
+                    hasEquals = true;
+                }
+                else
+                {
+                    value = "";
+                    hasEquals = false;
+                }
+
+                if (flagStyle == QxtCommandOptions::DoubleDash)
+                    name = param.mid(2);
+                else
+                    name = param.mid(1);
+
+                QxtCommandOption* option = lookup.value(name, 0);
+                if (!option)
+                {
+                    unrecognized.append(param);
+                }
+                else
+                {
+                    if (option->paramType & QxtCommandOptions::ValueRequired && !hasEquals)
+                    {
+                        // Check for parameters
+                        if (pos >= params.count())
+                        {
+                            missingParams.append(param);
+                            break;
+                        }
+                        value = params[pos];
+                        pos++;
+                    }
+                    else if ((paramStyle & QxtCommandOptions::Space)
+                            && (option->paramType & QxtCommandOptions::ValueOptional)
+                            && !hasEquals) 
+                    {
+                        if (pos < params.count())
+                        {
+                            if (!((flagStyle == QxtCommandOptions::Slash && params.at(pos)[0] == '/') ||
+                                (flagStyle != QxtCommandOptions::Slash && params.at(pos)[0] == '-')))
+                            {
+                                value = params[pos];
+                                pos++;
+                            }
+                        }
+                    }
+
+                    setOption(option, value);
+                }
+            }
+        }
+        else
+        {
+            // positional argument
+            positional.append(param);
+        }
+    }
+}
+
+/*!
+ * This is an overloaded member function, provided for convenience.
+ *
+ * Outputs a warning about any unrecognized options to the provided device, or
+ * standard error by default. The device must already be opened for writing.
+ *
+ * This function returns true if any warnings were output, or false otherwise.
+ *
+ * If a QCoreApplication or a subclass of QCoreApplication has been instantiated,
+ * this function uses QCoreApplication::applicationFilePath() to get the name
+ * of the executable to include in the message.
+ *
+ * \sa QCoreApplication::applicationFilePath()
+ */
+bool QxtCommandOptions::showUnrecognizedWarning(QIODevice* device) const
+{
+    if (!device)
+    {
+        QTextStream stream(stderr);
+        return showUnrecognizedWarning(*&stream);
+    }
+    else
+    {
+        QTextStream stream(device);
+        return showUnrecognizedWarning(*&stream);
+    }
+}
+
+/*!
+ * Returns the automatically-generated warning text about any unrecognized options.
+ *
+ * If a QCoreApplication or a subclass of QCoreApplication has been instantiated,
+ * this function uses QCoreApplication::applicationFilePath() to get the name
+ * of the executable to include in the message.
+ *
+ * \sa QCoreApplication::applicationFilePath()
+ */
+QString QxtCommandOptions::getUnrecognizedWarning() const
+{
+    QString usage;
+    QTextStream stream(&usage);
+    showUnrecognizedWarning(*&stream);
+    return usage;
+}
+
+/*!
+ * This is an overloaded member function, provided for convenience.
+ *
+ * Outputs a warning about any unrecognized options to the provided stream.
+ *
+ * This function returns true if any warnings were output, or false otherwise.
+ *
+ * If a QCoreApplication or a subclass of QCoreApplication has been instantiated,
+ * this function uses QCoreApplication::applicationFilePath() to get the name
+ * of the executable to include in the message.
+ *
+ * \sa QCoreApplication::applicationFilePath()
+ */
+bool QxtCommandOptions::showUnrecognizedWarning(QTextStream& stream) const
+{
+    if (!qxt_d().unrecognized.count() && !qxt_d().missingParams.count()) return false;
+
+    QString name;
+    if (QCoreApplication::instance())
+        name = QDir(QCoreApplication::applicationFilePath()).dirName();
+    if (name.isEmpty())
+        name = "QxtCommandOptions";
+
+    if (qxt_d().unrecognized.count())
+        stream << name << ": " << tr("unrecognized parameters: ") << qxt_d().unrecognized.join(" ") << endl;
+
+    foreach(const QString& param, qxt_d().missingParams)
+        stream << name << ": " << tr("%1 requires a parameter").arg(param) << endl;
+
+    return true;
+}
+
+/*!
+ * This is an overloaded member function, provided for convenience.
+ *
+ * Outputs automatically-generated usage text for the accepted options to the provided
+ * device, or standard error by default. The device must already be opened for writing.
+ *
+ * Pass true to showQtOptions to output usage text for the options recognized by
+ * QApplication.
+ *
+ * \sa QApplication
+ */
+void QxtCommandOptions::showUsage(bool showQtOptions, QIODevice* device) const
+{
+    if (!device)
+    {
+        QTextStream stream(stdout);
+        showUsage(showQtOptions, *&stream);
+    }
+    else
+    {
+        QTextStream stream(device);
+        showUsage(showQtOptions, *&stream);
+    }
+}
+
+/*!
+ * Returns the automatically-generated usage text for the accepted options.
+ */
+QString QxtCommandOptions::getUsage(bool showQtOptions) const
+{
+    QString usage;
+    QTextStream stream(&usage);
+    showUsage(showQtOptions, *&stream);
+    return usage;
+}
+
+/*!
+ * This is an overloaded member function, provided for convenience.
+ *
+ * Outputs automatically-generated usage text for the accepted options to the provided
+ * stream.
+ *
+ * Pass true to showQtOptions to output usage text for the options recognized by
+ * QApplication.
+ *
+ * \sa QApplication
+ */
+void QxtCommandOptions::showUsage(bool showQtOptions, QTextStream& stream) const
+{
+    QStringList names;
+    QStringList descs;
+    int maxNameLength = 0;
+    QString name;
+
+    foreach(const QxtCommandOption& option, qxt_d().options)
+    {
+        // Don't generate usage for undocumented parameters
+        if (option.paramType & Undocumented) continue;
+
+        foreach(const QString& n, option.names)
+        {
+            if (name.length()) name += ", ";
+            if (qxt_d().flagStyle == Slash)
+                name += '/';
+            else if (qxt_d().flagStyle == DoubleDash && n.length() > 1)
+                name += "--";
+            else
+                name += '-';
+            name += n;
+            if (option.paramType & (ValueOptional | ValueRequired))
+            {
+                if (option.paramType & ValueOptional)
+                    name += "[=x]";
+                else if (qxt_d().paramStyle == SpaceAndEquals)
+                    name += "[=]x";
+                else if (qxt_d().paramStyle == Equals)
+                    name += "=x";
+                else
+                    name += " x";
+            }
+        }
+
+        // The maximum name length is used for formatting the output columns
+        if (name.length() > maxNameLength)
+            maxNameLength = name.length();
+        names.append(name);
+        descs.append(option.desc);
+        name = "";
+    }
+
+    if (showQtOptions)
+    {
+        // Add a section header
+        names.append(QString());
+        descs.append("Common Qt Options");
+
+        // Parse through qxt_qt_options
+        const char* option;
+        bool optionHasValue;
+        for (int i = 0; qxt_qt_options[i]; i += 2)
+        {
+            option = qxt_qt_options[i];
+
+            if (option[0] == '=')
+            {
+                // The option takes a parameter
+                optionHasValue = true;
+                option = option + 1; // pointer math to skip the =
+            }
+            else
+            {
+                optionHasValue = false;
+            }
+
+            // Concatenate on the option alias
+            if (!name.isEmpty()) name += ", ";
+            name += '-';
+            name += option;
+            if (optionHasValue) name += "[=]x";
+
+            if (qxt_qt_options[i+1][0] != 0)
+            {
+                // The last alias for the option has the description
+                if (name.length() > maxNameLength)
+                    maxNameLength = name.length();
+                names.append(name);
+                descs.append(qxt_qt_options[i+1]);
+                name = "";
+            }
+        }
+    }
+
+    int ct = names.count();
+    QString line, wrap(maxNameLength + 3, ' ');
+    for (int i = 0; i < ct; i++)
+    {
+        if (names[i].isEmpty())
+        {
+            // Section headers have no name entry
+            stream << endl << descs[i] << ":" << endl;
+            continue;
+        }
+        line = ' ' + names[i] + QString(maxNameLength - names[i].length() + 2, ' ');
+        foreach(const QString& word, descs[i].split(' ', QString::SkipEmptyParts))
+        {
+            if (qxt_d().screenWidth > 0 && line.length() + word.length() >= qxt_d().screenWidth)
+            {
+                stream << line << endl;
+                line = wrap;
+            }
+            line += word + ' ';
+        }
+        stream << line << endl;
+    }
+}

companion/src/qxtcommandoptions/qxtcommandoptions.h

@@ -0,0 +1,124 @@
+/****************************************************************************
+ **
+ ** Copyright (C) Qxt Foundation. Some rights reserved.
+ **
+ ** This file is part of the QxtCore module of the Qxt library.
+ **
+ ** This library is free software; you can redistribute it and/or modify it
+ ** under the terms of the Common Public License, version 1.0, as published
+ ** by IBM, and/or under the terms of the GNU Lesser General Public License,
+ ** version 2.1, as published by the Free Software Foundation.
+ **
+ ** This file is provided "AS IS", without WARRANTIES OR CONDITIONS OF ANY
+ ** KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
+ ** WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR
+ ** FITNESS FOR A PARTICULAR PURPOSE.
+ **
+ ** You should have received a copy of the CPL and the LGPL along with this
+ ** file. See the LICENSE file and the cpl1.0.txt/lgpl-2.1.txt files
+ ** included with the source distribution for more information.
+ ** If you did not receive a copy of the licenses, contact the Qxt Foundation.
+ **
+ ** <http://libqxt.org>  <foundation@libqxt.org>
+ **
+ ****************************************************************************/
+
+#ifndef QXTCOMMANDOPTIONS_H
+#define QXTCOMMANDOPTIONS_H
+#include <qxtglobal.h>
+#include <QStringList>
+#include <QVariant>
+#include <QCoreApplication>     // for Q_DECLARE_TR_FUNCTIONS
+#include <QMultiHash>
+#include <QFlags>
+class QxtCommandOptionsPrivate;
+QT_FORWARD_DECLARE_CLASS(QTextStream)
+QT_FORWARD_DECLARE_CLASS(QIODevice)
+
+
+class QXT_CORE_EXPORT QxtCommandOptions
+{
+    Q_DECLARE_TR_FUNCTIONS(QxtCommandOptions)
+
+public:
+    /*!
+     * \enum QxtCommandOptions::FlagStyle
+     * This enum type defines which type of option prefix is used.
+     * Slash is the default on Windows.
+     * DoubleDash is the default on all other platforms.
+     */
+    enum FlagStyle
+    {
+        DoubleDash,         /*!< Two dashes (GNU-style) */
+        SingleDash,         /*!< One dash (UNIX-style) */
+        Slash               /*!< Forward slash (Windows-style) */
+    };
+    /*!
+     * \enum QxtCommandOptions::ParamStyle
+     * This enum type defines what syntax is used for options that
+     * require parameters. Equals is the default on Windows.
+     * SpaceAndEquals is the default on all other platforms.
+     */
+    enum ParamStyle
+    {
+        Space = 1,          /*!< Space ("-option value") */
+        Equals = 2,         /*!< Equals sign ("/option=value") */
+        SpaceAndEquals = 3  /*!< Accept either */
+    };
+    /*!
+     * \enum QxtCommandOptions::ParamType
+     * \flags QxtCommandOptions::ParamTypes
+     * This enum type is used to specify flags that control the
+     * interpretation of an option.
+     *
+     * The ParamTypes type is a typedef for QFlags<ParamType>. It stores
+     * an OR combination of ParamType values.
+     */
+    enum ParamType
+    {
+        NoValue = 0,                /*!< The option does not accept a value. */
+        ValueOptional = 1,          /*!< The option may accept a value. */
+        ValueRequired = 2,          /*!< The option requires a value. */
+        Optional = ValueOptional,   /*!< The option may accept a value. Deprecated in favor of ValueOptional. */
+        Required = ValueRequired,   /*!< The option requires a value. Deprecated in favor of ValueRequired. */
+        AllowMultiple = 4,          /*!< The option may be passed multiple times. */
+        Undocumented = 8            /*!< The option is not output in the help text. */
+    };
+    Q_DECLARE_FLAGS(ParamTypes, ParamType)
+
+    QxtCommandOptions();
+
+    void setFlagStyle(FlagStyle style);
+    FlagStyle flagStyle() const;
+    void setParamStyle(ParamStyle style);
+    ParamStyle paramStyle() const;
+    void setScreenWidth(quint16 width);
+    quint16 screenWidth() const;
+
+    void addSection(const QString& name);
+    void add(const QString& name, const QString& desc = QString(), ParamTypes paramType = NoValue, int group = -1);
+    void alias(const QString& from, const QString& to);
+
+    QStringList positional() const;
+    QStringList unrecognized() const;
+    int count(const QString& name) const;
+    QVariant value(const QString& name) const;
+    QMultiHash<QString, QVariant> parameters() const;
+
+    void parse(int argc, char** argv);
+    void parse(QStringList params);
+
+    void showUsage(bool showQtOptions = false, QIODevice* device = 0) const;
+    void showUsage(bool showQtOptions, QTextStream& stream) const;
+    QString getUsage(bool showQtOptions = false) const;
+
+    bool showUnrecognizedWarning(QIODevice* device = 0) const;
+    bool showUnrecognizedWarning(QTextStream& stream) const;
+    QString getUnrecognizedWarning() const;
+
+private:
+    QXT_DECLARE_PRIVATE(QxtCommandOptions)
+};
+Q_DECLARE_OPERATORS_FOR_FLAGS(QxtCommandOptions::ParamTypes)
+
+#endif // QXTCOMMANDOPTIONS_H

companion/src/qxtcommandoptions/qxtglobal.h

@@ -0,0 +1,207 @@
+/****************************************************************************
+ **
+ ** Copyright (C) Qxt Foundation. Some rights reserved.
+ **
+ ** This file is part of the QxtCore module of the Qxt library.
+ **
+ ** This library is free software; you can redistribute it and/or modify it
+ ** under the terms of the Common Public License, version 1.0, as published
+ ** by IBM, and/or under the terms of the GNU Lesser General Public License,
+ ** version 2.1, as published by the Free Software Foundation.
+ **
+ ** This file is provided "AS IS", without WARRANTIES OR CONDITIONS OF ANY
+ ** KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY
+ ** WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR
+ ** FITNESS FOR A PARTICULAR PURPOSE.
+ **
+ ** You should have received a copy of the CPL and the LGPL along with this
+ ** file. See the LICENSE file and the cpl1.0.txt/lgpl-2.1.txt files
+ ** included with the source distribution for more information.
+ ** If you did not receive a copy of the licenses, contact the Qxt Foundation.
+ **
+ ** <http://libqxt.org>  <foundation@libqxt.org>
+ **
+ ****************************************************************************/
+
+#ifndef QXTGLOBAL_H
+#define QXTGLOBAL_H
+
+#include <QtGlobal>
+
+#define QXT_VERSION 0x000602
+#define QXT_VERSION_STR "0.6.2"
+
+//--------------------------global macros------------------------------
+
+#ifndef QXT_NO_MACROS
+
+#endif // QXT_NO_MACROS
+
+//--------------------------export macros------------------------------
+
+#define QXT_DLLEXPORT DO_NOT_USE_THIS_ANYMORE
+
+#if !defined(QXT_STATIC)
+#    if defined(BUILD_QXT_CORE)
+#        define QXT_CORE_EXPORT Q_DECL_EXPORT
+#    else
+#        define QXT_CORE_EXPORT Q_DECL_IMPORT
+#    endif
+#else
+#    define QXT_CORE_EXPORT
+#endif // BUILD_QXT_CORE
+ 
+#if !defined(QXT_STATIC)
+#    if defined(BUILD_QXT_GUI)
+#        define QXT_GUI_EXPORT Q_DECL_EXPORT
+#    else
+#        define QXT_GUI_EXPORT Q_DECL_IMPORT
+#    endif
+#else
+#    define QXT_GUI_EXPORT
+#endif // BUILD_QXT_GUI
+ 
+#if !defined(QXT_STATIC)
+#    if defined(BUILD_QXT_NETWORK)
+#        define QXT_NETWORK_EXPORT Q_DECL_EXPORT
+#    else
+#        define QXT_NETWORK_EXPORT Q_DECL_IMPORT
+#    endif
+#else
+#    define QXT_NETWORK_EXPORT
+#endif // BUILD_QXT_NETWORK
+ 
+#if !defined(QXT_STATIC)
+#    if defined(BUILD_QXT_SQL)
+#        define QXT_SQL_EXPORT Q_DECL_EXPORT
+#    else
+#        define QXT_SQL_EXPORT Q_DECL_IMPORT
+#    endif
+#else
+#    define QXT_SQL_EXPORT
+#endif // BUILD_QXT_SQL
+ 
+#if !defined(QXT_STATIC)
+#    if defined(BUILD_QXT_WEB)
+#        define QXT_WEB_EXPORT Q_DECL_EXPORT
+#    else
+#        define QXT_WEB_EXPORT Q_DECL_IMPORT
+#    endif
+#else
+#    define QXT_WEB_EXPORT
+#endif // BUILD_QXT_WEB
+ 
+#if !defined(QXT_STATIC)
+#    if defined(BUILD_QXT_BERKELEY)
+#        define QXT_BERKELEY_EXPORT Q_DECL_EXPORT
+#    else
+#        define QXT_BERKELEY_EXPORT Q_DECL_IMPORT
+#    endif
+#else
+#    define QXT_BERKELEY_EXPORT
+#endif // BUILD_QXT_BERKELEY
+
+#if !defined(QXT_STATIC)
+#    if defined(BUILD_QXT_ZEROCONF)
+#        define QXT_ZEROCONF_EXPORT Q_DECL_EXPORT
+#    else
+#        define QXT_ZEROCONF_EXPORT Q_DECL_IMPORT
+#    endif
+#else
+#    define QXT_ZEROCONF_EXPORT
+#endif // QXT_ZEROCONF_EXPORT
+
+#if defined BUILD_QXT_CORE || defined BUILD_QXT_GUI || defined  BUILD_QXT_SQL || defined BUILD_QXT_NETWORK || defined BUILD_QXT_WEB || defined BUILD_QXT_BERKELEY || defined BUILD_QXT_ZEROCONF
+#   define BUILD_QXT
+#endif
+
+QXT_CORE_EXPORT const char* qxtVersion();
+
+#ifndef QT_BEGIN_NAMESPACE
+#define QT_BEGIN_NAMESPACE
+#endif
+
+#ifndef QT_END_NAMESPACE
+#define QT_END_NAMESPACE
+#endif
+
+#ifndef QT_FORWARD_DECLARE_CLASS
+#define QT_FORWARD_DECLARE_CLASS(Class) class Class;
+#endif
+
+/****************************************************************************
+** This file is derived from code bearing the following notice:
+** The sole author of this file, Adam Higerd, has explicitly disclaimed all
+** copyright interest and protection for the content within. This file has
+** been placed in the public domain according to United States copyright
+** statute and case law. In jurisdictions where this public domain dedication
+** is not legally recognized, anyone who receives a copy of this file is
+** permitted to use, modify, duplicate, and redistribute this file, in whole
+** or in part, with no restrictions or conditions. In these jurisdictions,
+** this file shall be copyright (C) 2006-2008 by Adam Higerd.
+****************************************************************************/
+
+#define QXT_DECLARE_PRIVATE(PUB) friend class PUB##Private; QxtPrivateInterface<PUB, PUB##Private> qxt_d;
+#define QXT_DECLARE_PUBLIC(PUB) friend class PUB;
+#define QXT_INIT_PRIVATE(PUB) qxt_d.setPublic(this);
+#define QXT_D(PUB) PUB##Private& d = qxt_d()
+#define QXT_P(PUB) PUB& p = qxt_p()
+
+template <typename PUB>
+class QxtPrivate
+{
+public:
+    virtual ~QxtPrivate()
+    {}
+    inline void QXT_setPublic(PUB* pub)
+    {
+        qxt_p_ptr = pub;
+    }
+
+protected:
+    inline PUB& qxt_p()
+    {
+        return *qxt_p_ptr;
+    }
+    inline const PUB& qxt_p() const
+    {
+        return *qxt_p_ptr;
+    }
+
+private:
+    PUB* qxt_p_ptr;
+};
+
+template <typename PUB, typename PVT>
+class QxtPrivateInterface
+{
+    friend class QxtPrivate<PUB>;
+public:
+    QxtPrivateInterface()
+    {
+        pvt = new PVT;
+    }
+    ~QxtPrivateInterface()
+    {
+        delete pvt;
+    }
+
+    inline void setPublic(PUB* pub)
+    {
+        pvt->QXT_setPublic(pub);
+    }
+    inline PVT& operator()()
+    {
+        return *static_cast<PVT*>(pvt);
+    }
+    inline const PVT& operator()() const
+    {
+        return *static_cast<PVT*>(pvt);
+    }
+private:
+    QxtPrivateInterface(const QxtPrivateInterface&) { }
+    QxtPrivateInterface& operator=(const QxtPrivateInterface&) { }
+    QxtPrivate<PUB>* pvt;
+};
+
+#endif // QXT_GLOBAL