Czech translations (Companion)

Italian translation in progress

DONATIONS.txt

@@ -640,3 +640,36 @@ Jeffery Golias
 Nick Milton
 Paul Zasso
 Reidar Johannes Lillebotn
+Handley William
+Luke Williams
+Michael Shellim
+Brian Spearing
+Derek Foster
+Pasi Pitkänen
+Lexington S Morley
+Jeff Roberson
+Volkov Victor
+Mike Perkins 
+Bryan Anderson
+Daniel Garber
+Pavel Stein 
+Ravi Gupta
+Patrick Tuxbury
+Mark Deverell
+John Capell 
+Neil McVean
+Matthew Elyash
+Kerry Cochrell
+Willem Aandewiel 
+Reg Bell
+Jean Chenoz
+Philippe Grand
+Tauno Rautakorpi
+Jeff Dillingham
+Brad Kelley
+Shaun Currier
+Danilo Schiara
+John Hennig
+RK Custom Homes
+James Houck
+Piet Teekens

companion/releasenotes.txt

@@ -1,3 +1,22 @@
+<h2>Version 2.0.14 / todo</h2>
+<ul>
+<li>OpenTX Companion and Companion9x can now be installed side by side on Linux</li>
+<li>Improved TAB order in dialogs</li>
+<li>Special Function <i>Start Logs</i> renamed to more appropriate <i>SD Logs</i></li>
+<li>Improvements for MAC build</li>
+<li>Fixes to Google Earth logs export</li>
+<li>Firmware compatibility warning check added when flashing new firmware to radio</li>
+<li>Fixed issue with Telemetry Type setting on 9XR-PRO</li>
+<li>Added Telemetry simulator</li>
+<li>Added Trainer simulator</li>
+<li>Added Debug Output window</li>
+<li>Various texts and translations corrections</li>
+<li>Various small bug-fixes</li>
+<li>More reliable method of writing EEPROM.BIN and FRIMWARE.BIN to radio</li>
+<li>Fixed issue with Edge function INSTANT for V1>2s</li>
+<li>Fixed buffer overflow in Joystick code</li>
+</ul>
+
 <h2>Version 2.0.13 / 2014-11-20</h2>
 <ul>
 <li>Too many curves shown on non ARM boards</li>

companion/src/CMakeLists.txt

@@ -2,7 +2,7 @@ PROJECT( companion )
 
 SET( C9X_VERSION_MAJOR "2" )
 SET( C9X_VERSION_MINOR "0" )
-SET( C9X_VERSION_REVISION "13" )
+SET( C9X_VERSION_REVISION "14" )
 SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION} )
 
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
@@ -364,7 +364,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     INSTALL( FILES images/linuxicons/256x256/companion.png  DESTINATION /usr/share/icons/hicolor/256x256/apps )
     INSTALL( FILES images/linuxicons/512x512/companion.png  DESTINATION /usr/share/icons/hicolor/512x512/apps )
     INSTALL( FILES images/linuxicons/scalable/companion.svg DESTINATION /usr/share/icons/hicolor/scalable/apps )
-    INSTALL( FILES ../targets/linux/45-taranis.rules DESTINATION /etc/udev/rules.d/ )
+    INSTALL( FILES ../targets/linux/45-companion-taranis.rules DESTINATION /etc/udev/rules.d/ )
     # Linux specific code
     SET(OperatingSystem "Linux")
 ELSE (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -411,14 +411,13 @@ IF( APPLE )
                      COMMAND mkdir -p companion.app/Contents/Resources
                      COMMAND mkdir -p companion.app/Contents/translations                     
                      COMMAND rsync ${PROJECT_SOURCE_DIR}/images/${MACOSX_BUNDLE_ICON_FILE} companion.app/Contents/Resources/${MACOSX_BUNDLE_ICON_FILE} # Copy the icon files
-                     #COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/lib* companion.app/Contents/Frameworks
-                     #COMMAND rsync ${PROJECT_SOURCE_DIR}/../targets/mac/libcrypto.1.0.0.dylib companion.app/Contents/Frameworks
-                     COMMAND rsync -r --exclude=.svn  ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/
+                     COMMAND rsync -r --exclude=.svn ${PROJECT_SOURCE_DIR}/../targets/mac/qt_menu.nib companion.app/Contents/Resources/
+                     COMMAND rsync -r /Library/Frameworks/SDL.framework companion.app/Contents/Frameworks/
                      COMMAND rsync ${PROJECT_BINARY_DIR}/*.qm companion.app/Contents/translations
                      COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app
+                     COMMAND install_name_tool -change @rpath/SDL.framework/Versions/A/SDL @executable_path/../Frameworks/SDL.framework/Versions/A/SDL companion.app/Contents/MacOS/companion
                      WORKING_DIRECTORY ${WORK_DIR}
                      DEPENDS ${PROJECT_NAME} )
-
                         
   ADD_CUSTOM_TARGET( makedmg
                      COMMAND ${QT_BINARY_DIR}/macdeployqt companion.app -dmg -no-plugins
@@ -453,7 +452,7 @@ if(DPKG_PROGRAM)
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
   SET(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME_LOWERCASE}_${C9X_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
-  SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Romolo Manfredini <romolo.manfredini-nosp@m-gmail.com>")
+  SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Bertrand Songis <bsongis-nosp@m-gmail.com>")
   SET(CPACK_DEBIAN_PACKAGE_VERSION ${C9X_VERSION})
   SET(CPACK_DEBIAN_PACKAGE_VERSION_MAJOR ${C9X_VERSION_MAJOR})
   SET(CPACK_DEBIAN_PACKAGE_VERSION_MINOR ${C9X_VERSION_MINOR})

companion/src/appdata.cpp

@@ -499,6 +499,7 @@ QString AppData::snapshotDir()     { return _snapshotDir;     }
 QString AppData::updatesDir()      { return _updatesDir;      }
 
 bool AppData::enableBackup()       { return _enableBackup;    }
+bool AppData::checkHardwareCompatibility() { return _checkHardwareCompatibility; }
 bool AppData::backupOnFlash()      { return _backupOnFlash;   }
 bool AppData::jsSupport()          { return _jsSupport;       }
 bool AppData::maximized()          { return _maximized;       }
@@ -550,6 +551,7 @@ void AppData::updatesDir      (const QString     x) { store(x, _updatesDir,
 
 void AppData::enableBackup    (const bool        x) { store(x, _enableBackup,    "backupEnable"            );}
 void AppData::backupOnFlash   (const bool        x) { store(x, _backupOnFlash,   "backupOnFlash"           );}
+void AppData::checkHardwareCompatibility(const bool x) { store(x, _checkHardwareCompatibility,   "checkHardwareCompatibility");}
 void AppData::maximized       (const bool        x) { store(x, _maximized,       "maximized"               );}
 void AppData::jsSupport       (const bool        x) { store(x, _jsSupport,       "js_support"              );}
 void AppData::showSplash      (const bool        x) { store(x, _showSplash,      "show_splash"             );}
@@ -675,6 +677,7 @@ AppData::AppData()
     getset( _updatesDir,      "lastUpdatesDir"          ,"" );
 
     getset( _enableBackup,    "backupEnable"            ,false );
+    getset( _checkHardwareCompatibility,    "checkHardwareCompatibility", true );
     getset( _backupOnFlash,   "backupOnFlash"           ,true  );
     getset( _jsSupport,       "js_support"              ,false );
     getset( _maximized,       "maximized"               ,false );

companion/src/appdata.h

@@ -226,6 +226,7 @@ class AppData: protected CompStoreObj
 
     bool _enableBackup;
     bool _backupOnFlash;
+    bool _checkHardwareCompatibility;
     bool _maximized;
     bool _jsSupport;
     bool _showSplash;
@@ -278,6 +279,7 @@ class AppData: protected CompStoreObj
 
     bool enableBackup();
     bool backupOnFlash();
+    bool checkHardwareCompatibility();
     bool jsSupport();
     bool maximized();
     bool showSplash();
@@ -329,6 +331,7 @@ class AppData: protected CompStoreObj
 
     void enableBackup    (const bool);
     void backupOnFlash   (const bool);
+    void checkHardwareCompatibility   (const bool);
     void maximized       (const bool);
     void jsSupport       (const bool);
     void showSplash      (const bool);

companion/src/apppreferencesdialog.cpp

@@ -263,8 +263,9 @@ void AppPreferencesDialog::on_joystickChkB_clicked() {
   }
 }
 
-void AppPreferencesDialog::on_joystickcalButton_clicked() {
-   joystickDialog * jd=new joystickDialog(this, ui->joystickCB->currentIndex());
+void AppPreferencesDialog::on_joystickcalButton_clicked()
+{
+   JoystickDialog *jd = new JoystickDialog(this, ui->joystickCB->currentIndex());
    jd->exec();
 }
 #endif
@@ -434,6 +435,7 @@ void AppPreferencesDialog::populateFirmwareOptions(const FirmwareInterface * fir
   voice = NULL; // we will search for a voice checkbox
 
   int index = 0;
+  QWidget * prevFocus = ui->voiceCombo;
   foreach(QList<Option> opts, parent->opts) {
     foreach(Option opt, opts) {
       if (index >= optionsCheckBoxes.size()) {
@@ -441,6 +443,9 @@ void AppPreferencesDialog::populateFirmwareOptions(const FirmwareInterface * fir
         ui->optionsLayout->addWidget(checkbox, optionsCheckBoxes.count()/5, optionsCheckBoxes.count()%5, 1, 1);
         optionsCheckBoxes.push_back(checkbox);
         connect(checkbox, SIGNAL(toggled(bool)), this, SLOT(firmwareOptionChanged(bool)));
+        if (prevFocus) {
+          QWidget::setTabOrder(prevFocus, checkbox);
+        }
       }
 
       QCheckBox *cb = optionsCheckBoxes.at(index++);
@@ -452,6 +457,7 @@ void AppPreferencesDialog::populateFirmwareOptions(const FirmwareInterface * fir
         if (opt.name == QString("voice")) {
           voice = cb;
         }
+        prevFocus = cb;
       }
     }
   }

companion/src/apppreferencesdialog.ui

@@ -1049,10 +1049,26 @@ Mode 4:
   </layout>
  </widget>
  <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>profileNameLE</tabstop>
+  <tabstop>removeProfileButton</tabstop>
+  <tabstop>downloadVerCB</tabstop>
+  <tabstop>langCombo</tabstop>
+  <tabstop>voiceCombo</tabstop>
+  <tabstop>SplashFileName</tabstop>
+  <tabstop>SplashSelect</tabstop>
+  <tabstop>clearImageButton</tabstop>
+  <tabstop>sdPath</tabstop>
+  <tabstop>sdPathButton</tabstop>
+  <tabstop>stickmodeCB</tabstop>
+  <tabstop>channelorderCB</tabstop>
+  <tabstop>renameFirmware</tabstop>
+  <tabstop>burnFirmware</tabstop>
   <tabstop>ge_lineedit</tabstop>
   <tabstop>ge_pathButton</tabstop>
   <tabstop>historySize</tabstop>
   <tabstop>showSplash</tabstop>
+  <tabstop>modelWizard_CB</tabstop>
   <tabstop>startupCheck_fw</tabstop>
   <tabstop>startupCheck_companion9x</tabstop>
   <tabstop>backupPath</tabstop>
@@ -1061,7 +1077,6 @@ Mode 4:
   <tabstop>splashincludeCB</tabstop>
   <tabstop>libraryPath</tabstop>
   <tabstop>libraryPathButton</tabstop>
-  <tabstop>buttonBox</tabstop>
   <tabstop>snapshotPath</tabstop>
   <tabstop>snapshotPathButton</tabstop>
   <tabstop>snapshotClipboardCKB</tabstop>
@@ -1070,11 +1085,7 @@ Mode 4:
   <tabstop>joystickCB</tabstop>
   <tabstop>joystickChkB</tabstop>
   <tabstop>joystickcalButton</tabstop>
-  <tabstop>SplashFileName</tabstop>
-  <tabstop>stickmodeCB</tabstop>
-  <tabstop>channelorderCB</tabstop>
-  <tabstop>renameFirmware</tabstop>
-  <tabstop>burnFirmware</tabstop>
+  <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>
   <include location="companion.qrc"/>

companion/src/avroutputdialog.cpp

@@ -138,7 +138,7 @@ void avrOutputDialog::doCopy()
 
   if (source.open(QIODevice::ReadOnly)) {
     QFile dest(destFile);
-    if (dest.open(QIODevice::WriteOnly)) {
+    if (dest.open(QIODevice::ReadWrite)) {
       addText(tr("Writing file: "));
       for (int i=0; i<blocks; i++) {
         int read = source.read(buf, BLKSIZE);

companion/src/burnconfigdialog.ui

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

companion/src/burndialog.cpp

@@ -42,6 +42,7 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
     if (IS_TARANIS(GetEepromInterface()->getBoard())) {
       ui->EEbackupCB->hide();
     }
+    ui->checkFirmwareCB->setChecked(g.checkHardwareCompatibility());
   }
   else {
     ui->FlashLoadButton->setText(tr("Browse for file"));
@@ -49,6 +50,7 @@ burnDialog::burnDialog(QWidget *parent, int Type, QString * fileName, bool * bac
     ui->patchcalib_CB->hide();
     ui->patchhw_CB->hide();
     ui->EEpromCB->hide();
+    ui->checkFirmwareCB->hide();
     ui->BurnFlashButton->setDisabled(true);
     ui->FWFileName->clear();
     ui->DateField->clear();
@@ -408,6 +410,7 @@ void burnDialog::on_useLibraryImageCB_clicked()
 void burnDialog::on_BurnFlashButton_clicked()
 {
   if (hexType==FLASH_FILE_TYPE) {
+    g.checkHardwareCompatibility(ui->checkFirmwareCB->isChecked());
     QString fileName=ui->FWFileName->text();
     if (!fileName.isEmpty()) {
       g.flashDir( QFileInfo(fileName).dir().absolutePath() );

companion/src/burndialog.ui

@@ -30,7 +30,7 @@
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <layout class="QGridLayout" name="gridLayout_7">
-   <item row="2" column="0">
+   <item row="3" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_4">
      <item>
       <spacer name="hs2">
@@ -76,6 +76,19 @@
      </item>
     </layout>
    </item>
+   <item row="2" column="0">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
    <item row="0" column="0">
     <layout class="QGridLayout" name="gridLayout_4">
      <item row="5" column="0">
@@ -342,26 +355,29 @@
     </layout>
    </item>
    <item row="1" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+    <widget class="QCheckBox" name="checkFirmwareCB">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>0</height>
-      </size>
+     <property name="toolTip">
+      <string>Allows Companion to write to older version of the firmware</string>
      </property>
-    </spacer>
+     <property name="text">
+      <string>Check Firmware compatibility</string>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>BurnFlashButton</tabstop>
   <tabstop>FWFileName</tabstop>
   <tabstop>FlashLoadButton</tabstop>
   <tabstop>versionField</tabstop>
   <tabstop>ModField</tabstop>
+  <tabstop>DateField</tabstop>
   <tabstop>useProfileImageCB</tabstop>
   <tabstop>useFwImageCB</tabstop>
   <tabstop>useLibraryImageCB</tabstop>
@@ -371,6 +387,7 @@
   <tabstop>patchhw_CB</tabstop>
   <tabstop>EEpromCB</tabstop>
   <tabstop>cancelButton</tabstop>
+  <tabstop>BurnFlashButton</tabstop>
  </tabstops>
  <resources>
   <include location="companion.qrc"/>

companion/src/eeprominterface.cpp

@@ -756,7 +756,7 @@ QString FuncSwData::funcToString()
   else if (func == FuncPlayScript)
     return QObject::tr("Play Script");
   else if (func == FuncLogs)
-    return QObject::tr("Start Logs");
+    return QObject::tr("SD Logs");
   else if (func == FuncVolume)
     return QObject::tr("Volume");
   else if (func == FuncBacklight)

companion/src/firmwares/er9x/er9xsimulator.h

@@ -54,6 +54,10 @@ class Er9xSimulator : public SimulatorInterface {
 
     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;

companion/src/firmwares/ersky9x/ersky9xsimulator.h

@@ -54,6 +54,10 @@ class Ersky9xSimulator : public SimulatorInterface {
 
     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;

companion/src/firmwares/opentx/opentxGruvin9xsimulator.cpp

@@ -49,6 +49,7 @@
 #define FAI_CHOICE
 #define FRSKY_STICKS
 #define OVERRIDE_CHANNEL_FUNCTION
+#define FLAVOUR "gruvin9x"
 
 #define EEPROM_VARIANT 3
 

companion/src/firmwares/opentx/opentxGruvin9xsimulator.h

@@ -56,6 +56,11 @@ class Open9xGruvin9xSimulator : public SimulatorInterface {
 
     virtual const char * getError();
 
+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
+
+    virtual void installTraceHook(void (*callback)(const char *)) {};
 };
 
 #endif

companion/src/firmwares/opentx/opentxM128simulator.cpp

@@ -49,6 +49,7 @@
 #define DSM2
 #define DSM2_PPM
 #define OVERRIDE_CHANNEL_FUNCTION
+#define FLAVOUR "9x128"
 
 #define EEPROM_VARIANT SIMU_M128_VARIANTS
 #define GAUGES

companion/src/firmwares/opentx/opentxM128simulator.h

@@ -56,6 +56,11 @@ class OpenTxM128Simulator : public SimulatorInterface {
 
     virtual const char * getError();
 
+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
+
+    virtual void installTraceHook(void (*callback)(const char *)) {};
 };
 
 #endif

companion/src/firmwares/opentx/opentxM64simulator.cpp

@@ -52,10 +52,9 @@
 #define FRSKY_STICKS
 #define OVERRIDE_CHANNEL_FUNCTION
 #define FAS_OFFSET
-
 #define EEPROM_VARIANT SIMU_STOCK_VARIANTS
 #define GAUGES
-
+#define FLAVOUR "9x"
 #define NUM_POTS  3
 
 #undef min

companion/src/firmwares/opentx/opentxM64simulator.h

@@ -55,6 +55,11 @@ class OpenTxM64Simulator : public SimulatorInterface {
 
     virtual const char * getError();
 
+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) {};
+
+    virtual void installTraceHook(void (*callback)(const char *)) {};
 };
 
 #endif

companion/src/firmwares/opentx/opentxSky9xsimulator.cpp

@@ -55,9 +55,9 @@
 #define FAI_CHOICE
 #define FRSKY_STICKS
 #define OVERRIDE_CHANNEL_FUNCTION
-
 #define NUM_POTS  3
 #define EEPROM_VARIANT 3
+#define FLAVOUR "sky9x"
 
 #undef min
 #undef max
@@ -76,6 +76,7 @@ namespace Open9xSky9x {
 #include "radio/src/eeprom_raw.cpp"
 #include "radio/src/eeprom_conversions.cpp"
 #include "radio/src/opentx.cpp"
+// #include "radio/src/debug.cpp"     // only included once in Taranis simulator because functions are exported as C and don't support namespaces
 #include "radio/src/strhelpers.cpp"
 #include "radio/src/switches.cpp"
 #include "radio/src/mixer.cpp"
@@ -258,3 +259,13 @@ const char * Open9xSky9xSimulator::getError()
 #define GETERROR_IMPORT
 #include "simulatorimport.h"
 }
+
+void Open9xSky9xSimulator::setTrainerInput(unsigned int inputNumber, int16_t value)
+{
+#define SETTRAINER_IMPORT
+#include "simulatorimport.h"
+}
+
+void Open9xSky9xSimulator::installTraceHook(void (*callback)(const char *)) {
+  ::traceCallback = callback;
+}

companion/src/firmwares/opentx/opentxSky9xsimulator.h

@@ -56,6 +56,11 @@ class Open9xSky9xSimulator : public SimulatorInterface {
 
     virtual const char * getError();
 
+    virtual void sendTelemetry(uint8_t * data, unsigned int len) {};
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value);
+
+    virtual void installTraceHook(void (*callback)(const char *));
 };
 
 #endif

companion/src/firmwares/opentx/opentxTaranisSimulator.cpp

@@ -55,8 +55,8 @@
 #define HAPTIC
 #define REVPLUS
 #define OVERRIDE_CHANNEL_FUNCTION
-
 #define NUM_POTS  5
+#define FLAVOUR "taranis-plus"
 
 #undef min
 #undef max
@@ -79,6 +79,7 @@ inline int geteepromsize() {
 #include "radio/src/eeprom_conversions.cpp"
 #include "radio/src/eeprom_rlc.cpp"
 #include "radio/src/opentx.cpp"
+#include "radio/src/debug.cpp"
 #include "radio/src/strhelpers.cpp"
 #include "radio/src/switches.cpp"
 #include "radio/src/curves.cpp"
@@ -297,3 +298,18 @@ const char * OpentxTaranisSimulator::getError()
 #define GETERROR_IMPORT
 #include "simulatorimport.h"
 }
+
+void OpentxTaranisSimulator::sendTelemetry(uint8_t * data, unsigned int len) 
+{
+  frskySportProcessPacket(data);
+}
+
+void OpentxTaranisSimulator::setTrainerInput(unsigned int inputNumber, int16_t value)
+{
+#define SETTRAINER_IMPORT
+#include "simulatorimport.h"
+}
+
+void OpentxTaranisSimulator::installTraceHook(void (*callback)(const char *)) {
+  ::traceCallback = callback;
+}

companion/src/firmwares/opentx/opentxTaranisSimulator.h

@@ -56,6 +56,11 @@ class OpentxTaranisSimulator : public SimulatorInterface {
 
     virtual const char * getError();
 
+    virtual void sendTelemetry(uint8_t * data, unsigned int len);
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value);
+
+    virtual void installTraceHook(void (*callback)(const char *));
 };
 
 #endif

companion/src/flashinterface.cpp

@@ -67,6 +67,11 @@ FlashInterface::FlashInterface(QString fileName):
 
   if (flash_size > 0) {
     version = seekLabel(VERS_MARK);
+    if (version.startsWith("opentx-")) {
+      int index = version.lastIndexOf('-');
+      flavour = version.mid(0, index);
+      version = version.mid(index+1);
+    }
     date = seekLabel(DATE_MARK);
     time = seekLabel(TIME_MARK);
     eepromId = seekLabel(EEPR_MARK);
@@ -94,7 +99,7 @@ QString FlashInterface::seekString(const QString & string)
   if (start > 0) {
     start += string.length();
     int end = -1;
-    for (int i=start; i<start+20; i++) {
+    for (int i=start; i<start+50; i++) {
       char c = flash.at(i);
       if (c == '\0' || c == '\036') {
         end = i;
@@ -305,6 +310,29 @@ bool FlashInterface::isValid()
   return isValidFlag;
 }
 
+QString FlashInterface::getFlavour()
+{
+  if (flavour == "opentx-x9dp")
+    return "opentx-taranis-plus";
+  else if (flavour == "opentx-x9d")
+    return "opentx-taranis";
+  else
+    return flavour;
+}
+
+bool FlashInterface::isHardwareCompatible(FlashInterface &previousFirmware)
+{
+  QString newFlavour = getFlavour();
+  if (newFlavour.isEmpty())
+    return true;
+
+  QString previousFlavour = previousFirmware.getFlavour();
+  if (previousFlavour.isEmpty())
+    return true;
+
+  return (newFlavour == previousFlavour);
+}
+
 uint FlashInterface::saveFlash(QString fileName)
 {
   uint8_t binflash[MAX_FSIZE];

companion/src/flashinterface.h

@@ -47,6 +47,7 @@ class FlashInterface
     inline QString getDate() { return date; }
     inline QString getTime() { return time; }
     int getSize() { return flash_size; }
+    QString getFlavour();
     inline QString getVersion() { return version; }
     unsigned int getVersionId() { return versionId; }
     inline int getEEpromVersion() { return eepromVersion; }
@@ -60,6 +61,7 @@ class FlashInterface
     QImage::Format getSplashFormat();
     uint saveFlash(QString fileName);
     bool isValid();
+    bool isHardwareCompatible(FlashInterface &previousFirmware);
 
   private:
     QByteArray flash;
@@ -72,6 +74,7 @@ class FlashInterface
     QString filename;
     QString date;
     QString time;
+    QString flavour;
     QString version;
     int versionId;
     QString eepromId;

companion/src/fwpreferencesdialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>416</width>
-    <height>153</height>
+    <height>154</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -177,6 +177,10 @@ May be different from firmware language</string>
   </layout>
  </widget>
  <tabstops>
+  <tabstop>checkFWUpdates</tabstop>
+  <tabstop>fw_dnld</tabstop>
+  <tabstop>voiceCombo</tabstop>
+  <tabstop>voice_dnld</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>

companion/src/generaledit.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>804</width>
+    <width>879</width>
     <height>912</height>
    </rect>
   </property>
@@ -1996,9 +1996,9 @@ Mode 4:
           <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;LCD Screen Contrast&lt;/span&gt;&lt;/p&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:8pt;&quot;&gt;Values can be 20-45&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Play Delay&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:8pt;&quot;&gt;Values can be 0ms-300ms&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
          </property>
          <property name="suffix">
           <string> ms</string>
@@ -3348,6 +3348,58 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>beeperCB</tabstop>
+  <tabstop>beeperlenCB</tabstop>
+  <tabstop>hapticmodeCB</tabstop>
+  <tabstop>hapticLengthCB</tabstop>
+  <tabstop>hapticStrength</tabstop>
+  <tabstop>battwarningDSB</tabstop>
+  <tabstop>contrastSB</tabstop>
+  <tabstop>displayTypeCB</tabstop>
+  <tabstop>inactimerSB</tabstop>
+  <tabstop>splashScreenChkB</tabstop>
+  <tabstop>splashScreenDuration</tabstop>
+  <tabstop>alarmwarnChkB</tabstop>
+  <tabstop>memwarnChkB</tabstop>
+  <tabstop>mavbaud_CB</tabstop>
+  <tabstop>chkSA</tabstop>
+  <tabstop>chkSB</tabstop>
+  <tabstop>chkSC</tabstop>
+  <tabstop>chkSD</tabstop>
+  <tabstop>chkSE</tabstop>
+  <tabstop>chkSF</tabstop>
+  <tabstop>chkSG</tabstop>
+  <tabstop>chkSH</tabstop>
+  <tabstop>stickmodeCB</tabstop>
+  <tabstop>stickReverse1</tabstop>
+  <tabstop>stickReverse2</tabstop>
+  <tabstop>stickReverse3</tabstop>
+  <tabstop>stickReverse4</tabstop>
+  <tabstop>channelorderCB</tabstop>
+  <tabstop>faimode_CB</tabstop>
+  <tabstop>switchesDelay</tabstop>
+  <tabstop>soundModeCB</tabstop>
+  <tabstop>speakerPitchSB</tabstop>
+  <tabstop>volume_SB</tabstop>
+  <tabstop>beepVolume_SL</tabstop>
+  <tabstop>wavVolume_SL</tabstop>
+  <tabstop>varioVolume_SL</tabstop>
+  <tabstop>bgVolume_SL</tabstop>
+  <tabstop>varioP0_SB</tabstop>
+  <tabstop>varioPMax_SB</tabstop>
+  <tabstop>varioR0_SB</tabstop>
+  <tabstop>backlightswCB</tabstop>
+  <tabstop>backlightautoSB</tabstop>
+  <tabstop>blAlarm_ChkB</tabstop>
+  <tabstop>BLBright_SB</tabstop>
+  <tabstop>backlightColor_SL</tabstop>
+  <tabstop>re_CB</tabstop>
+  <tabstop>countrycode_CB</tabstop>
+  <tabstop>units_CB</tabstop>
+  <tabstop>gpsFormatCB</tabstop>
+  <tabstop>timezoneSB</tabstop>
+  <tabstop>voiceLang_CB</tabstop>
   <tabstop>trnMode_1</tabstop>
   <tabstop>trnChn_1</tabstop>
   <tabstop>trnWeight_1</tabstop>
@@ -3372,12 +3424,32 @@ p, li { white-space: pre-wrap; }
   <tabstop>ana4Neg</tabstop>
   <tabstop>ana4Mid</tabstop>
   <tabstop>ana4Pos</tabstop>
+  <tabstop>pot1Type</tabstop>
+  <tabstop>pot2Type</tabstop>
+  <tabstop>pot3Type</tabstop>
+  <tabstop>serialPortMode</tabstop>
   <tabstop>battCalibDSB</tabstop>
+  <tabstop>CurrentCalib_SB</tabstop>
   <tabstop>PPM1</tabstop>
   <tabstop>PPM2</tabstop>
   <tabstop>PPM3</tabstop>
   <tabstop>PPM4</tabstop>
   <tabstop>PPM_MultiplierDSB</tabstop>
+  <tabstop>ana5Neg</tabstop>
+  <tabstop>ana5Mid</tabstop>
+  <tabstop>ana5Pos</tabstop>
+  <tabstop>ana6Neg</tabstop>
+  <tabstop>ana6Mid</tabstop>
+  <tabstop>ana6Pos</tabstop>
+  <tabstop>ana7Neg</tabstop>
+  <tabstop>ana7Mid</tabstop>
+  <tabstop>ana7Pos</tabstop>
+  <tabstop>ana8Neg</tabstop>
+  <tabstop>ana8Mid</tabstop>
+  <tabstop>ana8Pos</tabstop>
+  <tabstop>profile_CB</tabstop>
+  <tabstop>calretrieve_PB</tabstop>
+  <tabstop>calstore_PB</tabstop>
  </tabstops>
  <resources>
   <include location="companion.qrc"/>

companion/src/helpers.cpp

@@ -1037,3 +1037,29 @@ QString generateProcessUniqueTempFileName(const QString & fileName)
   sanitizedFileName.remove('/');
   return QDir::tempPath() + QString("/%1-").arg(QCoreApplication::applicationPid()) + sanitizedFileName;
 }
+
+QString getSoundsPath(const GeneralSettings &generalSettings)
+{
+  QString path = g.profile[g.id()].sdPath() + "/SOUNDS/";
+  QString lang = generalSettings.ttsLanguage;
+  if (lang.isEmpty())
+    lang = "en";
+  path.append(lang);
+  return path;
+}
+
+QSet<QString> getFilesSet(const QString &path, const QStringList &filter, int maxLen)
+{
+  QSet<QString> result;
+  QDir dir(path);
+  if (dir.exists()) {
+    foreach (QString filename, dir.entryList(filter, QDir::Files)) {
+      QFileInfo file(filename);
+      QString name = file.completeBaseName();
+      if (name.length() <= maxLen) {
+        result.insert(name);
+      }
+    }
+  }
+  return result;
+}

companion/src/helpers.h

@@ -155,4 +155,7 @@ int qunlink(const QString & fileName);
 
 QString generateProcessUniqueTempFileName(const QString & fileName);
 
+QString getSoundsPath(const GeneralSettings &generalSettings);
+QSet<QString> getFilesSet(const QString &path, const QStringList &filter, int maxLen);
+
 #endif // HELPERS_H

companion/src/imgpreferences.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>685</width>
-    <height>418</height>
+    <height>432</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -441,6 +441,25 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>backLightColor</tabstop>
+  <tabstop>joystickCB</tabstop>
+  <tabstop>joystickChkB</tabstop>
+  <tabstop>joystickcalButton</tabstop>
+  <tabstop>simuSW</tabstop>
+  <tabstop>snapshotPath</tabstop>
+  <tabstop>snapshotPathButton</tabstop>
+  <tabstop>snapshotClipboardCKB</tabstop>
+  <tabstop>libraryPath</tabstop>
+  <tabstop>libraryPathButton</tabstop>
+  <tabstop>splashincludeCB</tabstop>
+  <tabstop>SplashFileName</tabstop>
+  <tabstop>SplashSelect</tabstop>
+  <tabstop>splashLibraryButton</tabstop>
+  <tabstop>clearImageButton</tabstop>
+  <tabstop>InvertPixels</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources>
   <include location="companion.qrc"/>
  </resources>

companion/src/logsdialog.cpp

@@ -184,46 +184,33 @@ void logsDialog::on_mapsButton_clicked() {
   int latcol=0, longcol=0, altcol=0, speedcol=0;
   int itemSelected=0.;
   bool rangeSelected=false;
-  enum fieldtype {
-    T_F,
-    I_F,
-    F_F,
-    G_F
-  };
   ui->FieldsTW->setDisabled(true);
   ui->logTable->setDisabled(true);
-  QString fields[]={"SWR","RSSI","A1","A2","GPS Date"\
-        ,"GPS Time","Long","Lat","Course","GPS Speed","GPS Alt","Baro Alt"\
-        ,"Vertical Speed","Temp1","Temp2","RPM","Fuel","Cell volts","Cell 1"\
-        ,"Cell 2","Cell 3","Cell 4","Cell 5","Cell 6","Current","Consumption"\
-        ,"Vfas","AccelX","AccelY","AccelZ","Rud","Ele","Thr","Ail"\
-        ,"S1","S2","LS","RS","SA","SB","SC","SD","SE","SF","SG","SH"};
-  int fieldstype[]={I_F,I_F,F_F,F_F,T_F\
-        ,T_F,G_F,G_F,F_F,G_F,G_F,F_F\
-        ,F_F,F_F,F_F,I_F,I_F,F_F,F_F\
-        ,F_F,F_F,F_F,F_F,F_F,F_F,F_F\
-        ,F_F,F_F,F_F,F_F,I_F,I_F,I_F,I_F\
-        ,I_F,I_F,I_F,I_F,I_F,I_F,I_F,I_F,I_F,I_F,I_F,I_F};
-    
+     
   QString gePath=g.gePath();
   if (gePath.isEmpty() || !QFile(gePath).exists()) {
     ui->FieldsTW->setDisabled(false);
     ui->logTable->setDisabled(false);
     return;
   }  
+  QSet<int> nondataCols;
   for (int i=1; i<csvlog.at(0).count(); i++) {
     //Long,Lat,Course,GPS Speed,GPS Alt
     if (csvlog.at(0).at(i).contains("Long")) {
       longcol=i;
+      nondataCols << i;
     }
     if (csvlog.at(0).at(i).contains("Lat")) {
       latcol=i;
+      nondataCols << i;
     }
     if (csvlog.at(0).at(i).contains("GPS Alt")) {
       altcol=i;
+      nondataCols << i;
     }
     if (csvlog.at(0).at(i).contains("GPS Speed")) {
       speedcol=i;
+      nondataCols << i;
     }
   }
   if (longcol==0 || latcol==0 || altcol==0) {
@@ -270,23 +257,15 @@ void logsDialog::on_mapsButton_clicked() {
   outputStream << "\t\t<Style id=\"lineStyle\">\n\t\t\t<LineStyle>\n\t\t\t\t<color>991081f4</color>\n\t\t\t\t<width>6</width>\n\t\t\t</LineStyle>\n\t\t</Style>\n";
   outputStream << "\t\t<Schema id=\"schema\">\n";
   outputStream << "\t\t\t<gx:SimpleArrayField name=\"GPSSpeed\" type=\"float\">\n\t\t\t\t<displayName>GPS Speed</displayName>\n\t\t\t</gx:SimpleArrayField>\n";
+  // declare additional fields
   for (int i=0; i<csvlog.at(0).count()-2; i++) {
-    if (ui->FieldsTW->item(0,i)->isSelected() && fieldstype[i]!=G_F ) {
-      outputStream << "\t\t\t<gx:SimpleArrayField name=\""<< fields[i].replace(" ","_") <<"\" ";
-      switch (fieldstype[i]) {
-        case T_F:
-          outputStream << "type=\"string\"";
-          break;
-        case I_F:
-          outputStream << "type=\"int\"";
-          break;
-        case F_F:
-          outputStream << "type=\"float\"";
-          break;
-        default:
-          break;
-      }
-      outputStream << ">\n\t\t\t\t<displayName>" << fields[i] << "</displayName>\n\t\t\t</gx:SimpleArrayField>\n";
+    if (ui->FieldsTW->item(0,i)->isSelected() && !nondataCols.contains(i+2)) {
+      QString origName = csvlog.at(0).at(i+2);
+      QString safeName = origName;
+      safeName.replace(" ","_");
+      outputStream << "\t\t\t<gx:SimpleArrayField name=\""<< safeName <<"\" ";
+      outputStream << "type=\"string\"";   // additional fields have fixed type: string
+      outputStream << ">\n\t\t\t\t<displayName>" << origName << "</displayName>\n\t\t\t</gx:SimpleArrayField>\n";
     }
   }
   outputStream << "\t\t</Schema>\n";
@@ -335,9 +314,12 @@ void logsDialog::on_mapsButton_clicked() {
     }
   }
   outputStream << "\t\t\t\t\t\t\t</gx:SimpleArrayData>\n";
+  // add values for additional fields
   for (int i=0; i<csvlog.at(0).count()-2; i++) {
-    if (ui->FieldsTW->item(0,i)->isSelected() && fieldstype[i]!= G_F ) {
-      outputStream << "\t\t\t\t\t\t\t<gx:SimpleArrayData name=\""<< fields[i].replace(" ","_") <<"\">\n";
+    if (ui->FieldsTW->item(0,i)->isSelected() && !nondataCols.contains(i+2)) {
+      QString safeName = csvlog.at(0).at(i+2);;
+      safeName.replace(" ","_");
+      outputStream << "\t\t\t\t\t\t\t<gx:SimpleArrayData name=\""<< safeName <<"\">\n";
       for (int j=1; j<n; j++) {
         if ((ui->logTable->item(j-1,1)->isSelected() &&rangeSelected) || !rangeSelected) {
           outputStream << "\t\t\t\t\t\t\t\t<gx:value>"<< csvlog.at(j).at(i+2) <<"</gx:value>\n";

companion/src/logsdialog.ui

@@ -287,6 +287,17 @@
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>FileName_LE</tabstop>
+  <tabstop>fileOpen_BT</tabstop>
+  <tabstop>FieldsTW</tabstop>
+  <tabstop>ZoomX_ChkB</tabstop>
+  <tabstop>ZoomY_ChkB</tabstop>
+  <tabstop>Reset_PB</tabstop>
+  <tabstop>sessions_CB</tabstop>
+  <tabstop>logTable</tabstop>
+  <tabstop>mapsButton</tabstop>
+ </tabstops>
  <resources>
   <include location="companion.qrc"/>
  </resources>

companion/src/mainwindow.cpp

@@ -977,7 +977,7 @@ bool MainWindow::readFirmwareFromRadio(const QString filename)
     file.remove();
   }
 
-  g.flashDir(QFileInfo(filename).dir().absolutePath());
+  // g.flashDir(QFileInfo(filename).dir().absolutePath());
 
   if (IS_ARM(GetCurrentFirmware()->getBoard())) {
     QString path = FindMassstoragePath("FIRMWARE.BIN");
@@ -1171,7 +1171,6 @@ void MainWindow::writeBackup()
         }
         int oldrev = getEpromVersion(fileName);
         QString tempFlash = generateProcessUniqueTempFileName("flash.bin");
-
         if (!readFirmwareFromRadio(tempFlash))
           return;
 
@@ -1304,6 +1303,19 @@ void MainWindow::writeFlash(QString fileToFlash)
     if (IS_TARANIS(GetEepromInterface()->getBoard()))
       backup=false;
     if (!fileName.isEmpty()) {
+      if (g.checkHardwareCompatibility()) {
+        QString tempFlash = generateProcessUniqueTempFileName("flash.bin");
+        if (!readFirmwareFromRadio(tempFlash)) {
+          QMessageBox::warning(this, tr("Firmware check failed"), tr("Could not check firmware from radio"));
+          return;
+        }
+        FlashInterface previousFlash(tempFlash);
+        FlashInterface newFlash(fileName);
+        if (!newFlash.isHardwareCompatible(previousFlash)) {
+          QMessageBox::warning(this, tr("Firmware check failed"), tr("New firmware is not compatible with the one currently installed!"));
+          return;
+        }
+      }
       g.backupOnFlash(backup);
       if (backup) {
         QString backupFile = generateProcessUniqueTempFileName("backup.bin");

companion/src/modeledit/curves.ui

@@ -339,6 +339,20 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>curvePreview</tabstop>
+  <tabstop>curvePoints</tabstop>
+  <tabstop>curveCustom</tabstop>
+  <tabstop>curveSmooth</tabstop>
+  <tabstop>curveName</tabstop>
+  <tabstop>curveType</tabstop>
+  <tabstop>curveCoeff</tabstop>
+  <tabstop>yMin</tabstop>
+  <tabstop>yMid</tabstop>
+  <tabstop>yMax</tabstop>
+  <tabstop>curveSide</tabstop>
+  <tabstop>curveApply</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

companion/src/modeledit/customfunctions.cpp

@@ -69,36 +69,29 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
   int num_fsw = firmware->getCapability(CustomFunctions);
 
   if (!firmware->getCapability(VoicesAsNumbers)) {
+    tracksSet = getFilesSet(getSoundsPath(generalSettings), QStringList() << "*.wav" << "*.WAV", firmware->getCapability(VoicesMaxLength));
     for (int i=0; i<num_fsw; i++) {
       if (model.funcSw[i].func==FuncPlayPrompt || model.funcSw[i].func==FuncBackgroundMusic) {
         QString temp = model.funcSw[i].paramarm;
         if (!temp.isEmpty()) {
-          if (!paramarmList.contains(temp)) {
-            paramarmList.append(temp);
-          }
+          tracksSet.insert(temp);
         }
       }
     }
+    qDebug() << tracksSet;
+  }
 
-    QString path = g.profile[g.id()].sdPath();
-    path.append("/SOUNDS/");
-    QString lang = generalSettings.ttsLanguage;
-    if (lang.isEmpty())
-      lang="en";
-    path.append(lang);
-    QDir qd(path);
-    int vml= firmware->getCapability(VoicesMaxLength);
-    if (qd.exists()) {
-      QStringList filters;
-      filters << "*.wav" << "*.WAV";
-      foreach ( QString file, qd.entryList(filters, QDir::Files) ) {
-        QFileInfo fi(file);
-        QString temp=fi.completeBaseName();
-        if (!paramarmList.contains(temp) && temp.length()<=vml) {
-          paramarmList.append(temp);
+  if (IS_TARANIS(firmware->getBoard())) {
+    scriptsSet = getFilesSet(g.profile[g.id()].sdPath() + "/SCRIPTS", QStringList() << "*.lua", firmware->getCapability(VoicesMaxLength));
+    for (int i=0; i<num_fsw; i++) {
+      if (model.funcSw[i].func==FuncPlayScript) {
+        QString temp = model.funcSw[i].paramarm;
+        if (!temp.isEmpty()) {
+          scriptsSet.insert(temp);
         }
       }
     }
+    qDebug() << scriptsSet;
   }
 
   CompanionIcon playIcon("play.png");
@@ -124,7 +117,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
     // The function
     fswtchFunc[i] = new QComboBox(this);
     fswtchFunc[i]->setProperty("index", i);
-    connect(fswtchFunc[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
+    connect(fswtchFunc[i], SIGNAL(currentIndexChanged(int)), this, SLOT(functionEdited()));
     gridLayout->addWidget(fswtchFunc[i], i+1, 2);
 
     QHBoxLayout *paramLayout = new QHBoxLayout();
@@ -292,10 +285,20 @@ void CustomFunctionsPanel::customFunctionEdited()
 {
   if (!lock) {
     lock = true;
-
     int index = sender()->property("index").toInt();
     refreshCustomFunction(index, true);
+    emit modified();
+    lock = false;
+  }
+}
 
+void CustomFunctionsPanel::functionEdited()
+{
+  if (!lock) {
+    lock = true;
+    int index = sender()->property("index").toInt();
+    fswtchParamArmT[index]->setCurrentIndex(0);
+    refreshCustomFunction(index, true);
     emit modified();
     lock = false;
   }
@@ -438,11 +441,9 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
               }
             }
           }
-          else {
-            populateFuncParamArmTCB(fswtchParamArmT[i], model.funcSw[i].paramarm, paramarmList);
-            if (fswtchParamArmT[i]->currentText() != "----") {
-              widgetsMask |= CUSTOM_FUNCTION_PLAY;
-            }
+          populateFuncParamArmTCB(fswtchParamArmT[i], model.funcSw[i].paramarm, tracksSet);
+          if (fswtchParamArmT[i]->currentText() != "----") {
+            widgetsMask |= CUSTOM_FUNCTION_PLAY;
           }
         }
       }
@@ -458,6 +459,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
             }
           }
         }
+        populateFuncParamArmTCB(fswtchParamArmT[i], model.funcSw[i].paramarm, tracksSet);
       }
       else if (index==FuncPlaySound) {
         if (modified) model.funcSw[i].param = (uint8_t)fswtchParamT[i]->currentIndex();
@@ -481,6 +483,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
           }
         }
       }
+      populateFuncParamArmTCB(fswtchParamArmT[i], model.funcSw[i].paramarm, scriptsSet);
     }
     else if (index==FuncBacklight && IS_TARANIS_PLUS(GetEepromInterface()->getBoard())) {
       if (modified) model.funcSw[i].param = (uint8_t)fswtchBLcolor[i]->value();
@@ -523,7 +526,6 @@ void CustomFunctionsPanel::update()
       populateFuncCB(fswtchFunc[i], model.funcSw[i].func);
       populateGVmodeCB(fswtchGVmode[i], model.funcSw[i].adjustMode);
       populateFuncParamCB(fswtchParamT[i], model, model.funcSw[i].func, model.funcSw[i].param, model.funcSw[i].adjustMode);
-      populateFuncParamArmTCB(fswtchParamArmT[i], model.funcSw[i].paramarm, paramarmList);
     }
     refreshCustomFunction(i);
   }
@@ -544,7 +546,6 @@ void CustomFunctionsPanel::fswPaste()
     populateFuncCB(fswtchFunc[selectedFunction], model.funcSw[selectedFunction].func);
     populateGVmodeCB(fswtchGVmode[selectedFunction], model.funcSw[selectedFunction].adjustMode);
     populateFuncParamCB(fswtchParamT[selectedFunction], model, model.funcSw[selectedFunction].func, model.funcSw[selectedFunction].param, model.funcSw[selectedFunction].adjustMode);
-    populateFuncParamArmTCB(fswtchParamArmT[selectedFunction], model.funcSw[selectedFunction].paramarm, paramarmList);
     refreshCustomFunction(selectedFunction);
     lock = false;
     emit modified();
@@ -630,14 +631,14 @@ void CustomFunctionsPanel::populateGVmodeCB(QComboBox *b, unsigned int value)
   b->setCurrentIndex(value);
 }
 
-void CustomFunctionsPanel::populateFuncParamArmTCB(QComboBox *b, char * value, QStringList & paramsList)
+void CustomFunctionsPanel::populateFuncParamArmTCB(QComboBox *b, char * value, const QSet<QString> &paramsList)
 {
   b->clear();
   b->addItem("----");
 
   bool added = false;
   QString currentvalue(value);
-  foreach ( QString entry, paramsList ) {
+  foreach (QString entry, paramsList) {
     b->addItem(entry);
     if (entry==currentvalue) {
       b->setCurrentIndex(b->count()-1);

companion/src/modeledit/customfunctions.h

@@ -43,6 +43,7 @@ class CustomFunctionsPanel : public ModelPanel
 
   private slots:
     void customFunctionEdited();
+    void functionEdited();
     void fsw_customContextMenuRequested(QPoint pos);
     void refreshCustomFunction(int index, bool modified=false);
     void onChildModified();
@@ -59,10 +60,11 @@ class CustomFunctionsPanel : public ModelPanel
     void populateFuncCB(QComboBox *b, unsigned int value);
     void populateGVmodeCB(QComboBox *b, unsigned int value);
     void populateFuncParamCB(QComboBox *b, const ModelData & model, uint function, unsigned int value, unsigned int adjustmode=0);
-    void populateFuncParamArmTCB(QComboBox *b, char * value, QStringList & paramsList);
+    void populateFuncParamArmTCB(QComboBox *b, char * value, const QSet<QString> & paramsList);
 
     bool initialized;
-    QStringList paramarmList;
+    QSet<QString> tracksSet;
+    QSet<QString> scriptsSet;
     int phononCurrent;
     QComboBox * fswtchSwtch[C9X_MAX_CUSTOM_FUNCTIONS];
     QComboBox * fswtchFunc[C9X_MAX_CUSTOM_FUNCTIONS];

companion/src/modeledit/expodialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>381</width>
-    <height>414</height>
+    <width>389</width>
+    <height>488</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -481,6 +481,9 @@ If blank then the input is considered to be &quot;ON&quot; all the time.</string
   <tabstop>weightGV</tabstop>
   <tabstop>weightSB</tabstop>
   <tabstop>weightCB</tabstop>
+  <tabstop>offsetGV</tabstop>
+  <tabstop>offsetSB</tabstop>
+  <tabstop>offsetCB</tabstop>
   <tabstop>curveTypeCB</tabstop>
   <tabstop>curveGVarCB</tabstop>
   <tabstop>curveValueCB</tabstop>

companion/src/modeledit/flightmode.ui

@@ -457,6 +457,24 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>name</tabstop>
+  <tabstop>fadeIn</tabstop>
+  <tabstop>swtch</tabstop>
+  <tabstop>fadeOut</tabstop>
+  <tabstop>trim2Use</tabstop>
+  <tabstop>trim2Value</tabstop>
+  <tabstop>trim1Use</tabstop>
+  <tabstop>trim1Value</tabstop>
+  <tabstop>trim3Use</tabstop>
+  <tabstop>trim3Value</tabstop>
+  <tabstop>trim4Use</tabstop>
+  <tabstop>trim4Value</tabstop>
+  <tabstop>trim2Slider</tabstop>
+  <tabstop>trim3Slider</tabstop>
+  <tabstop>trim1Slider</tabstop>
+  <tabstop>trim4Slider</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

companion/src/modeledit/logicalswitches.cpp

@@ -213,7 +213,6 @@ void LogicalSwitchesPanel::edited()
         model.customSw[i].val1 = 0;
         model.customSw[i].val2 = 0;
       }
-      model.customSw[i].andsw = 0;
       setSwitchWidgetVisibility(i);
     }
 
@@ -249,7 +248,7 @@ void LogicalSwitchesPanel::edited()
         else {
           model.customSw[i].val3 = TimToVal(cswitchOffset2[i]->value()) - model.customSw[i].val2;
         }
-        updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, cswitchOffset[i]->value()-0.1);
+        updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1));
         if (model.customSw[i].val3 == 0) {
           cswitchOffset2[i]->setSuffix("(release)");
         }
@@ -335,7 +334,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
       mask &= ~DELAY_ENABLED;
       populateSwitchCB(cswitchSource1[i], RawSwitch(model.customSw[i].val1), generalSettings, LogicalSwitchesContext);
       updateTimerParam(cswitchOffset[i], model.customSw[i].val2, 0.0);
-      updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, cswitchOffset[i]->value()-0.1);
+      updateTimerParam(cswitchOffset2[i], model.customSw[i].val2+model.customSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1));
       cswitchOffset2[i]->setSpecialValueText(tr("(instant)"));
       if (model.customSw[i].val3 == 0) {
         cswitchOffset2[i]->setSuffix(tr("(release)"));

companion/src/modeledit/mixerdialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>364</width>
-    <height>434</height>
+    <width>412</width>
+    <height>541</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -67,7 +67,7 @@
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -96,7 +96,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -125,7 +125,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -148,7 +148,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -611,6 +611,39 @@ If blank then the mix is considered to be &quot;ON&quot; all the time.</string>
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>mixerName</tabstop>
+  <tabstop>sourceCB</tabstop>
+  <tabstop>weightGV</tabstop>
+  <tabstop>weightCB</tabstop>
+  <tabstop>weightSB</tabstop>
+  <tabstop>offsetGV</tabstop>
+  <tabstop>offsetCB</tabstop>
+  <tabstop>offsetSB</tabstop>
+  <tabstop>curveTypeCB</tabstop>
+  <tabstop>curveGVarCB</tabstop>
+  <tabstop>curveValueCB</tabstop>
+  <tabstop>curveValueSB</tabstop>
+  <tabstop>trimCB</tabstop>
+  <tabstop>MixDR_CB</tabstop>
+  <tabstop>cb_FP0</tabstop>
+  <tabstop>cb_FP1</tabstop>
+  <tabstop>cb_FP2</tabstop>
+  <tabstop>cb_FP3</tabstop>
+  <tabstop>cb_FP4</tabstop>
+  <tabstop>cb_FP5</tabstop>
+  <tabstop>cb_FP6</tabstop>
+  <tabstop>cb_FP7</tabstop>
+  <tabstop>cb_FP8</tabstop>
+  <tabstop>switchesCB</tabstop>
+  <tabstop>warningCB</tabstop>
+  <tabstop>mltpxCB</tabstop>
+  <tabstop>delayUpSB</tabstop>
+  <tabstop>slowUpSB</tabstop>
+  <tabstop>delayDownSB</tabstop>
+  <tabstop>slowDownSB</tabstop>
+  <tabstop>buttonBox</tabstop>
+ </tabstops>
  <resources>
   <include location="../companion.qrc"/>
  </resources>

companion/src/modeledit/setup.cpp

@@ -5,7 +5,7 @@
 #include "helpers.h"
 #include "appdata.h"
 
-TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, FirmwareInterface * firmware):
+TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, FirmwareInterface * firmware, QWidget *prevFocus):
   ModelPanel(parent, model, generalSettings, firmware),
   timer(timer),
   ui(new Ui::Timer)
@@ -35,6 +35,11 @@ TimerPanel::TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, Ge
   ui->persistent->addItem(tr("Persistent (manual reset)"), 2);
 
   disableMouseScrolling();
+  QWidget::setTabOrder(prevFocus, ui->value);
+  QWidget::setTabOrder(ui->value, ui->mode);
+  QWidget::setTabOrder(ui->mode, ui->countdownBeep);
+  QWidget::setTabOrder(ui->countdownBeep, ui->minuteBeep);
+  QWidget::setTabOrder(ui->minuteBeep, ui->persistent);
 
   lock = false;
 }
@@ -67,6 +72,11 @@ void TimerPanel::update()
   ui->minuteBeep->setChecked(timer.minuteBeep);
 }
 
+QWidget * TimerPanel::getLastFocus()
+{
+  return ui->persistent;
+}
+
 void TimerPanel::on_value_editingFinished()
 {
   timer.val = ui->value->time().minute()*60 + ui->value->time().second();
@@ -347,23 +357,6 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
 
   ui->name->setMaxLength(IS_TARANIS(firmware->getBoard()) ? 12 : 10);
 
-  for (int i=0; i<C9X_MAX_TIMERS; i++) {
-    timers[i] = new TimerPanel(this, model, model.timers[i], generalSettings, firmware);
-    ui->gridLayout->addWidget(timers[i], 1+i, 1);
-    connect(timers[i], SIGNAL(modified()), this, SLOT(onChildModified()));
-  }
-
-  for (int i=0; i<firmware->getCapability(NumModules); i++) {
-    modules[i] = new ModulePanel(this, model, model.moduleData[i], generalSettings, firmware, i);
-    ui->modulesLayout->addWidget(modules[i]);
-    connect(modules[i], SIGNAL(modified()), this, SLOT(onChildModified()));
-  }
-
-  if (firmware->getCapability(ModelTrainerEnable)) {
-    modules[C9X_NUM_MODULES] = new ModulePanel(this, model, model.moduleData[C9X_NUM_MODULES], generalSettings, firmware, -1);
-    ui->modulesLayout->addWidget(modules[C9X_NUM_MODULES]);
-  }
-
   if (firmware->getCapability(ModelImage)) {
     QStringList items;
     items.append("");
@@ -410,12 +403,21 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
     ui->modelImage_label->hide();
     ui->imagePreview->hide();
   }
+
+  QWidget *prevFocus = ui->image;
+  for (int i=0; i<C9X_MAX_TIMERS; i++) {
+    timers[i] = new TimerPanel(this, model, model.timers[i], generalSettings, firmware, prevFocus);
+    ui->gridLayout->addWidget(timers[i], 1+i, 1);
+    connect(timers[i], SIGNAL(modified()), this, SLOT(onChildModified()));
+    prevFocus = timers[i]->getLastFocus();
+  }
   
   if (!firmware->getCapability(HasDisplayText)) {
     ui->displayText->hide();
   }
 
   // Beep Center checkboxes
+  prevFocus = ui->displayText;
   int analogs = 4 + firmware->getCapability(Pots);
   for (int i=0; i<analogs+firmware->getCapability(RotaryEncoders); i++) {
     QCheckBox * checkbox = new QCheckBox(this);
@@ -427,6 +429,8 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
     if (!IS_TARANIS_PLUS(firmware->getBoard()) && i==6) {
         checkbox->hide();
     }
+    QWidget::setTabOrder(prevFocus, checkbox);
+    prevFocus = checkbox;
   }
 
   // Startup switches warnings
@@ -463,10 +467,14 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
     connect(cb, SIGNAL(toggled(bool)), this, SLOT(startupSwitchToggled(bool)));
     startupSwitchesSliders << slider;
     startupSwitchesCheckboxes << cb;
+    QWidget::setTabOrder(prevFocus, slider);
+    QWidget::setTabOrder(slider, cb);
+    prevFocus = cb;
   }
   ui->switchesStartupLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, firmware->getCapability(Switches));
 
   // Pot warnings
+  prevFocus = ui->potWarningMode;
   if (IS_TARANIS(firmware->getBoard())) {
     for (int i=0; i<firmware->getCapability(Pots); i++) {
       QCheckBox * cb = new QCheckBox(this);
@@ -478,6 +486,8 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
       if (!IS_TARANIS_PLUS(firmware->getBoard()) && i==2) {
         cb->hide();
       }
+      QWidget::setTabOrder(prevFocus, cb);
+      prevFocus = cb;
     }
   }
   else {
@@ -485,6 +495,17 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
     ui->potWarningMode->hide();
   }
 
+  for (int i=0; i<firmware->getCapability(NumModules); i++) {
+    modules[i] = new ModulePanel(this, model, model.moduleData[i], generalSettings, firmware, i);
+    ui->modulesLayout->addWidget(modules[i]);
+    connect(modules[i], SIGNAL(modified()), this, SLOT(onChildModified()));
+  }
+
+  if (firmware->getCapability(ModelTrainerEnable)) {
+    modules[C9X_NUM_MODULES] = new ModulePanel(this, model, model.moduleData[C9X_NUM_MODULES], generalSettings, firmware, -1);
+    ui->modulesLayout->addWidget(modules[C9X_NUM_MODULES]);
+  }
+
   disableMouseScrolling();
 
   lock = false;

companion/src/modeledit/setup.h

@@ -20,10 +20,11 @@ class TimerPanel : public ModelPanel
     Q_OBJECT
 
   public:
-    TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, FirmwareInterface * firmware);
+    TimerPanel(QWidget *parent, ModelData & model, TimerData & timer, GeneralSettings & generalSettings, FirmwareInterface * firmware, QWidget *prevFocus);
     virtual ~TimerPanel();
 
     virtual void update();
+    QWidget * getLastFocus();
 
   private slots:
     void on_mode_currentIndexChanged(int index);

companion/src/modeledit/setup.ui

@@ -532,6 +532,19 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>name</tabstop>
+  <tabstop>image</tabstop>
+  <tabstop>throttleSource</tabstop>
+  <tabstop>throttleTrim</tabstop>
+  <tabstop>throttleWarning</tabstop>
+  <tabstop>throttleReverse</tabstop>
+  <tabstop>trimIncrement</tabstop>
+  <tabstop>extendedLimits</tabstop>
+  <tabstop>extendedTrims</tabstop>
+  <tabstop>displayText</tabstop>
+  <tabstop>potWarningMode</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

companion/src/modeledit/setup_module.ui

@@ -541,6 +541,17 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>trainerMode</tabstop>
+  <tabstop>protocol</tabstop>
+  <tabstop>channelsStart</tabstop>
+  <tabstop>channelsCount</tabstop>
+  <tabstop>ppmFrameLength</tabstop>
+  <tabstop>ppmPolarity</tabstop>
+  <tabstop>ppmDelay</tabstop>
+  <tabstop>failsafeMode</tabstop>
+  <tabstop>rxNumber</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

companion/src/modeledit/telemetry.cpp

@@ -488,19 +488,6 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
     model.frsky.usrProto = 1;
   }
 
-  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())) {
-      ui->telemetryProtocol->addItem(tr("FrSky D (cable)"), 2);
-    }
-    ui->telemetryProtocol->setCurrentIndex(model.telemetryProtocol);
-  }
-  else {
-    ui->telemetryProtocolLabel->hide();
-    ui->telemetryProtocol->hide();
-  }
-
   analogs[0] = new TelemetryAnalog(this, model.frsky.channels[0], model, generalSettings, firmware);
   ui->A1Layout->addWidget(analogs[0]);
   connect(analogs[0], SIGNAL(modified()), this, SLOT(onAnalogModified()));
@@ -563,6 +550,19 @@ void TelemetryPanel::setup()
 
     lock = true;
 
+    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())) {
+        ui->telemetryProtocol->addItem(tr("FrSky D (cable)"), 2);
+      }
+      ui->telemetryProtocol->setCurrentIndex(model.telemetryProtocol);
+    }
+    else {
+      ui->telemetryProtocolLabel->hide();
+      ui->telemetryProtocol->hide();
+    }
+
     ui->rssiAlarm1SB->setValue(model.frsky.rssiAlarms[0].value);
     ui->rssiAlarm2SB->setValue(model.frsky.rssiAlarms[1].value);
     if (!IS_TARANIS(firmware->getBoard())) {
@@ -709,8 +709,10 @@ void TelemetryPanel::populateCurrentSource()
 
 void TelemetryPanel::on_telemetryProtocol_currentIndexChanged(int index)
 {
-  model.telemetryProtocol = index;
-  emit modified();
+  if (!lock) {
+    model.telemetryProtocol = index;
+    emit modified();
+  }
 }
 
 void TelemetryPanel::onAnalogModified()
@@ -720,16 +722,20 @@ void TelemetryPanel::onAnalogModified()
 
 void TelemetryPanel::on_bladesCount_editingFinished()
 {
-  model.frsky.blades = ui->bladesCount->value();
-  emit modified();
+  if (!lock) {
+    model.frsky.blades = ui->bladesCount->value();
+    emit modified();
+  }
 }
 
 void TelemetryPanel::on_frskyProtoCB_currentIndexChanged(int index)
 {
-  model.frsky.usrProto = index;
-  for (int i=0; i<firmware->getCapability(TelemetryCustomScreens); i++)
-    telemetryCustomScreens[i]->update();
-  emit modified();
+  if (!lock) {
+    model.frsky.usrProto = index;
+    for (int i=0; i<firmware->getCapability(TelemetryCustomScreens); i++)
+      telemetryCustomScreens[i]->update();
+    emit modified();
+  }
 }
 
 void TelemetryPanel::on_rssiAlarm1CB_currentIndexChanged(int index)

companion/src/modeledit/telemetry.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>850</width>
-    <height>457</height>
+    <height>521</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -1005,6 +1005,28 @@
    <header>qautocombobox.h</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>telemetryProtocol</tabstop>
+  <tabstop>rssiAlarm1CB</tabstop>
+  <tabstop>rssiAlarm1SB</tabstop>
+  <tabstop>rssiAlarm2CB</tabstop>
+  <tabstop>rssiAlarm2SB</tabstop>
+  <tabstop>varioSourceCB</tabstop>
+  <tabstop>varioLimitMin_DSB</tabstop>
+  <tabstop>varioLimitCenterMin_DSB</tabstop>
+  <tabstop>varioLimitCenterMax_DSB</tabstop>
+  <tabstop>varioLimitMax_DSB</tabstop>
+  <tabstop>AltitudeGPS_ChkB</tabstop>
+  <tabstop>AltitudeToolbar_ChkB</tabstop>
+  <tabstop>frskyProtoCB</tabstop>
+  <tabstop>fasOffset_DSB</tabstop>
+  <tabstop>mahCount_SB</tabstop>
+  <tabstop>mahCount_ChkB</tabstop>
+  <tabstop>frskyVoltCB</tabstop>
+  <tabstop>frskyCurrentCB</tabstop>
+  <tabstop>bladesCount</tabstop>
+  <tabstop>customScreens</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

companion/src/modeledit/telemetry_analog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>276</width>
-    <height>118</height>
+    <height>138</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -325,6 +325,17 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>UnitCB</tabstop>
+  <tabstop>RatioSB</tabstop>
+  <tabstop>CalibSB</tabstop>
+  <tabstop>alarm1LevelCB</tabstop>
+  <tabstop>alarm1GreaterCB</tabstop>
+  <tabstop>alarm1ValueSB</tabstop>
+  <tabstop>alarm2LevelCB</tabstop>
+  <tabstop>alarm2GreaterCB</tabstop>
+  <tabstop>alarm2ValueSB</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>

companion/src/preferencesdialog.ui

@@ -1625,22 +1625,91 @@ May be different from firmware language</string>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>InvertPixels</tabstop>
-  <tabstop>clearImageButton</tabstop>
+  <tabstop>showSplash</tabstop>
+  <tabstop>startupCheck_companion9x</tabstop>
+  <tabstop>startupCheck_fw</tabstop>
+  <tabstop>historySize</tabstop>
+  <tabstop>wizardEnable_ChkB</tabstop>
+  <tabstop>backupPath</tabstop>
+  <tabstop>backupPathButton</tabstop>
+  <tabstop>backupEnable</tabstop>
+  <tabstop>ge_lineedit</tabstop>
+  <tabstop>ge_pathButton</tabstop>
   <tabstop>SplashFileName</tabstop>
   <tabstop>splashLibraryButton</tabstop>
   <tabstop>SplashSelect</tabstop>
+  <tabstop>splashincludeCB</tabstop>
   <tabstop>libraryPath</tabstop>
   <tabstop>libraryPathButton</tabstop>
-  <tabstop>downloadVerCB</tabstop>
-  <tabstop>fw_dnld</tabstop>
-  <tabstop>optionCheckBox_1</tabstop>
-  <tabstop>optionCheckBox_2</tabstop>
-  <tabstop>checkFWUpdates</tabstop>
-  <tabstop>channelorderCB</tabstop>
+  <tabstop>InvertPixels</tabstop>
+  <tabstop>clearImageButton</tabstop>
+  <tabstop>backLightColor</tabstop>
+  <tabstop>simuSW</tabstop>
   <tabstop>joystickChkB</tabstop>
   <tabstop>joystickCB</tabstop>
   <tabstop>joystickcalButton</tabstop>
+  <tabstop>snapshotClipboardCKB</tabstop>
+  <tabstop>snapshotPath</tabstop>
+  <tabstop>snapshotPathButton</tabstop>
+  <tabstop>downloadVerCB</tabstop>
+  <tabstop>langCombo</tabstop>
+  <tabstop>fw_dnld</tabstop>
+  <tabstop>sdPath</tabstop>
+  <tabstop>sdPathButton</tabstop>
+  <tabstop>voiceCombo</tabstop>
+  <tabstop>voice_dnld</tabstop>
+  <tabstop>optionCheckBox_1</tabstop>
+  <tabstop>optionCheckBox_2</tabstop>
+  <tabstop>optionCheckBox_3</tabstop>
+  <tabstop>optionCheckBox_4</tabstop>
+  <tabstop>optionCheckBox_5</tabstop>
+  <tabstop>optionCheckBox_6</tabstop>
+  <tabstop>optionCheckBox_7</tabstop>
+  <tabstop>optionCheckBox_8</tabstop>
+  <tabstop>optionCheckBox_9</tabstop>
+  <tabstop>optionCheckBox_10</tabstop>
+  <tabstop>optionCheckBox_11</tabstop>
+  <tabstop>optionCheckBox_12</tabstop>
+  <tabstop>optionCheckBox_13</tabstop>
+  <tabstop>optionCheckBox_14</tabstop>
+  <tabstop>optionCheckBox_15</tabstop>
+  <tabstop>optionCheckBox_16</tabstop>
+  <tabstop>optionCheckBox_17</tabstop>
+  <tabstop>optionCheckBox_18</tabstop>
+  <tabstop>optionCheckBox_19</tabstop>
+  <tabstop>optionCheckBox_20</tabstop>
+  <tabstop>optionCheckBox_21</tabstop>
+  <tabstop>optionCheckBox_22</tabstop>
+  <tabstop>optionCheckBox_23</tabstop>
+  <tabstop>optionCheckBox_24</tabstop>
+  <tabstop>optionCheckBox_25</tabstop>
+  <tabstop>optionCheckBox_26</tabstop>
+  <tabstop>optionCheckBox_27</tabstop>
+  <tabstop>optionCheckBox_28</tabstop>
+  <tabstop>optionCheckBox_29</tabstop>
+  <tabstop>optionCheckBox_30</tabstop>
+  <tabstop>optionCheckBox_31</tabstop>
+  <tabstop>optionCheckBox_32</tabstop>
+  <tabstop>optionCheckBox_33</tabstop>
+  <tabstop>optionCheckBox_34</tabstop>
+  <tabstop>optionCheckBox_35</tabstop>
+  <tabstop>optionCheckBox_36</tabstop>
+  <tabstop>optionCheckBox_37</tabstop>
+  <tabstop>optionCheckBox_38</tabstop>
+  <tabstop>optionCheckBox_39</tabstop>
+  <tabstop>optionCheckBox_40</tabstop>
+  <tabstop>optionCheckBox_41</tabstop>
+  <tabstop>optionCheckBox_42</tabstop>
+  <tabstop>checkFWUpdates</tabstop>
+  <tabstop>renameFirmware</tabstop>
+  <tabstop>burnFirmware</tabstop>
+  <tabstop>stickmodeCB</tabstop>
+  <tabstop>channelorderCB</tabstop>
+  <tabstop>ProfSlot_SB</tabstop>
+  <tabstop>ProfName_LE</tabstop>
+  <tabstop>ProfSave_PB</tabstop>
+  <tabstop>import_PB</tabstop>
+  <tabstop>export_PB</tabstop>
   <tabstop>buttonBox</tabstop>
  </tabstops>
  <resources>

companion/src/simulation/CMakeLists.txt

@@ -1,10 +1,16 @@
 set(simulation_SRCS
   simulatordialog.cpp
+  telemetrysimu.cpp
+  trainersimu.cpp
+  debugoutput.cpp
 )
 
 set(simulation_UIS
   simulatordialog-9x.ui
   simulatordialog-taranis.ui
+  telemetrysimu.ui
+  trainersimu.ui
+  debugoutput.ui
 )
 
 set(simulation_HDRS
@@ -14,6 +20,9 @@ set(simulation_HDRS
   xcursorwidget.h
   xmenuwidget.h
   myslider.h
+  telemetrysimu.h
+  trainersimu.h
+  debugoutput.h
 )
 
 if(SDL_FOUND)

companion/src/simulation/debugoutput.cpp

@@ -0,0 +1,43 @@
+#include <QtGui>
+#include <stdint.h>
+#include "debugoutput.h"
+#include "ui_debugoutput.h"
+
+DebugOutput::DebugOutput(QWidget * parent):
+  QDialog(parent),
+  ui(new Ui::DebugOutput)
+{
+  ui->setupUi(this);
+
+#ifdef __APPLE__
+  QFont newFont("Courier", 13);
+  ui->Output->setFont(newFont);
+  ui->Output->setAttribute(Qt::WA_MacNormalSize);
+#endif
+#if defined WIN32 || !defined __GNUC__
+  QFont newFont("Courier", 9);
+  ui->Output->setFont(newFont);
+#endif
+
+}
+
+DebugOutput::~DebugOutput()
+{
+  delete ui;
+}
+
+void DebugOutput::traceCallback(const QString & text)
+{
+  // ui->Output->appendPlainText(text);
+  QTextCursor cursor(ui->Output->textCursor());
+
+  // is the scrollbar at the end?
+  bool atEnd = (ui->Output->verticalScrollBar()->value() == ui->Output->verticalScrollBar()->maximum());
+
+  cursor.movePosition(QTextCursor::End, QTextCursor::MoveAnchor, 1);
+  cursor.insertText(text);
+
+  if (atEnd) {
+    ui->Output->verticalScrollBar()->triggerAction(QAbstractSlider::SliderToMaximum);
+  }
+}

companion/src/simulation/debugoutput.h

@@ -0,0 +1,32 @@
+#ifndef debugoutput_h
+#define debugoutput_h
+
+
+#include <QDialog>
+#include "simulatorinterface.h"
+
+namespace Ui {
+  class DebugOutput;
+}
+
+
+class DebugOutput : public QDialog
+{
+  Q_OBJECT
+
+  public:
+    explicit DebugOutput(QWidget * parent);
+    virtual ~DebugOutput();
+    void traceCallback(const QString & text);
+
+  protected:
+
+  private:
+    Ui::DebugOutput * ui;
+
+  private slots:
+
+};
+
+#endif
+

companion/src/simulation/debugoutput.ui

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DebugOutput</class>
+ <widget class="QDialog" name="DebugOutput">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>711</width>
+    <height>470</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Debug Output</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="../companion.qrc">
+    <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPlainTextEdit" name="Output">
+       <property name="font">
+        <font>
+         <family>Courier New</family>
+         <pointsize>10</pointsize>
+        </font>
+       </property>
+       <property name="verticalScrollBarPolicy">
+        <enum>Qt::ScrollBarAlwaysOn</enum>
+       </property>
+       <property name="lineWrapMode">
+        <enum>QPlainTextEdit::NoWrap</enum>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources>
+  <include location="../companion.qrc"/>
+ </resources>
+ <connections/>
+</ui>

companion/src/simulation/joystick.cpp

@@ -62,8 +62,7 @@ void Joystick::processEvents()
 
   SDL_JoystickUpdate();
 
-  int i;
-  for (i = 0; i < numAxes; i++) {
+  for (int i = 0; i < numAxes; i++) {
     Sint16 moved = SDL_JoystickGetAxis(joystick, i);
     if ( abs(moved) >= deadzones[i] ) {
       if ( (moved != axes[i]) ) {
@@ -72,46 +71,55 @@ void Joystick::processEvents()
           emit axisValueChanged(i, moved);
         axes[i] = moved;
         axisRepeatTimers[i].restart();
-      } else if (autoRepeat && moved != 0) {
+      }
+      else if (autoRepeat && moved != 0) {
         if ( axisRepeatTimers[i].elapsed() >= autoRepeatDelay ) {
           emit axisValueChanged(i, moved);
           axes[i] = moved;
         }
-      } else
+      }
+      else
         axisRepeatTimers[i].restart();
-    } else
+    }
+    else {
       emit axisValueChanged(i, 0);
+    }
   }
-  for (i = 0; i < numButtons; i++) {
+  for (int i = 0; i < numButtons; i++) {
     Uint8 changed = SDL_JoystickGetButton(joystick, i);
     if ( (changed != buttons[i]) ) {
       emit buttonValueChanged(i, (bool) changed);
       buttons[i] = changed;
       buttonRepeatTimers[i].restart();
-    } else if (autoRepeat && changed != 0) {
+    }
+    else if (autoRepeat && changed != 0) {
       if ( buttonRepeatTimers[i].elapsed() >= autoRepeatDelay ) {
         emit buttonValueChanged(i, (bool) changed);
         buttons[i] = changed;
       }
-    } else
+    }
+    else {
       buttonRepeatTimers[i].restart();
+    }
   }
-  for (i = 0; i < numHats; i++) {
+  for (int i = 0; i < numHats; i++) {
     Uint8 changed = SDL_JoystickGetHat(joystick, i);
     if ( (changed != hats[i]) ) {
       emit hatValueChanged(i, changed);
       hats[i] = changed;
       hatRepeatTimers[i].restart();
-    } else if (autoRepeat && changed != 0) {
+    }
+    else if (autoRepeat && changed != 0) {
       if ( hatRepeatTimers[i].elapsed() >= autoRepeatDelay ) {
         emit hatValueChanged(i, changed);
         hats[i] = changed;
       }
-    } else
+    }
+    else {
       hatRepeatTimers[i].restart();
+    }
   }
-
-  for (i = 0; i < numTrackballs; i++) {
+  for (int i = 0; i < numTrackballs; i++) {
     int dx, dy;
     SDL_JoystickGetBall(joystick, i, &dx, &dy);
     if ( dx != 0 || dy != 0 )

companion/src/simulation/joystickdialog.cpp

@@ -3,21 +3,16 @@
 #include "appdata.h"
 #include <QtGui>
 
-joystickDialog::joystickDialog(QWidget *parent, int stick) :
+JoystickDialog::JoystickDialog(QWidget *parent, int stick) :
 QDialog(parent),
-ui(new Ui::joystickDialog) {
+ui(new Ui::JoystickDialog)
+{
   ui->setupUi(this);
-  int jscaltmp[8][3] = {
-    {32767, 0, -32767},
-    {32767, 0, -32767},
-    {32767, 0, -32767},
-    {32767, 0, -32767},
-    {32767, 0, -32767},
-    {32767, 0, -32767},
-    {32767, 0, -32767},
-    {32767, 0, -32767}
-  };
-  memcpy(jscal, jscaltmp, sizeof (jscal));
+  for (int i=0; i<8; ++i) {
+    jscal[i][0] = 32767;
+    jscal[i][1] = 0;
+    jscal[i][2] = -32767;
+  }
   ui->okButton->setDisabled(true);
   ui->howtoLabel->setText(tr("Move sticks and pots in every direction making full movement\nPress next when finished"));
   step = 0;
@@ -32,23 +27,24 @@ ui(new Ui::joystickDialog) {
   connect(joystick, SIGNAL(axisValueChanged(int, int)), this, SLOT(onjoystickAxisValueChanged(int, int)));
 }
 
-joystickDialog::~joystickDialog() {
+JoystickDialog::~JoystickDialog()
+{
   delete ui;
 }
 
-void joystickDialog::joystickOpen(int stick) {
+void JoystickDialog::joystickOpen(int stick)
+{
   if (stick == -1) {
     this->close();
     return;
   }
   joystick = new Joystick(this, 1, false, 0);
-  int numAxes=std::min(joystick->numAxes,8);
+  int numAxes = std::min(joystick->numAxes, 8);
   if (joystick) {
     joystick->open(stick);
-    
     for (int j=0; j<numAxes; j++) {
-        joystick->sensitivities[j] = 0;
-        joystick->deadzones[j]=20;
+      joystick->sensitivities[j] = 0;
+      joystick->deadzones[j] = 20;
     }
   }
   else {
@@ -57,27 +53,25 @@ void joystickDialog::joystickOpen(int stick) {
   }
 }
 
-void joystickDialog::onjoystickAxisValueChanged(int axis, int value) {
+void JoystickDialog::onjoystickAxisValueChanged(int axis, int value)
+{
   if (value > jscal[axis][2]) {
     jscal[axis][2] = value;
   }
   if (value < jscal[axis][0]) {
     jscal[axis][0] = value;
   }
-  QSlider * sl[]= {ui->Ch_1, ui->Ch_2, ui->Ch_3, ui->Ch_4, ui->Ch_5, ui->Ch_6, ui->Ch_7, ui->Ch_8};
-  QCheckBox * ib[]={ui->ChInv_1, ui->ChInv_2, ui->ChInv_3, ui->ChInv_4, ui->ChInv_5, ui->ChInv_6, ui->ChInv_7, ui->ChInv_8};
-  if (ib[axis]->isChecked()) {
-    sl[axis]->setInvertedAppearance(true);
-  } else {
-    sl[axis]->setInvertedAppearance(false);
-  }
+  QSlider * sl[] = {ui->Ch_1, ui->Ch_2, ui->Ch_3, ui->Ch_4, ui->Ch_5, ui->Ch_6, ui->Ch_7, ui->Ch_8};
+  QCheckBox * ib[] = {ui->ChInv_1, ui->ChInv_2, ui->ChInv_3, ui->ChInv_4, ui->ChInv_5, ui->ChInv_6, ui->ChInv_7, ui->ChInv_8};
+  sl[axis]->setInvertedAppearance(ib[axis]->isChecked());
   sl[axis]->setMinimum(jscal[axis][0]);
   sl[axis]->setMaximum(jscal[axis][2]);    
   sl[axis]->setValue(value);
 }
 
-void joystickDialog::on_nextButton_clicked() {
-  int numAxes=std::min(joystick->numAxes,8);
+void JoystickDialog::on_nextButton_clicked()
+{
+  int numAxes = std::min(joystick->numAxes,8);
   switch (step) {
     case 0:
       ui->howtoLabel->setText(tr("Place sticks and pots in middle position.\nPress next when done"));
@@ -85,11 +79,11 @@ void joystickDialog::on_nextButton_clicked() {
       break;
     case 1:
       for (int i=0; i<numAxes; i++) {
-        jscal[i][1]=0;
-        for (int j=0; j<100;j++) {
-          jscal[i][1]+=joystick->getAxisValue(i);
+        jscal[i][1] = 0;
+        for (int j=0; j<100; j++) {
+          jscal[i][1] += joystick->getAxisValue(i);
         }
-        jscal[i][1]/=100;
+        jscal[i][1] /= 100;
       }
       ui->howtoLabel->setText(tr("Map joystick channels to controls using comboboxes.\nPress next when done"));
       step++;
@@ -110,20 +104,22 @@ void joystickDialog::on_nextButton_clicked() {
   }
 }
 
-void joystickDialog::on_cancelButton_clicked() {
+void JoystickDialog::on_cancelButton_clicked()
+{
   joystick->close();
   this->close();
 }
 
-void joystickDialog::on_okButton_clicked() {
-  int sticks[8]={0,0,0,0,0,0,0,0};
+void JoystickDialog::on_okButton_clicked()
+{
+  int sticks[8] = {0,0,0,0,0,0,0,0};
   foreach(QComboBox *cb, findChildren<QComboBox *>(QRegExp("jsmapCB_[0-9]+"))) {
     sticks[cb->currentIndex()]++;
   }
   bool duplicated=false;
   for (int i=1; i<8;i++) {
     if (sticks[i]>1) {
-      duplicated=true;
+      duplicated = true;
     }
   }
   if (duplicated) {
@@ -131,7 +127,7 @@ void joystickDialog::on_okButton_clicked() {
     return;
   }
   joystick->close();
-  for (int i=0; i<8;i++) {
+  for (int i=0; i<8; i++) {
     g.joystick[i].remove();
   }
   QCheckBox * ib[]={ui->ChInv_1, ui->ChInv_2, ui->ChInv_3, ui->ChInv_4, ui->ChInv_5, ui->ChInv_6, ui->ChInv_7, ui->ChInv_8};

companion/src/simulation/joystickdialog.h

@@ -5,23 +5,23 @@
 #include <QDialog>
 
 namespace Ui {
-    class joystickDialog;
+    class JoystickDialog;
 }
 
-class joystickDialog : public QDialog
+class JoystickDialog : public QDialog
 {
     Q_OBJECT
 
 public:
-    explicit joystickDialog(QWidget *parent = 0, int stick=-1);
-    ~joystickDialog();
+    explicit JoystickDialog(QWidget *parent = 0, int stick=-1);
+    ~JoystickDialog();
     Joystick *joystick;
 
 public slots:
     void onjoystickAxisValueChanged(int axis, int value);
     
 private:
-    Ui::joystickDialog *ui;
+    Ui::JoystickDialog *ui;
     void joystickOpen(int stick);
     int jscal[8][3];
     int step;

companion/src/simulation/joystickdialog.ui

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>joystickDialog</class>
- <widget class="QDialog" name="joystickDialog">
+ <class>JoystickDialog</class>
+ <widget class="QDialog" name="JoystickDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>418</width>
-    <height>301</height>
+    <width>505</width>
+    <height>398</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -908,6 +908,35 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>Ch_1</tabstop>
+  <tabstop>ChInv_1</tabstop>
+  <tabstop>jsmapCB_1</tabstop>
+  <tabstop>Ch_2</tabstop>
+  <tabstop>ChInv_2</tabstop>
+  <tabstop>jsmapCB_2</tabstop>
+  <tabstop>Ch_3</tabstop>
+  <tabstop>ChInv_3</tabstop>
+  <tabstop>jsmapCB_3</tabstop>
+  <tabstop>Ch_4</tabstop>
+  <tabstop>ChInv_4</tabstop>
+  <tabstop>jsmapCB_4</tabstop>
+  <tabstop>Ch_5</tabstop>
+  <tabstop>ChInv_5</tabstop>
+  <tabstop>jsmapCB_5</tabstop>
+  <tabstop>Ch_6</tabstop>
+  <tabstop>ChInv_6</tabstop>
+  <tabstop>jsmapCB_6</tabstop>
+  <tabstop>Ch_7</tabstop>
+  <tabstop>ChInv_7</tabstop>
+  <tabstop>jsmapCB_7</tabstop>
+  <tabstop>Ch_8</tabstop>
+  <tabstop>ChInv_8</tabstop>
+  <tabstop>jsmapCB_8</tabstop>
+  <tabstop>cancelButton</tabstop>
+  <tabstop>nextButton</tabstop>
+  <tabstop>okButton</tabstop>
+ </tabstops>
  <resources>
   <include location="companion.qrc"/>
  </resources>

companion/src/simulation/simulatordialog-taranis.ui

@@ -1694,6 +1694,43 @@ QPushButton:checked {
    <container>1</container>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>switchF</tabstop>
+  <tabstop>dialP_3</tabstop>
+  <tabstop>switchE</tabstop>
+  <tabstop>switchA</tabstop>
+  <tabstop>switchB</tabstop>
+  <tabstop>dialP_1</tabstop>
+  <tabstop>dialP_2</tabstop>
+  <tabstop>switchC</tabstop>
+  <tabstop>switchD</tabstop>
+  <tabstop>switchG</tabstop>
+  <tabstop>dialP_4</tabstop>
+  <tabstop>switchH</tabstop>
+  <tabstop>holdLeftY</tabstop>
+  <tabstop>FixLeftY</tabstop>
+  <tabstop>FixLeftX</tabstop>
+  <tabstop>holdLeftX</tabstop>
+  <tabstop>leftStick</tabstop>
+  <tabstop>trimHL_L</tabstop>
+  <tabstop>trimHLeft</tabstop>
+  <tabstop>trimHL_R</tabstop>
+  <tabstop>trimVL_D</tabstop>
+  <tabstop>trimVLeft</tabstop>
+  <tabstop>trimVL_U</tabstop>
+  <tabstop>trimVR_U</tabstop>
+  <tabstop>trimVRight</tabstop>
+  <tabstop>trimVR_D</tabstop>
+  <tabstop>trimHR_L</tabstop>
+  <tabstop>trimHRight</tabstop>
+  <tabstop>trimHR_R</tabstop>
+  <tabstop>rightStick</tabstop>
+  <tabstop>holdRightY</tabstop>
+  <tabstop>FixRightY</tabstop>
+  <tabstop>FixRightX</tabstop>
+  <tabstop>holdRightX</tabstop>
+ </tabstops>
  <resources>
   <include location="../companion.qrc"/>
  </resources>

companion/src/simulation/simulatordialog.cpp

@@ -9,6 +9,42 @@
 #define RESX        1024
 
 int SimulatorDialog::screenshotIdx = 0;
+SimulatorDialog * traceCallbackInstance = 0;
+
+void traceCb(const char * text) {
+  // divert C callback into simulator instance
+  if (traceCallbackInstance) {
+      traceCallbackInstance->traceCallback(text);
+  }
+}
+
+void SimulatorDialog::traceCallback(const char * text)
+{
+  // this function is called from other threads
+  traceMutex.lock();
+  // limit the size of list
+  if (traceList.size() < 1000) {
+    traceList.append(QString(text));
+  }
+  traceMutex.unlock();
+}
+
+void SimulatorDialog::updateDebugOutput()
+{
+  traceMutex.lock();
+  while (!traceList.isEmpty()) {
+    QString text = traceList.takeFirst();
+    traceBuffer.append(text);
+    // limit the size of traceBuffer
+    if (traceBuffer.size() > 10*1024) {
+      traceBuffer.remove(0, 1*1024);
+    }
+    if (DebugOut) {
+      DebugOut->traceCallback(QString(text));
+    }
+  }
+  traceMutex.unlock();
+}
 
 SimulatorDialog::SimulatorDialog(QWidget * parent, unsigned int flags):
   QDialog(parent),
@@ -19,10 +55,19 @@ SimulatorDialog::SimulatorDialog(QWidget * parent, unsigned int flags):
   simulator(NULL),
   lastPhase(-1),
   beepVal(0),
+  TelemetrySimu(0),
+  TrainerSimu(0),
+  DebugOut(0),
   buttonPressed(0),
   trimPressed (TRIM_NONE),
   middleButtonPressed(false)
 {
+  //shorcut for telemetry simulator
+  // new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_T), this, SLOT(openTelemetrySimulator()));
+  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()));
+  traceCallbackInstance = this;
 }
 
 uint32_t SimulatorDialog9X::switchstatus = 0;
@@ -37,6 +82,9 @@ SimulatorDialog9X::SimulatorDialog9X(QWidget * parent, unsigned int flags):
 
   initUi<Ui::SimulatorDialog9X>(ui);
 
+  // install simulator TRACE hook
+  simulator->installTraceHook(traceCb);
+
   backLight = g.backLight();
   if (backLight > 4) backLight = 0;
   switch (backLight) {
@@ -109,6 +157,10 @@ SimulatorDialogTaranis::SimulatorDialogTaranis(QWidget * parent, unsigned int fl
   lcdDepth = 4;
 
   initUi<Ui::SimulatorDialogTaranis>(ui);
+
+  // install simulator TRACE hook
+  simulator->installTraceHook(traceCb);
+
   dialP_4 = ui->dialP_4;
 
   ui->lcd->setBackgroundColor(47, 123, 227);
@@ -154,6 +206,7 @@ SimulatorDialogTaranis::~SimulatorDialogTaranis()
 
 SimulatorDialog::~SimulatorDialog()
 {
+  traceCallbackInstance = 0;
   delete timer;
   delete simulator;
 }
@@ -215,6 +268,49 @@ void SimulatorDialog::onTrimReleased()
   trimPressed = TRIM_NONE;
 }
 
+void SimulatorDialog::openTelemetrySimulator()
+{
+  // allow only one instance
+  if (TelemetrySimu == 0) {
+    TelemetrySimu = new TelemetrySimulator(this, simulator);
+    TelemetrySimu->show();
+  }
+  else if (!TelemetrySimu->isVisible()) {
+    TelemetrySimu->show();
+  }
+}
+
+void SimulatorDialog::openTrainerSimulator()
+{
+  // allow only one instance
+  if (TrainerSimu == 0) {
+    TrainerSimu = new TrainerSimulator(this, simulator);
+    TrainerSimu->show();
+  }
+  else if (!TrainerSimu->isVisible()) {
+    TrainerSimu->show();
+  }
+}
+
+void SimulatorDialog::openDebugOutput()
+{
+  // allow only one instance, but install signal handler to catch dialog destruction just in case
+  if (DebugOut == 0) {
+    DebugOut = new DebugOutput(this);
+    QObject::connect(DebugOut, SIGNAL(destroyed()), this, SLOT(onDebugOutputClose()));
+    DebugOut->traceCallback(traceBuffer);
+    DebugOut->show();
+  }
+  else if (!DebugOut->isVisible()) {
+    DebugOut->show();
+  }
+}
+
+void SimulatorDialog::onDebugOutputClose()
+{
+  DebugOut = 0;
+}
+
 void SimulatorDialog::keyPressEvent (QKeyEvent *event)
 {
   switch (event->key()) {
@@ -559,6 +655,8 @@ void SimulatorDialog::onTimerEvent()
       QApplication::beep();
     }
   }
+
+  updateDebugOutput();
 }
 
 void SimulatorDialog::centerSticks()
@@ -971,8 +1069,8 @@ void SimulatorDialog::on_FixRightY_clicked(bool checked)
 void SimulatorDialog::onjoystickAxisValueChanged(int axis, int value)
 {
   int stick;
-  if (axis>=0 && axis<=8) {
-    stick=jsmap[axis];
+  if (axis>=0 && axis<8) {
+    stick = jsmap[axis];
     int stickval;
     if (value>jscal[axis][1]) {
       if ((jscal[axis][2]-jscal[axis][1])==0)

companion/src/simulation/simulatordialog.h

@@ -4,6 +4,9 @@
 #include <QDialog>
 #include "modeledit/node.h"
 #include "eeprominterface.h"
+#include "telemetrysimu.h"
+#include "trainersimu.h"
+#include "debugoutput.h"
 
 #ifdef JOYSTICKS
 #include "joystick.h"
@@ -38,6 +41,7 @@ class SimulatorDialog : public QDialog
 
     void start(const char * filename);
     void start(QByteArray & eeprom);
+    virtual void traceCallback(const char * text);
 
   protected:
     template <class T> void initUi(T * ui);
@@ -95,6 +99,14 @@ class SimulatorDialog : public QDialog
 
     int lcdWidth;
     int lcdDepth;
+    TelemetrySimulator * TelemetrySimu;
+    TrainerSimulator * TrainerSimu;
+    DebugOutput * DebugOut;
+
+    QString traceBuffer;
+    QMutex traceMutex;
+    QList<QString> traceList;
+    void updateDebugOutput();
 
   protected:
     virtual void closeEvent(QCloseEvent *);
@@ -125,6 +137,10 @@ class SimulatorDialog : public QDialog
     void onTimerEvent();
     void onTrimPressed();
     void onTrimReleased();
+    void openTelemetrySimulator();
+    void openTrainerSimulator();
+    void openDebugOutput();
+    void onDebugOutputClose();
 
 #ifdef JOYSTICKS
     void onjoystickAxisValueChanged(int axis, int value);

companion/src/simulation/simulatorimport.h

@@ -97,4 +97,9 @@ return lcd_buf;
 return main_thread_error;
 #endif
 
+#ifdef SETTRAINER_IMPORT
+#undef SETTRAINER_IMPORT
+  ppmInValid = 100;
+  g_ppmIns[inputNumber] = LIMIT<int16_t>(-512, value, 512);
+#endif
 

companion/src/simulation/simulatorinterface.h

@@ -80,6 +80,11 @@ class SimulatorInterface {
 
     virtual const char * getError() = 0;
 
+    virtual void sendTelemetry(uint8_t * data, unsigned int len) = 0;
+
+    virtual void setTrainerInput(unsigned int inputNumber, int16_t value) = 0;
+
+    virtual void installTraceHook(void (*callback)(const char *)) = 0;
 };
 
 #endif

companion/src/simulation/telemetrysimu.cpp

@@ -0,0 +1,91 @@
+#include <stdint.h>
+#include "telemetrysimu.h"
+#include "ui_telemetrysimu.h"
+#include "radio/src/telemetry/frsky.h"
+
+TelemetrySimulator::TelemetrySimulator(QWidget * parent, SimulatorInterface * simulator):
+  QDialog(parent),
+  ui(new Ui::TelemetrySimulator),
+  simulator(simulator)
+{
+  ui->setupUi(this);
+
+  timer = new QTimer(this);
+  connect(timer, SIGNAL(timeout()), this, SLOT(onTimerEvent()));
+  timer->start(100);
+}
+
+TelemetrySimulator::~TelemetrySimulator()
+{
+  timer->stop();
+  delete ui;
+}
+
+void TelemetrySimulator::onTimerEvent()
+{
+  if (ui->Simulate->isChecked()) {
+    generateTelemetryFrame();
+  }
+}
+
+void TelemetrySimulator::closeEvent(QCloseEvent *event)
+{
+  ui->Simulate->setChecked(false);
+  event->accept();
+}
+
+void setSportPacketCrc(uint8_t * packet)
+{
+  short crc = 0;
+  for (int i=1; i<FRSKY_SPORT_PACKET_SIZE-1; i++) {
+    crc += packet[i]; //0-1FF
+    crc += crc >> 8; //0-100
+    crc &= 0x00ff;
+    crc += crc >> 8; //0-0FF
+    crc &= 0x00ff;
+  }
+  packet[FRSKY_SPORT_PACKET_SIZE-1] = 0xFF - (crc & 0x00ff);
+  //TRACE("crc set: %x", packet[FRSKY_SPORT_PACKET_SIZE-1]);
+}
+
+void generateSportPacket(uint8_t * packet, uint8_t dataId, uint8_t prim, uint16_t appId, uint32_t data)
+{
+  packet[0] = dataId;
+  packet[1] = prim;
+  *((uint16_t *)(packet+2)) = appId;
+  *((int32_t *)(packet+4)) = data;
+  setSportPacketCrc(packet);
+}
+
+void TelemetrySimulator::generateTelemetryFrame()
+{
+  static int item = 0;
+  uint8_t buffer[FRSKY_SPORT_PACKET_SIZE];
+
+  switch(item++) {
+    case 0:
+      generateSportPacket(buffer, 1, DATA_FRAME, RSSI_ID, LIMIT<uint32_t>(0, ui->Rssi->text().toInt(), 0xFF));
+      break;
+
+    case 1:
+      generateSportPacket(buffer, 1, DATA_FRAME, XJT_VERSION_ID, 11);
+      break;
+
+    case 2:
+      generateSportPacket(buffer, 1, DATA_FRAME, SWR_ID, LIMIT<uint32_t>(0, ui->Swr->text().toInt(), 0xFF));
+      break;
+
+    case 3:
+      generateSportPacket(buffer, 1, DATA_FRAME, ADC1_ID, LIMIT<uint32_t>(0, ui->A1->text().toInt(), 0xFF));
+      break;
+
+    case 4:
+      generateSportPacket(buffer, 1, DATA_FRAME, ADC2_ID, LIMIT<uint32_t>(0, ui->A2->text().toInt(), 0xFF));
+      break;
+
+    default:
+      item = 0;
+      return;
+  }
+  simulator->sendTelemetry(buffer, 9);
+}

companion/src/simulation/telemetrysimu.h

@@ -0,0 +1,40 @@
+#ifndef telemetrysimu_h
+#define telemetrysimu_h
+
+
+#include <QCloseEvent>
+#include <QDialog>
+#include <QTimer>
+#include "simulatorinterface.h"
+
+namespace Ui {
+  class TelemetrySimulator;
+}
+
+
+class TelemetrySimulator : public QDialog
+{
+  Q_OBJECT
+
+  public:
+    explicit TelemetrySimulator(QWidget * parent, SimulatorInterface * simulator);
+    virtual ~TelemetrySimulator();
+
+
+  protected:
+    virtual void closeEvent(QCloseEvent *event);
+
+  private:
+    Ui::TelemetrySimulator * ui;
+    QTimer * timer;
+    SimulatorInterface *simulator;
+
+    void generateTelemetryFrame();
+
+  private slots:
+    void onTimerEvent();
+
+};
+
+#endif
+

companion/src/simulation/telemetrysimu.ui

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TelemetrySimulator</class>
+ <widget class="QDialog" name="TelemetrySimulator">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>184</width>
+    <height>165</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Telemetry Simulator</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="1" column="0">
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="3" column="3">
+      <widget class="QLineEdit" name="Swr"/>
+     </item>
+     <item row="4" column="3">
+      <widget class="QLineEdit" name="A1"/>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>RSSI</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QLineEdit" name="Rssi"/>
+     </item>
+     <item row="4" column="1">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>A1</string>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>SWR</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QCheckBox" name="Simulate">
+       <property name="text">
+        <string>simulate</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="1">
+      <widget class="QLabel" name="label_4">
+       <property name="text">
+        <string>A2</string>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="3">
+      <widget class="QLineEdit" name="A2"/>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

companion/src/simulation/trainersimu.cpp

@@ -0,0 +1,124 @@
+#include <stdint.h>
+#include "trainersimu.h"
+#include "ui_trainersimu.h"
+#include "helpers.h"
+
+#define GBALL_SIZE  20
+#define RESX        512
+
+TrainerSimulator::TrainerSimulator(QWidget * parent, SimulatorInterface * simulator):
+  QDialog(parent),
+  ui(new Ui::TrainerSimulator),
+  simulator(simulator)
+{
+  ui->setupUi(this);
+  leftStick = ui->leftStick;
+  rightStick = ui->rightStick;
+
+  setupSticks();
+
+  // resize(0, 0); // to force min height, min width
+  setFixedSize(width(), height());
+
+  timer = new QTimer(this);
+  connect(timer, SIGNAL(timeout()), this, SLOT(onTimerEvent()));
+}
+
+TrainerSimulator::~TrainerSimulator()
+{
+  timer->stop();
+  delete ui;
+}
+
+void TrainerSimulator::showEvent(QShowEvent *event)
+{
+  timer->start(10);
+  event->accept();
+}
+
+void TrainerSimulator::closeEvent(QCloseEvent *event)
+{
+  timer->stop();
+  event->accept();
+}
+
+void TrainerSimulator::centerSticks()
+{
+  if (leftStick->scene())
+    nodeLeft->stepToCenter();
+
+  if (rightStick->scene())
+    nodeRight->stepToCenter();
+}
+
+void TrainerSimulator::setupSticks()
+{
+  QGraphicsScene *leftScene = new QGraphicsScene(leftStick);
+  leftScene->setItemIndexMethod(QGraphicsScene::NoIndex);
+  leftStick->setScene(leftScene);
+
+  // leftStick->scene()->addLine(0,10,20,30);
+
+  QGraphicsScene *rightScene = new QGraphicsScene(rightStick);
+  rightScene->setItemIndexMethod(QGraphicsScene::NoIndex);
+  rightStick->setScene(rightScene);
+
+  // rightStick->scene()->addLine(0,10,20,30);
+
+  nodeLeft = new Node();
+  nodeLeft->setPos(-GBALL_SIZE/2,-GBALL_SIZE/2);
+  nodeLeft->setBallSize(GBALL_SIZE);
+  leftScene->addItem(nodeLeft);
+
+  nodeRight = new Node();
+  nodeRight->setPos(-GBALL_SIZE/2,-GBALL_SIZE/2);
+  nodeRight->setBallSize(GBALL_SIZE);
+  rightScene->addItem(nodeRight);
+}
+
+void TrainerSimulator::resizeEvent(QResizeEvent *event)
+{
+  if (leftStick->scene()) {
+    QRect qr = leftStick->contentsRect();
+    qreal w  = (qreal)qr.width()  - GBALL_SIZE;
+    qreal h  = (qreal)qr.height() - GBALL_SIZE;
+    qreal cx = (qreal)qr.width()/2;
+    qreal cy = (qreal)qr.height()/2;
+    leftStick->scene()->setSceneRect(-cx,-cy,w,h);
+
+    QPointF p = nodeLeft->pos();
+    p.setX(qMin(cx, qMax(p.x(), -cx)));
+    p.setY(qMin(cy, qMax(p.y(), -cy)));
+    nodeLeft->setPos(p);
+  }
+
+  if (rightStick->scene()) {
+    QRect qr = rightStick->contentsRect();
+    qreal w  = (qreal)qr.width()  - GBALL_SIZE;
+    qreal h  = (qreal)qr.height() - GBALL_SIZE;
+    qreal cx = (qreal)qr.width()/2;
+    qreal cy = (qreal)qr.height()/2;
+    rightStick->scene()->setSceneRect(-cx,-cy,w,h);
+
+    QPointF p = nodeRight->pos();
+    p.setX(qMin(cx, qMax(p.x(), -cx)));
+    p.setY(qMin(cy, qMax(p.y(), -cy)));
+    nodeRight->setPos(p);
+  }
+  QDialog::resizeEvent(event);
+}
+
+
+void TrainerSimulator::onTimerEvent()
+{
+  centerSticks();
+  setTrainerInputs();
+}
+
+void TrainerSimulator::setTrainerInputs()
+{
+  simulator->setTrainerInput(0, int( 512* nodeLeft->getX()));  // LEFT HORZ
+  simulator->setTrainerInput(1, int(-512* nodeLeft->getY()));  // LEFT VERT
+  simulator->setTrainerInput(2, int(-512*nodeRight->getY()));  // RGHT VERT
+  simulator->setTrainerInput(3, int( 512*nodeRight->getX()));  // RGHT HORZ
+}

companion/src/simulation/trainersimu.h

@@ -0,0 +1,50 @@
+#ifndef trainersimu_h
+#define trainersimu_h
+
+
+#include <QShowEvent>
+#include <QCloseEvent>
+#include <QDialog>
+#include <QTimer>
+#include "modeledit/node.h"
+#include "simulatorinterface.h"
+
+namespace Ui {
+  class TrainerSimulator;
+}
+
+
+class TrainerSimulator : public QDialog
+{
+  Q_OBJECT
+
+  public:
+    explicit TrainerSimulator(QWidget * parent, SimulatorInterface * simulator);
+    virtual ~TrainerSimulator();
+
+
+  protected:
+    virtual void showEvent(QShowEvent *event);
+    virtual void closeEvent(QCloseEvent *event);
+
+  private:
+    Ui::TrainerSimulator * ui;
+    QTimer * timer;
+    SimulatorInterface *simulator;
+
+    QGraphicsView * leftStick, * rightStick;
+    Node *nodeLeft;
+    Node *nodeRight;
+
+    void centerSticks();
+    void setupSticks();
+    void resizeEvent(QResizeEvent *event  = 0);
+    void setTrainerInputs();
+
+  private slots:
+    void onTimerEvent();
+
+};
+
+#endif
+

companion/src/simulation/trainersimu.ui

@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>TrainerSimulator</class>
+ <widget class="QDialog" name="TrainerSimulator">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>566</width>
+    <height>268</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Trainer simulator</string>
+  </property>
+  <widget class="QFrame" name="frame">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>563</width>
+     <height>267</height>
+    </rect>
+   </property>
+   <property name="frameShape">
+    <enum>QFrame::Panel</enum>
+   </property>
+   <property name="frameShadow">
+    <enum>QFrame::Raised</enum>
+   </property>
+   <property name="lineWidth">
+    <number>2</number>
+   </property>
+   <layout class="QHBoxLayout" name="horizontalLayout">
+    <property name="margin">
+     <number>5</number>
+    </property>
+    <item>
+     <layout class="QGridLayout" name="gridLayout_3">
+      <item row="0" column="1">
+       <spacer name="horizontalSpacer">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Minimum</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>17</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="0" column="2">
+       <widget class="QGraphicsView" name="rightStick">
+        <property name="minimumSize">
+         <size>
+          <width>245</width>
+          <height>245</height>
+         </size>
+        </property>
+        <property name="verticalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOff</enum>
+        </property>
+        <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOff</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QGraphicsView" name="leftStick">
+        <property name="minimumSize">
+         <size>
+          <width>245</width>
+          <height>245</height>
+         </size>
+        </property>
+        <property name="verticalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOff</enum>
+        </property>
+        <property name="horizontalScrollBarPolicy">
+         <enum>Qt::ScrollBarAlwaysOff</enum>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

companion/src/translations/companion_de.ts

@@ -1777,7 +1777,7 @@ Das kann auch unterschiedlich zur Firmwaresprache sein</translation>
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -5156,7 +5156,7 @@ If blank then the mix is considered to be &quot;ON&quot; all the time.</source>
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;

companion/src/translations/companion_fi.ts

@@ -1852,7 +1852,7 @@ Jos tyhjä tulon katsotaan olevan &quot;ON&quot; kokoajan.</translation>
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -1863,7 +1863,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -5574,7 +5574,7 @@ Haluatko tallentaa muutokset ?</translation>
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -5585,7 +5585,7 @@ p, li { white-space: pre-wrap; }
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;

companion/src/translations/companion_he.ts

@@ -4633,7 +4633,7 @@ This determines how mixer values are added.
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay and slow</span></p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix.  </p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>

companion/src/translations/companion_nl.ts

@@ -4493,7 +4493,7 @@ Do you want to save your changes?</source>
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;

companion/src/translations/companion_pl.ts

@@ -4506,7 +4506,7 @@ Ustala w jaki sposób miksery są łączone.
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay and slow</span></p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix.  </p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>

companion/src/translations/companion_pt.ts

@@ -4653,7 +4653,7 @@ This determines how mixer values are added.
 <html><head><meta name="qrichtext" content="1" /><style type="text/css">
 p, li { white-space: pre-wrap; }
 </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay ans Slow</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600; text-decoration: underline;">Delay and slow</span></p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;"></p>
 <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">These values control the speed and delay of the output of the mix.  </p>
 <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p>

companion/src/translations/companion_ru.ts

@@ -1665,7 +1665,7 @@ May be different from firmware language</source>
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -4691,7 +4691,7 @@ This determines how mixer values are added.
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;

companion/src/translations/companion_sv.ts

@@ -1682,7 +1682,7 @@ Behöver inte vara samma som menyspråket</translation>
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;
@@ -5080,7 +5080,7 @@ Anger hur mixervärden påverkar kanalen.
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;MS Shell Dlg 2&apos;; font-size:8.25pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay ans Slow&lt;/span&gt;&lt;/p&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600; text-decoration: underline;&quot;&gt;Delay and slow&lt;/span&gt;&lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600; text-decoration: underline;&quot;&gt;&lt;/p&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;These values control the speed and delay of the output of the mix.  &lt;/p&gt;
 &lt;p style=&quot;-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;/p&gt;

radio/releasenotes.txt

@@ -1,3 +1,47 @@
+<h2>Version 2.0.14 / todo</h2>
+
+[Taranis]
+<ul>
+<li>Fixed blank LCD screen at very low temperatures</li>
+<li>Shortened radio reboot time in case of watchdog reset</li>
+<li>Fixed timer problem in bootloader, which prevented radio from powering off after being connected to USB</li>
+<li>Fixed issue with heli swash plate mixing when using <i>notrim</i></li>
+<li>Various fixes for double-keys</li>
+<li>Added switch auto detection in Timer source</li>
+<li>Totally removed splash screen display if duration is set to ---</li>
+<li>Back-light turned on sooner at startup (Taranis +)</li>
+<li>Fixed reverse polarity on external CPPM output</li>
+<li>Suppressed center beep for non-existing pots</li>
+<li>Fixed THt persistent timer running after model load (with Throttle at -100%)</li>
+<li>Fixed buffer overflow for automatic flight mode change audio announcements (if very long model and flight mode names were used)</li>
+<li>Limited stick throws to 100% when using trainer in add mode</li>
+<li>Fixed Lua lcd.drawLine(), first pixel was not drawn</li>
+<li>Fixed missing last column for some bitmap sizes</li>
+<li>Minor display corrections</li>
+</ul>
+
+[9XR-PRO]
+<ul>
+<li>MAVLINK adaptation</li>
+</ul>
+
+[9XR]
+<ul>
+<li>Added 115200 bps speed to MAVLINK</li>
+</ul>
+
+[9X2561]
+<ul>
+<li>PWM backlight fixed</li>
+</ul>
+
+[All]
+<ul>
+<li>Various texts and translations corrections</li>
+<li>Various small bug-fixes</li>
+</ul>
+
+
 <h2>Version 2.0.13 / 2014-11-20</h2>
 [Taranis]
 <ul>
@@ -408,4 +452,4 @@
 <li>New menu in Main Views / Telemetry Views</li>
 <li>Vario sounds improved!</li>
 <li>SD Folders renamed. "9XSOUNDS" becomes "SOUNDS", don't forget to update your SD card!</li>
-</ul>
+</ul>

radio/src/CoOS/kernel/OsConfig.h

@@ -43,7 +43,7 @@ Idle task stack size(word).
 System frequency (Hz).	                 	         
 */    
 #if defined(PCBTARANIS)
-#define CFG_CPU_FREQ            (60000000)
+#define CFG_CPU_FREQ            (120000000)
 #else
 #define CFG_CPU_FREQ            (36000000)  // TODO check if really correct for sky9x?
 #endif

radio/src/Makefile

@@ -295,7 +295,7 @@ CHANNELS_MONITOR_INV_HIDE = NO
 
 # Use newlib-nano 
 # Values = NO, YES
-NANO = NO
+NANO = YES
 
 # Enable trace of events into Trace Buffer for debugging purposes
 # Activating any of these options also activates DEBUG and DEBUG_TRACE_BUFFER
@@ -314,7 +314,7 @@ SHELL = sh
 IMG2LBM = -python ../util/img2lbm.py
 BIN2LBM = -python ../util/bin2lbm.py
 TRANSLATE = -python ../util/translate.py
-VERSION = 2.0.13
+VERSION = 2.0.14
 
 SRC =
 CPPSRC =
@@ -351,10 +351,13 @@ ifeq ($(PCB), $(filter $(PCB), STD 9X 9XR))
   EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
   LCDSRC = lcd_common.cpp lcd_default.cpp
   PULSESSRC = pulses/pulses_avr.cpp
+  CPPSRC += debug.cpp
 
   ifeq ($(PCB), 9XR)
+    FLAVOUR = 9xr
     CPPDEFS += -DPCB9XR
   else
+    FLAVOUR = 9x
     CPPDEFS += -DPCB9X
   endif
   
@@ -415,10 +418,13 @@ ifeq ($(PCB), $(filter $(PCB), STD128 9X128 9XR128))
   EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
   LCDSRC = lcd_common.cpp lcd_default.cpp
   PULSESSRC = pulses/pulses_avr.cpp
+  CPPSRC += debug.cpp
   
   ifeq ($(PCB), 9XR128)
+    FLAVOUR = 9xr128
     CPPDEFS += -DPCB9XR128
   else
+    FLAVOUR = 9x128
     CPPDEFS += -DPCB9X128
   endif
   
@@ -475,10 +481,13 @@ ifeq ($(PCB), $(filter $(PCB), 9X2561))
   EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
   LCDSRC = lcd_common.cpp lcd_default.cpp
   PULSESSRC = pulses/pulses_avr.cpp
+  CPPSRC += debug.cpp
 
   ifeq ($(PCB), 9XR2561)
+    FLAVOUR = 9xr2561
     CPPDEFS += -DPCB9XR2561
   else
+    FLAVOUR = 9x2561
     CPPDEFS += -DPCB9X2561
   endif
     
@@ -517,6 +526,7 @@ endif
 
 ifeq ($(PCB), GRUVIN9X)
   # 9x radio with a gruvin9x replacement board
+  FLAVOUR = gruvin9x
   ARCH = AVR
   ifeq ($(PCBREV), REV0)
     CPPDEFS = -DREV0
@@ -536,7 +546,7 @@ ifeq ($(PCB), GRUVIN9X)
   EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
   LCDSRC = lcd_common.cpp lcd_default.cpp
   PULSESSRC = pulses/pulses_avr.cpp  
-  CPPSRC += audio_avr.cpp haptic.cpp
+  CPPSRC += audio_avr.cpp haptic.cpp debug.cpp
   
   ifeq ($(SDCARD), YES)
     CPPDEFS += -DRTCLOCK
@@ -562,6 +572,7 @@ endif
 
 ifeq ($(PCB), MEGA2560)
   # ARDUINO2560 DIY RADIO
+  FLAVOUR = mega2560
   ARCH = AVR
   TRGT = avr-
   MCU = atmega2560
@@ -575,7 +586,7 @@ ifeq ($(PCB), MEGA2560)
   EEPROMSRC = eeprom_common.cpp eeprom_rlc.cpp
   LCDSRC = lcd_common.cpp lcd_default.cpp
   PULSESSRC = pulses/pulses_avr.cpp  
-  CPPSRC += audio_avr.cpp
+  CPPSRC += audio_avr.cpp debug.cpp
 
   ifeq ($(SDCARD), YES)
     EXTRABOARDSRC += FatFs/ff.c FatFs/fattime.c FatFs/option/ccsbcs.c targets/gruvin9x/diskio.cpp 
@@ -594,17 +605,21 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
   ARCH = ARM
   CPPDEFS = -Dat91sam3s4
   ifeq ($(PCB), 9XRPRO)
+    FLAVOUR = 9xrpro
     CPPDEFS += -DREVX
     LDSCRIPT = targets/sky9x/sam3s8c_flash.ld
   else ifeq ($(PCBREV), REVA)
+    FLAVOUR = sky9x
     CPPDEFS += -DREVA
     LDSCRIPT = targets/sky9x/sam3s2c_flash.ld
     CPPSRC += targets/sky9x/coproc_driver.cpp 
   else ifeq ($(PCBREV), REVB)
+    FLAVOUR = sky9x
     CPPDEFS += -DREVB -DCOPROCESSOR
     LDSCRIPT = targets/sky9x/sam3s4c_flash.ld
     CPPSRC += targets/sky9x/coproc_driver.cpp
   else
+    FLAVOUR = sky9x
     CPPDEFS += -DREVC -DCOPROCESSOR
     LDSCRIPT = targets/sky9x/sam3s4c_flash.ld
     CPPSRC += targets/sky9x/coproc_driver.cpp
@@ -637,7 +652,7 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
   PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp pulses/dsm2_arm.cpp
   CPPSRC += audio_arm.cpp haptic.cpp gui/view_about.cpp gui/view_text.cpp
   CPPSRC += targets/sky9x/telemetry_driver.cpp targets/sky9x/second_serial_driver.cpp targets/sky9x/pwr_driver.cpp targets/sky9x/adc_driver.cpp targets/sky9x/eeprom_driver.cpp targets/sky9x/pulses_driver.cpp targets/sky9x/keys_driver.cpp targets/sky9x/audio_driver.cpp targets/sky9x/buzzer_driver.cpp targets/sky9x/haptic_driver.cpp targets/sky9x/sdcard_driver.cpp targets/sky9x/massstorage.cpp
-  CPPSRC += loadboot.cpp
+  CPPSRC += loadboot.cpp debug.cpp
   ifeq ($(SDCARD), YES)
     CPPDEFS += -DVOICE
     INCDIRS += FatFs FatFs/option
@@ -656,7 +671,6 @@ ifeq ($(PCB), $(filter $(PCB), SKY9X 9XRPRO))
     CPPSRC += targets/sky9x/bluetooth.cpp 
   endif
   ifeq ($(DEBUG), YES)
-    CPPSRC += debug.cpp
     SRC += targets/sky9x/syscalls.c
   endif
 endif
@@ -664,14 +678,18 @@ endif
 ifeq ($(PCB), TARANIS)
   # TARANIS radio
   ARCH = ARM
-  ifeq ($(PCBREV), REV3)
-    CPPDEFS = -DREV3
-  else ifeq ($(PCBREV), REV4a)
-    CPPDEFS = -DREV4a
-  else ifeq ($(PCBREV), REVPLUS)
+  ifeq ($(PCBREV), REVPLUS)
+    FLAVOUR = taranis-plus
     CPPDEFS = -DREVPLUS
     HAPTIC = YES
+  else ifeq ($(PCBREV), REV3)
+    FLAVOUR = taranis
+    CPPDEFS = -DREV3
+  else ifeq ($(PCBREV), REV4a)
+    FLAVOUR = taranis
+    CPPDEFS = -DREV4a
   else
+    FLAVOUR = taranis
     CPPDEFS = -DREV4
   endif
   ifeq ($(SPORT_FILE_LOG), YES)
@@ -723,7 +741,7 @@ ifeq ($(PCB), TARANIS)
   PULSESSRC = pulses/pulses_arm.cpp pulses/ppm_arm.cpp pulses/pxx_arm.cpp
   CPPSRC += audio_arm.cpp
   CPPSRC += targets/taranis/pulses_driver.cpp targets/taranis/keys_driver.cpp targets/taranis/adc_driver.cpp targets/taranis/trainer_driver.cpp targets/taranis/audio_driver.cpp targets/taranis/uart3_driver.cpp targets/taranis/telemetry_driver.cpp
-  CPPSRC += bmp.cpp gui/view_channels.cpp gui/view_about.cpp gui/view_text.cpp loadboot.cpp
+  CPPSRC += bmp.cpp gui/view_channels.cpp gui/view_about.cpp gui/view_text.cpp loadboot.cpp debug.cpp
   SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/CMSIS/Device/ST/STM32F2xx/Source/Templates/system_stm32f2xx.c
   SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/misc.c
   SRC += targets/taranis/STM32F2xx_StdPeriph_Lib_V1.1.0/Libraries/STM32F2xx_StdPeriph_Driver/src/stm32f2xx_gpio.c
@@ -782,9 +800,6 @@ ifeq ($(PCB), TARANIS)
     CPPDEFS += -DRTCLOCK
     CPPSRC += rtc.cpp targets/taranis/rtc_driver.cpp
   endif
-  ifeq ($(DEBUG), YES)
-    CPPSRC += debug.cpp
-  endif
   ifeq ($(DSM2), PPM)
     CPPSRC += pulses/dsm2_arm.cpp
   endif
@@ -992,7 +1007,7 @@ endif
 
 ifeq ($(EXT), MAVLINK)
  CPPDEFS += -DMAVLINK
- CPPSRC += telemetry/mavlink.cpp gui/view_mavlink.cpp serial.cpp
+ CPPSRC += telemetry/mavlink.cpp gui/view_mavlink.cpp
  EEPROM_VARIANT += ${MAVLINK_VARIANT}
 endif
 
@@ -1166,6 +1181,7 @@ MSG_CLEANING = Cleaning project:
 # Combine all necessary flags and optional flags.
 # Add target processor to flags.
 
+CPPFLAGS += -DFLAVOUR=\"$(FLAVOUR)\"
 ARMCPPFLAGS = -c -mcpu=$(MCU) -mthumb -fomit-frame-pointer -fverbose-asm -Wa,-ahlms=opentx.lst -DRUN_FROM_FLASH=1 -O$(OPT) $(CPPFLAGS) -fdata-sections -ffunction-sections $(INCFLAGS) $(EXTRAINCFLAGS) $(GENDEPFLAGS) 
 AVRCPPFLAGS = -mmcu=$(MCU) -I. -x c++ -O$(OPT) $(CPPFLAGS) $(INCFLAGS) $(EXTRAINCFLAGS) $(GENDEPFLAGS) -fwhole-program
 
@@ -1205,7 +1221,7 @@ bootloader.lbm: bootloader/bootloader_ramBoot.bin
 
 .PHONY bootloader/bootloader_ramBoot.bin:
 	@echo "Building bootloader..."
-	$(MAKE) -C bootloader PCB=$(PCB) PCBREV=$(PCBREV)
+	$(MAKE) -C bootloader PCB=$(PCB) PCBREV=$(PCBREV) NANO=$(NANO)
 else ifeq ($(PCB), 9XRPRO)
 bootloader.lbm:
 	@echo "Fetching Mike's bootloader..."

radio/src/audio_arm.cpp

@@ -404,7 +404,7 @@ bool isAudioFileReferenced(uint32_t i, char * filename)
   uint8_t event = i & 0xFF;
 
 #if 0
-  printf("isAudioFileReferenced(%08x)\n", i); fflush(stdout);
+  TRACE("isAudioFileReferenced(%08x)", i);
 #endif
 
   if (category == SYSTEM_AUDIO_CATEGORY) {
@@ -843,8 +843,7 @@ void AudioQueue::playTone(uint16_t freq, uint16_t len, uint16_t pause, uint8_t f
 void AudioQueue::playFile(const char *filename, uint8_t flags, uint8_t id)
 {
 #if defined(SIMU)
-  printf("playFile(\"%s\", flags=%x, id=%d)\n", filename, flags, id);
-  fflush(stdout);
+  TRACE("playFile(\"%s\", flags=%x, id=%d)", filename, flags, id);
 #else
 
   if (!sdMounted())
@@ -887,7 +886,7 @@ void AudioQueue::playFile(const char *filename, uint8_t flags, uint8_t id)
 void AudioQueue::stopPlay(uint8_t id)
 {
 #if defined(SIMU)
-  printf("stopPlay(id=%d)\n", id); fflush(stdout);
+  TRACE("stopPlay(id=%d)", id);
 #endif
 
   // For the moment it's only needed to stop the background music

radio/src/audio_arm.h

@@ -39,7 +39,7 @@
 
 #include "FatFs/ff.h"
 
-#define AUDIO_FILENAME_MAXLEN (40)
+#define AUDIO_FILENAME_MAXLEN (42)      //max lenght example: /SOUNDS/fr/123456789012/1234567890-off.wav
 #define AUDIO_QUEUE_LENGTH    (20)
 
 #define AUDIO_SAMPLE_RATE     (32000)

radio/src/bmp.cpp

@@ -186,22 +186,11 @@ const pm_char * bmpLoad(uint8_t *bmp, const char *filename, const xcoord_t width
           f_close(&bmpFile);
           return SDCARD_ERROR(result);
         }
-        for (uint32_t j=0; j<rowSize; j++) {
-          uint8_t * dst = dest + (i/2)*w + j*2;
-          if (i & 1) {
-            uint8_t val = palette[(buf[j] >> 4) & 0x0F] << 4;
-            *dst |= val ^ 0xF0;
-            if ((j+1)*2 >= w) break;
-            val = palette[buf[j] & 0x0F] << 4;
-            *(dst+1) |= val ^ 0xF0;
-          }
-          else {
-            uint8_t val = palette[(buf[j] >> 4) & 0x0F];
-            *dst |= val ^ 0x0F;
-            if ((j+1)*2 >= w) break;
-            val = palette[buf[j] & 0x0F];
-            *(dst+1) |= val ^ 0x0F;
-          }
+        uint8_t * dst = dest + (i/2)*w;
+        for (uint32_t j=0; j<w; j++) {
+          uint8_t index = (buf[j/2] >> ((j & 1) ? 0 : 4)) & 0x0F;
+          uint8_t val = palette[index] << ((i & 1) ? 4 : 0);
+          *dst++ |= val ^ ((i & 1) ? 0xF0 : 0x0F);
         }
       }
       break;

radio/src/bootloader/Makefile

@@ -254,9 +254,15 @@ CPPXOBJS  = $(CPPSRC:%.cpp=%.o)
 LIBS    = $(DLIBS) $(ULIBS)
 MCFLAGS = -mcpu=$(MCU)
 
+ifeq ($(NANO), YES)
+  # use newlib-nano for linking
+  # NEWLIB_NANO_FLAGS = --specs=nano.specs -u _printf_float   #use this version if printf for floats is needed!
+  NEWLIB_NANO_FLAGS = --specs=nano.specs
+endif
+
 #ASFLAGS = $(MCFLAGS) -g -gdwarf-2 -Wa,-amhls=$(OBJDIR)/$(notdir $(<:.s=.lst)) $(ADEFS)
-CPFLAGS = $(MCFLAGS) $(OPT) -fdata-sections -ffunction-sections  -gdwarf-2 -mthumb -fomit-frame-pointer -Wall -Wstrict-prototypes -fverbose-asm $(DEFS)
-LDFLAGS = $(MCFLAGS) -mthumb -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(FULL_PRJ).map,--cref,--no-warn-mismatch $(LIBDIR)
+CPFLAGS = $(MCFLAGS) $(OPT) -gdwarf-2 -mthumb -fomit-frame-pointer -Wall -Wstrict-prototypes -fverbose-asm $(DEFS)
+LDFLAGS = $(MCFLAGS) -mthumb -nostartfiles -T$(LDSCRIPT) -Wl,-Map=$(FULL_PRJ).map,--cref,--no-warn-mismatch $(LIBDIR) $(NEWLIB_NANO_FLAGS)
 CPPFLAGS = $(MCFLAGS) $(OPT) -gdwarf-2 -mthumb -fomit-frame-pointer -Wall -fverbose-asm $(DEFS)
 
 CPPFLAGS += $(CPPDEFS)

radio/src/bootloader/boot.cpp

@@ -193,11 +193,11 @@ void interrupt10ms(void)
 {
   Tenms |= 1;			// 10 mS has passed
 
-  uint8_t enuk = KEY_MENU;
-  uint8_t in = ~readKeys();
+  uint32_t enuk = KEY_MENU;
+  uint32_t in = ~readKeys();
 
-  for (int i = 1; i < 7; i++) {
-    uint8_t value = in & (1 << i);
+  for (int i=1; i<7; ++i) {
+    uint32_t value = in & (1 << i);
     keys[enuk].input(value, (EnumKeys) enuk);
     ++enuk;
   }
@@ -260,28 +260,6 @@ extern "C" void TIM8_TRG_COM_TIM14_IRQHandler()
   TIM14->SR &= ~TIM_SR_UIF;
   interrupt10ms();
 }
-
-void init_hw_timer()
-{
-  // Timer13
-  RCC->APB1ENR |= RCC_APB1ENR_TIM13EN;		// Enable clock
-  TIM13->ARR = 65535;
-  TIM13->PSC = (PERI1_FREQUENCY * TIMER_MULT_APB1) / 10000000 - 1;// 0.1uS from 12MHz
-  TIM13->CCER = 0;
-  TIM13->CCMR1 = 0;
-  TIM13->EGR = 0;
-  TIM13->CR1 = 1;
-}
-
-// delay in units of 0.1 uS up to 6.5535 mS
-void hw_delay(uint16_t time)
-{
-  TIM13->CNT = 0;
-  TIM13->EGR = 1;		// Re-start counter
-  while ( TIM13->CNT < time) {
-    // wait
-  }
-}
 #endif
 
 FRESULT readBinDir(DIR *dj, FILINFO *fno)
@@ -460,8 +438,8 @@ void writeEepromBlock()
 
 int main()
 {
-  uint8_t index = 0;
-  uint8_t maxhsize = DISPLAY_CHAR_WIDTH;
+  uint32_t index = 0;
+  uint32_t maxhsize = DISPLAY_CHAR_WIDTH;
   FRESULT fr;
   uint32_t state = ST_START;
   uint32_t nameCount = 0;
@@ -485,7 +463,11 @@ int main()
   start_timer0();
 #endif
 
+#if defined(PCBTARANIS)
+  delaysInit();               //needed for lcdInit()
+#endif 
   lcdInit();
+
 #if defined(PCBSKY9X)
   extern uint8_t OptrexDisplay;
   OptrexDisplay = 1;
@@ -505,7 +487,6 @@ int main()
 #endif
   keysInit();
   I2C_EE_Init();
-  init_hw_timer();
 #endif
 
   __enable_irq();
@@ -789,6 +770,7 @@ int main()
     }
 
     if (pwrCheck() == e_power_off && state != ST_FLASHING && state != ST_USB) {
+      lcdOff();    // this drains LCD caps
       pwrOff();
       for (;;) {
         // Wait for power to go off
@@ -797,6 +779,9 @@ int main()
 
     if (state == ST_REBOOT) {
       if ((~readKeys() & 0x7E) == 0) {
+        lcd_clear();
+        lcdRefresh();
+        RCC->CSR |= RCC_CSR_RMVF;   //clear the reset flags in RCC clock control & status register
         NVIC_SystemReset();
       }
     }

radio/src/debug.cpp

@@ -34,28 +34,44 @@
  *
  */
 
-#include "../opentx.h"
+#include "opentx.h"
 #include <stdio.h>
 #include <stdarg.h>
 
-#if !defined(SIMU) && defined(DEBUG)
+#if (defined(DEBUG) && defined(CPUARM)) || defined(SIMU)
 
-Fifo<512> debugRxFifo;
+#if defined(SIMU)
+traceCallbackFunc traceCallback = 0;
+#endif
+
+#if defined(SIMU)
+  #define PRINTF_BUFFER_SIZE    1024
+#else
+  #define PRINTF_BUFFER_SIZE    256
+#endif
 
 // Outputs a string to the UART
 void debugPuts(const char *format, ...)
 {
   va_list arglist;
-  char tmp[256];
+  char tmp[PRINTF_BUFFER_SIZE];
 
   va_start(arglist, format);
-  vsnprintf(tmp, 256, format, arglist);
+  vsnprintf(tmp, PRINTF_BUFFER_SIZE, format, arglist);
   va_end(arglist);
 
+#if defined(SIMU)
+  fputs(tmp, stdout);
+  fflush(stdout);
+  if (traceCallback) {
+    traceCallback(tmp);
+  }
+#else
   const char *t = tmp;
   while (*t) {
     debugPutc(*t++);
   }
+#endif
 }
 
 void dump(unsigned char *data, unsigned int size)
@@ -73,9 +89,13 @@ void dump(unsigned char *data, unsigned int size)
   debugPuts("\n\r");
 }
 
+
+#if !defined(SIMU)
+
 uint32_t Mem_address ;
 uint32_t Next_mem_address ;
 uint32_t Memaddmode ;
+Fifo<512> debugRxFifo;
 
 void crlf()
 {
@@ -86,55 +106,55 @@ void crlf()
 // Send a single 4 bit value to the RS232 port as a hex digit
 void hex_digit_send( unsigned char c )
 {
-	c &= 0x0F ;
-	if ( c > 9 )
-	{
-		c += 7 ;
-	}
-	c += '0' ;
-	debugPutc( c ) ;
+  c &= 0x0F ;
+  if ( c > 9 )
+  {
+    c += 7 ;
+  }
+  c += '0' ;
+  debugPutc( c ) ;
 }
 
 // Send the 8 bit value to the RS232 port as 2 hex digits
 void p2hex( unsigned char c )
 {
-//	asm("swap %c") ;
-	hex_digit_send( c >> 4 ) ;
-//	asm("swap %c") ;
-	hex_digit_send( c ) ;
+//  asm("swap %c") ;
+  hex_digit_send( c >> 4 ) ;
+//  asm("swap %c") ;
+  hex_digit_send( c ) ;
 }
 
 // Send the 16 bit value to the RS232 port as 4 hex digits
 void p4hex( uint16_t value )
 {
-	p2hex( value >> 8 ) ;
-	p2hex( value ) ;
+  p2hex( value >> 8 ) ;
+  p2hex( value ) ;
 }
 
 // Send the 32 bit value to the RS232 port as 8 hex digits
 void p8hex( uint32_t value )
 {
-	p4hex( value >> 16 ) ;
-	p4hex( value ) ;
+  p4hex( value >> 16 ) ;
+  p4hex( value ) ;
 }
 
 
 static void dispw_256( register uint32_t address, register uint32_t lines )
 {
-	register uint32_t i ;
-	register uint32_t j ;
-	address &= 0xFFFFFFFC ;
-	for ( i = 0 ; i < lines ; i += 1 )
-	{
-		p8hex( address ) ;
-		for ( j = 0 ; j < 4 ; j += 1 )
-		{
-			debugPutc(' ') ;
-			p8hex( *( (uint32_t *)address ) ) ;
-			address += 4 ;
-		}
-		crlf() ;
-	}
+  register uint32_t i ;
+  register uint32_t j ;
+  address &= 0xFFFFFFFC ;
+  for ( i = 0 ; i < lines ; i += 1 )
+  {
+    p8hex( address ) ;
+    for ( j = 0 ; j < 4 ; j += 1 )
+    {
+      debugPutc(' ') ;
+      p8hex( *( (uint32_t *)address ) ) ;
+      address += 4 ;
+    }
+    crlf() ;
+  }
 }
 
 void debugTask(void* pdata)
@@ -214,7 +234,8 @@ void debugTask(void* pdata)
 
   }
 }
-#endif
+#endif  // #if !defined(SIMU)
+#endif  // #if (defined(DEBUG) && defined(CPUARM)) || defined(SIMU)
 
 
 #if defined(DEBUG_TRACE_BUFFER)

radio/src/debug.h

@@ -40,42 +40,17 @@
 #include <inttypes.h>
 #include "rtc.h"
 
-#if defined(SIMU)
-
-#include <stdio.h>
-
-#define TRACE(...)            do { printf(__VA_ARGS__); printf("\n"); fflush(stdout); } while(0)
-#define TRACE_DEBUG(...)      do { printf("-D- " __VA_ARGS__); fflush(stdout); } while(0)
-#define TRACE_DEBUG_WP(...)   do { printf(__VA_ARGS__); fflush(stdout); } while(0)
-#define TRACE_INFO(...)       do { printf("-I- " __VA_ARGS__); fflush(stdout); } while(0)
-#define TRACE_INFO_WP(...)    do { printf(__VA_ARGS__); fflush(stdout); } while(0)
-#define TRACE_WARNING(...)    do { printf("-W- " __VA_ARGS__); fflush(stdout); } while(0)
-#define TRACE_WARNING_WP(...) do { printf(__VA_ARGS__); fflush(stdout); } while(0)
-#define TRACE_ERROR(...)      do { printf("-E- " __VA_ARGS__); fflush(stdout); } while(0)
-inline void dump(void * data, unsigned int size)
-{
-  unsigned char *uchar_data = (unsigned char *)data;
-
-  printf("DUMP %d bytes ...\n\r", size);
-  unsigned int i = 0, j=0;
-  while (i*32+j < size) {
-    printf("%.2X ", uchar_data[i*32+j]);
-    j++;
-    if (j==32) {
-      i++; j=0;
-      printf("\n\r");
-    }
-  }
-  printf("\n\r");
-}
-#define DUMP(data, size) dump(data, size)
-
-#elif defined(DEBUG) && defined(CPUARM)
+#if (defined(DEBUG) && defined(CPUARM)) || defined(SIMU)
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+#if defined(SIMU)
+typedef void (*traceCallbackFunc)(const char * text);
+extern traceCallbackFunc traceCallback;
+#endif
+
 void debugPuts(const char *string, ...);
 void dump(unsigned char *data, unsigned int size);
 
@@ -93,7 +68,9 @@ void dump(unsigned char *data, unsigned int size);
 #define TRACE_WARNING_WP(...) debugPuts(__VA_ARGS__)
 #define TRACE_ERROR(...)      debugPuts("-E- " __VA_ARGS__)
 
+#if !defined(SIMU)
 void debugTask(void* pdata);
+#endif
 
 #else
 

radio/src/eeprom_conversions.cpp

@@ -835,6 +835,7 @@ void ConvertModel_215_to_216(ModelData &model)
     memcpy(g_model.gvars[i].name, oldModel.gvar_names[i], LEN_GVAR_NAME);
   }
 
+#if defined(FRSKY)
   memcpy(&g_model.frsky, &oldModel.frsky, 2*sizeof(FrSkyChannelData));
   // gap for A3-A4
   memcpy(((uint8_t *)&g_model.frsky) + 4*sizeof(FrSkyChannelData), ((uint8_t *)&oldModel.frsky) + 2*sizeof(FrSkyChannelData), sizeof(oldModel.frsky) - 2*sizeof(FrSkyChannelData));
@@ -862,6 +863,7 @@ void ConvertModel_215_to_216(ModelData &model)
       }
     }
   }
+#endif
 
 #if defined(PCBTARANIS)
   g_model.externalModule = oldModel.externalModule;

radio/src/eeprom_rlc.cpp

@@ -293,12 +293,10 @@ inline bool EeFsOpen()
 
 #ifdef SIMU
   if (eeFs.version != EEFS_VERS) {
-    printf("bad eeFs.version (%d instead of %d)\n", eeFs.version, EEFS_VERS);
-    fflush(stdout);
+    TRACE("bad eeFs.version (%d instead of %d)", eeFs.version, EEFS_VERS);
   }
   if (eeFs.mySize != sizeof(eeFs)) {
-    printf("bad eeFs.mySize (%d instead of %d)\n", (int)eeFs.mySize, (int)sizeof(eeFs));
-    fflush(stdout);
+    TRACE("bad eeFs.mySize (%d instead of %d)", (int)eeFs.mySize, (int)sizeof(eeFs));
   }
 #endif  
 
@@ -605,7 +603,7 @@ const pm_char * eeBackupModel(uint8_t i_fileSrc)
   strcpy_P(&buf[len], STR_MODELS_EXT);
 
 #ifdef SIMU
-  printf("SD-card backup filename=%s\n", buf); fflush(stdout);
+  TRACE("SD-card backup filename=%s", buf);
 #endif
 
   result = f_open(&g_oLogFile, buf, FA_CREATE_ALWAYS | FA_WRITE);

radio/src/gui/menu_general.cpp

@@ -1156,7 +1156,7 @@ void menuGeneralTrainer(uint8_t event)
       uint8_t chan = channel_order(i);
       volatile TrainerMix *td = &g_eeGeneral.trainer.mix[chan-1];
 
-      putsMixerSource(0, y, MIXSRC_Rud-1+chan, (m_posVert==i && m_posHorz<0) ? INVERS : 0);
+      putsMixerSource(0, y, MIXSRC_Rud-1+chan, (m_posVert==i && CURSOR_ON_LINE()) ? INVERS : 0);
 
       for (uint8_t j=0; j<3; j++) {
 
@@ -1255,9 +1255,9 @@ void menuGeneralDiagKeys(uint8_t event)
     }
 
     if (i<6) {
-      y = (5-i)*FH+2*FH;
-      lcd_putsiAtt(0, y, STR_VKEYS, i, 0);
-      displayKeyState(5*FW+2, y, (EnumKeys)(KEY_MENU+i));
+      y = i*FH+2*FH;
+      lcd_putsiAtt(0, y, STR_VKEYS, (5-i), 0);
+      displayKeyState(5*FW+2, y, (EnumKeys)(KEY_MENU+(5-i)));
     }
 
 #if !defined(PCBTARANIS)

radio/src/gui/menu_model.cpp

@@ -996,7 +996,7 @@ void menuModelSetup(uint8_t event)
   #define MODEL_SETUP_MAX_LINES             (1+ITEM_MODEL_SETUP_MAX)
   #define POT_WARN_ITEMS()                  ((g_model.nPotsToWarn >> 6) ? (uint8_t)NUM_POTS : (uint8_t)0)
   bool CURSOR_ON_CELL = (m_posHorz >= 0);
-  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 2, CASE_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0, CASE_CPUARM(LABEL(PreflightCheck)) CASE_CPUARM(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_INTERNAL_MODULE_ON(1), IF_INTERNAL_MODULE_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_INTERNAL_MODULE_ON(FAILSAFE_ROWS(INTERNAL_MODULE)), LABEL(ExternalModule), (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, EXTERNAL_MODULE_CHANNELS_ROWS(), (IS_MODULE_XJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW, IF_EXTERNAL_MODULE_XJT(FAILSAFE_ROWS(EXTERNAL_MODULE)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)});
+  MENU_TAB({ 0, 0, CASE_PCBTARANIS(0) 2|NAVIGATION_LINE_BY_LINE, CASE_PERSISTENT_TIMERS(0) 0, 0, 2|NAVIGATION_LINE_BY_LINE, CASE_PERSISTENT_TIMERS(0) 0, 0, 0, 1, 0, CASE_PCBTARANIS(LABEL(Throttle)) 0, 0, 0, CASE_CPUARM(LABEL(PreflightCheck)) CASE_CPUARM(0) 0, 7, POT_WARN_ITEMS(), NAVIGATION_LINE_BY_LINE|(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS-1), LABEL(InternalModule), 0, IF_INTERNAL_MODULE_ON(1), IF_INTERNAL_MODULE_ON(IS_D8_RX(0) ? (uint8_t)1 : (uint8_t)2), IF_INTERNAL_MODULE_ON(FAILSAFE_ROWS(INTERNAL_MODULE)), LABEL(ExternalModule), (IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)1 : (uint8_t)0, EXTERNAL_MODULE_CHANNELS_ROWS(), (IS_MODULE_XJT(EXTERNAL_MODULE) && IS_D8_RX(EXTERNAL_MODULE)) ? (uint8_t)1 : (IS_MODULE_PPM(EXTERNAL_MODULE) || IS_MODULE_XJT(EXTERNAL_MODULE) || IS_MODULE_DSM2(EXTERNAL_MODULE)) ? (uint8_t)2 : HIDDEN_ROW, IF_EXTERNAL_MODULE_XJT(FAILSAFE_ROWS(EXTERNAL_MODULE)), LABEL(Trainer), 0, TRAINER_CHANNELS_ROWS(), IF_TRAINER_ON(2)});
 #elif defined(CPUARM)
   #define IF_EXTERNAL_MODULE_XJT(x)         (IS_MODULE_XJT(EXTERNAL_MODULE) ? (uint8_t)x : HIDDEN_ROW)
   #define IF_EXTERNAL_MODULE_ON(x)          (g_model.externalModule == MODULE_TYPE_NONE ? HIDDEN_ROW : (uint8_t)(x))
@@ -1114,14 +1114,34 @@ void menuModelSetup(uint8_t event)
           putsTimerMode(MODEL_SETUP_2ND_COLUMN, y, timer->mode, m_posHorz==0 ? attr : 0);
           putsTimer(MODEL_SETUP_2ND_COLUMN+5*FW-2+5*FWNUM+1, y, timer->start, m_posHorz==1 ? attr : 0, m_posHorz==2 ? attr : 0);
 #if defined(PCBTARANIS)
-          if (attr && m_posHorz < 0) lcd_filled_rect(MODEL_SETUP_2ND_COLUMN, y, LCD_W-MODEL_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH, 8);
+          if (attr && m_posHorz < 0) lcd_filled_rect(MODEL_SETUP_2ND_COLUMN-1, y-1, LCD_W-MODEL_SETUP_2ND_COLUMN-MENUS_SCROLLBAR_WIDTH+1, FH+1);
 #endif
           if (attr && (editMode>0 || p1valdiff)) {
             div_t qr = div(timer->start, 60);
             switch (m_posHorz) {
               case 0:
-                CHECK_INCDEC_MODELVAR_CHECK(event, timer->mode, SWSRC_FIRST, TMRMODE_COUNT+SWSRC_LAST-1/*SWSRC_None removed*/, isSwitchAvailableInTimers);
+              {
+#if defined(CPUARM)
+                int8_t timerMode = timer->mode;
+                if (timerMode < 0) timerMode -= TMRMODE_COUNT-1;
+                CHECK_INCDEC_MODELVAR_CHECK(event, timerMode, -TMRMODE_COUNT-SWSRC_LAST+1, TMRMODE_COUNT+SWSRC_LAST-1, isSwitchAvailableInTimers);
+                if (timerMode < 0) timerMode += TMRMODE_COUNT-1;
+                timer->mode = timerMode;
+#else
+                CHECK_INCDEC_MODELVAR(event, timer->mode, SWSRC_FIRST, TMRMODE_COUNT+SWSRC_LAST-1/*SWSRC_None removed*/);
+#endif
+#if defined(AUTOSWITCH)
+                if (s_editMode>0) {
+                  int8_t val = timer->mode - (TMRMODE_COUNT-1);
+                  int8_t switchVal = checkIncDecMovedSwitch(val);
+                  if (val != switchVal) {
+                    timer->mode = switchVal + (TMRMODE_COUNT-1);
+                    eeDirty(EE_MODEL);
+                  }
+                }
+#endif
                 break;
+              }
               case 1:
                 CHECK_INCDEC_MODELVAR_ZERO(event, qr.quot, 59);
                 timer->start = qr.rem + qr.quot*60;
@@ -1129,7 +1149,6 @@ void menuModelSetup(uint8_t event)
               case 2:
                 qr.rem -= checkIncDecModel(event, qr.rem+2, 1, 62)-2;
                 timer->start -= qr.rem ;
-                if ((int16_t)timer->start < 0) timer->start=0;
                 break;
             }
           }
@@ -1360,7 +1379,7 @@ void menuModelSetup(uint8_t event)
             x -= FW;
           }
 #endif
-          lcd_putsiAtt(x, y, STR_RETA123, i, ((m_posHorz==i) && attr) ? BLINK|INVERS : (((g_model.beepANACenter & ((BeepANACenter)1<<i)) || (attr && m_posHorz<0)) ? INVERS : 0 ) );
+          lcd_putsiAtt(x, y, STR_RETA123, i, ((m_posHorz==i) && attr) ? BLINK|INVERS : (((g_model.beepANACenter & ((BeepANACenter)1<<i)) || (attr && CURSOR_ON_LINE())) ? INVERS : 0 ) );
         }
         if (attr && CURSOR_ON_CELL) {
           if (event==EVT_KEY_BREAK(KEY_ENTER) || p1valdiff) {
@@ -1690,8 +1709,8 @@ void menuModelSetup(uint8_t event)
           lcd_puts(MODEL_SETUP_2ND_COLUMN+3*FW, y, STR_MS);
           lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN, y, (int16_t)g_model.ppmFrameLength*5 + 225, (m_posHorz<=0 ? attr : 0) | PREC1|LEFT);
           lcd_putc(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, 'u');
-          lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (g_model.ppmDelay*50)+300, (m_posHorz < 0 || m_posHorz==1) ? attr : 0);
-          lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+10*FW, y, g_model.pulsePol ? '+' : '-', (m_posHorz < 0 || m_posHorz==2) ? attr : 0);
+          lcd_outdezAtt(MODEL_SETUP_2ND_COLUMN+8*FW+2, y, (g_model.ppmDelay*50)+300, m_posHorz==1 ? attr : 0);
+          lcd_putcAtt(MODEL_SETUP_2ND_COLUMN+10*FW, y, g_model.pulsePol ? '+' : '-', m_posHorz==2 ? attr : 0);
           if (attr && (editMode>0 || p1valdiff)) {
             switch (m_posHorz) {
               case 0:
@@ -1928,7 +1947,7 @@ void menuModelFlightModesAll(uint8_t event)
 
     FlightModeData *p = flightModeAddress(k);
 
-    putsFlightMode(0, y, k+1, (getFlightMode()==k ? BOLD : 0) | ((sub==k && m_posHorz<0) ? INVERS : 0));
+    putsFlightMode(0, y, k+1, (getFlightMode()==k ? BOLD : 0) | ((sub==k && CURSOR_ON_LINE()) ? INVERS : 0));
 
     for (uint8_t j=0; j<ITEM_FLIGHT_MODES_COUNT; j++) {
       uint8_t attr = ((sub==k && posHorz==j) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
@@ -4036,7 +4055,11 @@ void menuModelLimits(uint8_t event)
           lcd_outdezAtt(LIMITS_OFFSET_POS, y, ld->offset, attr|PREC1);
 #endif
           if (active) {
-            ld->offset = checkIncDec(event, ld->offset, -1000, 1000, EE_MODEL|NO_INCDEC_MARKS|DBLKEYS_1000);
+#if defined(CPUARM)
+            ld->offset = checkIncDec(event, ld->offset, -1000, 1000, EE_MODEL, NULL, stops1000);
+#else
+            ld->offset = checkIncDec(event, ld->offset, -1000, 1000, EE_MODEL|NO_INCDEC_MARKS);
+#endif
           }
           else if (attr && event==EVT_KEY_LONG(KEY_MENU)) {
             copySticksToOffset(k);
@@ -4047,23 +4070,31 @@ void menuModelLimits(uint8_t event)
         case ITEM_LIMITS_MIN:
 #if defined(PCBTARANIS)
           if (GV_IS_GV_VALUE(ld->min, -LIMIT_EXT_MAX, LIMIT_EXT_MAX) || (attr && event == EVT_KEY_LONG(KEY_ENTER))) {
-            ld->min = GVAR_MENU_ITEM(LIMITS_MIN_POS, y, ld->min, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, MIN_MAX_ATTR, DBLKEYS_1000, event);
+            ld->min = GVAR_MENU_ITEM(LIMITS_MIN_POS, y, ld->min, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, MIN_MAX_ATTR, 0, event);
             break;
           }
 #endif
           lcd_outdezAtt(LIMITS_MIN_POS, y, MIN_MAX_DISPLAY(ld->min-LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
-          if (active) ld->min = LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->min-LIMITS_MIN_MAX_OFFSET, -limit, 0, EE_MODEL|DBLKEYS_1000);
+#if defined(CPUARM)
+          if (active) ld->min = LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->min-LIMITS_MIN_MAX_OFFSET, -limit, 0, EE_MODEL, NULL, stops1000);
+#else
+          if (active) ld->min = LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->min-LIMITS_MIN_MAX_OFFSET, -limit, 0, EE_MODEL);
+#endif
           break;
 
         case ITEM_LIMITS_MAX:
 #if defined(PCBTARANIS)
           if (GV_IS_GV_VALUE(ld->max, -LIMIT_EXT_MAX, LIMIT_EXT_MAX) || (attr && event == EVT_KEY_LONG(KEY_ENTER))) {
-            ld->max = GVAR_MENU_ITEM(LIMITS_MAX_POS, y, ld->max, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, MIN_MAX_ATTR, DBLKEYS_1000, event);
+            ld->max = GVAR_MENU_ITEM(LIMITS_MAX_POS, y, ld->max, -LIMIT_EXT_MAX, LIMIT_EXT_MAX, MIN_MAX_ATTR, 0, event);
             break;
           }
 #endif
           lcd_outdezAtt(LIMITS_MAX_POS, y, MIN_MAX_DISPLAY(ld->max+LIMITS_MIN_MAX_OFFSET), MIN_MAX_ATTR);
-          if (active) ld->max = -LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->max+LIMITS_MIN_MAX_OFFSET, 0, +limit, EE_MODEL|DBLKEYS_1000);
+#if defined(CPUARM)
+          if (active) ld->max = -LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->max+LIMITS_MIN_MAX_OFFSET, 0, +limit, EE_MODEL, NULL, stops1000);
+#else
+          if (active) ld->max = -LIMITS_MIN_MAX_OFFSET + checkIncDec(event, ld->max+LIMITS_MIN_MAX_OFFSET, 0, +limit, EE_MODEL);
+#endif
           break;
 
         case ITEM_LIMITS_DIRECTION:
@@ -4251,7 +4282,7 @@ void menuModelGVars(uint8_t event)
 #endif
 
     if (g_model.gvars[i].popup) lcd_putc(3*FW, y, '!');
-    putsStrIdx(0, y, STR_GV, i+1, (sub==i && m_posHorz<0) ? INVERS : 0);
+    putsStrIdx(0, y, STR_GV, i+1, (sub==i && CURSOR_ON_LINE()) ? INVERS : 0);
 
     for (uint8_t j=0; j<1+MAX_FLIGHT_MODES; j++) {
       LcdFlags attr = ((sub==i && m_posHorz==j) ? ((s_editMode>0) ? BLINK|INVERS : INVERS) : 0);
@@ -4677,7 +4708,11 @@ void menuModelLogicalSwitches(uint8_t event)
 
     // CSW name
     uint8_t sw = SWSRC_SW1+k;
+#if defined(PCBTARANIS)
     putsSwitches(0, y, sw, (getSwitch(sw) ? BOLD : 0) | ((sub==k && horz<0) ? INVERS : 0));
+#else
+    putsSwitches(0, y, sw, getSwitch(sw) ? BOLD : 0);
+#endif
 
     // CSW func
     lcd_putsiAtt(CSW_1ST_COLUMN, y, STR_VCSWFUNC, cs->func, horz==0 ? attr : 0);
@@ -5002,7 +5037,7 @@ void menuModelCustomFunctions(uint8_t event)
   int8_t  sub = m_posVert - 1;
 
 #if defined(PCBTARANIS)
-   if (sub>=0 && m_posHorz<0 && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
+   if (sub>=0 && CURSOR_ON_LINE() && event==EVT_KEY_LONG(KEY_ENTER) && !READ_ONLY()) {
      killEvents(event);
      CustomFnData *sd = &g_model.funcSw[sub];
      if (!CFN_EMPTY(sd))
@@ -5028,7 +5063,7 @@ void menuModelCustomFunctions(uint8_t event)
     k = i+s_pgOfs;
 
 #if LCD_W >= 212
-    putsStrIdx(0, y, STR_CF, k+1, (sub==k && m_posHorz<0) ? INVERS : 0);
+    putsStrIdx(0, y, STR_CF, k+1, (sub==k && CURSOR_ON_LINE()) ? INVERS : 0);
 #endif
 
     CustomFnData *sd = &g_model.funcSw[k];
@@ -5749,8 +5784,8 @@ void menuModelTelemetry(uint8_t event)
 #else
         lcd_putsLeft(y, STR_ALARM);
         lcd_putsiAtt(TELEM_COL2, y, STR_VALARM, ALARM_LEVEL(ch, alarm), m_posHorz<=0 ? attr : 0);
-        lcd_putsiAtt(TELEM_COL2+4*FW, y, STR_VALARMFN, ALARM_GREATER(ch, alarm), (m_posHorz<0 || m_posHorz==1) ? attr : 0);
-        putsTelemetryChannel(TELEM_COL2+6*FW, y, dest, channel.alarms_value[alarm], ((m_posHorz<0 || m_posHorz==2) ? attr : 0) | LEFT);
+        lcd_putsiAtt(TELEM_COL2+4*FW, y, STR_VALARMFN, ALARM_GREATER(ch, alarm), (CURSOR_ON_LINE() || m_posHorz==1) ? attr : 0);
+        putsTelemetryChannel(TELEM_COL2+6*FW, y, dest, channel.alarms_value[alarm], ((CURSOR_ON_LINE() || m_posHorz==2) ? attr : 0) | LEFT);
 
         if (attr && (s_editMode>0 || p1valdiff)) {
           uint8_t t;
@@ -5893,9 +5928,9 @@ void menuModelTelemetry(uint8_t event)
         }
 #else
         lcd_outdezAtt(TELEM_COL2, y, -10+g_model.frsky.varioMin, (m_posHorz<=0 ? attr : 0)|LEFT);
-        lcd_outdezAtt(TELEM_COL2+7*FW-2, y, -5+g_model.frsky.varioCenterMin, ((m_posHorz<0 || m_posHorz==1) ? attr : 0)|PREC1);
-        lcd_outdezAtt(TELEM_COL2+10*FW, y, 5+g_model.frsky.varioCenterMax, ((m_posHorz<0 || m_posHorz==2) ? attr : 0)|PREC1);
-        lcd_outdezAtt(TELEM_COL2+13*FW+2, y, 10+g_model.frsky.varioMax, ((m_posHorz<0 || m_posHorz==3) ? attr : 0));
+        lcd_outdezAtt(TELEM_COL2+7*FW-2, y, -5+g_model.frsky.varioCenterMin, ((CURSOR_ON_LINE() || m_posHorz==1) ? attr : 0)|PREC1);
+        lcd_outdezAtt(TELEM_COL2+10*FW, y, 5+g_model.frsky.varioCenterMax, ((CURSOR_ON_LINE() || m_posHorz==2) ? attr : 0)|PREC1);
+        lcd_outdezAtt(TELEM_COL2+13*FW+2, y, 10+g_model.frsky.varioMax, ((CURSOR_ON_LINE() || m_posHorz==3) ? attr : 0));
         if (attr && (s_editMode>0 || p1valdiff)) {
           switch (m_posHorz) {
             case 0:

radio/src/gui/menus.cpp

@@ -104,42 +104,66 @@ uint8_t switchToMix(uint8_t source)
 #endif
 }
 
+#if defined(AUTOSWITCH)
+int8_t checkIncDecMovedSwitch(int8_t val)
+{
+  if (s_editMode>0) {
+    int8_t swtch = getMovedSwitch();
+    if (swtch) {
+#if defined(PCBTARANIS)
+      if (swtch == SWSRC_SH2)
+        val = (val == SWSRC_SH2 ? SWSRC_SH0 : SWSRC_SH2);
+      else if (swtch != SWSRC_SH0)
+        val = swtch;
+#else
+      if (IS_MOMENTARY(val) && IS_MOMENTARY(val))
+        val = -val;
+      else
+        val = swtch;
+#endif
+    }
+  }
+  return val;
+}
+#endif
+
 int8_t  checkIncDec_Ret;
 
 #if defined(CPUARM)
-int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, uint8_t i_flags, IsValueAvailable isValueAvailable)
-#else
-int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, uint8_t i_flags)
-#endif
+INIT_STOPS(stops100, 3, -100, 0, 100)
+INIT_STOPS(stops1000, 3, -1000, 0, 1000)
+INIT_STOPS(stopsSwitch, 15, SWSRC_FIRST, CATEGORY_END(-SWSRC_FIRST_LOGICAL_SWITCH), CATEGORY_END(-SWSRC_FIRST_TRIM), CATEGORY_END(-SWSRC_LAST_SWITCH+1), 0, CATEGORY_END(SWSRC_LAST_SWITCH), CATEGORY_END(SWSRC_FIRST_TRIM-1), CATEGORY_END(SWSRC_FIRST_LOGICAL_SWITCH-1), SWSRC_LAST)
+
+int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int i_flags, IsValueAvailable isValueAvailable, const CheckIncDecStops &stops)
 {
-  int16_t newval = val;
+  int newval = val;
 
 #if defined(DBLKEYS)
-  uint8_t in = KEYS_PRESSED();
-  if (EVT_KEY_MASK(event)) {
+  unsigned int in = KEYS_PRESSED();
+  if (!(i_flags & NO_DBLKEYS) && (EVT_KEY_MASK(event))) {
     bool dblkey = true;
-    if (DBLKEYS_PRESSED_RGT_LFT(in))
-      newval = -val;
+    if (DBLKEYS_PRESSED_RGT_LFT(in)) {
+      if (!isValueAvailable || isValueAvailable(-val))
+        newval = -val;
+    }
     else if (DBLKEYS_PRESSED_RGT_UP(in)) {
-      newval = (i_max > 100 ? 100 : i_max);
-#if defined(CPUARM)
-      if (i_flags & DBLKEYS_1000) newval *= 10;
-#endif
+      newval = (i_max > stops.max() ? stops.max() : i_max);
+      while (isValueAvailable && !isValueAvailable(newval) && newval>i_min) {
+        --newval;
+      }
     }
     else if (DBLKEYS_PRESSED_LFT_DWN(in)) {
-      newval = (i_min < -100 ? -100 : i_min);
-#if defined(CPUARM)
-      if (i_flags & DBLKEYS_1000) newval *= 10;
-#endif
+      newval = (i_min < stops.min() ? stops.min() : i_min);
+      while (isValueAvailable && !isValueAvailable(newval) && newval<i_max) {
+        ++newval;
+      }
     }
-    else if (DBLKEYS_PRESSED_UP_DWN(in))
+    else if (DBLKEYS_PRESSED_UP_DWN(in)) {
       newval = 0;
-    else
+    }
+    else {
       dblkey = false;
-
-#if defined(CPUARM)
-
-#endif
+    }
 
     if (dblkey) {
       killEvents(KEY_UP);
@@ -162,7 +186,7 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui
 #else
   if (event==EVT_KEY_FIRST(KEY_RIGHT) || event==EVT_KEY_REPT(KEY_RIGHT) || (s_editMode>0 && (IS_ROTARY_RIGHT(event) || event==EVT_KEY_FIRST(KEY_UP) || event==EVT_KEY_REPT(KEY_UP)))) {
 #endif
-#if defined(CPUARM)
+
     do {
       if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) {
         newval += min(10, i_max-val);
@@ -171,23 +195,22 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui
         newval++;
       }
     } while (isValueAvailable && !isValueAvailable(newval) && newval<=i_max);
+
     if (newval > i_max) {
       newval = val;
       killEvents(event);
       AUDIO_WARNING2();
     }
-    else
-#else
-    newval++;
-#endif
-    AUDIO_KEYPAD_UP();
+    else {
+      AUDIO_KEYPAD_UP();
+    }
   }
 #if defined(PCBTARANIS)
   else if (s_editMode>0 && (IS_ROTARY_LEFT(event) || event==EVT_KEY_FIRST(KEY_DOWN) || event==EVT_KEY_REPT(KEY_DOWN))) {
 #else
   else if (event==EVT_KEY_FIRST(KEY_LEFT) || event==EVT_KEY_REPT(KEY_LEFT) || (s_editMode>0 && (IS_ROTARY_LEFT(event) || event==EVT_KEY_FIRST(KEY_DOWN) || event==EVT_KEY_REPT(KEY_DOWN)))) {
 #endif
-#if defined(CPUARM)
+
     do {
       if (IS_KEY_REPT(event) && (i_flags & INCDEC_REP10)) {
         newval -= min(10, val-i_min);
@@ -196,15 +219,118 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui
         newval--;
       }
     } while (isValueAvailable && !isValueAvailable(newval) && newval>=i_min);
+
     if (newval < i_min) {
       newval = val;
       killEvents(event);
       AUDIO_WARNING2();
     }
-    else
-#else
-    newval--;
+    else {
+      AUDIO_KEYPAD_DOWN();
+    }
+  }
+
+  if (!READ_ONLY() && i_min==0 && i_max==1 && (event==EVT_KEY_BREAK(KEY_ENTER) || IS_ROTARY_BREAK(event))) {
+    s_editMode = 0;
+    newval = !val;
+  }
+
+#if defined(NAVIGATION_POT1)
+  // change values based on P1
+  newval -= p1valdiff;
+  p1valdiff = 0;
 #endif
+
+#if defined(AUTOSWITCH)
+  if (i_flags & INCDEC_SWITCH) {
+    newval = checkIncDecMovedSwitch(newval);
+  }
+#endif
+
+#if defined(AUTOSOURCE)
+  if (i_flags & INCDEC_SOURCE) {
+    if (s_editMode>0) {
+      int source = GET_MOVED_SOURCE(i_min, i_max);
+      if (source) {
+        newval = source;
+      }
+#if defined(AUTOSWITCH)
+      else {
+        unsigned int swtch = abs(getMovedSwitch());
+        if (swtch) {
+          newval = switchToMix(swtch);
+        }
+      }
+#endif
+    }
+  }
+#endif
+
+  if (newval > i_max || newval < i_min) {
+    newval = (newval > i_max ? i_max : i_min);
+    killEvents(event);
+    AUDIO_WARNING2();
+  }
+
+  if (newval != val) {
+    if (!(i_flags & NO_INCDEC_MARKS) && (newval != i_max) && (newval != i_min) && stops.contains(newval) && !IS_ROTARY_EVENT(event)) {
+      bool pause = (newval > val ? !stops.contains(newval+1) : !stops.contains(newval-1));
+      if (pause) {
+        pauseEvents(event); // delay before auto-repeat continues
+        if (newval>val) // without AUDIO it's optimized, because the 2 sounds are the same
+          AUDIO_KEYPAD_UP();
+        else
+          AUDIO_KEYPAD_DOWN();
+      }
+    }
+    eeDirty(i_flags & (EE_GENERAL|EE_MODEL));
+    checkIncDec_Ret = (newval > val ? 1 : -1);
+  }
+  else {
+    checkIncDec_Ret = 0;
+  }
+  return newval;
+}
+#else
+int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, uint8_t i_flags)
+{
+  int16_t newval = val;
+
+#if defined(DBLKEYS)
+  uint8_t in = KEYS_PRESSED();
+  if (!(i_flags & NO_DBLKEYS) && (EVT_KEY_MASK(event))) {
+    bool dblkey = true;
+    if (DBLKEYS_PRESSED_RGT_LFT(in))
+      newval = -val;
+    else if (DBLKEYS_PRESSED_RGT_UP(in)) {
+      newval = (i_max > 100 ? 100 : i_max);
+    }
+    else if (DBLKEYS_PRESSED_LFT_DWN(in)) {
+      newval = (i_min < -100 ? -100 : i_min);
+    }
+    else if (DBLKEYS_PRESSED_UP_DWN(in)) {
+      newval = 0;
+    }
+    else {
+      dblkey = false;
+    }
+
+    if (dblkey) {
+      killEvents(KEY_UP);
+      killEvents(KEY_DOWN);
+      killEvents(KEY_RIGHT);
+      killEvents(KEY_LEFT);
+      event = 0;
+    }
+  }
+#endif
+
+  if (event==EVT_KEY_FIRST(KEY_RIGHT) || event==EVT_KEY_REPT(KEY_RIGHT) || (s_editMode>0 && (IS_ROTARY_RIGHT(event) || event==EVT_KEY_FIRST(KEY_UP) || event==EVT_KEY_REPT(KEY_UP)))) {
+    newval++;
+    AUDIO_KEYPAD_UP();
+  }
+  else if (event==EVT_KEY_FIRST(KEY_LEFT) || event==EVT_KEY_REPT(KEY_LEFT) || (s_editMode>0 && (IS_ROTARY_LEFT(event) || event==EVT_KEY_FIRST(KEY_DOWN) || event==EVT_KEY_REPT(KEY_DOWN)))) {
+    newval--;
     AUDIO_KEYPAD_DOWN();
   }
 
@@ -221,22 +347,7 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui
 
 #if defined(AUTOSWITCH)
   if (i_flags & INCDEC_SWITCH) {
-    if (s_editMode>0) {
-      int8_t swtch = getMovedSwitch();
-      if (swtch) {
-#if defined(PCBTARANIS)
-        if(swtch == SWSRC_SH2)
-          newval = (newval == SWSRC_SH2 ? SWSRC_SH0 : SWSRC_SH2);
-        else if(swtch != SWSRC_SH0)
-          newval = swtch;
-#else
-        if (IS_MOMENTARY(newval) && IS_MOMENTARY(swtch))
-          newval = -newval;
-        else
-          newval = swtch;
-#endif
-      }
-    }
+    newval = checkIncDecMovedSwitch(newval);
   }
 #endif
 
@@ -281,6 +392,7 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui
   }
   return newval;
 }
+#endif
 
 #if defined(CPUM64)
 int8_t checkIncDecModel(uint8_t event, int8_t i_val, int8_t i_min, int8_t i_max)
@@ -1137,6 +1249,10 @@ int8_t switchMenuItem(uint8_t x, uint8_t y, int8_t value, LcdFlags attr, uint8_t
   }
 #endif
 
+bool noZero(int val) {
+  return val != 0;
+}
+
 #if defined(GVARS)
 #if defined(CPUARM)
 int16_t gvarMenuItem(uint8_t x, uint8_t y, int16_t value, int16_t min, int16_t max, LcdFlags attr, uint8_t editflags, uint8_t event) 
@@ -1172,18 +1288,29 @@ int16_t gvarMenuItem(uint8_t x, uint8_t y, int16_t value, int16_t min, int16_t m
 #endif
 
     int8_t idx = (int16_t) GV_INDEX_CALC_DELTA(value, delta);
+#if defined(CPUARM)
+    if (idx >= 0) ++idx;    // transform form idx=0=GV1 to idx=1=GV1 in order to handle double keys invert 
+#endif
     if (invers) {
-      CHECK_INCDEC_MODELVAR(event, idx, -MAX_GVARS, MAX_GVARS-1);
+#if defined(CPUARM)
+      CHECK_INCDEC_MODELVAR_CHECK(event, idx, -MAX_GVARS, MAX_GVARS, noZero);
+      if (idx == 0) idx = 1;    // handle reset to zero, map to GV1
+#else
+      idx = checkIncDec(event, idx, -MAX_GVARS, MAX_GVARS-1, EE_MODEL|NO_DBLKEYS);   // disable double keys
+#endif
     }
-
-    if (idx < 0) { 
+    if (idx < 0) {
       value = (int16_t) GV_CALC_VALUE_IDX_NEG(idx, delta);
       idx = -idx;
       lcd_putcAtt(x-6, y, '-', attr);
     }
     else {
+#if defined(CPUARM)
+      value = (int16_t) GV_CALC_VALUE_IDX_POS(idx-1, delta);
+#else
       value = (int16_t) GV_CALC_VALUE_IDX_POS(idx, delta);
       idx++;
+#endif
     }
     putsStrIdx(x, y, STR_GV, idx, attr);
   }
@@ -1433,9 +1560,11 @@ bool isTelemetrySourceAvailable(int source)
     return false;
 #endif
 
+#if defined(FRSKY)
   if (source >= TELEM_A1 && source <= TELEM_A4) {
     return g_model.frsky.channels[source-TELEM_A1].ratio != 0;
   }
+#endif
 
 #if !defined(RTCLOCK)
   if (source == TELEM_TX_TIME)
@@ -1566,10 +1695,16 @@ bool isSwitchAvailableInMixes(int swtch)
 bool isSwitchAvailableInTimers(int swtch)
 {
   if (swtch >= 0) {
-    if (swtch < TMRMODE_COUNT) {
+    if (swtch < TMRMODE_COUNT)
       return true;
-    }
-    swtch -= TMRMODE_COUNT-1;
+    else
+      swtch -= TMRMODE_COUNT-1;
+  }
+  else {
+    if (swtch > -TMRMODE_COUNT)
+      return false;
+    else
+      swtch += TMRMODE_COUNT-1;
   }
 
   return isSwitchAvailable(swtch, TimersContext);

radio/src/gui/menus.h

@@ -181,8 +181,8 @@ extern int8_t s_editMode;       // global editmode
 #define NO_INCDEC_MARKS 0x04
 #define INCDEC_SWITCH   0x08
 #define INCDEC_SOURCE   0x10
-#define DBLKEYS_1000    0x20
 #define INCDEC_REP10    0x40
+#define NO_DBLKEYS      0x80
 
 // mawrow special values
 #define TITLE_ROW      ((uint8_t)-1)
@@ -190,11 +190,45 @@ extern int8_t s_editMode;       // global editmode
 
 #if defined(CPUARM)
 typedef bool (*IsValueAvailable)(int);
-int16_t checkIncDec(uint8_t event, int16_t i_pval, int16_t i_min, int16_t i_max, uint8_t i_flags=0, IsValueAvailable isValueAvailable=NULL);
+struct CheckIncDecStops {
+  const int count;
+  const int stops[];
+  int min() const
+  {
+    return stops[0];
+  }
+  int max() const
+  {
+    return stops[count-1];
+  }
+  bool contains(int value) const
+  {
+    for (int i=0; i<count; ++i) {
+      int stop = stops[i];
+      if (value == stop)
+        return true;
+      else if (value < stop)
+        return false;
+    }
+    return false;
+  }
+};
+extern const CheckIncDecStops &stops100;
+extern const CheckIncDecStops &stops1000;
+extern const CheckIncDecStops &stopsSwitch;
+#define INIT_STOPS(var, ...)                                        \
+  const int _ ## var[] = { __VA_ARGS__ };                           \
+  const CheckIncDecStops &var  = (const CheckIncDecStops&)_ ## var;
+#define CATEGORY_END(val)                                          \
+  (val), (val+1)
+
+int checkIncDec(unsigned int event, int val, int i_min, int i_max, unsigned int i_flags=0, IsValueAvailable isValueAvailable=NULL, const CheckIncDecStops &stops=stops100);
 #else
 int16_t checkIncDec(uint8_t event, int16_t i_pval, int16_t i_min, int16_t i_max, uint8_t i_flags=0);
 #endif
 
+int8_t checkIncDecMovedSwitch(int8_t val);
+
 #if defined(CPUM64)
 int8_t checkIncDecModel(uint8_t event, int8_t i_val, int8_t i_min, int8_t i_max);
 int8_t checkIncDecModelZero(uint8_t event, int8_t i_val, int8_t i_max);
@@ -234,7 +268,7 @@ int8_t checkIncDecGen(uint8_t event, int8_t i_val, int8_t i_min, int8_t i_max);
   bool isModuleAvailable(int module);
   #define AUTOSWITCH_ENTER_LONG() (attr && event==EVT_KEY_LONG(KEY_ENTER))
   #define CHECK_INCDEC_MODELSWITCH(event, var, min, max, available) \
-    var = checkIncDec(event,var,min,max,EE_MODEL|INCDEC_SWITCH|NO_INCDEC_MARKS, available)
+    var = checkIncDec(event,var,min,max,EE_MODEL|INCDEC_SWITCH, available, stopsSwitch)
 #elif defined(AUTOSWITCH)
   #define AUTOSWITCH_ENTER_LONG() (attr && event==EVT_KEY_LONG(KEY_ENTER))
   #define CHECK_INCDEC_MODELSWITCH(event, var, min, max, available) \
@@ -264,8 +298,10 @@ int8_t checkIncDecGen(uint8_t event, int8_t i_val, int8_t i_min, int8_t i_max);
 
 #if defined(PCBTARANIS)
   #define NAVIGATION_LINE_BY_LINE  0x40
+  #define CURSOR_ON_LINE()         (m_posHorz<0)
 #else
   #define NAVIGATION_LINE_BY_LINE  0
+  #define CURSOR_ON_LINE()         (0)
 #endif
 
 #if defined(PCBTARANIS)

radio/src/gui/view_mavlink.cpp

@@ -99,8 +99,8 @@ void menuTelemetryMavlink(uint8_t event) {
 		menuTelemetryMavlinkGPS();
 		break;
 #ifdef DUMP_RX_TX
-	case MENU_DUMP_TX:
 	case MENU_DUMP_RX:
+	case MENU_DUMP_DIAG:
 		menuTelemetryMavlinkDump(event);
 		break;
 #endif
@@ -206,9 +206,12 @@ void mav_title(const pm_char * s, uint8_t index)
   lcd_putsAtt(0, 0, PSTR("MAVLINK"), INVERS);
   lcd_puts(10 * FW, 0, s);
   displayScreenIndex(index, MAX_MAVLINK_MENU, INVERS);
-  lcd_putc(7 * FW, 0, (mav_heartbeat > 0) ? '*' : ' ');
-  if (telemetry_data.active)
-  	  lcd_putcAtt(8 * FW, 0, 'A', BLINK);
+  #if defined(PCBSKY9X)
+  lcd_putc(7 * FW, 0, mav_heartbeat+'0');	/* ok til 9 :-) */
+  #else
+  lcd_putc(7 * FW, 0, (mav_heartbeat > 0) ? '*' : ' ');  
+  #endif
+  lcd_putc(8 * FW, 0, telemetry_data.active ? 'A' : 'N');
 }
 
 /*!	\brief Global info menu
@@ -249,13 +252,12 @@ void menuTelemetryMavlinkInfos(void) {
 		y += FH;
 		lcd_puts(x1, y, PSTR("BATT"));
 		lcd_outdezNAtt(xnum, y, telemetry_data.vbat, PREC1, 5);
-
 		y += FH;
-		lcd_puts(x1, y, PSTR("DROP"));
+		lcd_puts(x1, y, PSTR("PKT DROP"));
 		lcd_outdezAtt(xnum, y, telemetry_data.packet_drop, 0);
-/*		y += FH;
-		lcd_puts(x1, y, PSTR("FIX"));
-		lcd_outdezAtt(xnum, y, telemetry_data.packet_fixed, 0);
+		y += FH;
+		lcd_puts(x1, y, PSTR("PKT REC"));
+		lcd_outdezAtt(xnum, y, telemetry_data.packet_fixed, 0);		/* TODO use correct var */
 		y += FH;
 		lcd_puts(x1, y, PSTR("MAV Comp"));
 		lcd_outdezAtt(xnum, y, telemetry_data.mav_compid, 0);
@@ -268,7 +270,6 @@ void menuTelemetryMavlinkInfos(void) {
 		y += FH;
 		lcd_puts(x1, y, PSTR("Rad Sys"));
 		lcd_outdezAtt(xnum, y, telemetry_data.radio_sysid, 0);
-*/
 		
 	}
 }
@@ -347,7 +348,7 @@ void menuTelemetryMavlinkBattery(void) {
     
 }
 
-/*!	\brief Navigation dislplay
+/*!	\brief Navigation display
  *	\details Shows Navigation telemetry.
  *	Altitude in this menu is the relative (to the home location) altitude. This
  *	is the same altitude used by the waypoints.
@@ -463,19 +464,20 @@ void menuTelemetryMavlinkDump(uint8_t event) {
 	uint8_t *ptr = NULL;
 	switch (MAVLINK_menu) {
 		case MENU_DUMP_RX:
-		mav_dump_rx = 1;
-		mav_title(PSTR("RX"), MAVLINK_menu);
-		bufferLen = mavlinkRxBufferCount;
-		ptr = mavlinkRxBuffer;
-		break;
+			mav_dump_rx = 1;
+			mav_title(PSTR("RX"), MAVLINK_menu);
+			bufferLen = mavlinkRxBufferCount;
+			ptr = mavlinkRxBuffer;
+			break;
 
-		case MENU_DUMP_TX:
-		mav_title(PSTR("TX"), MAVLINK_menu);
-		bufferLen = serialTxBufferCount;
-		ptr = ptrTxISR;
-		break;
+		case MENU_DUMP_DIAG:
+			mav_title(PSTR("Diag"), MAVLINK_menu);
+		//	bufferLen = serialTxBufferCount;
+		//	ptr = ptrTxISR;
+			break;
+		
 		default:
-		break;
+			break;
 	}
 	for (uint16_t var = 0; var < bufferLen; var++) {
 		uint8_t byte = *ptr++;

radio/src/gui/view_mavlink.h

@@ -77,7 +77,7 @@ enum mavlink_menu_ {
 	MENU_GPS, //
 #ifdef DUMP_RX_TX
 	MENU_DUMP_RX, //
-	MENU_DUMP_TX, //
+	MENU_DUMP_DIAG, //
 #endif
 	MAX_MAVLINK_MENU
 };

radio/src/lcd.h

@@ -180,7 +180,7 @@ void lcd_putsnAtt(xcoord_t x, uint8_t y, const pm_char * s,unsigned char len, Lc
 void lcd_puts(xcoord_t x, uint8_t y, const pm_char * s);
 void lcd_putsn(xcoord_t x, uint8_t y, const pm_char * s, unsigned char len);
 void lcd_putsLeft(uint8_t y, const pm_char * s);
-#define lcd_putsCenter(y, s) lcd_puts((LCD_W-sizeof(TR_##s)*FW+FW-2)/2, y, STR_##s)
+#define lcd_putsCenter(y, s) lcd_puts((LCD_W-sizeof(TR_##s)*FW+FW+1)/2, y, STR_##s)
 
 void lcd_outhex4(xcoord_t x, uint8_t y, uint16_t val);
 void lcd_outdezAtt(xcoord_t x, uint8_t y, lcdint_t val, LcdFlags mode=0);
@@ -263,9 +263,14 @@ void lcd_img(xcoord_t x, uint8_t y, const pm_uchar * img, uint8_t idx, LcdFlags
 void lcd_bmp(xcoord_t x, uint8_t y, const pm_uchar * img, uint8_t offset=0, uint8_t width=0);
 #define LCD_ICON(x, y, icon) lcd_bmp(x, y, icons, icon)
 void lcdSetRefVolt(unsigned char val);
-void lcdInit();
 void lcd_clear();
 void lcdSetContrast();
+void lcdInit();
+#if defined(PCBTARANIS)
+  void lcdOff();
+#else
+  #define lcdOff()
+#endif
 
 #if defined(PCBTARANIS) && defined(REVPLUS) && !defined(SIMU)
   void lcdRefresh(bool wait=true);

radio/src/lcd_common.cpp

@@ -110,7 +110,7 @@ void lcdPutPattern(xcoord_t x, uint8_t y, const uint8_t * pattern, uint8_t width
 
       for (int8_t j=-1; j<=height; j++) {
         bool plot;
-        if (j < 0 || j == height) {
+        if (j < 0 || ((j == height) && !(flags & SMLSIZE))) {
           plot = false;
           if (height >= 12) continue;
           if (j<0 && !inv) continue;
@@ -177,7 +177,7 @@ void lcd_putcAtt(xcoord_t x, uint8_t y, const unsigned char c, LcdFlags flags)
   }
   else if (flags & SMLSIZE) {
     q = (c < 0xc0 ? &font_4x6[(c-0x20)*5] : &font_4x6_extra[(c-0xc0)*5]);
-    lcdPutPattern(x, y, q, 5, 7, flags);
+    lcdPutPattern(x, y, q, 5, 6, flags);
   }
   else if (flags & TINSIZE) {
     q = &font_3x5[((uint16_t)c-0x2d)*3];
@@ -509,28 +509,30 @@ void lcd_line(xcoord_t x1, int8_t y1, xcoord_t x2, int8_t y2, uint8_t pat, LcdFl
 
   if (dxabs >= dyabs) {
     /* the line is more horizontal than vertical */
-    for (int i=0; i<dxabs; i++) {
+    for (int i=0; i<=dxabs; i++) {
       y += dyabs;
       if (y>=dxabs) {
         y -= dxabs;
         py += sdy;
       }
-      px += sdx;
-      if ((1<<(px%8)) & pat)
+      if ((1<<(px%8)) & pat) {
         lcd_plot(px, py, att);
+      }
+      px += sdx;
     }
   }
   else {
     /* the line is more vertical than horizontal */
-    for (int i=0; i<dyabs; i++) {
+    for (int i=0; i<=dyabs; i++) {
       x += dxabs;
       if (x >= dyabs) {
         x -= dyabs;
         px += sdx;
       }
-      py += sdy;
-      if ((1<<(py%8)) & pat)
+      if ((1<<(py%8)) & pat) {
         lcd_plot(px, py, att);
+      }
+      py += sdy;
     }
   }
 }