OpenTX 2.1.9

* Skip first record when calculating replay speed and set minimum replay speed to 100 ms.
Fixes issue 3708

* Cosmetics

.gitignore

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

.travis.yml

@@ -7,7 +7,7 @@ before_install:
     - 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
+  - sudo apt-get install --yes --force-yes 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

DONATIONS.txt

@@ -9,6 +9,7 @@
 <a href="http://openpilot.com">David Ankers (OpenPilot)</a>
 <a href="http://3drobotics.com">3D Robotics</a>
 <a href="http://rcstudio.cz">RC Studio (monthly)</a>
+<a href="http://www.craftandtheoryllc.com">Craft & Theory (monthly)</a>
 
 Mario Sette
 Felice Baratto
@@ -48,11 +49,9 @@ R. Scott Page
 Johan Cronje
 Renato Aranghelovici
 Jeffrey Irvin
-John Rodgers
 Kenneth Crump
 Damjan Adamic
 Martin Wilson
-Joe Street
 John Holdsworth
 Daniel Schwartz
 Dean Church (monthly)
@@ -148,7 +147,6 @@ Mike Matheny
 Martin Sniedze
 Fernando Rimoldi
 Sidney Fisher
-Bruce Anderson
 John Rodgers
 Ed Pare
 Thomas Kilduff
@@ -335,7 +333,6 @@ Jose Sobral
 Heung Jin Choi
 Tomasz Janiak
 Fabien Gagné
-Joe Street
 Micha Ronen
 Albert Blondin
 Klaus Schuebel
@@ -850,3 +847,167 @@ 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
+David McDonald
+Tauno Rautakorpi
+Carsten Schlassa
+Angel de la Dehesa Calles
+Michel Garbarin
+Algirdas Tamosiunas
+Petr Kysela
+Pascal Roux
+Robert Whitfield
+InTheTubeDeep
+Jaromir Malek
+Joe Street
+Regin Poulsen
+Hervé Laveyssiere
+Walter Fowler 
+Richard Wagner
+Kevin Hyman
+Herald Reichel
+Frederic Rouyre
+David Libby
+Hans Timmermans
+Adrian De Zee
+John Hanagan
+Didier van Steensel
+Julius Vicze
+Cristiano Merighi
+James Holley
+Chris Merry
+Jiri Fojtasek
+Thierry Laligand
+Hassouna Cherif
+Fred Thijssen
+Andrew Gardiner
+Christian Niß
+Douglas Penney
+Starck Associates
+Johannes Wollenweber
+Fred Page
+Jean Trouche
+Patrick Blanc
+Jean-Louis Tonnellier
+Masoud
+Mustafa Güven
+William Waters
+Joël Allamy
+William Mckinstry 
+Jean-Jacques Pointel
+Frédéric Rouyre
+Jonathan Pruett
+Jörg Zieren
+Christopher Rhodes
+Marco Strack
+Stefano Boggia
+Dwayne Myers
+Stavros Papathanasiou
+Roland Nittby
+Courtney Puskas
+NorthSide
+Martin Polák
+Ulf Reinhardt
+Wolfgang Renisch
+Trevor Hinze
+Mohammad Zargari
+Dr. Willutzki
+Jean Pierre Bernard
+Patrick Castellan
+Udo Tödter
+Marc J Merlin 
+Paul Chitonu
+Wolfgang Rauser
+Emmanuel Dallery
+James Lyons
+Tauno Rautakorpi
+Gerald Peklar
+Fabien Gagné
+David Cox
+Philip Cork
+Kevin Wright
+John Scott
+Yves Berger
+Otto Fröhlich
+Kenneth Lilja
+Benjamin Johnson
+Brad Kelley
+Michel Biancki
+Lynn Laycock
+Claude Godefroy
+Gérald Joubert
+Wayne J Podaima
+Philippe Peyron
+Julien Kieffer
+Gregor Walter 
+Carlos Viegas
+Roberto Orsello
+Steve Murray (monthly)
+Marcel Schäfer
+Sean Cull
+Holger Bothmer
+Michael Manning
+Martin Risik
+ZEN Computer Services
+Egbert Stohlmann
+Martin Peryea
+Nathan James
+Luis Suarez
+Artur Uzieblo
+InTheTubeDeep
+Jaap Greve
+Peter Glassey
+David Reynolds
+David Frazier
+Donald L Singer
+George Carnie
+Susan Holbert 
+Richard Garrett
+Paco Galván
+Matthew Sylvester
+Robert Bates
+Hans-Peter Endres
+Axel Stöckle
+Leonard MacKey
+Andrew Fernie
+Mark McCoy
+Damir Pooshs
+Jeff Dillingham
+Brent Hampton

README.md

@@ -1,9 +1,16 @@
 ##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)
+[![Join the chat at https://opentx.rocket.chat](https://camo.githubusercontent.com/3d659054abd6ce21c0e47cf3b83a51bda69ca282/68747470733a2f2f64656d6f2e726f636b65742e636861742f696d616765732f6a6f696e2d636861742e737667)](https://opentx.rocket.chat)
 [![Donate using Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DJ9MASSKVW8WN)
 
 The ongoing development on 2.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.
+Refer to the [OpenTX wiki](https://github.com/opentx/opentx/wiki) for information about setting up the tool chains for building OpenTX and OpenTX Companion as well as other development related issues.
+
+Useful links:
+ * OpenTX Blog http://blog.open-tx.org/
+ * OpenTX Main Site http://www.open-tx.org/
+ * OpenTx University http://open-txu.org/
+ * OpenTX User Manual https://www.gitbook.com/book/opentx/opentx-taranis-manual/details
+ * OpenTX Lua Reference Guide https://www.gitbook.com/book/opentx/opentx-lua-reference-guide/details

companion/releasenotes.txt

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

companion/src/CMakeLists.txt

@@ -2,7 +2,7 @@ PROJECT( companion )
 
 SET(C9X_VERSION_MAJOR "2")
 SET(C9X_VERSION_MINOR "1")
-SET(C9X_VERSION_REVISION "6")
+SET(C9X_VERSION_REVISION "9")
 SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
 
 SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})
@@ -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 )
@@ -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 )
@@ -117,6 +126,7 @@ include_directories(
   ${PROJECT_SOURCE_DIR}/shared
   ${SIMU_SRC_DIRECTORY}
   ${XSD_INCLUDE_DIR}
+  ${PROJECT_SOURCE_DIR}/qxtcommandoptions
 )
 
 add_subdirectory(shared)
@@ -125,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
@@ -340,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 ####################
 
@@ -474,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

@@ -312,6 +312,8 @@ QString Profile::speaker()       const { return _speaker;       }
 QString Profile::stickPotCalib() const { return _stickPotCalib; }
 QString Profile::timeStamp()     const { return _timeStamp;     }
 QString Profile::trainerCalib()  const { return _trainerCalib;  }
+QString Profile::controlTypes()  const { return _controlTypes;  }
+QString Profile::controlNames()  const { return _controlNames;  }
 int     Profile::txCurrentCalibration()  const { return _txCurrentCalibration;  }
 int     Profile::gsStickMode()   const { return _gsStickMode;   }
 int     Profile::ppmMultiplier() const { return _ppmMultiplier; }
@@ -342,6 +344,8 @@ void Profile::speaker       (const QString x) { store(x, _speaker,       "Speake
 void Profile::stickPotCalib (const QString x) { store(x, _stickPotCalib, "StickPotCalib"         ,"Profiles", QString("profile%1").arg(index));}
 void Profile::timeStamp     (const QString x) { store(x, _timeStamp,     "TimeStamp"             ,"Profiles", QString("profile%1").arg(index));}
 void Profile::trainerCalib  (const QString x) { store(x, _trainerCalib,  "TrainerCalib"          ,"Profiles", QString("profile%1").arg(index));}
+void Profile::controlTypes  (const QString x) { store(x, _controlTypes,  "ControlTypes"          ,"Profiles", QString("profile%1").arg(index));}
+void Profile::controlNames  (const QString x) { store(x, _controlNames,  "ControlNames"          ,"Profiles", QString("profile%1").arg(index));}
 void Profile::txCurrentCalibration  (const int x) { store(x, _txCurrentCalibration, "currentCalib","Profiles", QString("profile%1").arg(index));}
 void Profile::gsStickMode   (const int     x) { store(x, _gsStickMode,   "GSStickMode"           ,"Profiles", QString("profile%1").arg(index));}
 void Profile::ppmMultiplier (const int     x) { store(x, _ppmMultiplier, "PPM_Multiplier"        ,"Profiles", QString("profile%1").arg(index));}
@@ -378,6 +382,8 @@ Profile& Profile::operator=(const Profile& rhs)
     speaker      ( rhs.speaker()       );
     stickPotCalib( rhs.stickPotCalib() );
     trainerCalib ( rhs.trainerCalib()  );
+    controlTypes ( rhs.controlTypes()  );
+    controlNames ( rhs.controlNames()  );
     txCurrentCalibration ( rhs.txCurrentCalibration()  );
     gsStickMode  ( rhs.gsStickMode()   );
     ppmMultiplier( rhs.ppmMultiplier() );
@@ -423,6 +429,8 @@ void Profile::initFwVariables()
     _stickPotCalib = "";
     _timeStamp =     "";
     _trainerCalib =  "";
+    _controlTypes =  "";
+    _controlNames =  "";
 
     _txCurrentCalibration =  0;
     _gsStickMode =   0;
@@ -483,6 +491,8 @@ void Profile::flush()
     getset( _stickPotCalib, "StickPotCalib"         ,""     ,"Profiles", QString("profile%1").arg(index));
     getset( _timeStamp,     "TimeStamp"             ,""     ,"Profiles", QString("profile%1").arg(index));
     getset( _trainerCalib,  "TrainerCalib"          ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _controlTypes,  "ControlTypes"          ,""     ,"Profiles", QString("profile%1").arg(index));
+    getset( _controlNames,  "ControlNames"          ,""     ,"Profiles", QString("profile%1").arg(index));
     getset( _txCurrentCalibration,  "currentCalib"          ,0      ,"Profiles", QString("profile%1").arg(index));
     getset( _gsStickMode,   "GSStickMode"           ,0      ,"Profiles", QString("profile%1").arg(index));
     getset( _ppmMultiplier, "PPM_Multiplier"        ,0      ,"Profiles", QString("profile%1").arg(index));
@@ -737,7 +747,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/appdata.h

@@ -125,6 +125,8 @@ class Profile: protected CompStoreObj
     QString _stickPotCalib;
     QString _timeStamp;
     QString _trainerCalib;
+    QString _controlTypes;
+    QString _controlNames;
     int     _txCurrentCalibration;
     int     _gsStickMode;
     int     _ppmMultiplier;
@@ -156,6 +158,8 @@ class Profile: protected CompStoreObj
     QString stickPotCalib() const;
     QString timeStamp() const;
     QString trainerCalib() const;
+    QString controlTypes() const;
+    QString controlNames() const;
     int     txCurrentCalibration() const;
     int     gsStickMode() const;
     int     ppmMultiplier() const;
@@ -186,6 +190,8 @@ class Profile: protected CompStoreObj
     void stickPotCalib (const QString);
     void timeStamp     (const QString);
     void trainerCalib  (const QString);
+    void controlTypes  (const QString);
+    void controlNames  (const QString);
     void txCurrentCalibration  (const int);
     void gsStickMode   (const int);
     void ppmMultiplier (const int);

companion/src/eeprominterface.cpp

@@ -1410,7 +1410,7 @@ void ModelData::clear()
     moduleData[1].protocol = PULSES_OFF;
   }
   for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
-    flightModeData[i].clear();
+    flightModeData[i].clear(i);
   }
   clearInputs();
   clearMixes();
@@ -1523,9 +1523,7 @@ int ModelData::getTrimValue(int phaseIdx, int trimIdx)
       }
       else {
         phaseIdx = phase.trimRef[trimIdx];
-        if (phase.trimMode[trimIdx] == 0)
-          result = 0;
-        else
+        if (phase.trimMode[trimIdx] != 0)
           result += phase.trim[trimIdx];
       }
     }
@@ -1538,16 +1536,57 @@ bool ModelData::isGVarLinked(int phaseIdx, int gvarIdx)
   return flightModeData[phaseIdx].gvars[gvarIdx] > 1024;
 }
 
-int ModelData::getGVarValue(int phaseIdx, int gvarIdx)
+bool ModelData::isGVarLinkedCircular(int phaseIdx, int gvarIdx)
 {
-  int idx = flightModeData[phaseIdx].gvars[gvarIdx];
-  for (int i=0; idx>1024 && i<C9X_MAX_FLIGHT_MODES; i++) {
-    int nextPhase = idx - 1025;
+  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
+    int val = flightModeData[phaseIdx].gvars[gvarIdx];
+    if ((phaseIdx==0) || (val<=1024)) return false;
+    int nextPhase = val - 1025;
     if (nextPhase >= phaseIdx) nextPhase += 1;
     phaseIdx = nextPhase;
-    idx = flightModeData[phaseIdx].gvars[gvarIdx];
   }
-  return idx;
+  return true;
+}
+
+int ModelData::getGVarValue(int phaseIdx, int gvarIdx)
+{
+  for (int i=0; i<C9X_MAX_FLIGHT_MODES; i++) {
+    int val = flightModeData[phaseIdx].gvars[gvarIdx];
+    if ((phaseIdx==0) || (val<=1024)) return val;
+    int nextPhase = val - 1025;
+    if (nextPhase >= phaseIdx) nextPhase += 1;
+    phaseIdx = nextPhase;
+  }
+  return flightModeData[0].gvars[gvarIdx];  // circular linked
+}
+
+bool ModelData::isRELinked(int phaseIdx, int reIdx)
+{
+  return flightModeData[phaseIdx].rotaryEncoders[reIdx] > 1024;
+}
+
+bool ModelData::isRELinkedCircular(int phaseIdx, int reIdx)
+{
+  for (int i=0; i<C9X_MAX_ENCODERS; i++) {
+    int val = flightModeData[phaseIdx].rotaryEncoders[reIdx];
+    if ((phaseIdx==0) || (val<=1024)) return false;
+    int nextPhase = val - 1025;
+    if (nextPhase >= phaseIdx) nextPhase += 1;
+    phaseIdx = nextPhase;
+  }
+  return true;
+}
+
+int ModelData::getREValue(int phaseIdx, int reIdx)
+{
+  for (int i=0; i<C9X_MAX_ENCODERS; i++) {
+    int val = flightModeData[phaseIdx].rotaryEncoders[reIdx];
+    if ((phaseIdx==0) || (val<=1024)) return val;
+    int nextPhase = val - 1025;
+    if (nextPhase >= phaseIdx) nextPhase += 1;
+    phaseIdx = nextPhase;
+  }
+  return flightModeData[0].rotaryEncoders[reIdx];  // circular linked
 }
 
 void ModelData::setTrimValue(int phaseIdx, int trimIdx, int value)
@@ -1843,3 +1882,17 @@ SimulatorInterface *GetCurrentFirmwareSimulator()
   else
     return NULL;
 }
+
+void FlightModeData::clear(const int phase)
+{
+  memset(this, 0, sizeof(FlightModeData));
+  if (phase != 0) {
+    for (int idx=0; idx<C9X_MAX_GVARS; idx++) {
+      gvars[idx] = 1025;
+    }
+    for (int idx=0; idx<C9X_MAX_ENCODERS; idx++) {
+      rotaryEncoders[idx] = 1025;
+    }
+  }
+}
+

companion/src/eeprominterface.h

@@ -632,7 +632,7 @@ class CustomFunctionData { // Function Switches data
 
 class FlightModeData {
   public:
-    FlightModeData() { clear(); }
+    FlightModeData() { clear(0); }
     int trimMode[NUM_STICKS];
     int trimRef[NUM_STICKS];
     int trim[NUM_STICKS];
@@ -640,9 +640,9 @@ class FlightModeData {
     char name[10+1];
     unsigned int fadeIn;
     unsigned int fadeOut;
-    int rotaryEncoders[2];
+    int rotaryEncoders[C9X_MAX_ENCODERS];
     int gvars[C9X_MAX_GVARS];
-    void clear() { memset(this, 0, sizeof(FlightModeData)); }
+    void clear(const int phase);
 };
 
 class SwashRingData { // Swash Ring data
@@ -841,6 +841,8 @@ enum PulsesProtocol {
   PULSES_PXX_XJT_D8,
   PULSES_PXX_XJT_LR12,
   PULSES_PXX_DJT,
+  PULSES_CROSSFIRE,
+  PULSES_MULTIMODULE,
   PULSES_PROTOCOL_LAST
 };
 
@@ -1076,8 +1078,13 @@ class ModelData {
     void setTrimValue(int phaseIdx, int trimIdx, int value);
 
     bool isGVarLinked(int phaseIdx, int gvarIdx);
+    bool isGVarLinkedCircular(int phaseIdx, int gvarIdx);
     int getGVarValue(int phaseIdx, int gvarIdx);
 
+    bool isRELinked(int phaseIdx, int reIdx);
+    bool isRELinkedCircular(int phaseIdx, int reIdx);
+    int getREValue(int phaseIdx, int reIdx);
+
     ModelData removeGlobalVars();
 
     void clearMixes();
@@ -1623,7 +1630,9 @@ class Firmware {
     }
 
     virtual int getCapability(const Capability) = 0;
-
+    
+    virtual QTime getMaxTimerStart() = 0;
+    
     virtual bool isTelemetrySourceAvailable(int source) = 0;
 
     virtual int isAvailable(PulsesProtocol proto, int port=0) = 0;

companion/src/firmwares/er9x/er9xinterface.cpp

@@ -17,7 +17,6 @@
 #include <iostream>
 #include "er9xinterface.h"
 #include "er9xeeprom.h"
-#include "simulator/er9xsimulator.h"
 #include "file.h"
 #include "appdata.h"
 

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

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

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

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

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

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

companion/src/firmwares/ersky9x/ersky9xinterface.cpp

@@ -17,7 +17,6 @@
 #include <iostream>
 #include "ersky9xinterface.h"
 #include "ersky9xeeprom.h"
-#include "simulator/ersky9xsimulator.h"
 #include "file.h"
 
 #define FILE_TYP_GENERAL 1

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

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

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

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

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

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

companion/src/firmwares/opentx/opentxeeprom.cpp

@@ -296,7 +296,7 @@ class SourcesConversionTable: public ConversionTable {
             addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
           }
         }
-        else  {
+        else {
           if (afterrelease21March2013) {
             if ((board != BOARD_STOCK && (board!=BOARD_M128 || version<215)) || (variant & GVARS_VARIANT)) {
               for (int i=0; i<MAX_GVARS(board, version); i++) {
@@ -305,25 +305,25 @@ class SourcesConversionTable: public ConversionTable {
             }
           }
 
-          for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
-            if (version < 216) {
-              if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_ASPEED || i==TELEMETRY_SOURCE_DTE || i==TELEMETRY_SOURCE_CELL_MIN || i==TELEMETRY_SOURCE_CELLS_MIN || i==TELEMETRY_SOURCE_VFAS_MIN)
+          if (IS_ARM(board)) {
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 0), val++); // BATT
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 1), val++); // TIME
+            val += 5;
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 2), val++); // Timer1
+            addConversion(RawSource(SOURCE_TYPE_SPECIAL, 3), val++); // Timer2
+          }
+          else {
+            for (int i=0; i<TELEMETRY_SOURCE_ACC; i++) {
+              if (version < 216) {
+                if (i == TELEMETRY_SOURCE_TX_TIME || i == TELEMETRY_SOURCE_SWR || i == TELEMETRY_SOURCE_A3 ||
+                    i == TELEMETRY_SOURCE_A4 || i == TELEMETRY_SOURCE_ASPEED || i == TELEMETRY_SOURCE_DTE ||
+                    i == TELEMETRY_SOURCE_CELL_MIN || i == TELEMETRY_SOURCE_CELLS_MIN || i == TELEMETRY_SOURCE_VFAS_MIN)
+                  continue;
+              }
+              if (i == TELEMETRY_SOURCE_TX_TIME || i == TELEMETRY_SOURCE_SWR || i == TELEMETRY_SOURCE_A3 ||
+                  i == TELEMETRY_SOURCE_A4 || i == TELEMETRY_SOURCE_A3_MIN || i == TELEMETRY_SOURCE_A4_MIN)
                 continue;
-            }
-            if (!IS_ARM(board)) {
-              if (i==TELEMETRY_SOURCE_TX_TIME || i==TELEMETRY_SOURCE_SWR || i==TELEMETRY_SOURCE_A3 || i==TELEMETRY_SOURCE_A4 || i==TELEMETRY_SOURCE_A3_MIN || i==TELEMETRY_SOURCE_A4_MIN)
-                continue;
-            }
-            addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
-            if (version >= 216 && IS_ARM(board)) {
-              if (i==TELEMETRY_SOURCE_RSSI_RX)
-                val += 1;
-              if (i==TELEMETRY_SOURCE_TX_TIME)
-                val += 5;
-              if (i==TELEMETRY_SOURCE_DTE)
-                val += 5;
-              if (i==TELEMETRY_SOURCE_POWER_MAX)
-                val += 5;
+              addConversion(RawSource(SOURCE_TYPE_TELEMETRY, i), val++);
             }
           }
         }
@@ -741,6 +741,14 @@ class CurveReferenceField: public TransformedField {
     int _curve_value;
 };
 
+static int exportHeliInversionWeight(int source) {
+  return (source < 0) ? 1 : 0;
+}
+
+static int importHeliInversionWeight(int source) {
+  return source ? -100: 100;
+}
+
 class HeliField: public StructField {
   public:
     HeliField(SwashRingData & heli, BoardEnum board, unsigned int version, unsigned int variant)
@@ -756,22 +764,15 @@ class HeliField: public StructField {
         Append(new SignedField<8>(heli.elevatorWeight));
       }
       else {
-        Append(new BoolField<1>(invertELE));
-        Append(new BoolField<1>(invertAIL));
-        Append(new BoolField<1>(invertCOL));
+        Append(new ConversionField< SignedField<1> >(heli.elevatorWeight, exportHeliInversionWeight, importHeliInversionWeight));
+        Append(new ConversionField< SignedField<1> >(heli.aileronWeight, exportHeliInversionWeight, importHeliInversionWeight));
+        Append(new ConversionField< SignedField<1> >(heli.collectiveWeight, exportHeliInversionWeight, importHeliInversionWeight));
         Append(new UnsignedField<5>(heli.type));
         Append(new SourceField<8>(heli.collectiveSource, board, version, variant));
         //, FLAG_NOSWITCHES)); Fix shift in collective
         Append(new UnsignedField<8>(heli.value));
       }
     }
-
-  // TODO before + after
-
-  protected:
-    bool invertELE;
-    bool invertAIL;
-    bool invertCOL;
 };
 
 class FlightModeField: public TransformedField {
@@ -2170,7 +2171,7 @@ class ArmCustomFunctionField: public TransformedField {
 
       if (fn.func >= FuncOverrideCH1 && fn.func <= FuncOverrideCH32) {
         fn.func = AssignFunc(fn.func + index);
-        fn.param = (int8_t)value;
+        fn.param = (int16_t)(uint16_t)value;
       }
       else if (fn.func >= FuncSetTimer1 && fn.func <= FuncSetTimer3) {
         fn.func = AssignFunc(fn.func + index);
@@ -2211,8 +2212,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);
       }
@@ -2822,7 +2824,7 @@ class SensorField: public TransformedField {
         _instance = sensor.formula;
         if (sensor.formula == SensorData::TELEM_FORMULA_CELL)
           _param = (sensor.source) + (sensor.index << 8);
-        else if (sensor.formula == SensorData::TELEM_FORMULA_ADD || sensor.formula == SensorData::TELEM_FORMULA_MULTIPLY || sensor.formula == SensorData::TELEM_FORMULA_MIN || sensor.formula == SensorData::TELEM_FORMULA_MAX)
+        else if (sensor.formula == SensorData::TELEM_FORMULA_ADD || sensor.formula == SensorData::TELEM_FORMULA_AVERAGE || sensor.formula == SensorData::TELEM_FORMULA_MULTIPLY || sensor.formula == SensorData::TELEM_FORMULA_MIN || sensor.formula == SensorData::TELEM_FORMULA_MAX)
           _param = ((uint8_t)sensor.sources[0]) + ((uint8_t)sensor.sources[1] << 8) + ((uint8_t)sensor.sources[2] << 16) + ((uint8_t)sensor.sources[3] << 24);
         else if (sensor.formula == SensorData::TELEM_FORMULA_DIST)
           _param = (sensor.gps) + (sensor.alt << 8);
@@ -2844,7 +2846,7 @@ class SensorField: public TransformedField {
         sensor.formula = _instance;
         if (sensor.formula == SensorData::TELEM_FORMULA_CELL)
           (sensor.source = _sources[0], sensor.index = _sources[1]);
-        else if (sensor.formula == SensorData::TELEM_FORMULA_ADD || sensor.formula == SensorData::TELEM_FORMULA_MULTIPLY || sensor.formula == SensorData::TELEM_FORMULA_MIN || sensor.formula == SensorData::TELEM_FORMULA_MAX)
+        else if (sensor.formula == SensorData::TELEM_FORMULA_ADD || sensor.formula == SensorData::TELEM_FORMULA_AVERAGE || sensor.formula == SensorData::TELEM_FORMULA_MULTIPLY || sensor.formula == SensorData::TELEM_FORMULA_MIN || sensor.formula == SensorData::TELEM_FORMULA_MAX)
           for (int i=0; i<4; ++i)
             sensor.sources[i] = _sources[i];
         else if (sensor.formula == SensorData::TELEM_FORMULA_DIST)

companion/src/firmwares/opentx/opentxeeprom.h

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

companion/src/firmwares/opentx/opentxinterface.cpp

@@ -805,6 +805,16 @@ int OpenTxFirmware::getCapability(const Capability capability)
   }
 }
 
+QTime OpenTxFirmware::getMaxTimerStart()
+{
+  if (IS_TARANIS(board))
+    return QTime(23, 59, 59);
+  else if (IS_ARM(board))
+    return QTime(8, 59, 59);
+  else
+    return QTime(0, 59, 59);
+}
+
 bool OpenTxFirmware::isTelemetrySourceAvailable(int source)
 {
   if (IS_TARANIS(board) && (source == TELEMETRY_SOURCE_RSSI_TX))
@@ -824,9 +834,9 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
         switch (proto) {
           case PULSES_OFF:
           case PULSES_PXX_XJT_X16:
+          case PULSES_PXX_XJT_LR12:
             return 1;
           case PULSES_PXX_XJT_D8:
-          case PULSES_PXX_XJT_LR12:
             return id.contains("eu") ? 0 : 1;
           case PULSES_PPM:
             return id.contains("internalppm") ? 1 : 0;
@@ -845,6 +855,7 @@ int OpenTxFirmware::isAvailable(PulsesProtocol proto, int port)
           case PULSES_LP45:
           case PULSES_DSM2:
           case PULSES_DSMX:
+          case PULSES_CROSSFIRE:
             return 1;
           default:
             return 0;
@@ -1142,7 +1153,7 @@ void addOpenTxTaranisOptions(OpenTxFirmware * firmware)
   Option usb_options[] = { { "massstorage", QObject::tr("Instead of Joystick emulation, USB connection is Mass Storage (as in the Bootloader)") }, { "cli", QObject::tr("Instead of Joystick emulation, USB connection is Command Line Interface") }, { NULL } };
   firmware->addOptions(usb_options);
   firmware->addOption("mixersmon", QObject::tr("Adds mixers output view to the CHANNELS MONITOR screen, pressing [ENT] switches between the views"));
-  firmware->addOption("eu", QObject::tr("Removes D8 and LR12 FrSky protocols that are not legal for use in the EU on radios sold after Jan 1st, 2015"));
+  firmware->addOption("eu", QObject::tr("Removes D8 FrSky protocol support which is not legal for use in the EU on radios sold after Jan 1st, 2015"));
   firmware->addOption("internalppm", QObject::tr("Support for PPM internal module hack"));
 }
 
@@ -1167,8 +1178,109 @@ void registerOpenTxFirmwares()
   Option nav_options[] = { { "rotenc", QObject::tr("Rotary Encoder use in menus navigation") }, { "potscroll", QObject::tr("Pots use in menus navigation") }, { NULL } };
   Option dsm2_options[] = { { "DSM2", QObject::tr("Support for DSM2 modules"), 0 }, { "DSM2PPM", QObject::tr("Support for DSM2 modules using ppm instead of true serial"), 0 }, { NULL } };
 
+  /* Taranis Plus board */
+  firmware = new OpenTxFirmware("opentx-taranisplus", QObject::tr("FrSky Taranis Plus"), BOARD_TARANIS_PLUS);
+  addOpenTxTaranisOptions(firmware);
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
+  /* Taranis board */
+  firmware = new OpenTxFirmware("opentx-taranis", QObject::tr("FrSky Taranis"), BOARD_TARANIS);
+  firmware->addOption("haptic", QObject::tr("Haptic module installed"));
+  addOpenTxTaranisOptions(firmware);
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
+  /* Taranis X9E board */
+  firmware = new OpenTxFirmware("opentx-taranisx9e", QObject::tr("FrSky Taranis X9E"), BOARD_TARANIS_X9E);
+  firmware->addOption("shutdownconfirm", QObject::tr("Confirmation before radio shutdown"));
+  addOpenTxTaranisOptions(firmware);
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
+  /* 9XR-Pro */
+  firmware = new OpenTxFirmware("opentx-9xrpro", QObject::tr("Turnigy 9XR-PRO"), BOARD_9XRPRO);
+  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
+  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  firmware->addOption("nofp", QObject::tr("No flight modes"));
+  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
+  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
+  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
+  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  firmware->addOption("battgraph", QObject::tr("Battery graph"));
+  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
+  /* 9XR board with M128 chip */
+  firmware = new OpenTxFirmware("opentx-9xr128", QObject::tr("Turnigy 9XR with m128 chip"), BOARD_M128);
+  firmware->addOptions(extr_options);
+  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  firmware->addOption("nosplash", QObject::tr("No splash screen"));
+  firmware->addOption("nofp", QObject::tr("No flight modes"));
+  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
+  firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
+  firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
+  // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
+  firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
+  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
+  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  firmware->addOption("battgraph", QObject::tr("Battery graph"));
+  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
+  firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
+  firmware->addOption("imperial", QObject::tr("Imperial units"));
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
+  /* 9XR board */
+  firmware = new OpenTxFirmware("opentx-9xr", QObject::tr("Turnigy 9XR"), BOARD_STOCK);
+  firmware->addOptions(extr_options);
+  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
+  firmware->addOption("nosplash", QObject::tr("No splash screen"));
+  firmware->addOption("nofp", QObject::tr("No flight modes"));
+  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
+  firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
+  firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
+  firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
+  // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
+  firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
+  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
+  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
+  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
+  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
+  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
+  firmware->addOption("battgraph", QObject::tr("Battery graph"));
+  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
+  firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
+  firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
+  firmware->addOption("imperial", QObject::tr("Imperial units"));
+  firmware->addOption("nowshh", QObject::tr("No Winged Shadow How High support"));
+  firmware->addOption("novario", QObject::tr("No vario support"));
+  firmware->addOption("nogps", QObject::tr("No GPS support"));
+  firmware->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
+  firmware->addOption("stickrev", QObject::tr("Add support for reversing stick inputs (e.g. needed for FrSky gimbals)"));
+  addOpenTxCommonOptions(firmware);
+  firmwares.push_back(firmware);
+
   /* 9x board */
-  firmware = new OpenTxFirmware("opentx-9x", QObject::tr("9X board"), BOARD_STOCK);
+  firmware = new OpenTxFirmware("opentx-9x", QObject::tr("9X with stock board"), BOARD_STOCK);
   firmware->addOptions(ext_options);
   firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
   firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
@@ -1204,7 +1316,7 @@ void registerOpenTxFirmwares()
   firmwares.push_back(firmware);
 
   /* 9x board with M128 chip */
-  firmware = new OpenTxFirmware("opentx-9x128", QObject::tr("M128 / 9X board"), BOARD_M128);
+  firmware = new OpenTxFirmware("opentx-9x128", QObject::tr("9X with stock board and m128 chip"), BOARD_M128);
   firmware->addOptions(ext_options);
   firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
   firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
@@ -1233,69 +1345,52 @@ void registerOpenTxFirmwares()
   addOpenTxCommonOptions(firmware);
   firmwares.push_back(firmware);
 
-  /* 9XR board */
-  firmware = new OpenTxFirmware("opentx-9xr", QObject::tr("9XR"), BOARD_STOCK);
-  firmware->addOptions(extr_options);
-  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  /* ar9x board */
+  firmware = new OpenTxFirmware("opentx-ar9x", QObject::tr("9X with AR9X board"), BOARD_AR9X);
+  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
   firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  firmware->addOption("nosplash", QObject::tr("No splash screen"));
   firmware->addOption("nofp", QObject::tr("No flight modes"));
   firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
-  firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
-  firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
-  firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
-  // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
-  firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
   firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
   firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
   firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
   firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
   firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
   firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
   firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
   firmware->addOption("battgraph", QObject::tr("Battery graph"));
   firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
-  firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
-  firmware->addOption("imperial", QObject::tr("Imperial units"));
-  firmware->addOption("nowshh", QObject::tr("No Winged Shadow How High support"));
-  firmware->addOption("novario", QObject::tr("No vario support"));
-  firmware->addOption("nogps", QObject::tr("No GPS support"));
-  firmware->addOption("nogauges", QObject::tr("No gauges in the custom telemetry screen"));
-  firmware->addOption("stickrev", QObject::tr("Add support for reversing stick inputs (e.g. needed for FrSky gimbals)"));
+  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
+//  firmware->addOption("rtc", QObject::tr("Optional RTC added"));
+//  firmware->addOption("volume", QObject::tr("i2c volume control added"));
   addOpenTxCommonOptions(firmware);
   firmwares.push_back(firmware);
 
-  /* 9XR board with M128 chip */
-  firmware = new OpenTxFirmware("opentx-9xr128", QObject::tr("9XR with M128 chip"), BOARD_M128);
-  firmware->addOptions(extr_options);
-  firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
+  /* Sky9x board */
+  firmware = new OpenTxFirmware("opentx-sky9x", QObject::tr("9X with Sky9x board"), BOARD_SKY9X);
+  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
   firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  firmware->addOption("nosplash", QObject::tr("No splash screen"));
   firmware->addOption("nofp", QObject::tr("No flight modes"));
   firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
-  firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
-  firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
-  firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
-  // NOT TESTED firmware->addOption("PXX", QObject::tr("Support of FrSky PXX protocol"));
-  firmware->addOption("DSM2", QObject::tr("Support for DSM2 modules"));
   firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
   firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
   firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
+  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
   firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
   firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
   firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
+  firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
   firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
   firmware->addOption("battgraph", QObject::tr("Battery graph"));
   firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  firmware->addOption("thrtrace", QObject::tr("Enable the throttle trace in Statistics"));
-  firmware->addOption("pgbar", QObject::tr("EEprom write Progress bar"));
-  firmware->addOption("imperial", QObject::tr("Imperial units"));
+  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
   addOpenTxCommonOptions(firmware);
   firmwares.push_back(firmware);
 
   /* Gruvin9x board */
-  firmware = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("Gruvin9x board / 9X"), BOARD_GRUVIN9X);
+  firmware = new OpenTxFirmware("opentx-gruvin9x", QObject::tr("9X with Gruvin9x board"), BOARD_GRUVIN9X);
   firmware->addOption("heli", QObject::tr("Enable heli menu and cyclic mix support"));
   firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
   firmware->addOption("nofp", QObject::tr("No flight modes"));
@@ -1320,7 +1415,7 @@ void registerOpenTxFirmwares()
   firmwares.push_back(firmware);
 
   /* MEGA2560 board */
-  firmware = new OpenTxFirmware("opentx-mega2560", QObject::tr("MEGA2560 board"), BOARD_MEGA2560);
+  firmware = new OpenTxFirmware("opentx-mega2560", QObject::tr("DIY MEGA2560 radio"), BOARD_MEGA2560);
   addOpenTxLcdOptions(firmware);
   firmware->addOption("PWR", QObject::tr("Power management by soft-off circuitry"));
   firmware->addOptions(ext_options);
@@ -1331,7 +1426,7 @@ void registerOpenTxFirmwares()
   firmware->addOption("nofp", QObject::tr("No flight modes"));
   firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
   firmware->addOption("sdcard", QObject::tr("Support for SD memory card"));
-//firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
+  firmware->addOption("audio", QObject::tr("Support for radio modified with regular speaker"));
 //firmware->addOption("voice", QObject::tr("Used if you have modified your radio with voice mode"));
   firmware->addOption("haptic", QObject::tr("Used if you have modified your radio with haptic mode"));
   firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
@@ -1349,90 +1444,6 @@ void registerOpenTxFirmwares()
   addOpenTxCommonOptions(firmware);
   firmwares.push_back(firmware);
 
-  /* Sky9x board */
-  firmware = new OpenTxFirmware("opentx-sky9x", QObject::tr("Sky9x board / 9X"), BOARD_SKY9X);
-  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
-  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  firmware->addOption("nofp", QObject::tr("No flight modes"));
-  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
-  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
-  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
-  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
-  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  firmware->addOption("battgraph", QObject::tr("Battery graph"));
-  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  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"));
-  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  firmware->addOption("nofp", QObject::tr("No flight modes"));
-  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
-  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
-  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
-  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  firmware->addOption("dblkeys", QObject::tr("Enable resetting values by pressing up and down at the same time"));
-  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  firmware->addOption("battgraph", QObject::tr("Battery graph"));
-  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
-//  firmware->addOption("rtc", QObject::tr("Optional RTC added"));
-//  firmware->addOption("volume", QObject::tr("i2c volume control added"));
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
-  /* 9XR-Pro */
-  firmware = new OpenTxFirmware("opentx-9xrpro", QObject::tr("9XR-PRO"), BOARD_9XRPRO);
-  firmware->addOption("heli", QObject::tr("Enable HELI menu and cyclic mix support"));
-  firmware->addOption("templates", QObject::tr("Enable TEMPLATES menu"));
-  firmware->addOption("nofp", QObject::tr("No flight modes"));
-  firmware->addOption("nocurves", QObject::tr("Disable curves menus"));
-  firmware->addOption("ppmca", QObject::tr("PPM center adjustment in limits"));
-  firmware->addOption("gvars", QObject::tr("Global variables"), GVARS_VARIANT);
-  firmware->addOption("symlimits", QObject::tr("Symetrical Limits"));
-  firmware->addOption("timer3", QObject::tr("Support for a third timer"));
-  firmware->addOption("potscroll", QObject::tr("Pots use in menus navigation"));
-  firmware->addOption("autosource", QObject::tr("In model setup menus automatically set source by moving the control"));
-  firmware->addOption("autoswitch", QObject::tr("In model setup menus automatically set switch by moving the control"));
-  firmware->addOption("nographics", QObject::tr("No graphical check boxes and sliders"));
-  firmware->addOption("battgraph", QObject::tr("Battery graph"));
-  firmware->addOption("nobold", QObject::tr("Don't use bold font for highlighting active items"));
-  firmware->addOption("bluetooth", QObject::tr("Bluetooth interface"));
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
-  /* Taranis board */
-  firmware = new OpenTxFirmware("opentx-taranis", QObject::tr("FrSky Taranis"), BOARD_TARANIS);
-  firmware->addOption("haptic", QObject::tr("Haptic module installed"));
-  addOpenTxTaranisOptions(firmware);
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
-  /* Taranis Plus board */
-  firmware = new OpenTxFirmware("opentx-taranisplus", QObject::tr("FrSky Taranis Plus"), BOARD_TARANIS_PLUS);
-  addOpenTxTaranisOptions(firmware);
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
-  /* Taranis X9E board */
-  firmware = new OpenTxFirmware("opentx-taranisx9e", QObject::tr("FrSky Taranis X9E"), BOARD_TARANIS_X9E);
-  firmware->addOption("shutdownconfirm", QObject::tr("Confirmation before radio shutdown"));
-  addOpenTxTaranisOptions(firmware);
-  addOpenTxCommonOptions(firmware);
-  firmwares.push_back(firmware);
-
   default_firmware_variant = GetFirmware("opentx-taranisplus-en");
   current_firmware_variant = default_firmware_variant;
 }

companion/src/firmwares/opentx/opentxinterface.h

@@ -118,6 +118,8 @@ class OpenTxFirmware: public Firmware {
     virtual QString getFirmwareUrl();
 
     virtual int getCapability(const Capability);
+    
+    virtual QTime getMaxTimerStart();
 
     virtual bool isTelemetrySourceAvailable(int source);
 

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/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     -DCPUARM -DPCBTARANIS                   -DLUA -DVIRTUALINPUTS)
+add_lua_export_target(taranis_x9e -DCPUARM -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>
@@ -78,6 +77,9 @@
 #undef min
 #undef max
 
+// some C++ headers must be included outside the custom namespace (fails to compile in gcc-6)
+#include <math.h>
+
 namespace NAMESPACE {
 
 #if defined(CPUARM)
@@ -91,6 +93,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"
@@ -316,6 +319,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];
@@ -325,6 +329,11 @@ uint16_t anaIn(uint8_t chan)
     return g_anas[chan];
 }
 
+uint16_t getAnalogValue(uint32_t index) 
+{
+  return anaIn(index);
+}
+
 bool hasExtendedTrims()
 {
   return g_model.extendedTrims;
@@ -496,6 +505,44 @@ void OpenTxSimulator::sendTelemetry(::uint8_t * data, unsigned int len)
 #endif
 }
 
+uint8_t OpenTxSimulator::getSensorInstance(uint16_t id, uint8_t defaultValue)
+{
+#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 defaultValue;
+}
+
+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, uint8_t defaultValue = 0);
+
+    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/th9x/simulator/CMakeLists.txt

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

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

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

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

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

companion/src/firmwares/th9x/th9xinterface.cpp

@@ -17,7 +17,6 @@
 #include <iostream>
 #include "th9xinterface.h"
 #include "th9xeeprom.h"
-#include "simulator/th9xsimulator.h"
 #include "file.h"
 #include "appdata.h"
 

companion/src/flasheepromdialog.ui

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

companion/src/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 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 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, 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);
-
-  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, bool threePos);
+    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() );
 }
@@ -82,12 +84,15 @@ void GeneralEdit::on_calretrieve_PB_clicked()
 {
   int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();
   QString calib=g.profile[profile_id].stickPotCalib();
-  int potsnum=GetCurrentFirmware()->getCapability(Pots);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
+  int numSwPots=GetCurrentFirmware()->getCapability(Switches)+GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
   if (calib.isEmpty()) {
     return;
   }
   else {
     QString trainercalib = g.profile[profile_id].trainerCalib();
+    QString hwtypes = g.profile[profile_id].controlTypes();
+    QString controlNames=g.profile[profile_id].controlNames();
     int8_t txVoltageCalibration = (int8_t)g.profile[profile_id].txVoltageCalibration();
     int8_t txCurrentCalibration = (int8_t)g.profile[profile_id].txCurrentCalibration();
     int8_t PPM_Multiplier = (int8_t)g.profile[profile_id].ppmMultiplier();
@@ -106,22 +111,18 @@ void GeneralEdit::on_calretrieve_PB_clicked()
       for (int i=0; i<(NUM_STICKS+potsnum); i++) {
         Byte=calib.mid(i*12,4);
         byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok)
-          generalSettings.calibMid[i]=byte16;
+        if (ok) generalSettings.calibMid[i]=byte16;
         Byte=calib.mid(4+i*12,4);
         byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok)
-          generalSettings.calibSpanNeg[i]=byte16;
+        if (ok) generalSettings.calibSpanNeg[i]=byte16;
         Byte=calib.mid(8+i*12,4);
         byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok)
-          generalSettings.calibSpanPos[i]=byte16;
+        if (ok) generalSettings.calibSpanPos[i]=byte16;
       }
       for (int i=0; i<4; i++) {
         Byte=trainercalib.mid(i*4,4);
         byte16=(int16_t)Byte.toInt(&ok,16);
-        if (ok)
-          generalSettings.trainer.calib[i]=byte16;
+        if (ok) generalSettings.trainer.calib[i]=byte16;
       }
       generalSettings.txCurrentCalibration=txCurrentCalibration;
       generalSettings.txVoltageCalibration=txVoltageCalibration;
@@ -134,6 +135,48 @@ void GeneralEdit::on_calretrieve_PB_clicked()
     } else {
       QMessageBox::critical(this, tr("Warning"), tr("Wrong data in profile, radio calibration was not retrieved"));
     }
+    if (hwtypes.length()==numSwPots) {
+      QString Byte;
+      int16_t byte16;
+      QByteArray qba;
+      int16_t offset;
+      bool ok;
+      for (int i=0; i<NUM_STICKS; i++) {
+        qba = controlNames.mid(3*i,3).toAscii();
+        strcpy(generalSettings.stickName[i], qba.data());
+      }
+      for (int i=0; i<(GetCurrentFirmware()->getCapability(Switches)); i++) {
+        Byte=hwtypes.mid(i,1);
+        byte16=(int16_t)Byte.toInt(&ok,16);
+        qba=controlNames.mid(3*(i+NUM_STICKS),3).toAscii();
+        if (ok) {
+          generalSettings.switchConfig[i]=byte16;
+          strcpy(generalSettings.switchName[i], qba.data());
+        }
+      }
+      offset = GetCurrentFirmware()->getCapability(Switches);
+      for (int i=0; i<(GetCurrentFirmware()->getCapability(Pots)); i++) {
+        Byte=hwtypes.mid(i+offset,1);
+        byte16=(int16_t)Byte.toInt(&ok,16);
+        qba=controlNames.mid(3*(i+NUM_STICKS+offset),3).toAscii();
+        if (ok) {
+          generalSettings.potConfig[i]=byte16;
+          strcpy(generalSettings.potName[i], qba.data());
+        }
+      }
+      offset += GetCurrentFirmware()->getCapability(Pots);
+      for (int i=0; i<(GetCurrentFirmware()->getCapability(Sliders)); i++) {
+        Byte=hwtypes.mid(i+offset,1);
+        byte16=(int16_t)Byte.toInt(&ok,16);
+        qba=controlNames.mid(3*(i+NUM_STICKS+offset),3).toAscii();
+        if (ok) {
+          generalSettings.sliderConfig[i]=byte16;
+          strcpy(generalSettings.sliderName[i], qba.data());
+        }
+      }
+    } else {
+      QMessageBox::critical(this, tr("Warning"), tr("Wrong data in profile, Switch/pot config not retrieved"));
+    }
     if ((DisplaySet.length()==6) && (BeeperSet.length()==4) && (HapticSet.length()==6) && (SpeakerSet.length()==6)) {
       generalSettings.stickMode=GSStickMode;
       uint8_t byte8u;
@@ -141,45 +184,32 @@ void GeneralEdit::on_calretrieve_PB_clicked()
       QString chars;
       bool ok;
       byte8=(int8_t)DisplaySet.mid(0,2).toInt(&ok,16);
-      if (ok)
-        generalSettings.optrexDisplay=(byte8==1 ? true : false);
+      if (ok) generalSettings.optrexDisplay=(byte8==1 ? true : false);
       byte8u=(uint8_t)DisplaySet.mid(2,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.contrast=byte8u;
+      if (ok) generalSettings.contrast=byte8u;
       byte8u=(uint8_t)DisplaySet.mid(4,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.backlightBright=byte8u;
+      if (ok) generalSettings.backlightBright=byte8u;
       byte8=(int8_t)BeeperSet.mid(0,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.beeperMode = (GeneralSettings::BeeperMode)byte8;
+      if (ok) generalSettings.beeperMode = (GeneralSettings::BeeperMode)byte8;
       byte8=(int8_t)BeeperSet.mid(2,2).toInt(&ok,16);
-      if (ok)
-        generalSettings.beeperLength=byte8;
+      if (ok) generalSettings.beeperLength=byte8;
       byte8=(int8_t)HapticSet.mid(0,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.hapticMode=(GeneralSettings::BeeperMode)byte8;
+      if (ok) generalSettings.hapticMode=(GeneralSettings::BeeperMode)byte8;
       byte8=(int8_t)HapticSet.mid(2,2).toInt(&ok,16);
-      if (ok)
-        generalSettings.hapticStrength=byte8;
+      if (ok) generalSettings.hapticStrength=byte8;
       byte8=(int8_t)HapticSet.mid(4,2).toInt(&ok,16);
-      if (ok)
-        generalSettings.hapticLength=byte8;
+      if (ok) generalSettings.hapticLength=byte8;
       byte8u=(uint8_t)SpeakerSet.mid(0,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.speakerMode=byte8u;
+      if (ok) generalSettings.speakerMode=byte8u;
       byte8u=(uint8_t)SpeakerSet.mid(2,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.speakerPitch=byte8u;
+      if (ok) generalSettings.speakerPitch=byte8u;
       byte8u=(uint8_t)SpeakerSet.mid(4,2).toUInt(&ok,16);
-      if (ok)
-        generalSettings.speakerVolume=byte8u;
+      if (ok) generalSettings.speakerVolume=byte8u;
       if (CountrySet.length()==6) {
         byte8u=(uint8_t)CountrySet.mid(0,2).toUInt(&ok,16);
-        if (ok)
-          generalSettings.countryCode=byte8u;
+        if (ok) generalSettings.countryCode=byte8u;
         byte8u=(uint8_t)CountrySet.mid(2,2).toUInt(&ok,16);
-        if (ok)
-          generalSettings.imperial=byte8u;
+        if (ok) generalSettings.imperial=byte8u;
         chars=CountrySet.mid(4,2);
         generalSettings.ttsLanguage[0]=chars[0].toAscii();
         generalSettings.ttsLanguage[1]=chars[1].toAscii();
@@ -198,13 +228,15 @@ void GeneralEdit::on_calstore_PB_clicked()
   int profile_id=ui->profile_CB->itemData(ui->profile_CB->currentIndex()).toInt();
 
   QString name=g.profile[profile_id].name();
-  int potsnum=GetCurrentFirmware()->getCapability(Pots);
+  int potsnum=GetCurrentFirmware()->getCapability(Pots)+GetCurrentFirmware()->getCapability(Sliders);
   if (name.isEmpty()) {
     ui->calstore_PB->setDisabled(true);
     return;
   }
   else {
     QString calib=g.profile[profile_id].stickPotCalib();
+    QString hwtypes=g.profile[profile_id].controlTypes();
+    QString controlNames=g.profile[profile_id].controlNames();
     if (!(calib.isEmpty())) {
       int ret = QMessageBox::question(this, "Companion",
                       tr("Do you want to store calibration in %1 profile<br>overwriting existing calibration?").arg(name) ,
@@ -225,6 +257,25 @@ void GeneralEdit::on_calstore_PB_clicked()
       calib.append(QString("%1").arg((uint16_t)generalSettings.trainer.calib[i], 4, 16, QChar('0')));
     }
     g.profile[profile_id].trainerCalib( calib );
+    hwtypes.clear();
+    controlNames.clear();
+    for (int i=0; i<NUM_STICKS; i++) {
+      controlNames.append(QString("%1").arg(generalSettings.stickName[i], -3));
+    }
+    for (int i=0; i<(GetCurrentFirmware()->getCapability(Switches)); i++) {
+      hwtypes.append(QString("%1").arg((uint16_t)generalSettings.switchConfig[i], 1));
+      controlNames.append(QString("%1").arg(generalSettings.switchName[i], -3));
+    }
+    for (int i=0; i<(GetCurrentFirmware()->getCapability(Pots)); i++) {
+      hwtypes.append(QString("%1").arg((uint16_t)generalSettings.potConfig[i], 1));
+      controlNames.append(QString("%1").arg(generalSettings.potName[i], -3));
+    }
+    for (int i=0; i<(GetCurrentFirmware()->getCapability(Sliders)); i++) {
+      hwtypes.append(QString("%1").arg((uint16_t)generalSettings.sliderConfig[i], 1));
+      controlNames.append(QString("%1").arg(generalSettings.sliderName[i], -3));
+    }
+    g.profile[profile_id].controlTypes( hwtypes );
+    g.profile[profile_id].controlNames( controlNames );
     g.profile[profile_id].txVoltageCalibration( generalSettings.txVoltageCalibration );
     g.profile[profile_id].txCurrentCalibration( generalSettings.txCurrentCalibration );
     g.profile[profile_id].vBatWarn( generalSettings.vBatWarn );

companion/src/generaledit/generalsetup.cpp

@@ -275,8 +275,8 @@ void GeneralSetupPanel::populateBacklightCB()
 void GeneralSetupPanel::populateVoiceLangCB()
 {
   QComboBox * b = ui->voiceLang_CB;
-  QString strings[] = { QObject::tr("English"), QObject::tr("Finnish"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), NULL};
-  QString langcode[] = { "en", "fi","fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", NULL};
+  QString strings[] = { QObject::tr("English"), QObject::tr("Dutch"), QObject::tr("French"), QObject::tr("Italian"), QObject::tr("German"), QObject::tr("Czech"), QObject::tr("Slovak"), QObject::tr("Spanish"), QObject::tr("Polish"), QObject::tr("Portuguese"), QObject::tr("Swedish"), QObject::tr("Hungarian"), NULL};
+  QString langcode[] = { "en", "nl","fr", "it", "de", "cz", "sk", "es", "pl", "pt", "se", "hu", NULL};
 
   b->clear();
   for (int i=0; strings[i]!=NULL; i++) {

companion/src/generaledit/generalsetup.ui

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

companion/src/generaledit/hardware.cpp

@@ -0,0 +1,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),
@@ -101,7 +103,7 @@ void populatePhasesCB(QComboBox *b, int value)
   b->setCurrentIndex(value + GetCurrentFirmware()->getCapability(FlightModes));
 }
 
-GVarGroup::GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox *weightCB, int & weight, const int deflt, const int mini, const int maxi, const double step, bool allowGvars):
+GVarGroup::GVarGroup(QCheckBox * weightGV, QAbstractSpinBox * weightSB, QComboBox * weightCB, int & weight, const ModelData & model, const int deflt, const int mini, const int maxi, const double step, bool allowGvars):
   QObject(),
   weightGV(weightGV),
   weightSB(weightSB),
@@ -113,7 +115,7 @@ GVarGroup::GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox
   lock(true)
 {
   if (allowGvars && GetCurrentFirmware()->getCapability(Gvars)) {
-    populateGVCB(weightCB, weight);
+    populateGVCB(*weightCB, weight, model);
     connect(weightGV, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
     connect(weightCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
   }
@@ -173,17 +175,18 @@ void GVarGroup::valuesChanged()
     else if (sb)
       weight = sb->value();
     else
-      weight = dsb->value()/step;
+      weight = round(dsb->value()/step);
   }
 }
 
-CurveGroup::CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags):
+CurveGroup::CurveGroup(QComboBox * curveTypeCB, QCheckBox * curveGVarCB, QComboBox * curveValueCB, QSpinBox * curveValueSB, CurveReference & curve, const ModelData & model, unsigned int flags):
   QObject(),
   curveTypeCB(curveTypeCB),
   curveGVarCB(curveGVarCB),
   curveValueCB(curveValueCB),
   curveValueSB(curveValueSB),
   curve(curve),
+  model(model),
   flags(flags),
   lock(false),
   lastType(-1)
@@ -217,7 +220,7 @@ void CurveGroup::update()
       curveGVarCB->setChecked(true);
       if (lastType != CurveReference::CURVE_REF_DIFF && lastType != CurveReference::CURVE_REF_EXPO) {
         lastType = curve.type;
-        populateGVCB(curveValueCB, curve.value);
+        populateGVCB(*curveValueCB, curve.value, model);
       }
       curveValueCB->show();
       curveValueSB->hide();
@@ -274,6 +277,7 @@ void CurveGroup::gvarCBChanged(int state)
   if (!lock) {
     if (state) {
       curve.value = 10000+1; // TODO constant in EEpromInterface ...
+      lastType = -1; // quickfix for issue #3518: force refresh of curveValueCB at next update() to set current index to GV1
     }
     else {
       curve.value = 0; // TODO could be better
@@ -476,33 +480,39 @@ void populateSwitchCB(QComboBox *b, const RawSwitch & value, const GeneralSettin
   b->setMaxVisibleItems(10);
 }
 
-void populateGVCB(QComboBox *b, int value)
+void populateGVCB(QComboBox & b, int value, const ModelData & model)
 {
   bool selected = false;
 
-  b->clear();
+  b.clear();
 
-  int pgvars = GetCurrentFirmware()->getCapability(Gvars);
-  for (int i=-pgvars; i<=-1; i++) {
+  int count = GetCurrentFirmware()->getCapability(Gvars);
+  for (int i=-count; i<=-1; i++) {
     int16_t gval = (int16_t)(-10000+i);
-    b->addItem(QObject::tr("-GV%1").arg(-i), gval);
+    if (strlen(model.gvars_names[-i-1]) > 0)
+      b.addItem(QObject::tr("-GV%1 (%2)").arg(-i).arg(model.gvars_names[-i-1]), gval);
+    else
+      b.addItem(QObject::tr("-GV%1").arg(-i), gval);
     if (value == gval) {
-      b->setCurrentIndex(b->count()-1);
+      b.setCurrentIndex(b.count()-1);
       selected = true;
     }
   }
 
-  for (int i=1; i<=pgvars; i++) {
+  for (int i=1; i<=count; i++) {
     int16_t gval = (int16_t)(10000+i);
-    b->addItem(QObject::tr("GV%1").arg(i), gval);
+    if (strlen(model.gvars_names[i-1]) > 0)
+      b.addItem(QObject::tr("GV%1 (%2)").arg(i).arg(model.gvars_names[i-1]), gval);
+    else
+      b.addItem(QObject::tr("GV%1").arg(i), gval);
     if (value == gval) {
-      b->setCurrentIndex(b->count()-1);
+      b.setCurrentIndex(b.count()-1);
       selected = true;
     }
   }
 
   if (!selected) {
-    b->setCurrentIndex(pgvars);
+    b.setCurrentIndex(count);
   }
 }
 
@@ -995,3 +1005,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];
@@ -42,7 +45,7 @@ class GVarGroup: public QObject {
   Q_OBJECT
 
   public:
-    GVarGroup(QCheckBox *weightGV, QAbstractSpinBox *weightSB, QComboBox *weightCB, int & weight, const int deflt, const int mini, const int maxi, const double step=1.0, bool allowGVars=true);
+    GVarGroup(QCheckBox * weightGV, QAbstractSpinBox * weightSB, QComboBox * weightCB, int & weight, const ModelData & model, const int deflt, const int mini, const int maxi, const double step=1.0, bool allowGVars=true);
 
   protected slots:
     void gvarCBChanged(int);
@@ -68,7 +71,7 @@ class CurveGroup : public QObject {
   Q_OBJECT
 
   public:
-    CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, unsigned int flags=0);
+    CurveGroup(QComboBox *curveTypeCB, QCheckBox *curveGVarCB, QComboBox *curveValueCB, QSpinBox *curveValueSB, CurveReference & curve, const ModelData & model, unsigned int flags=0);
     void update();
 
   protected slots:
@@ -82,6 +85,7 @@ class CurveGroup : public QObject {
     QComboBox *curveValueCB;
     QSpinBox *curveValueSB;
     CurveReference & curve;
+    const ModelData & model;
     unsigned int flags;
     bool lock;
     int lastType;
@@ -114,8 +118,7 @@ void populateGvarUseCB(QComboBox *b, unsigned int phase);
 #define GVARS_VARIANT 0x0001
 #define FRSKY_VARIANT 0x0002
 
-// void populateGVarCB(QComboBox *b, int value, int min, int max,int pgvars=5); //TODO: Clean Up
-void populateGVCB(QComboBox *b, int value);
+void populateGVCB(QComboBox & b, int value, const ModelData & model);
 void populateSourceCB(QComboBox *b, const RawSource &source, const GeneralSettings generalSettings, const ModelData * model, unsigned int flags);
 QString image2qstring(QImage image);
 int findmult(float value, float base);
@@ -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/mdichild.cpp

@@ -179,11 +179,16 @@ void MdiChild::modelEdit()
     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");
   }
 }
 

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, const ModelData & model, int min, int max, int deflt):
   firmware(firmware),
   spinbox(new QDoubleSpinBox()),
   value(value),
@@ -39,15 +39,18 @@ 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);
-  gvarGroup = new GVarGroup(gv, spinbox, cb, value, deflt, min, max, displayStep, allowGVars);
+  tableLayout->addLayout(row, col, horizontalLayout);
+  gvarGroup = new GVarGroup(gv, spinbox, cb, value, model, deflt, min, max, displayStep, allowGVars);
 }
 
 LimitsGroup::~LimitsGroup()
@@ -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, model, -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, -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, model, 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, const ModelData & model, int min, int max, int deflt);
     ~LimitsGroup();
 
     void updateMinMax(int max);

companion/src/modeledit/curves.cpp

@@ -503,9 +503,8 @@ void Curves::resizeEvent(QResizeEvent *event)
   ModelPanel::resizeEvent(event);
 }
 
-void Curves::on_curveType_currentIndexChanged()
+void Curves::on_curveType_currentIndexChanged(int index)
 {
-  int index = ui->curveType->currentIndex();
   unsigned int flags = templates[index].flags;
   ui->curveCoeffLabel->setVisible(flags & CURVE_COEFF_ENABLE);
   ui->curveCoeff->setVisible(flags & CURVE_COEFF_ENABLE);

companion/src/modeledit/curves.h

@@ -46,7 +46,7 @@ class Curves : public ModelPanel
     void onNodeMoved(int x, int y);
     void onNodeFocus();
     void onNodeUnfocus();
-    void on_curveType_currentIndexChanged();
+    void on_curveType_currentIndexChanged(int index);
     void on_curveApply_clicked();
 
   protected:

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,8 +67,10 @@ 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));
+    scriptsSet = getFilesSet(g.profile[g.id()].sdPath() + "/SCRIPTS/FUNCTIONS", QStringList() << "*.lua", firmware->getCapability(VoicesMaxLength));
     for (int i=0; i<num_fsw; i++) {
       if (functions[i].func==FuncPlayScript) {
         QString temp = functions[i].paramarm;
@@ -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()
@@ -386,7 +403,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
     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]->setMaximumTime(firmware->getMaxTimerStart());
       fswtchParamTime[i]->setTime(QTimeS(cfn.param));
       widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE;
     }
@@ -519,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;
 }
 

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

@@ -46,8 +46,6 @@
 
 #include <math.h>
 
-static const double Pi = 3.14159265358979323846264338327950288419717;
-
 Edge::Edge(Node *sourceNode, Node *destNode)
     : arrowSize(10)
 {

companion/src/modeledit/expodialog.cpp

@@ -21,11 +21,11 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
   QRegExp rx(CHAR_FOR_NAMES_REGEX);
 
   if (IS_TARANIS(GetEepromInterface()->getBoard())) {
-    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, 100, -100, 100);
-    gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, ed->offset, 0, -100, 100);
+    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, model, 100, -100, 100);
+    gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, ed->offset, model, 0, -100, 100);
   }
   else {
-    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, 100, 0, 100);
+    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, ed->weight, model, 100, 0, 100);
     gvOffsetGroup = NULL;
     ui->offsetLabel->hide();
     ui->offsetGV->hide();
@@ -33,7 +33,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
     ui->offsetCB->hide();
   }
 
-  curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve, 
+  curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve, model,
                               firmware->getCapability(HasInputDiff) ? 0 : (HIDE_DIFF | HIDE_NEGATIVE_CURVES));
 
   populateSwitchCB(ui->switchesCB, ed->swtch, generalSettings, MixesContext);

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
@@ -107,14 +110,14 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
       reLayout->addWidget(label, i, 0, 1, 1);
       if (phaseIdx > 0) {
         // RE link to another RE
-        QComboBox *link = new QComboBox(ui->gvGB);
-        link->setProperty("index", i);
-        populateGvarUseCB(link, phaseIdx);
-        connect(link, SIGNAL(currentIndexChanged(int)), this, SLOT(phaseREUse_currentIndexChanged(int)));
+        reUse[i] = new QComboBox(ui->reGB);
+        reUse[i]->setProperty("index", i);
+        populateGvarUseCB(reUse[i], phaseIdx);
         if (phase.rotaryEncoders[i] > 1024) {
-          link->setCurrentIndex(phase.rotaryEncoders[i] - 1024);
+          reUse[i]->setCurrentIndex(phase.rotaryEncoders[i] - 1024);
         }
-        reLayout->addWidget(link, i, 1, 1, 1);
+        connect(reUse[i], SIGNAL(currentIndexChanged(int)), this, SLOT(phaseREUse_currentIndexChanged(int)));
+        reLayout->addWidget(reUse[i], i, 1, 1, 1);
       }
       // RE value
       reValues[i] = new QSpinBox(ui->reGB);
@@ -149,14 +152,14 @@ FlightModePanel::FlightModePanel(QWidget * parent, ModelData & model, int phaseI
       }
       if (phaseIdx > 0) {
         // GVar link to another GVar
-        QComboBox *link = new QComboBox(ui->gvGB);
-        link->setProperty("index", i);
-        populateGvarUseCB(link, phaseIdx);
+        gvUse[i] = new QComboBox(ui->gvGB);
+        gvUse[i]->setProperty("index", i);
+        populateGvarUseCB(gvUse[i], phaseIdx);
         if (phase.gvars[i] > 1024) {
-          link->setCurrentIndex(phase.gvars[i] - 1024);
+          gvUse[i]->setCurrentIndex(phase.gvars[i] - 1024);
         }
-        connect(link, SIGNAL(currentIndexChanged(int)), this, SLOT(phaseGVUse_currentIndexChanged(int)));
-        gvLayout->addWidget(link, i, col++, 1, 1);
+        connect(gvUse[i], SIGNAL(currentIndexChanged(int)), this, SLOT(phaseGVUse_currentIndexChanged(int)));
+        gvLayout->addWidget(gvUse[i], i, col++, 1, 1);
       }
       // GVar value
       gvValues[i] = new QSpinBox(ui->gvGB);
@@ -224,17 +227,11 @@ void FlightModePanel::update()
     }
   }
 
-  for (int i=0; i<reCount; i++) {    
-    reValues[i]->setDisabled(false);
-    int idx = phase.rotaryEncoders[i];
-    FlightModeData *phasere = &phase;
-    while (idx > 1024) {
-      idx -= 1025;
-      phasere = &model->flightModeData[idx];
-      idx = phasere->rotaryEncoders[i];
-      reValues[i]->setDisabled(true);
+  if (ui->reGB->isVisible()) {
+    for (int i=0; i<reCount; i++) {    
+      reValues[i]->setDisabled(model->isRELinked(phaseIdx, i));
+      reValues[i]->setValue(model->getREValue(phaseIdx, i));
     }
-    reValues[i]->setValue(phasere->rotaryEncoders[i]);
   }
 }
 
@@ -248,9 +245,11 @@ void FlightModePanel::phaseName_editingFinished()
 
 void FlightModePanel::phaseSwitch_currentIndexChanged(int index)
 {
+  if (!lock) {
     QComboBox *comboBox = qobject_cast<QComboBox*>(sender());
     phase.swtch = RawSwitch(comboBox->itemData(index).toInt());
     emit modified();
+  }
 }
 
 void FlightModePanel::phaseFadeIn_editingFinished()
@@ -287,8 +286,14 @@ void FlightModePanel::trimUpdate(unsigned int trim)
       trimsUse[trim]->setCurrentIndex(1 + 2*phase.trimRef[chn] + phase.trimMode[chn] - (phase.trimRef[chn] > phaseIdx ? 1 : 0));
     else
       trimsUse[trim]->setCurrentIndex(phase.trimRef[chn]);
-    trimsValue[trim]->setEnabled(true);
-    trimsSlider[trim]->setEnabled(true);
+    if (phaseIdx == 0 || phase.trimRef[chn] == phaseIdx || (IS_TARANIS(board) && phase.trimMode[chn] != 0)) {
+      trimsValue[trim]->setEnabled(true);
+      trimsSlider[trim]->setEnabled(true);
+    }
+    else {
+      trimsValue[trim]->setEnabled(false);
+      trimsSlider[trim]->setEnabled(false);
+    }
   }
   lock = false;
 }
@@ -327,6 +332,8 @@ void FlightModePanel::phaseGVUse_currentIndexChanged(int index)
       phase.gvars[gvar] = 1024 + index;
     }
     update();
+    if (model->isGVarLinkedCircular(phaseIdx,gvar))
+      QMessageBox::warning(this, "Companion", tr("Warning: Global variable links back to itself. Flight Mode 0 value used."));
     emit modified();
     lock = false;
   }
@@ -337,6 +344,7 @@ void FlightModePanel::phaseGVPopupToggled(bool checked)
   QCheckBox *cb = qobject_cast<QCheckBox*>(sender());
   int gvar = cb->property("index").toInt();
   model->gvars_popups[gvar] = checked;
+  emit modified();
 }
 
 void FlightModePanel::phaseREValue_editingFinished()
@@ -362,8 +370,10 @@ void FlightModePanel::phaseREUse_currentIndexChanged(int index)
       phase.rotaryEncoders[re] = 1024 + index;                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                    ;
     }
     update();
-    lock = false;
+    if (model->isRELinkedCircular(phaseIdx,re))
+      QMessageBox::warning(this, "Companion", tr("Warning: Rotary encoder links back to itself. Flight Mode 0 value used."));
     emit modified();
+    lock = false;
   }
 }
 
@@ -426,6 +436,49 @@ 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(phaseIdx);
+    if (phaseIdx == 0) {
+      if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+        for (int i=0; i < gvCount; ++i) {
+          memset(&model->gvars_names[i], 0, sizeof(model->gvars_names[i]));
+          model->gvars_popups[i] = 0;
+        }
+      }
+    }
+    else {
+      lock = true;
+      QComboBox * pswtch = ui->swtch;
+      RawSwitch item = RawSwitch(SWITCH_TYPE_NONE);
+      pswtch->setCurrentIndex(pswtch->findText(item.toString()));
+      if (gvCount > 0 && (firmware->getCapability(GvarsFlightModes))) {
+        for (int i=0; i<gvCount; i++) {
+          gvUse[i]->setCurrentIndex((phase.gvars[i] > 1024 ? (phase.gvars[i] - 1024) : 0));
+        }
+      }
+      for (int i=0; i<reCount; i++) {
+        reUse[i]->setCurrentIndex((phase.rotaryEncoders[i] > 1024 ? (phase.rotaryEncoders[i] - 1024) : 0));
+      }
+      lock = false;
+    }
+    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;
@@ -52,7 +54,9 @@ class FlightModePanel : public ModelPanel
     QLineEdit * gvNames[C9X_MAX_GVARS];
     QSpinBox * gvValues[C9X_MAX_GVARS];
     QCheckBox * gvPopups[C9X_MAX_GVARS];
+    QComboBox * gvUse[C9X_MAX_GVARS];
     QSpinBox * reValues[C9X_MAX_ENCODERS];
+    QComboBox * reUse[C9X_MAX_ENCODERS];
     QVector<QComboBox *> trimsUse;
     QVector<QSpinBox *> trimsValue;
     QVector<QSlider *> trimsSlider;

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

companion/src/modeledit/mixerdialog.cpp

@@ -25,10 +25,10 @@ MixerDialog::MixerDialog(QWidget *parent, ModelData & model, MixData *mixdata, G
 
     int limit = firmware->getCapability(OffsetWeight);
 
-    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, md->weight, 100, -limit, limit);
-    gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, md->sOffset, 0, -limit, limit);
+    gvWeightGroup = new GVarGroup(ui->weightGV, ui->weightSB, ui->weightCB, md->weight, model, 100, -limit, limit);
+    gvOffsetGroup = new GVarGroup(ui->offsetGV, ui->offsetSB, ui->offsetCB, md->sOffset, model, 0, -limit, limit);
     curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, 
-                                md->curve, firmware->getCapability(HasMixerExpo) ? 0 : HIDE_EXPO);
+                                md->curve, model, firmware->getCapability(HasMixerExpo) ? 0 : HIDE_EXPO);
 
     ui->MixDR_CB->setChecked(md->noExpo == 0);
 

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)
@@ -42,6 +42,8 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
     ui->countdownBeep->addItem(tr("Voice"), TimerData::COUNTDOWN_VOICE);
     ui->countdownBeep->addItem(tr("Haptic"), TimerData::COUNTDOWN_HAPTIC);
   }
+  
+  ui->value->setMaximumTime(firmware->getMaxTimerStart());
 
   ui->persistent->setField(timer.persistent, this);
   ui->persistent->addItem(tr("Not persistent"), 0);
@@ -66,9 +68,11 @@ TimerPanel::~TimerPanel()
 
 void TimerPanel::update()
 {
-  int min = timer.val / 60;
-  int sec = timer.val % 60;
-  ui->value->setTime(QTime(0, min, sec));
+  int hour = timer.val / 3600;
+  int min = (timer.val - (hour * 3600)) / 60;
+  int sec = (timer.val - (hour * 3600)) % 60;
+
+  ui->value->setTime(QTime(hour, min, sec));
 
   if (firmware->getCapability(PermTimers)) {
     int sign = 1;
@@ -94,7 +98,7 @@ QWidget * TimerPanel::getLastFocus()
 
 void TimerPanel::on_value_editingFinished()
 {
-  timer.val = ui->value->time().minute()*60 + ui->value->time().second();
+  timer.val = ui->value->time().hour()*3600 + ui->value->time().minute()*60 + ui->value->time().second();
   emit modified();
 }
 
@@ -247,6 +251,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())) {
@@ -323,8 +331,8 @@ void ModulePanel::update()
   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()));
+    ui->channelsStart->setMaximum(33 - ui->channelsCount->value());
+    ui->channelsCount->setMaximum(qMin(16, 33-ui->channelsStart->value()));
   }
 }
 
@@ -770,6 +778,7 @@ void SetupPanel::populateThrottleSourceCB()
 
   lock = true;
 
+  ui->throttleSource->clear();
   ui->throttleSource->addItem(QObject::tr("THR"));
 
   if (IS_TARANIS_X9E(GetEepromInterface()->getBoard())) {

companion/src/modeledit/setup_timer.ui

@@ -18,7 +18,7 @@
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
    <property name="spacing">
-    <number>-1</number>
+    <number>6</number>
    </property>
    <property name="margin">
     <number>0</number>
@@ -39,10 +39,10 @@
       <bool>true</bool>
      </property>
      <property name="currentSection">
-      <enum>QDateTimeEdit::MinuteSection</enum>
+      <enum>QDateTimeEdit::HourSection</enum>
      </property>
      <property name="displayFormat">
-      <string notr="true">mm:ss</string>
+      <string notr="true">hh:mm:ss</string>
      </property>
     </widget>
    </item>

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);
     }
   }
 
@@ -615,7 +619,7 @@ void TelemetrySensorPanel::update()
   ui->source4->setVisible(sources34FieldsDisplayed);
   ui->autoOffset->setVisible(sensor.unit != SensorData::UNIT_RPMS && isConfigurable);
   ui->filter->setVisible(isConfigurable);
-  ui->persistent->setVisible((sensor.type == SensorData::TELEM_TYPE_CALCULATED && sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION) || isConfigurable);
+  ui->persistent->setVisible(sensor.type == SensorData::TELEM_TYPE_CALCULATED);
 
   lock = false;
 }
@@ -684,15 +688,18 @@ void TelemetrySensorPanel::on_unit_currentIndexChanged(int index)
 {
   if (!lock) {
     sensor.unit = index;
+    if (sensor.unit == SensorData::UNIT_FAHRENHEIT) {
+      sensor.prec = 0;
+    }
     update();
     emit modified();
   }
 }
 
-void TelemetrySensorPanel::on_prec_valueChanged()
+void TelemetrySensorPanel::on_prec_valueChanged(double value)
 {
   if (!lock) {
-    sensor.prec = ui->prec->value();
+    sensor.prec = value;
     emit dataModified();
     emit modified();
   }
@@ -793,7 +800,8 @@ void TelemetryPanel::setup()
     if (IS_ARM(firmware->getBoard())) {
       ui->telemetryProtocol->addItem(tr("FrSky S.PORT"), 0);
       ui->telemetryProtocol->addItem(tr("FrSky D"), 1);
-      if (IS_9XRPRO(firmware->getBoard())) {
+      if (IS_9XRPRO(firmware->getBoard()) || 
+         (IS_TARANIS(firmware->getBoard()) && generalSettings.hw_uartMode == 2)) {
         ui->telemetryProtocol->addItem(tr("FrSky D (cable)"), 2);
       }
       ui->telemetryProtocol->setCurrentIndex(model->telemetryProtocol);

companion/src/modeledit/telemetry.h

@@ -96,7 +96,7 @@ class TelemetrySensorPanel: public ModelPanel
     void on_type_currentIndexChanged(int index);
     void on_formula_currentIndexChanged(int index);
     void on_unit_currentIndexChanged(int index);
-    void on_prec_valueChanged();
+    void on_prec_valueChanged(double value);
 
   protected:
     void updateSourcesComboBox(AutoComboBox * cb, bool negative);

companion/src/modelprinter.cpp

@@ -90,13 +90,16 @@ 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",
+	  "DIY Multiprotocol Module"
   };
 
   return CHECK_IN_ARRAY(strings, protocol);
@@ -140,6 +143,25 @@ QString ModelPrinter::printTrainerMode()
   return result;
 }
 
+QString ModelPrinter::printHeliSwashType ()
+{
+  switch (model.swashRingData.type) {
+    case HELI_SWASH_TYPE_90:
+        return tr("90");
+      case HELI_SWASH_TYPE_120:
+        return tr("120");
+      case HELI_SWASH_TYPE_120X:
+        return tr("120X");
+      case HELI_SWASH_TYPE_140:
+        return tr("140");
+      case HELI_SWASH_TYPE_NONE:
+        return tr("Off");
+      default:
+        return "???";
+    }
+}
+
+
 QString ModelPrinter::printCenterBeep()
 {
   QStringList strl;
@@ -304,6 +326,9 @@ QString ModelPrinter::printInputLine(const ExpoData & input)
     else if (input.carryTrim<0) str += " " + Qt::escape(RawSource(SOURCE_TYPE_TRIM, (-(input.carryTrim)-1)).toString(&model));
   }
 
+  if (input.offset)
+    str += " " + Qt::escape(tr("Offset(%1)").arg(getGVarString(input.offset)));
+
   if (firmware->getCapability(HasExpoNames) && input.name[0]) 
     str += Qt::escape(QString(" [%1]").arg(input.name));
 

companion/src/modelprinter.h

@@ -44,6 +44,7 @@ class ModelPrinter: public QObject
     QString printModule(int idx);
     QString printTrainerMode();
     QString printCenterBeep();
+    QString printHeliSwashType();
     QString printTrim(int flightModeIndex, int stickIndex);
     QString printGlobalVar(int flightModeIndex, int gvarIndex);
     QString printRotaryEncoder(int flightModeIndex, int reIndex);

companion/src/mountlist.cpp

@@ -209,8 +209,8 @@
 
 #ifdef MOUNTED_GETMNTINFO
 
-# if ! HAVE_STRUCT_STATFS_F_FSTYPENAME
-static char *
+# if defined(MOUNTED_VMOUNT) && ! HAVE_STRUCT_STATFS_F_FSTYPENAME
+static const char *
 fstype_to_string (short int t)
 {
   switch (t)
@@ -305,20 +305,11 @@ fstype_to_string (short int t)
 }
 # endif
 
-static char *
-fsp_to_string (const struct statfs *fsp)
-{
-# if HAVE_STRUCT_STATFS_F_FSTYPENAME
-  return (char *) (fsp->f_fstypename);
-# else
-  return fstype_to_string (fsp->f_type);
-# endif
-}
 
 #endif /* MOUNTED_GETMNTINFO */
 
 #ifdef MOUNTED_VMOUNT                /* AIX.  */
-static char *
+static const char *
 fstype_to_string (int t)
 {
   struct vfs_ent *e;
@@ -900,7 +891,7 @@ read_file_system_list (bool need_fs_type)
   *mtail = NULL;
   return mount_list;
 
-
+#if defined(MOUNTED_GETMNTENT1) || defined(MOUNTED_GETMNTENT2) || defined(MOUNTED_GETMNT) || defined(MOUNTED_FREAD) || defined(MOUNTED_FREAD_FSTYP)
  free_then_fail:
   {
     int saved_errno = errno;
@@ -920,6 +911,7 @@ read_file_system_list (bool need_fs_type)
     errno = saved_errno;
     return NULL;
   }
+#endif
 }
 
 void free_file_system_list(struct mount_entry * mount_list)

companion/src/multimodelprinter.cpp

@@ -128,6 +128,8 @@ QString MultiModelPrinter::print(QTextDocument * document)
 
   QString str = "<table border='1' cellspacing='0' cellpadding='3' width='100%' style='font-family: monospace;'>";
   str += printSetup();
+  if (firmware->getCapability(Heli))
+    str += printHeliSetup();
   if (firmware->getCapability(FlightModes))
     str += printFlightModes();
   str += printInputs();
@@ -181,6 +183,57 @@ QString MultiModelPrinter::printSetup()
   return str;
 }
 
+
+QString MultiModelPrinter::printHeliSetup()
+{
+  bool heliEnabled = false;
+  for (int k=0; k<models.size(); k++) {
+    heliEnabled =  heliEnabled || models[k]->swashRingData.type != HELI_SWASH_TYPE_NONE;
+  }
+
+  if (!heliEnabled)
+    return "";
+
+  QString str = printTitle(tr("Helicopter Setup"));
+  MultiColumns columns(models.size());
+  columns.appendTitle (tr("Swash Type:"));
+  COMPARE(modelPrinter->printHeliSwashType());
+  columns.append ("<br/>");
+
+  columns.appendTitle (tr("Swash Ring:"));
+  COMPARE(model->swashRingData.value);
+
+  columns.append ("<table cellspacing='0' cellpadding='1' width='100%' border='0' style='border-collapse:collapse'>");
+  columns.append("<tr>");
+  columns.append("<td></td><td><b>" + tr("Input") + "</b></td><td><b>" + tr("Weight") + "</b></td>");
+  columns.append("</tr>");
+
+  columns.append("<tr><td><b>" + tr("Long. cyc") + "</b></td><td>");
+  COMPARE(model->swashRingData.elevatorSource.toString(model));
+  columns.append("</td><td>");
+  COMPARE(model->swashRingData.elevatorWeight)
+  columns.append("</td></tr>");
+
+  columns.append("<tr><td><b>" + tr("Lateral cyc") + "</b></td><td>");
+  COMPARE(model->swashRingData.aileronSource.toString(model));
+  columns.append("</td><td>");
+  COMPARE(model->swashRingData.aileronWeight)
+  columns.append("</td></tr>");
+
+
+  columns.append("<tr><td><b>" + tr("Collective") + "</b></td><td>");
+  COMPARE(model->swashRingData.collectiveSource.toString(model));
+  columns.append("</td><td>");
+  COMPARE(model->swashRingData.collectiveWeight)
+  columns.append("</td></tr>");
+  columns.append("</table>");
+
+
+
+  str.append(columns.print());
+  return str;
+}
+
 QString MultiModelPrinter::printFlightModes()
 {
   QString str = printTitle(tr("Flight modes"));

companion/src/multimodelprinter.h

@@ -43,6 +43,7 @@ class MultiModelPrinter: public QObject
 
     QString printTitle(const QString & label);
     QString printSetup();
+    QString printHeliSetup();
     QString printFlightModes();
     QString printLimits();
     QString printInputs();

companion/src/process_sync.cpp

@@ -94,7 +94,7 @@ QString SyncProcess::updateEntry(const QString & path, const QDir & source, cons
   else {
     if (!destinationInfo.exists()) {
       // qDebug() << "Copy" << path << "to" << destinationPath;
-      progress->addText(tr("Copy %1 to %2\n").arg(path).arg(destinationPath));
+      progress->addText(tr("Copy %1 to %2").arg(path).arg(destinationPath) + "\n");
       if (!QFile::copy(path, destinationPath)) {
         return QObject::tr("Copy '%1' to '%2' failed").arg(path).arg(destinationPath);
       }
@@ -105,27 +105,38 @@ QString SyncProcess::updateEntry(const QString & path, const QDir & source, cons
       if (!sourceFile.open(QFile::ReadOnly)) {
         return QObject::tr("Open '%1' failed").arg(path);
       }
-      QString sourceContents = sourceFile.readAll();
+      QByteArray sourceContents = sourceFile.readAll();
       sourceFile.close();
-      // try to retrieve destination contents
-      QFile destinationFile(path);
-      if (destinationFile.open(QFile::ReadOnly)) {
-        QString destinationContents = destinationFile.readAll();
-        destinationFile.close();
-        if (sourceContents == destinationContents) {
-          // qDebug() << "Skip" << path;
-          return QString();
-        }
+
+      // retrieve destination contents
+      QFile destinationFile(destinationPath);
+      if (!destinationFile.open(QFile::ReadOnly)) {
+        return QObject::tr("Open '%1' failed").arg(destinationPath);
       }
-      if (!destinationFile.open(QFile::WriteOnly)) {
-        return QObject::tr("Write '%1' failed").arg(destinationPath);
-      }
-      progress->addText(tr("Write %1\n").arg(destinationPath));
-      // qDebug() << "Write" << destinationPath;
-      QTextStream destinationStream(&destinationFile);
-      destinationStream << sourceContents;
+      QByteArray destinationContents = destinationFile.readAll();
       destinationFile.close();
+
+      if (contentsDifferent(sourceContents, destinationContents)) {
+        // copy contents
+        if (!destinationFile.open(QFile::WriteOnly | QIODevice::Truncate)) {
+          return QObject::tr("Write '%1' failed").arg(destinationPath);
+        }
+        progress->addText(tr("Write %1").arg(destinationPath) + "\n");
+        // qDebug() << "Write" << destinationPath;
+        destinationFile.write(sourceContents);
+        destinationFile.close();
+      }
     }
   }
   return QString();
 }
+
+bool SyncProcess::contentsDifferent(const QByteArray & source, const QByteArray & dest) {
+  if (source.size() != dest.size()) return true;
+  for(int n=0; n<source.size(); ++n) {
+    if (source[n] != dest[n]) {
+      return true;
+    }
+  }
+  return false;
+}

companion/src/process_sync.h

@@ -3,6 +3,7 @@
 
 #include <QString>
 #include <QStringList>
+#include <QByteArray>
 
 class QDir;
 class ProgressWidget;
@@ -22,6 +23,7 @@ class SyncProcess : public QObject
     int getFilesCount(const QString & directory);
     QStringList updateDir(const QString & source, const QString & destination);
     QString updateEntry(const QString & path, const QDir & source, const QDir & destination);
+    bool contentsDifferent(const QByteArray & source, const QByteArray & dest);
     QString folder1;
     QString folder2;
     ProgressWidget * progress;

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

companion/src/radiointerface.cpp

@@ -138,7 +138,7 @@ QStringList getWriteFirmwareArgs(const QString &filename)
   else if (eepromInterface->getBoard() == BOARD_SKY9X) {
     return getSambaArgs(QString("send_file {Flash} \"") + filename + "\" 0x400000 0\n" + "FLASH::ScriptGPNMV 2\n");
   }
-  else if (eepromInterface->getBoard() == BOARD_9XRPRO) {
+  else if (eepromInterface->getBoard() == BOARD_9XRPRO || eepromInterface->getBoard() == BOARD_AR9X) {
     return getSambaArgs(QString("send_file {Flash} \"") + filename + "\" 0x400000 0\n" + "FLASH::ScriptGPNMV 2\n");
   }
   else {
@@ -191,7 +191,7 @@ void resetAvrdudeFuses(bool eepromProtect, ProgressWidget *progress)
     QStringList str;
     if (bcd.getMCU() == "m2560") {
       args << "-B8";
-      QString erStr = eepromProtect ? "hfuse:w:0x11:m" : "hfuse:w:0x19:m";
+      QString erStr = eepromProtect ? "hfuse:w:0x51:m" : "hfuse:w:0x59:m";
       str << "-U" << "lfuse:w:0xD7:m" << "-U" << erStr << "-U" << "efuse:w:0xFC:m";
       //use hfuse = 0x81 to prevent eeprom being erased with every flashing
     }
@@ -220,7 +220,7 @@ void resetAvrdudeFuses(bool eepromProtect, ProgressWidget *progress)
         lfuses = "lfuse:w:0x3F:m";
       }
 
-      QString erStr = eepromProtect ? "hfuse:w:0x81:m" : "hfuse:w:0x89:m";
+      QString erStr = eepromProtect ? "hfuse:w:0xC1:m" : "hfuse:w:0xC9:m";
       str << "-U" << lfuses << "-U" << erStr << "-U" << "efuse:w:0xFF:m";
       //use hfuse = 0x81 to prevent eeprom being erased with every flashing
     }

companion/src/shared/CMakeLists.txt

@@ -14,7 +14,6 @@ set(shared_HDRS
   autolineedit.h
   genericpanel.h
   hexspinbox.h
-  verticalscrollarea.h
 )
  
 qt4_wrap_cpp(shared_SRCS ${shared_HDRS})

companion/src/shared/autodoublespinbox.h

@@ -3,6 +3,11 @@
 
 #include <QDoubleSpinBox>
 #include "modeledit/modeledit.h"
+#if __GNUC__
+  #include <math.h>
+#else
+  #include "../targets/windows/winbuild.h"
+#endif
 
 class AutoDoubleSpinBox: public QDoubleSpinBox
 {
@@ -62,7 +67,7 @@ class AutoDoubleSpinBox: public QDoubleSpinBox
     void onValueChanged(double value)
     {
       if (field && !lock) {
-        *field = value * multiplier();
+        *field = round(value * multiplier());
         if (panel) {
           emit panel->modified();
         }

companion/src/shared/verticalscrollarea.cpp

@@ -5,8 +5,7 @@
 
 VerticalScrollArea::VerticalScrollArea(QWidget * parent, GenericPanel * panel):
   QScrollArea(parent),
-  panel(panel),
-  parent(parent)
+  panel(panel)
 {
   setWidgetResizable(true);
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);

companion/src/shared/verticalscrollarea.h

@@ -15,7 +15,6 @@ class VerticalScrollArea : public QScrollArea
 
   private:
     GenericPanel * panel;
-    QWidget * parent;
 };
 
 #endif

companion/src/simulation/simulatordialog-taranis.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>739</width>
-    <height>658</height>
+    <height>756</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -36,7 +36,7 @@
    <property name="spacing">
     <number>0</number>
    </property>
-   <item row="1" column="0" colspan="2">
+   <item row="2" column="0" colspan="2">
     <spacer name="horizontalSpacer_4">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -52,7 +52,7 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <widget class="QTabWidget" name="tabWidget">
      <property name="enabled">
       <bool>true</bool>
@@ -265,7 +265,7 @@
      </widget>
     </widget>
    </item>
-   <item row="0" column="0">
+   <item row="1" column="0">
     <widget class="QFrame" name="controlFrame">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -297,8 +297,8 @@
      <layout class="QGridLayout" name="gridLayout_9" rowstretch="1,0">
       <item row="0" column="0" colspan="3">
        <layout class="QGridLayout" name="gridLayout_8" rowstretch="0,0,0">
-        <item row="0" column="2">
-         <spacer name="horizontalSpacer_11">
+        <item row="0" column="7">
+         <spacer name="horizontalSpacer_7">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
@@ -310,20 +310,76 @@
           </property>
          </spacer>
         </item>
-        <item row="1" column="6">
-         <widget class="QLabel" name="label_3">
+        <item row="1" column="3">
+         <widget class="QLabel" name="label_5">
           <property name="text">
-           <string notr="true">SB</string>
+           <string notr="true">SE</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
           </property>
          </widget>
         </item>
-        <item row="1" column="4">
-         <widget class="QLabel" name="label_2">
+        <item row="1" column="11">
+         <widget class="QLabel" name="label_4">
           <property name="text">
-           <string notr="true">SA</string>
+           <string notr="true">SC</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="0">
+         <widget class="QSlider" name="switchF">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>50</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="statusTip">
+           <string/>
+          </property>
+          <property name="maximum">
+           <number>1</number>
+          </property>
+          <property name="pageStep">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>0</number>
+          </property>
+          <property name="sliderPosition">
+           <number>0</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="invertedAppearance">
+           <bool>true</bool>
+          </property>
+          <property name="tickPosition">
+           <enum>QSlider::TicksBothSides</enum>
+          </property>
+          <property name="tickInterval">
+           <number>1</number>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="16">
+         <widget class="QLabel" name="sliderLabel1">
+          <property name="text">
+           <string notr="true">RS</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -343,8 +399,28 @@
           </property>
          </spacer>
         </item>
-        <item row="0" column="12">
-         <spacer name="horizontalSpacer_13">
+        <item row="1" column="4">
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string notr="true">SA</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="6">
+         <widget class="QLabel" name="label_3">
+          <property name="text">
+           <string notr="true">SB</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="2">
+         <spacer name="horizontalSpacer_11">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
@@ -436,84 +512,8 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="11">
-         <widget class="QLabel" name="label_4">
-          <property name="text">
-           <string notr="true">SC</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="3">
-         <widget class="QLabel" name="label_5">
-          <property name="text">
-           <string notr="true">SE</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="16">
-         <widget class="QLabel" name="sliderLabel1">
-          <property name="text">
-           <string notr="true">RS</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="0">
-         <widget class="QSlider" name="switchF">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>50</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="statusTip">
-           <string/>
-          </property>
-          <property name="maximum">
-           <number>1</number>
-          </property>
-          <property name="pageStep">
-           <number>1</number>
-          </property>
-          <property name="value">
-           <number>0</number>
-          </property>
-          <property name="sliderPosition">
-           <number>0</number>
-          </property>
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="invertedAppearance">
-           <bool>true</bool>
-          </property>
-          <property name="tickPosition">
-           <enum>QSlider::TicksBothSides</enum>
-          </property>
-          <property name="tickInterval">
-           <number>1</number>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="7">
-         <spacer name="horizontalSpacer_7">
+        <item row="0" column="12">
+         <spacer name="horizontalSpacer_13">
           <property name="orientation">
            <enum>Qt::Horizontal</enum>
           </property>
@@ -525,6 +525,26 @@
           </property>
          </spacer>
         </item>
+        <item row="1" column="17">
+         <widget class="QLabel" name="label_8">
+          <property name="text">
+           <string notr="true">SH</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
+        <item row="1" column="1">
+         <widget class="QLabel" name="sliderLabel0">
+          <property name="text">
+           <string notr="true">LS</string>
+          </property>
+          <property name="alignment">
+           <set>Qt::AlignCenter</set>
+          </property>
+         </widget>
+        </item>
         <item row="0" column="13">
          <widget class="QSlider" name="switchD">
           <property name="sizePolicy">
@@ -565,39 +585,6 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="1">
-         <widget class="QLabel" name="sliderLabel0">
-          <property name="text">
-           <string notr="true">LS</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="15">
-         <spacer name="horizontalSpacer_14">
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>13</width>
-            <height>47</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item row="1" column="17">
-         <widget class="QLabel" name="label_8">
-          <property name="text">
-           <string notr="true">SH</string>
-          </property>
-          <property name="alignment">
-           <set>Qt::AlignCenter</set>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="17">
          <widget class="QSlider" name="switchH">
           <property name="sizePolicy">
@@ -654,10 +641,23 @@
           </property>
          </spacer>
         </item>
-        <item row="1" column="14">
-         <widget class="QLabel" name="label_7">
+        <item row="0" column="15">
+         <spacer name="horizontalSpacer_14">
+          <property name="orientation">
+           <enum>Qt::Horizontal</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>13</width>
+            <height>47</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+        <item row="1" column="0">
+         <widget class="QLabel" name="label">
           <property name="text">
-           <string notr="true">SG</string>
+           <string notr="true">SF</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -707,10 +707,10 @@
           </property>
          </widget>
         </item>
-        <item row="1" column="0">
-         <widget class="QLabel" name="label">
+        <item row="1" column="14">
+         <widget class="QLabel" name="label_7">
           <property name="text">
-           <string notr="true">SF</string>
+           <string notr="true">SG</string>
           </property>
           <property name="alignment">
            <set>Qt::AlignCenter</set>
@@ -757,46 +757,6 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="6">
-         <widget class="QSlider" name="switchB">
-          <property name="sizePolicy">
-           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-           </sizepolicy>
-          </property>
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>50</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string/>
-          </property>
-          <property name="maximum">
-           <number>2</number>
-          </property>
-          <property name="pageStep">
-           <number>1</number>
-          </property>
-          <property name="value">
-           <number>0</number>
-          </property>
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="invertedAppearance">
-           <bool>true</bool>
-          </property>
-          <property name="tickPosition">
-           <enum>QSlider::TicksBothSides</enum>
-          </property>
-          <property name="tickInterval">
-           <number>1</number>
-          </property>
-         </widget>
-        </item>
         <item row="1" column="13">
          <widget class="QLabel" name="label_6">
           <property name="text">
@@ -807,25 +767,6 @@
           </property>
          </widget>
         </item>
-        <item row="0" column="16">
-         <widget class="QSlider" name="slider1">
-          <property name="maximumSize">
-           <size>
-            <width>16777215</width>
-            <height>50</height>
-           </size>
-          </property>
-          <property name="minimum">
-           <number>-1024</number>
-          </property>
-          <property name="maximum">
-           <number>1024</number>
-          </property>
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-         </widget>
-        </item>
         <item row="0" column="1">
          <widget class="QSlider" name="slider0">
           <property name="maximumSize">
@@ -861,6 +802,65 @@
           </property>
          </spacer>
         </item>
+        <item row="0" column="16">
+         <widget class="QSlider" name="slider1">
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>50</height>
+           </size>
+          </property>
+          <property name="minimum">
+           <number>-1024</number>
+          </property>
+          <property name="maximum">
+           <number>1024</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+         </widget>
+        </item>
+        <item row="0" column="6">
+         <widget class="QSlider" name="switchB">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="maximumSize">
+           <size>
+            <width>16777215</width>
+            <height>50</height>
+           </size>
+          </property>
+          <property name="toolTip">
+           <string/>
+          </property>
+          <property name="maximum">
+           <number>2</number>
+          </property>
+          <property name="pageStep">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>0</number>
+          </property>
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="invertedAppearance">
+           <bool>true</bool>
+          </property>
+          <property name="tickPosition">
+           <enum>QSlider::TicksBothSides</enum>
+          </property>
+          <property name="tickInterval">
+           <number>1</number>
+          </property>
+         </widget>
+        </item>
         <item row="0" column="8" rowspan="2" colspan="2">
          <layout class="QGridLayout" name="gridLayout_10">
           <item row="0" column="1">
@@ -1731,6 +1731,50 @@ QPushButton:checked {
      </layout>
     </widget>
    </item>
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="telemSim">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>PF4 - Telemetry Simulator</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="trainerSim">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>PF5- Trainer Simulator</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="debugConsole">
+       <property name="focusPolicy">
+        <enum>Qt::NoFocus</enum>
+       </property>
+       <property name="text">
+        <string>PF6 - Debug Console Output</string>
+       </property>
+      </widget>
+     </item>
+      <item>
+        <widget class="QPushButton" name="luaReload">
+          <property name="focusPolicy">
+            <enum>Qt::NoFocus</enum>
+          </property>
+          <property name="text">
+            <string>PF7 - Reload Lua Scripts</string>
+          </property>
+        </widget>
+      </item>
+    </layout>
+   </item>
   </layout>
  </widget>
  <customwidgets>
@@ -1763,6 +1807,48 @@ QPushButton:checked {
    <header location="global">myqdial.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>telemSim</tabstop>
+  <tabstop>trainerSim</tabstop>
+  <tabstop>debugConsole</tabstop>
+  <tabstop>switchF</tabstop>
+  <tabstop>slider0</tabstop>
+  <tabstop>switchE</tabstop>
+  <tabstop>switchA</tabstop>
+  <tabstop>switchB</tabstop>
+  <tabstop>pot0</tabstop>
+  <tabstop>pot1</tabstop>
+  <tabstop>pot2</tabstop>
+  <tabstop>pot3</tabstop>
+  <tabstop>switchC</tabstop>
+  <tabstop>switchD</tabstop>
+  <tabstop>switchG</tabstop>
+  <tabstop>slider1</tabstop>
+  <tabstop>switchH</tabstop>
+  <tabstop>leftStick</tabstop>
+  <tabstop>holdLeftY</tabstop>
+  <tabstop>FixLeftY</tabstop>
+  <tabstop>FixLeftX</tabstop>
+  <tabstop>holdLeftX</tabstop>
+  <tabstop>trimVL_U</tabstop>
+  <tabstop>trimVLeft</tabstop>
+  <tabstop>trimVL_D</tabstop>
+  <tabstop>trimHL_L</tabstop>
+  <tabstop>trimHLeft</tabstop>
+  <tabstop>trimHL_R</tabstop>
+  <tabstop>rightStick</tabstop>
+  <tabstop>trimVR_U</tabstop>
+  <tabstop>trimVRight</tabstop>
+  <tabstop>trimVR_D</tabstop>
+  <tabstop>holdRightY</tabstop>
+  <tabstop>FixRightY</tabstop>
+  <tabstop>FixRightX</tabstop>
+  <tabstop>holdRightX</tabstop>
+  <tabstop>trimHR_L</tabstop>
+  <tabstop>trimHRight</tabstop>
+  <tabstop>trimHR_R</tabstop>
+ </tabstops>
  <resources>
   <include location="../companion.qrc"/>
  </resources>

companion/src/simulation/simulatordialog.cpp

@@ -67,6 +67,7 @@ SimulatorDialog::SimulatorDialog(QWidget * parent, SimulatorInterface *simulator
   new QShortcut(QKeySequence(Qt::Key_F4), this, SLOT(openTelemetrySimulator()));
   new QShortcut(QKeySequence(Qt::Key_F5), this, SLOT(openTrainerSimulator()));
   new QShortcut(QKeySequence(Qt::Key_F6), this, SLOT(openDebugOutput()));
+  new QShortcut(QKeySequence(Qt::Key_F7), this, SLOT(luaReload()));
   traceCallbackInstance = this;
 }
 
@@ -209,6 +210,10 @@ SimulatorDialogTaranis::SimulatorDialogTaranis(QWidget * parent, SimulatorInterf
   connect(ui->trimHL_L, SIGNAL(released()), this, SLOT(onTrimReleased()));
   connect(ui->trimVL_U, SIGNAL(released()), this, SLOT(onTrimReleased()));
   connect(ui->trimVL_D, SIGNAL(released()), this, SLOT(onTrimReleased()));
+  connect(ui->telemSim, SIGNAL(released()), this, SLOT(openTelemetrySimulator()));
+  connect(ui->trainerSim, SIGNAL(released()), this, SLOT(openTrainerSimulator()));
+  connect(ui->debugConsole, SIGNAL(released()), this, SLOT(openDebugOutput()));
+  connect(ui->luaReload, SIGNAL(released()), this, SLOT(luaReload()));
 }
 
 SimulatorDialogTaranis::~SimulatorDialogTaranis()
@@ -318,6 +323,12 @@ void SimulatorDialog::openDebugOutput()
   }
 }
 
+void SimulatorDialog::luaReload()
+{
+  // force a reload of the lua environment (as if a standalone script were run)
+  simulator->setLuaStateReloadPermanentScripts();
+}
+
 void SimulatorDialog::onDebugOutputClose()
 {
   DebugOut = 0;
@@ -851,7 +862,7 @@ void SimulatorDialogTaranis::getValues()
     {
       -pots[0]->value(),
       pots[1]->value(),
-      ((flags && SIMULATOR_FLAGS_S3) ? pots[2]->value() : 0),
+      ((flags & SIMULATOR_FLAGS_S3) ? pots[2]->value() : 0),
       -sliders[0]->value(),
       sliders[1]->value()
     },

companion/src/simulation/simulatordialog.h

@@ -151,6 +151,7 @@ class SimulatorDialog : public QDialog
     void openTrainerSimulator();
     void openDebugOutput();
     void onDebugOutputClose();
+    void luaReload();
 
 #ifdef JOYSTICKS
     void onjoystickAxisValueChanged(int axis, int value);

companion/src/simulation/simulatorinterface.cpp

@@ -77,6 +77,7 @@ SimulatorFactory *getSimulatorFactory(const QString &name)
     foreach (QString name, registered_simulators.keys()) {
       if (name.contains(simuName)) {
         simuName = name;
+        qDebug() << "found" << simuName;
         return registered_simulators[simuName];
       }
     }

companion/src/simulation/simulatorinterface.h

@@ -99,9 +99,15 @@ class SimulatorInterface
 
     virtual void sendTelemetry(uint8_t * data, unsigned int len) = 0;
 
+    virtual uint8_t getSensorInstance(uint16_t id, uint8_t defaultValue = 0) = 0;
+
+    virtual uint16_t getSensorRatio(uint16_t id) = 0;
+
     virtual void setTrainerInput(unsigned int inputNumber, int16_t value) = 0;
 
     virtual void installTraceHook(void (*callback)(const char *)) = 0;
+
+    virtual void setLuaStateReloadPermanentScripts() = 0;
 };
 
 class SimulatorFactory {

companion/src/simulation/telemetrysimu.h

@@ -1,13 +1,16 @@
 #ifndef telemetrysimu_h
 #define telemetrysimu_h
 
-
 #include <QCloseEvent>
 #include <QDialog>
 #include <QTimer>
+#include <QDateTime>
+#include <QtCore/qmath.h>
+#include <QFileDialog>
+
 #include "simulatorinterface.h"
 
-#define INSTANCE (ui->Instance->text().toInt(&ok,0) -1)
+static double const SPEEDS[] = { 0.2, 0.4, 0.6, 0.8, 1, 2, 3, 4, 5 };
 
 namespace Ui {
   class TelemetrySimulator;
@@ -22,19 +25,146 @@ class TelemetrySimulator : public QDialog
     explicit TelemetrySimulator(QWidget * parent, SimulatorInterface * simulator);
     virtual ~TelemetrySimulator();
 
-
   protected:
     virtual void closeEvent(QCloseEvent *event);
+    virtual void showEvent(QShowEvent *event);
 
   private:
+    class LogPlaybackController
+    {
+    public:
+      LogPlaybackController(Ui::TelemetrySimulator * ui);
+      bool isReady();
+      void loadLogFile();
+      void play();
+      void stop();
+      void rewind();
+      void stepForward(bool focusOnStop);
+      void stepBack();
+      void updatePositionLabel(int32_t percentage);
+      void setUiDataValues();
+      double logFrequency; // in seconds
+    private:
+      enum CONVERT_TYPE {
+        RXBT_V,
+        RSSI,
+        SWR,
+        A1,
+        A2,
+        A3,
+        A4,
+        T1_DEGC,
+        T1_DEGF,
+        T2_DEGC,
+        T2_DEGF,
+        RPM,
+        FUEL,
+        VSPD_MS,
+        VSPD_FS,
+        ALT_FEET,
+        ALT_METERS,
+        FASV,
+        FASC,
+        CELS_GRE,
+        ASPD_KTS,
+        ASPD_KMH,
+        ASPD_MPH,
+        GALT_FEET,
+        GALT_METERS,
+        GSPD_KNTS,
+        GSPD_KMH,
+        GSPD_MPH,
+        GHDG_DEG,
+        GDATE,
+        G_LATLON,
+        ACCX,
+        ACCY,
+        ACCZ,
+        FUEL_QTY,
+      };
+      QMap<QString, CONVERT_TYPE> colToFuncMap; // contains all 'known' column headings and how they are to be processed
+      Ui::TelemetrySimulator * ui;
+      struct DATA_TO_FUNC_XREF {
+        CONVERT_TYPE functionIndex;
+        int32_t dataIndex;
+      };
+      QStringList csvRecords; // contents of the log file (one string per line);
+      QStringList columnNames;
+      QList<DATA_TO_FUNC_XREF> supportedCols;
+      int32_t recordIndex;
+      double convertFeetToMeters(QString input);
+      double convertFahrenheitToCelsius(QString input);
+      QString convertGPSDate(QString input);
+      QString convertGPS(QString input);
+      void addColumnHash(QString key, CONVERT_TYPE functionIndex);
+      double convertDegMin(QString input);
+      bool stepping;
+      QDateTime parseTransmittterTimestamp(QString row);
+      void calcLogFrequency();
+    };
+
+private:
     Ui::TelemetrySimulator * ui;
     QTimer * timer;
+    QTimer * logTimer;
     SimulatorInterface *simulator;
-
     void generateTelemetryFrame();
-
+    TelemetrySimulator::LogPlaybackController *logPlayback;
+  
   private slots:
+    void onSimulateToggled(bool isChecked);
     void onTimerEvent();
+    void onLogTimerEvent();
+    void onLoadLogFile();
+    void onPlay();
+    void onRewind();
+    void onStepForward();
+    void onStepBack();
+    void onStop();
+    void onPositionIndicatorChanged(int value);
+    void onReplayRateChanged(int value);
+
+
+  private: // private classes follow
+    class FlvssEmulator
+    {
+    public:
+        uint32_t setAllCells_GetNextPair(double cellValues[6]);
+        static const uint32_t MAXCELLS = 6;
+    private:
+      void encodeAllCells();
+      void splitIntoCells(double totalVolts);
+      static uint32_t encodeCellPair(uint8_t cellNum, uint8_t firstCellNo, double cell1, double cell2);
+      double cellFloats[6];
+      uint32_t nextCellNum;
+      uint32_t numCells;
+      uint32_t cellData1;
+      uint32_t cellData2;
+      uint32_t cellData3;
+    };
+
+    class GPSEmulator
+    {
+    public:
+      GPSEmulator();
+      uint32_t getNextPacketData(uint32_t packetType);
+      void setGPSDateTime(QString dateTime);
+      void setGPSLatLon(QString latLon);
+      void setGPSCourse(double course);
+      void setGPSSpeedKMH(double speed);
+      void setGPSAltitude(double altitude);
+    private:
+      QDateTime dt;
+      bool sendLat;
+      bool sendDate;
+      double lat;
+      double lon;
+      double course;
+      double speedKNTS;
+      double altitude; // in meters
+      uint32_t encodeLatLon(double latLon, bool isLat);
+      uint32_t encodeDateTime(uint8_t yearOrHour, uint8_t monthOrMinute, uint8_t dayOrSecond, bool isDate);
+    };
 
 };
 

companion/src/simulator.cpp

@@ -1,187 +1,243 @@
-/****************************************************************************
-**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the examples of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial Usage
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QTranslator>
-#include <QLocale>
-#include <QString>
-#include <QDir>
-#include <QFileInfo>
-#include <QSplashScreen>
-#include <QThread>
-#include <iostream>
-#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
-  #include <SDL.h>
-  #undef main
-#endif
-#include "simulatordialog.h"
-#include "eeprominterface.h"
-#include "appdata.h"
-
-#if defined WIN32 || !defined __GNUC__
-#include <windows.h>
-#define sleep(x) Sleep(x*1000)
-#else
-#include <unistd.h>
-#endif
-
-#ifdef __APPLE__
-#include <QProxyStyle> 
-
-class MyProxyStyle : public QProxyStyle
- {
-   public:
-    void polish ( QWidget * w ) {
-      QMenu* mn = dynamic_cast<QMenu*>(w);
-      QPushButton* pb = dynamic_cast<QPushButton*>(w);
-      if(!(mn || pb) && !w->testAttribute(Qt::WA_MacNormalSize))
-          w->setAttribute(Qt::WA_MacSmallSize);
-    }
- };
-#endif
-
-int main(int argc, char *argv[])
-{
-  Q_INIT_RESOURCE(companion);
-  QApplication app(argc, argv);
-  app.setApplicationName("OpenTX Simulator");
-  app.setOrganizationName("OpenTX");
-  app.setOrganizationDomain("open-tx.org");
-
-#ifdef __APPLE__
-  app.setStyle(new MyProxyStyle);
-#endif
-
-  QString dir;
-  if (argc) dir = QFileInfo(argv[0]).canonicalPath() + "/lang";
-
-  /* QTranslator companionTranslator;
-  companionTranslator.load(":/companion_" + locale);
-  QTranslator qtTranslator;
-  qtTranslator.load((QString)"qt_" + locale.left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
-  app.installTranslator(&companionTranslator);
-  app.installTranslator(&qtTranslator);
-*/
-
-  QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
-
-#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
-  uint32_t sdlFlags = 0;
-  #ifdef JOYSTICKS
-    sdlFlags |= SDL_INIT_JOYSTICK;
-  #endif
-  #ifdef SIMU_AUDIO
-    sdlFlags |= SDL_INIT_AUDIO;
-  #endif
-  if (SDL_Init(sdlFlags) < 0) {
-    fprintf(stderr, "ERROR: couldn't initialize SDL: %s\n", SDL_GetError());
-  }
-#endif
-
-  SimulatorDialog *dialog;
-  QString eepromFileName;
-  QDir eedir;
-  QFile file;
-
-  registerSimulators();
-  registerOpenTxFirmwares();
-
-  eedir = QDir(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation));
-  if (!eedir.exists("OpenTX")) {
-    eedir.mkdir("OpenTX");
-  }
-  eedir.cd("OpenTX");
-
-  QStringList firmwareIds;
-  int currentIdx = 0;
-  foreach(SimulatorFactory *factory, registered_simulators) {
-    firmwareIds << factory->name();
-    if (factory->name() == g.lastSimulator()) {
-      currentIdx = firmwareIds.size() - 1;
-    }
-  }
-
-  bool ok;
-  QString firmwareId = QInputDialog::getItem(0, QObject::tr("Radio type"), 
-                                                QObject::tr("Which radio type do you want to simulate?"),
-                                                firmwareIds, currentIdx, false, &ok);
-  if (ok && !firmwareId.isEmpty()) {
-    if (firmwareId != g.lastSimulator()) {
-      g.lastSimulator(firmwareId);
-    }
-    QString radioId;
-    int pos = firmwareId.indexOf("-");
-    if (pos > 0) {
-      radioId = firmwareId.mid(pos+1);
-      pos = radioId.lastIndexOf("-");
-      if (pos > 0) {
-        radioId = radioId.mid(0, pos);
-      }
-    }
-    current_firmware_variant = GetFirmware(firmwareId);
-    eepromFileName = QString("eeprom-%1.bin").arg(radioId);
-    eepromFileName = eedir.filePath(eepromFileName.toAscii());
-    SimulatorFactory *factory = getSimulatorFactory(firmwareId);
-    if (factory->type() == BOARD_TARANIS)
-      dialog = new SimulatorDialogTaranis(NULL, factory->create(), SIMULATOR_FLAGS_S1|SIMULATOR_FLAGS_S2);
-    else
-      dialog = new SimulatorDialog9X(NULL, factory->create());
-  }
-  else {
-    return 0;
-  }
-
-  dialog->show();
-  dialog->start(eepromFileName.toAscii().constData());
-
-  int result = app.exec();
-
-  delete dialog;
-
-  unregisterSimulators();
-  unregisterOpenTxFirmwares();
-
-#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
-  SDL_Quit();
-#endif
-
-  return result;
-}
+/****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial Usage
+** Licensees holding valid Qt Commercial licenses may use this file in
+** accordance with the Qt Commercial License Agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Nokia.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QTranslator>
+#include <QLocale>
+#include <QString>
+#include <QDir>
+#include <QFileInfo>
+#include <QSplashScreen>
+#include <QThread>
+#include <QDebug>
+#include <QTextStream>
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  #include <SDL.h>
+  #undef main
+#endif
+#include "simulatordialog.h"
+#include "eeprominterface.h"
+#include "appdata.h"
+#include "qxtcommandoptions.h"
+
+#if defined WIN32 || !defined __GNUC__
+#include <windows.h>
+#define sleep(x) Sleep(x*1000)
+#else
+#include <unistd.h>
+#endif
+
+#ifdef __APPLE__
+#include <QProxyStyle> 
+
+class MyProxyStyle : public QProxyStyle
+ {
+   public:
+    void polish ( QWidget * w ) {
+      QMenu* mn = dynamic_cast<QMenu*>(w);
+      QPushButton* pb = dynamic_cast<QPushButton*>(w);
+      if(!(mn || pb) && !w->testAttribute(Qt::WA_MacNormalSize))
+          w->setAttribute(Qt::WA_MacSmallSize);
+    }
+ };
+#endif
+
+
+void showMessage(const QString & message, enum QMessageBox::Icon icon = QMessageBox::NoIcon) {
+  QMessageBox msgBox;
+  msgBox.setText(message);
+  msgBox.setIcon(icon);
+  msgBox.exec();
+}
+
+int main(int argc, char *argv[])
+{
+  Q_INIT_RESOURCE(companion);
+  QApplication app(argc, argv);
+  app.setApplicationName("OpenTX Simulator");
+  app.setOrganizationName("OpenTX");
+  app.setOrganizationDomain("open-tx.org");
+
+#ifdef __APPLE__
+  app.setStyle(new MyProxyStyle);
+#endif
+
+  /* QTranslator companionTranslator;
+  companionTranslator.load(":/companion_" + locale);
+  QTranslator qtTranslator;
+  qtTranslator.load((QString)"qt_" + locale.left(2), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+  app.installTranslator(&companionTranslator);
+  app.installTranslator(&qtTranslator);
+*/
+
+  QTextCodec::setCodecForCStrings(QTextCodec::codecForName("UTF-8"));
+
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  uint32_t sdlFlags = 0;
+  #ifdef JOYSTICKS
+    sdlFlags |= SDL_INIT_JOYSTICK;
+  #endif
+  #ifdef SIMU_AUDIO
+    sdlFlags |= SDL_INIT_AUDIO;
+  #endif
+  if (SDL_Init(sdlFlags) < 0) {
+    showMessage(QObject::tr("WARNING: couldn't initialize SDL:\n%1").arg(SDL_GetError()), QMessageBox::Warning);
+  }
+#endif
+
+  SimulatorDialog *dialog;
+  QString eepromFileName;
+  QDir eedir;
+  QFile file;
+
+  registerSimulators();
+  registerOpenTxFirmwares();
+
+  eedir = QDir(QDesktopServices::storageLocation(QDesktopServices::DocumentsLocation));
+  if (!eedir.exists("OpenTX")) {
+    eedir.mkdir("OpenTX");
+  }
+  eedir.cd("OpenTX");
+
+  QStringList firmwareIds;
+  int currentIdx = 0;
+  foreach(SimulatorFactory *factory, registered_simulators) {
+    firmwareIds << factory->name();
+    if (factory->name() == g.lastSimulator()) {
+      currentIdx = firmwareIds.size() - 1;
+    }
+  }
+
+  QxtCommandOptions options;
+  options.add("radio", "radio to simulate", QxtCommandOptions::ValueRequired);
+  options.alias("radio", "r");
+  options.add("help", "show this help text");
+  options.alias("help", "h");
+  options.parse(QCoreApplication::arguments());
+  if(options.count("help") || options.showUnrecognizedWarning()) {
+    QString msg;
+    QTextStream stream(&msg);
+    stream << "Usage: simulator [OPTION]... [EEPROM.BIN FILE] " << endl << endl;
+    stream << "Options:" << endl;
+    options.showUsage(false, stream);
+    // list all available radios
+    stream << endl << "Available radios:" << endl;
+    foreach(QString name, firmwareIds) {
+      stream << "\t" << name << endl;
+    }
+    // display
+    showMessage(msg, QMessageBox::Information);
+    return 1;
+  }
+
+
+  bool ok = false;
+  QString firmwareId;
+  if (options.count("radio") == 1) {
+    firmwareId = options.value("radio").toString();
+    if (firmwareIds.contains(firmwareId)) {
+      ok = true;
+    }
+  }
+  if (!ok) {
+    firmwareId = QInputDialog::getItem(0, QObject::tr("Radio type"), 
+                                                QObject::tr("Which radio type do you want to simulate?"),
+                                                firmwareIds, currentIdx, false, &ok);
+  }
+  qDebug() << "firmwareId" << firmwareId;
+
+  if (ok && !firmwareId.isEmpty()) {
+    if (firmwareId != g.lastSimulator()) {
+      g.lastSimulator(firmwareId);
+    }
+    QString radioId;
+    int pos = firmwareId.indexOf("-");
+    if (pos > 0) {
+      radioId = firmwareId.mid(pos+1);
+      pos = radioId.lastIndexOf("-");
+      if (pos > 0) {
+        radioId = radioId.mid(0, pos);
+      }
+    }
+    qDebug() << "radioId" << radioId;
+    current_firmware_variant = GetFirmware(firmwareId);
+    qDebug() << "current_firmware_variant" << current_firmware_variant->getName();
+
+    if (options.positional().isEmpty()) {
+      eepromFileName = QString("eeprom-%1.bin").arg(radioId);
+      eepromFileName = eedir.filePath(eepromFileName.toAscii());
+    }
+    else {
+      eepromFileName = options.positional()[0];
+    }
+    qDebug() << "eepromFileName" << eepromFileName;
+    // TODO display used eeprom filename somewhere
+
+    SimulatorFactory *factory = getSimulatorFactory(firmwareId);
+    if (!factory) {
+      showMessage(QObject::tr("ERROR: Simulator %1 not found").arg(firmwareId), QMessageBox::Critical);
+      return 2;
+    }
+    if (factory->type() == BOARD_TARANIS)
+      dialog = new SimulatorDialogTaranis(NULL, factory->create(), SIMULATOR_FLAGS_S1|SIMULATOR_FLAGS_S2);
+    else
+      dialog = new SimulatorDialog9X(NULL, factory->create());
+  }
+  else {
+    return 0;
+  }
+
+  dialog->show();
+  dialog->start(eepromFileName.toAscii().constData());
+
+  int result = app.exec();
+
+  delete dialog;
+
+  unregisterSimulators();
+  unregisterOpenTxFirmwares();
+
+#if defined(JOYSTICKS) || defined(SIMU_AUDIO)
+  SDL_Quit();
+#endif
+
+  return result;
+}