Update releasenotes.txt

Kilrah/protocol fixes

.travis.yml

@@ -0,0 +1,14 @@
+language: cpp
+
+before_install:
+    - sudo apt-get remove cmake cmake-data --yes
+    - sudo add-apt-repository ppa:george-edison55/precise-backports --yes
+    - sudo add-apt-repository ppa:terry.guo/gcc-arm-embedded --yes
+    - sudo apt-get update    
+
+install:
+  - sudo apt-get install -y lcov cmake cmake-data bc curl gcc-arm-none-eabi gcc-avr avr-libc avrdude libqtcore4 libqt4-dev qt4-qmake g++ libxerces-c-dev xsdcxx libsdl1.2-dev libusb-1.0-0 libphonon-dev phonon libqtwebkit-dev python-qt4 python-qt4-dev libfox-1.6-dev libgtest-dev
+
+script:
+  - radio/util/commit-tests.sh
+  - mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Debug ../companion/src && cmake --build .

DONATIONS.txt

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

README.md

@@ -1,5 +1,9 @@
 ##OpenTX 2.1 Branch
 
+[![Build Status](https://travis-ci.org/opentx/opentx.svg?branch=master)](https://travis-ci.org/opentx/opentx)
+[![Join the chat at https://gitter.im/opentx/opentx](https://img.shields.io/badge/%E2%8A%AA%20GITTER%20-JOIN%20CHAT%20%E2%86%92-brightgreen.svg?style=flat)](https://gitter.im/opentx/opentx?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Donate using Paypal](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=DJ9MASSKVW8WN)
+
 The ongoing development on 2.1.x is done in this branch.
 
 Refer to the opentx.wiki for information about setting up the tool chains for building OpenTX and OpenTX Companion as well as other development related issues.

companion/releasenotes.txt

@@ -1,3 +1,37 @@
+<h2>Version 2.1.5 / 2015-11-05</h2>
+
+Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrSky's release of OpenTX 2.1.4
+
+<ul>
+<li>Fixed: changing any setting on the telemetry panel does not set the file as being modified (<a href=https://github.com/opentx/opentx/issues/2875>#2875</a>)</li>
+<li>Print model fix for "Play value.... not on startup" (<a href=https://github.com/opentx/opentx/issues/2736>#2736</a>)</li>
+<li>Top LCD Timer could not be selected for X9E  (<a href=https://github.com/opentx/opentx/issues/2850>#2850</a>)</li>
+<li>More informative error/info messages when openin eepe files (<a href=https://github.com/opentx/opentx/issues/2778>#2778</a>)</li>
+<li>Print model fix for curves (<a href=https://github.com/opentx/opentx/issues/2896>#2896</a>)</li>
+<li>Added missing special functions (bind, range check, set failsafe) (<a href=https://github.com/opentx/opentx/issues/2753>#2753</a>)</li>
+<li>Some defaults missing when changing telemetry formula, update propagation issues (<a href=https://github.com/opentx/opentx/issues/2928>#2928</a>)</li>
+<li>Fixed wrong import of Logical switches from OpenTX 2.0.x version (<a href=https://github.com/opentx/opentx/issues/2942>#2942</a>)</li>
+<li>Fixed a problem with updates path on Windows (<a href=https://github.com/opentx/opentx/issues/2876>#2876</a>)</li>
+<li>Edge representation unified (changed from "no release" to "instant") (<a href=https://github.com/opentx/opentx/issues/2837>#2837</a>)</li>
+<li>Added channel names on failsafe sliders (<a href=https://github.com/opentx/opentx/issues/3021>#3021</a>)</li>
+<li>Corrected failsafe mapping when using Custom failsafe mode, D16 protocol and channel range different from from 1-8. 
+  Users with such setups are advised to re-check their failsafe settings (<a href=https://github.com/opentx/opentx/issues/2975>#2975</a>)</li>
+<li>Various texts and translations corrections</li>
+<li>Various small bug-fixes: <a href=https://github.com/opentx/opentx/issues/2994>#2994</a>, 
+                             <a href=https://github.com/opentx/opentx/issues/3016>#3016</a>,
+                             <a href=https://github.com/opentx/opentx/issues/3012>#3012</a>
+</li>
+</ul>
+
+
+
+<h2>Version 2.1.3 / 2015-09-09</h2>
+
+<ul>
+<li>Fix missing translations in inputs/mixes tabs, print and compare dialogs (<a href=https://github.com/opentx/opentx/issues/2847>#2847</a>)</li>
+</ul>
+
+
 <h2>Version 2.1.2 / 2015-09-07</h2>
 
 <ul>

companion/src/CMakeLists.txt

@@ -2,13 +2,13 @@ PROJECT( companion )
 
 SET(C9X_VERSION_MAJOR "2")
 SET(C9X_VERSION_MINOR "1")
-SET(C9X_VERSION_REVISION "2")
+SET(C9X_VERSION_REVISION "5")
 SET(C9X_VERSION_SUFFIX $ENV{OPENTX_VERSION_SUFFIX})
 
 SET(C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION}${C9X_VERSION_SUFFIX})
 MESSAGE(STATUS "OpenTX Companion ${C9X_VERSION}")
 
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 )
 
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 
@@ -62,7 +62,7 @@ ELSE()
     MESSAGE( "SDL not found! Joysticks support will be disabled. Simulator audio will not work." )
 ENDIF()
 
-FIND_PACKAGE(Qt4 4.8.4 REQUIRED)
+FIND_PACKAGE(Qt4 4.8.1 REQUIRED)
 SET( QT_USE_QTNETWORK True )
 SET( QT_USE_QTXML True )
 INCLUDE( ${QT_USE_FILE} )
@@ -102,6 +102,11 @@ ELSE( )
   LINK_DIRECTORIES( /usr/local/lib )
 ENDIF( )
 
+IF( MSVC )
+  MESSAGE( STATUS "Adding include C:/Programs/dirent/include for dirent.h" )
+  INCLUDE_DIRECTORIES( C:/programs/dirent/include )
+ENDIF( )
+
 set(RADIO_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/../../radio/src)
 set(SIMU_SRC_DIRECTORY ${PROJECT_SOURCE_DIR}/simulation)
 set(COMPANION_SRC_DIRECTORY ${PROJECT_SOURCE_DIR})
@@ -213,6 +218,8 @@ set(companion_MOC_HDRS
   radionotfound.h
   helpers.h
   wizarddialog.h
+  modelprinter.h
+  multimodelprinter.h
 )
 
 set(companion_UIS
@@ -432,7 +439,7 @@ ADD_CUSTOM_TARGET( stamp
 IF( LUPDATE_FOUND )
   ADD_CUSTOM_TARGET( translations
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -ts ${companion_TS}
+    COMMAND ${LUPDATE_EXECUTABLE} ${CMAKE_SOURCE_DIR} -no-obsolete -ts ${companion_TS}
   )
 ELSE()
   ADD_CUSTOM_TARGET( translations
@@ -443,7 +450,11 @@ ENDIF()
 SET(CPACK_PACKAGE_NAME "companion${C9X_NAME_SUFFIX}")
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Models and settings editor for the OpenTx open source firmware")
 string(TOLOWER "${CPACK_PACKAGE_NAME}" CPACK_PACKAGE_NAME_LOWERCASE)
-SET( CPACK_STRIP_FILES TRUE )
+
+# The file stripping is deliberately disabled, with the stripped file we get 
+# very poor trace-backs from the users when they report Companion crash
+SET( CPACK_STRIP_FILES FALSE )
+
 find_program(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
 if(DPKG_PROGRAM)
   SET(CPACK_GENERATOR "DEB")

companion/src/apppreferencesdialog.ui

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

companion/src/companion.cpp

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

companion/src/comparedialog.cpp

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

companion/src/converteeprom.cpp

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

companion/src/eeprominterface.cpp

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

companion/src/eeprominterface.h

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

companion/src/file.cpp

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

companion/src/firmwares/er9x/er9xinterface.cpp

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

companion/src/firmwares/er9x/er9xinterface.h

@@ -1,6 +1,6 @@
 /*
  * Author - Bertrand Songis <bsongis@gmail.com>
- * 
+ *
  * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
@@ -29,21 +29,21 @@ class Er9xInterface : public EEPROMInterface
     virtual ~Er9xInterface();
 
     virtual const char * getName();
-    
+
     virtual const int getEEpromSize();
 
     virtual const int getMaxModels();
 
-    virtual bool load(RadioData &, const uint8_t * eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t * eeprom, int size);
 
-    virtual bool loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
-    
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadBackup(RadioData &, uint8_t * eeprom, int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
     virtual int save(uint8_t * eeprom, RadioData & radioData, uint32_t variant=0, uint8_t version=0);
 
     virtual int getSize(const ModelData &);
-    
+
     virtual int getSize(const GeneralSettings &settings);
 
     virtual int isAvailable(PulsesProtocol proto, int port=0);
@@ -54,17 +54,17 @@ class Er9xInterface : public EEPROMInterface
 
   private:
     void appendTextElement(QDomDocument * qdoc, QDomElement * pe, QString name, QString value);
-    
+
     void appendNumberElement(QDomDocument * qdoc, QDomElement * pe,QString name, int value, bool forceZeroWrite = false);
-    
+
     void appendCDATAElement(QDomDocument * qdoc, QDomElement * pe,QString name, const char * data, int size);
-    
+
     QDomElement getGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen);   //parse out data to XML format
-    
+
     QDomElement getModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum, int mdver); //parse out data to XML format
-    
+
     bool loadGeneralDataXML(QDomDocument * qdoc, Er9xGeneral * tgen); // get data from XML
-    
+
     bool loadModelDataXML(QDomDocument * qdoc, Er9xModelData * tmod, int modelNum = -1); // get data from XML
 
 };

companion/src/firmwares/ersky9x/ersky9xinterface.cpp

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

companion/src/firmwares/ersky9x/ersky9xinterface.h

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

companion/src/firmwares/gruvin9x/gruvin9xinterface.cpp

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

companion/src/firmwares/gruvin9x/gruvin9xinterface.h

@@ -1,6 +1,6 @@
 /*
  * Author - Bertrand Songis <bsongis@gmail.com>
- * 
+ *
  * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
@@ -30,21 +30,22 @@ class Gruvin9xInterface : public EEPROMInterface
     virtual ~Gruvin9xInterface();
 
     virtual const char * getName();
-    
+
     virtual const int  getEEpromSize();
 
     virtual const int getMaxModels();
 
-    virtual bool load(RadioData &, const uint8_t *eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);
 
-    virtual bool loadBackup(RadioData &, uint8_t *eeprom,int esize, int index);
-    
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom,int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
     virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
 
     virtual int getSize(const ModelData &);
-    
+
     virtual int getSize(const GeneralSettings & settings);
 
     virtual int isAvailable(PulsesProtocol proto, int port=0);

companion/src/firmwares/opentx/opentxeeprom.cpp

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

companion/src/firmwares/opentx/opentxinterface.cpp

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

companion/src/firmwares/opentx/opentxinterface.h

@@ -1,6 +1,6 @@
 /*
  * Author - Bertrand Songis <bsongis@gmail.com>
- * 
+ *
  * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
@@ -33,25 +33,23 @@ class OpenTxEepromInterface : public EEPROMInterface
 
     virtual const int getMaxModels();
 
-    virtual bool load(RadioData &, const uint8_t *eeprom, int size);
+    virtual unsigned long load(RadioData &, const uint8_t *eeprom, int size);
 
-    virtual bool loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
-    
-    virtual bool loadxml(RadioData &radioData, QDomDocument &doc);
+    virtual unsigned long loadBackup(RadioData &, uint8_t *eeprom, int esize, int index);
+
+    virtual unsigned long loadxml(RadioData &radioData, QDomDocument &doc);
 
     virtual int save(uint8_t *eeprom, RadioData &radioData, uint32_t variant=0, uint8_t version=0);
 
     virtual int getSize(const ModelData &);
 
     virtual int getSize(const GeneralSettings &);
-    
-    virtual int isAvailable(PulsesProtocol proto, int port=0);
-    
+
   protected:
 
     const char * getName();
 
-    bool checkVersion(unsigned int version);
+    EepromLoadErrors checkVersion(unsigned int version);
 
     bool checkVariant(unsigned int version, unsigned int variant);
 
@@ -112,7 +110,7 @@ class OpenTxFirmware: public Firmware {
     }
 
     virtual Firmware * getFirmwareVariant(const QString & id);
-    
+
     virtual QString getStampUrl();
 
     virtual QString getReleaseNotesUrl();
@@ -122,7 +120,9 @@ class OpenTxFirmware: public Firmware {
     virtual int getCapability(const Capability);
 
     virtual bool isTelemetrySourceAvailable(int source);
-    
+
+    virtual int isAvailable(PulsesProtocol proto, int port=0);
+
   protected:
 
     QString getFirmwareBaseUrl();
@@ -130,5 +130,6 @@ class OpenTxFirmware: public Firmware {
 };
 
 void registerOpenTxFirmwares();
+void unregisterOpenTxFirmwares();
 
 #endif

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

@@ -260,7 +260,11 @@ namespace NAMESPACE {
 #include "radio/src/targets/simu/simpgmspace.cpp"
 #include "radio/src/translations.cpp"
 #include "radio/src/telemetry/frsky.cpp"
-#include "radio/src/telemetry/frsky_d.cpp"
+#if defined(CPUARM)
+  #include "radio/src/telemetry/frsky_d_arm.cpp"
+#else
+  #include "radio/src/telemetry/frsky_d.cpp"
+#endif
 #include "radio/src/translations/tts_en.cpp"
 
 #if defined(CPUARM)

companion/src/firmwares/th9x/th9xinterface.cpp

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

companion/src/firmwares/th9x/th9xinterface.h

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

companion/src/flasheepromdialog.cpp

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

companion/src/generaledit/calibration.cpp

@@ -1,7 +1,7 @@
 #include "calibration.h"
 #include "ui_calibration.h"
 
-void CalibrationPanel::setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type)
+void CalibrationPanel::setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos = true)
 {
   bool enabled = false;
 
@@ -18,7 +18,7 @@ void CalibrationPanel::setupSwitchConfig(int index, QLabel *label, AutoLineEdit
   if (enabled) {
     type->addItem(tr("2 Positions Toggle"), GeneralSettings::SWITCH_TOGGLE);
     type->addItem(tr("2 Positions"), GeneralSettings::SWITCH_2POS);
-    type->addItem(tr("3 Positions"), GeneralSettings::SWITCH_3POS);
+    if (threePos) type->addItem(tr("3 Positions"), GeneralSettings::SWITCH_3POS);
     name->setField(generalSettings.switchName[index], 3, this);
     type->setField(generalSettings.switchConfig[index], this);
   }
@@ -130,9 +130,9 @@ CalibrationPanel::CalibrationPanel(QWidget * parent, GeneralSettings & generalSe
   setupSwitchConfig(2, ui->scLabel, ui->scName, ui->scType);
   setupSwitchConfig(3, ui->sdLabel, ui->sdName, ui->sdType);
   setupSwitchConfig(4, ui->seLabel, ui->seName, ui->seType);
-  setupSwitchConfig(5, ui->sfLabel, ui->sfName, ui->sfType);
+  setupSwitchConfig(5, ui->sfLabel, ui->sfName, ui->sfType, false);   //switch does not support 3POS
   setupSwitchConfig(6, ui->sgLabel, ui->sgName, ui->sgType);
-  setupSwitchConfig(7, ui->shLabel, ui->shName, ui->shType);
+  setupSwitchConfig(7, ui->shLabel, ui->shName, ui->shType, false);   //switch does not support 3POS
   setupSwitchConfig(8, ui->siLabel, ui->siName, ui->siType);
   setupSwitchConfig(9, ui->sjLabel, ui->sjName, ui->sjType);
   setupSwitchConfig(10, ui->skLabel, ui->skName, ui->skType);

companion/src/generaledit/calibration.h

@@ -63,7 +63,7 @@ class CalibrationPanel : public GeneralPanel
   protected:
     void setupPotConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
     void setupSliderConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
-    void setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type);
+    void setupSwitchConfig(int index, QLabel *label, AutoLineEdit *name, AutoComboBox *type, bool threePos);
 
   private:
     Ui::Calibration *ui;

companion/src/mainwindow.cpp

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

companion/src/mdichild.cpp

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

companion/src/modeledit/customfunctions.cpp

@@ -383,13 +383,16 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
       populateFuncParamCB(fswtchParamT[i], func, cfn.param);
       widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE;
     }
-    else if (func>=FuncSetTimer1 && func<=FuncSetTimer2) {
+    else if (func>=FuncSetTimer1 && func<=FuncSetTimer3) {
       if (modified) cfn.param = QTimeS(fswtchParamTime[i]->time()).seconds();
       fswtchParamTime[i]->setMinimumTime(QTime(0, 0, 0));
       fswtchParamTime[i]->setMaximumTime(QTime(0, 59, 59));
       fswtchParamTime[i]->setTime(QTimeS(cfn.param));
       widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE;
     }
+    else if (func>=FuncSetFailsafeInternalModule && func<=FuncBindExternalModule) {
+      widgetsMask |= CUSTOM_FUNCTION_ENABLE;
+    }
     else if (func==FuncVolume) {
       if (modified) cfn.param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
       populateFuncParamCB(fswtchParamT[i], func, cfn.param);
@@ -604,6 +607,8 @@ void CustomFunctionsPanel::populateFuncCB(QComboBox *b, unsigned int value)
         ((i==FuncPlayHaptic) && !firmware->getCapability(Haptic)) ||
         ((i==FuncPlayBoth) && !firmware->getCapability(HasBeeper)) ||
         ((i==FuncLogs) && !firmware->getCapability(HasSDLogs)) ||
+        ((i==FuncSetTimer3) && firmware->getCapability(Timers) < 3) ||
+        ((i>=FuncRangeCheckInternalModule && i<=FuncBindExternalModule) && (!model || !firmware->getCapability(DangerousFunctions))) ||
         ((i>=FuncAdjustGV1 && i<=FuncAdjustGVLast) && !firmware->getCapability(Gvars))
         ) {
       // skipped

companion/src/modeledit/logicalswitches.cpp

@@ -240,7 +240,7 @@ void LogicalSwitchesPanel::edited()
         updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.1);
         break;
       case LS_FAMILY_EDGE:
-        cswitchOffset2[i]->setSpecialValueText(tr("(no release)"));
+        cswitchOffset2[i]->setSpecialValueText(tr("(instant)"));
         if (sender() == cswitchOffset[i]) {
           model->logicalSw[i].val2 = TimToVal(cswitchOffset[i]->value());
           updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0);
@@ -339,7 +339,7 @@ void LogicalSwitchesPanel::setSwitchWidgetVisibility(int i)
       populateSwitchCB(cswitchSource1[i], RawSwitch(model->logicalSw[i].val1), generalSettings, LogicalSwitchesContext);
       updateTimerParam(cswitchOffset[i], model->logicalSw[i].val2, 0.0);
       updateTimerParam(cswitchOffset2[i], model->logicalSw[i].val2+model->logicalSw[i].val3, ValToTim(TimToVal(cswitchOffset[i]->value())-1));
-      cswitchOffset2[i]->setSpecialValueText(tr("(no release)"));
+      cswitchOffset2[i]->setSpecialValueText(tr("(instant)"));
       if (model->logicalSw[i].val3 == 0) {
         cswitchOffset2[i]->setSuffix(tr("(infinite)"));
       }

companion/src/modeledit/setup.cpp

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

companion/src/modeledit/setup.h

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

companion/src/modeledit/setup.ui

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

companion/src/modeledit/setup_module.ui

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

companion/src/modeledit/telemetry.cpp

@@ -645,7 +645,7 @@ void TelemetrySensorPanel::on_name_editingFinished()
 {
   if (!lock) {
     strcpy(sensor.label, ui->name->text().toAscii());
-    emit nameModified();
+    emit dataModified();
     emit modified();
   }
 }
@@ -667,7 +667,15 @@ void TelemetrySensorPanel::on_formula_currentIndexChanged(int index)
       sensor.prec = 2;
       sensor.unit = SensorData::UNIT_VOLTS;
     }
-    update();
+    else if (sensor.formula == SensorData::TELEM_FORMULA_CONSUMPTION) {
+      sensor.prec = 0;
+      sensor.unit = SensorData::UNIT_MAH;
+    }
+    else if (sensor.formula == SensorData::TELEM_FORMULA_DIST) {
+      sensor.prec = 0;
+      sensor.unit = SensorData::UNIT_METERS;
+    }
+    emit dataModified();
     emit modified();
   }
 }
@@ -685,7 +693,7 @@ void TelemetrySensorPanel::on_prec_valueChanged()
 {
   if (!lock) {
     sensor.prec = ui->prec->value();
-    update();
+    emit dataModified();
     emit modified();
   }
 }
@@ -709,7 +717,8 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
       TelemetrySensorPanel * panel = new TelemetrySensorPanel(this, model.sensorData[i], model, generalSettings, firmware);
       ui->sensorsLayout->addWidget(panel);
       sensorPanels[i] = panel;
-      connect(panel, SIGNAL(nameModified()), this, SLOT(update()));
+      connect(panel, SIGNAL(dataModified()), this, SLOT(update()));
+      connect(panel, SIGNAL(modified()), this, SLOT(onModified()));
     }
   }
   else {
@@ -719,14 +728,14 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model, GeneralSettin
     connect(analogs[0], SIGNAL(modified()), this, SLOT(onAnalogModified()));
     analogs[1] = new TelemetryAnalog(this, model.frsky.channels[1], model, generalSettings, firmware);
     ui->A2Layout->addWidget(analogs[1]);
-    connect(analogs[1], SIGNAL(modified()), this, SLOT(onAnalogModified()));
+    connect(analogs[1], SIGNAL(modified()), this, SLOT(onModified()));
   }
 
   if (IS_TARANIS(firmware->getBoard())) {
-    ui->voltsSource->setField(model.frsky.voltsSource);
-    ui->altitudeSource->setField(model.frsky.altitudeSource);
-    ui->varioSource->setField(model.frsky.varioSource);
-    ui->varioCenterSilent->setField(model.frsky.varioCenterSilent);
+    ui->voltsSource->setField(model.frsky.voltsSource, this);
+    ui->altitudeSource->setField(model.frsky.altitudeSource, this);
+    ui->varioSource->setField(model.frsky.varioSource, this);
+    ui->varioCenterSilent->setField(model.frsky.varioCenterSilent, this);
   }
   else {
     ui->topbarGB->hide();
@@ -937,7 +946,7 @@ void TelemetryPanel::on_telemetryProtocol_currentIndexChanged(int index)
   }
 }
 
-void TelemetryPanel::onAnalogModified()
+void TelemetryPanel::onModified()
 {
   emit modified();
 }

companion/src/modeledit/telemetry.h

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

companion/src/modelprinter.cpp

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

companion/src/modelprinter.h

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

companion/src/mountlist.cpp

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

companion/src/mountlist.h

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

companion/src/multimodelprinter.cpp

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

companion/src/multimodelprinter.h

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

companion/src/printdialog.cpp

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

companion/src/radiointerface.cpp

@@ -411,7 +411,8 @@ QString findMassstoragePath(const QString &filename)
   }
 #else
   struct mount_entry *entry;
-  entry = read_file_system_list(true);
+  struct mount_entry *firstEntry;
+  firstEntry = entry = read_file_system_list(true);
   while (entry != NULL) {
     if (!drives.contains(entry->me_devname)) {
       drives.append(entry->me_devname);
@@ -426,11 +427,13 @@ QString findMassstoragePath(const QString &filename)
 #else
       if (QFile::exists(eepromfile)) {
 #endif
+        free_file_system_list(firstEntry);
         return eepromfile;
       }
     }
     entry = entry->me_next;
   }
+  free_file_system_list(firstEntry);
 #endif
 
   return QString();

companion/src/simulation/simulatorinterface.cpp

@@ -6,6 +6,9 @@
 #include <QMap>
 #include <QMessageBox>
 #include "version.h"
+#if defined WIN32 || !defined __GNUC__
+  #include <windows.h>
+#endif
 
 QMap<QString, SimulatorFactory *> registered_simulators;
 
@@ -47,10 +50,15 @@ void registerSimulators()
     simulatorsFound = true;
   }
 
-#if defined(__APPLE__) || !( (!defined __GNUC__) || (defined __CYGWIN__) )
   if (!simulatorsFound) {
 #if defined(__APPLE__)
     dir = QLibraryInfo::location(QLibraryInfo::PrefixPath) + "/Resources";
+#elif (!defined __GNUC__) 
+    char name[MAX_PATH];
+    GetModuleFileName(NULL, name, MAX_PATH);
+	QString path(name);
+	path.truncate(path.lastIndexOf('\\'));
+	dir.setPath(path);
 #else
     dir = SIMULATOR_LIB_SEARCH_PATH;
 #endif
@@ -59,7 +67,6 @@ void registerSimulators()
       simulatorsFound = true;
     }
   }
-#endif
 }
 
 SimulatorFactory *getSimulatorFactory(const QString &name)
@@ -81,3 +88,9 @@ SimulatorFactory *getSimulatorFactory(const QString &name)
   return NULL;
 }
 
+void unregisterSimulators()
+{
+  foreach(SimulatorFactory *factory, registered_simulators) {
+    delete factory;
+  }
+}

companion/src/simulation/simulatorinterface.h

@@ -118,6 +118,7 @@ class SimulatorFactory {
 };
 
 void registerSimulators();
+void unregisterSimulators();
 SimulatorFactory *getSimulatorFactory(const QString &name);
 extern QMap<QString, SimulatorFactory *> registered_simulators;
 

companion/src/simulator.cpp

@@ -176,6 +176,9 @@ int main(int argc, char *argv[])
 
   delete dialog;
 
+  unregisterSimulators();
+  unregisterOpenTxFirmwares();
+
 #if defined(JOYSTICKS) || defined(SIMU_AUDIO)
   SDL_Quit();
 #endif

companion/src/xmlinterface.cpp

@@ -1,6 +1,6 @@
 /*
  * Author - Bertrand Songis <bsongis@gmail.com>
- * 
+ *
  * Based on th9x -> http://code.google.com/p/th9x/
  *
  * This program is free software; you can redistribute it and/or modify
@@ -121,7 +121,7 @@ void saveModel(ModelData & m, model & xm)
      if (t.mode) {
       timer xt(TimerSwitch::value(t.mode+TMR_NUM_OPTION), direction::value(t.dir), timer::value_type(t.val/3600, (t.val%3600)/60, t.val%60));
       timer_sequence.push_back(xt);
-    } 
+    }
   }
   */
   if (m.moduleData[0].protocol != PULSES_PPM || m.moduleData[0].channelsCount != 8 || m.moduleData[0].ppmDelay != 300 || m.moduleData[0].ppmPulsePol != 0) {
@@ -185,7 +185,7 @@ bool XmlInterface::save(RadioData &radioData)
     radio r;
 
     // the general settings
-    global_settings gs;  
+    global_settings gs;
     saveGeneralSettings(settings, gs);
     r.global_settings(gs);
 

doc/Mega2560/MEGA2560.sch

@@ -36,7 +36,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title "OpenTX board based on Arduino MEGA2560"
-Date "18 jun 2015"
+Date "21 oct 2015"
 Rev "0"
 Comp "Copyright 2015 F. Aguerre"
 Comment1 ""
@@ -1057,13 +1057,13 @@ Text Label 5650 5850 2    42   ~ 0
 SW_Trn
 Text GLabel 4850 5850 2    42   Input ~ 0
 port L 7 (1)
-Text GLabel 4850 6250 2    42   Output ~ 0
+Text GLabel 4850 6250 2    42   Input ~ 0
 port B 3 (1)
 Text Label 5650 6250 2    42   ~ 0
 SD_MISO
 Text Label 6600 6250 2    42   ~ 0
 SD_MOSI
-Text GLabel 5800 6250 2    42   Input ~ 0
+Text GLabel 5800 6250 2    42   Output ~ 0
 port B 2 (1)
 Text GLabel 5800 6350 2    42   Input ~ 0
 port B 0 (1)
@@ -1278,7 +1278,7 @@ PPM_OUT
 Text GLabel 2100 4600 1    42   Output ~ 0
 port B 6 (0)
 Text GLabel 2000 4600 1    42   Input ~ 0
-port B 7 (0)
+port E 7 (0)
 Text Label 5650 4850 2    42   ~ 0
 LCD_DATA0
 Text GLabel 4850 4850 2    42   Output ~ 0
@@ -41110,7 +41110,7 @@ CA 3B B1 B4 D6 FB 76 3A 4D 11 32 4D 1E A1 3D 78 1C 8B 1E 14 74 10 57 46 8C 97 FB
 33 B3 93 2C A5 90 EC 7D 2B A5 BC 7A F5 EA E1 E1 5E 44 C8 BD 2E 90 84 08 60 87 C2 BB D7 FD 40 85 
 4A 52 6F 3D D0 6D 9E 6E 41 36 CA 77 04 97 99 83 92 6E D1 7C 20 6D 2C 33 D2 7F 5B 16 F2 83 51 39 
 A0 3F CF F3 A7 9F 7E FA CB 5F FE F5 EB D7 AF 45 64 59 96 6D DB F6 23 3E B3 52 CA B3 1B C5 00 F7 
-08 C0 CC FE 1F 15 4F 30 6D 3D C2 80 DE 00 00 00 00 49 45 4E 44 AE 42 60 82 00 $EndBitmap
+08 C0 CC FE 1F 15 4F 30 6D 3D C2 80 DE 00 00 00 00 49 45 4E 44 AE 42 60 82 04 $EndBitmap
 EndData
 $EndBitmap
 $Comp
@@ -41427,7 +41427,7 @@ Wire Wire Line
 Wire Wire Line
 	2100 4750 2100 4600
 Wire Wire Line
-	2000 4750 2000 4600
+	2000 4600 2000 5550
 Wire Wire Line
 	4700 4850 4850 4850
 Wire Wire Line
@@ -41863,4 +41863,8 @@ Wire Wire Line
 	5300 7500 5300 7600
 Wire Wire Line
 	4800 7500 5300 7500
+Wire Wire Line
+	2000 5550 2500 5550
+Text Notes 2550 5550 0    50   ~ 0
+Pin 9, can be soldered\nwith pin 8 (unused)
 $EndSCHEMATC

radio/releasenotes.txt

@@ -1,9 +1,77 @@
+<h2>Version 2.1.5 / 2015-11-05</h2>
+
+Notice: version 2.1.4 was skipped by the OpenTX team to avoid confusion with FrSky's release of OpenTX 2.1.4
+
+[Taranis]
+<ul>
+<li>Switches SF and SH limited to 2-position type in Hardware setup (<a href=https://github.com/opentx/opentx/issues/2936>#2936</a>)</li>
+<li>Fixed possible LCD freeze when line with bad coordinates was drawn by Lua script (<a href=https://github.com/opentx/opentx/issues/2925>#2925</a>)</li>
+<li>Added missing "midtrim" and "endtrim" to FR sound pack (<a href=https://github.com/opentx/opentx/issues/2912>#2912</a>)</li>
+<li>Improved display of Lua script errors (<a href=https://github.com/opentx/opentx/issues/1914>#1914</a>)</li>
+<li>Three position switch type removed from SH and SF switches (hw only supports 2POS type) (<a href=https://github.com/opentx/opentx/issues/2936>#2936</a>)</li>
+<li>Trainer mode fixes for X9E (<a href=https://github.com/opentx/opentx/issues/2913>#2913</a>)</li>
+<li>Fixed a bug that caused no servo movement when certain firmware option combinations were used (<a href=https://github.com/opentx/opentx/issues/2945>#2945</a>)</li>
+<li>Fixed missing arrows on RS, LS2, RS2 pot warnings on X9E (<a href=https://github.com/opentx/opentx/issues/2961>#2961</a>)</li>
+<li>Fixed erroneous haptic feedback when using high powered UHF RF modules (<a href=https://github.com/opentx/opentx/issues/2722>#2722</a>)</li>
+<li>The trainer icon will be shown only if valid PPM is received</li>
+<li>Several Lua io library fixes (<a href=https://github.com/opentx/opentx/issues/3001>#3001</a>, <a href=https://github.com/opentx/opentx/issues/3003>#3003</a>)</li>
+<li>Corrected failsafe mapping when using Custom failsafe mode, D16 protocol and channel range different from from 1-8. 
+  Users with such setups are advised to re-check their failsafe settings (<a href=https://github.com/opentx/opentx/issues/2975>#2975</a>)</li>
+</ul>
+
+[ARM boards]
+<ul>
+<li>Fixed several problems with automatic playing of Physical and Logical Switches changes (eg LS15-on.wav, SG-mid.wav) (<a href=https://github.com/opentx/opentx/issues/2855>#2855</a>)</li>
+<li>Source selector did not work in Telemetry screen for Bars (<a href=https://github.com/opentx/opentx/issues/2843>#2843</a>)</li>
+<li>Shortened screen-shot file name (<a href=https://github.com/opentx/opentx/issues/2934>#2934</a>)</li>
+<li>PPM center was not working with DSM2 hack module (<a href=https://github.com/opentx/opentx/issues/2880>#2880</a>)</li>
+<li>Enabled PPM2 output on 9XR-PRO (<a href=https://github.com/opentx/opentx/issues/2870>#2870</a>)</li>
+</ul>
+
+[Sky9x / 9XR-PRO / AR9X]
+<ul>
+<li>Fixed navigation problem in Telemetry setup  (<a href=https://github.com/opentx/opentx/issues/2951>#2951</a>)</li>
+<li>Fixed: Model Restore broken (<a href=https://github.com/opentx/opentx/issues/2797>#2797</a>)</li>
+<li>Fixed battery indicator graphics (<a href=https://github.com/opentx/opentx/issues/2989>#2989</a>)</li>
+</ul>
+
+[AVR boards]
+<ul>
+<li>Mavlink build option was not working (<a href=https://github.com/opentx/opentx/issues/2950>#2950</a>)</li>
+</ul>
+
+[Mega2560]
+<ul>
+<li>Fixed : mixer update rate was too slow (<a href=https://github.com/opentx/opentx/issues/2750>#2750</a>)</li>
+</ul>
+
+
+
+<h2>Version 2.1.3 / 2015-09-09</h2>
+
+[ARM boards]
+<ul>
+<li>Fix shift in automatic switch sounds (<a href=https://github.com/opentx/opentx/issues/2855>#2855</a>)</li>
+</ul>
+
+[Taranis]
+<ul>
+<li>Fix broken popup menu on some special functions (<a href=https://github.com/opentx/opentx/issues/2851>#2851</a>)</li>
+</ul>
+
+[AVR boards]
+<ul>
+<li>Fix timers not working (<a href=https://github.com/opentx/opentx/issues/2848>#2848</a>)</li>
+</ul>
+
+
 <h2>Version 2.1.2 / 2015-09-07</h2><br>
 
 <b>PLEASE NOTE the following important information:</b>
 <ul>
 <li>FrSky Taranis X9E users are highly advised to upgrade firmware (including bootloader!) to this version or its equivalent when provided by FrSky due to the risk of shutdown upon software error that was present in previous versions.</li>
 <li>Telemetry sensors are no longer continuously detected, it is now necessary to go to the telemetry setup page and select the "Discover new sensors" menu item. This prevents creation of non-existing sensors in case if transmission errors, and allows deleting sensors that are received but considered uninteresting.</li>
+<li>A bug was found in the "Throttle source" setting, fixing it might have changed your selection. If your throttle-based timers don't work check this first and set it back to the correct setting if needed.</li>
 </ul>
 
 [ARM Boards]
@@ -637,4 +705,4 @@ Nothing new (only Companion fixes)
 <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/Makefile

@@ -375,6 +375,10 @@ SIMU_AUDIO = NO
 # Values = NO, YES
 WATCHDOG_TEST = NO
 
+# Treat compiler warnings as errors
+# Values = NO, YES
+WARNINGS_AS_ERRORS = NO
+
 #------- END BUILD OPTIONS ---------------------------
 
 # Define programs and commands.
@@ -391,7 +395,7 @@ IMG2LBM = -$(PYTHON) ../util/img2lbm.py
 BIN2LBM = -$(PYTHON) ../util/bin2lbm.py
 FONT2PNG = -$(PYTHON) ../util/font2png.py
 TRANSLATE = -$(PYTHON) ../util/translate.py
-VERSION = 2.1.2$(OPENTX_VERSION_SUFFIX)
+VERSION = 2.1.5$(OPENTX_VERSION_SUFFIX)
 
 THIRDPARTY = thirdparty
 COOSDIR = $(THIRDPARTY)/CoOS
@@ -1273,7 +1277,7 @@ endif
 
 ifeq ($(EXT), MAVLINK)
   CPPDEFS += -DMAVLINK
-  INCDIRS += thirdparty
+  INCDIRS += thirdparty targets/common_avr/
   CPPSRC += telemetry/mavlink.cpp gui/$(GUIDIRECTORY)/view_mavlink.cpp targets/common_avr/serial_driver.cpp
   EEPROM_VARIANT += ${MAVLINK_VARIANT}
 endif
@@ -1284,13 +1288,18 @@ endif
 
 ifeq ($(EXT), $(filter $(EXT), FRSKY FRSKY_SPORT TELEMETREZ))
   CPPDEFS += -DFRSKY
-  ifeq ($(EXT), FRSKY_SPORT)
-    CPPSRC += telemetry/frsky.cpp telemetry/frsky_sport.cpp telemetry/frsky_d.cpp
-    CPPDEFS += -DFRSKY_SPORT
+
+  ifeq ($(ARCH), ARM)
+    CPPSRC += telemetry/frsky.cpp telemetry/frsky_d_arm.cpp
   else
     CPPSRC += telemetry/frsky.cpp telemetry/frsky_d.cpp
   endif
 
+  ifeq ($(EXT), FRSKY_SPORT)
+    CPPSRC += telemetry/frsky_sport.cpp
+    CPPDEFS += -DFRSKY_SPORT
+  endif
+
   CPPSRC += gui/$(GUIDIRECTORY)/view_telemetry.cpp
 
   ifeq ($(FRSKY_HUB), YES)
@@ -1422,6 +1431,10 @@ CPPFLAGS += -Wno-strict-aliasing
 CPPFLAGS += -Wformat -Wreturn-type -Wunused -Wuninitialized -Wunknown-pragmas -Wno-switch -Wtype-limits
 INCFLAGS = $(patsubst %,-I%,$(INCDIRS))
 
+ifeq ($(WARNINGS_AS_ERRORS), YES)
+  CPPFLAGS += -Werror
+endif
+
 MATH_LIB = -lm
 
 #---------------- Linker Options ----------------
@@ -1488,7 +1501,7 @@ bootloader.lbm: targets/taranis/bootloader/bootloader_ramBoot.bin
 	$(BIN2LBM) $^ $@
 .PHONY targets/taranis/bootloader/bootloader_ramBoot.bin:
 	@echo "Building bootloader..."
-	$(MAKE) -C targets/taranis/bootloader PCB=$(PCB) PCBREV=$(PCBREV) NANO=$(NANO)
+	$(MAKE) -C targets/taranis/bootloader PCB=$(PCB) PCBREV=$(PCBREV) NANO=$(NANO) WARNINGS_AS_ERRORS=$(WARNINGS_AS_ERRORS)
 else ifeq ($(PCB), $(filter $(PCB), 9XRPRO AR9X))
 bootloader.lbm:
 	@echo "Fetching Mike's bootloader..."
@@ -1828,15 +1841,16 @@ endif
 
 #### GOOGLE TESTS
 
-GTEST_DIR = ../gtest-1.6.0
+GTEST_INCDIR = /usr/include/gtest
+GTEST_SRCDIR = /usr/src/gtest/
 
 # Where to find user code.
 USER_DIR = ./
 
 # All Google Test headers.  Usually you shouldn't change this
 # definition.
-GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
-                $(GTEST_DIR)/include/gtest/internal/*.h
+GTEST_HEADERS = $(GTEST_INCDIR)/*.h \
+                $(GTEST_INCDIR)/internal/*.h
 
 # House-keeping build targets.
 
@@ -1844,15 +1858,14 @@ GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \
 
 # Usually you shouldn't tweak such internal variables, indicated by a
 # trailing _.
-GTEST_SRCS_ = $(GTEST_DIR)/src/*.cc $(GTEST_DIR)/src/*.h $(GTEST_HEADERS)
+GTEST_SRCS = $(GTEST_SRCDIR)/src/*.cc $(GTEST_HEADERS)
 
 # For simplicity and to avoid depending on Google Test's
 # implementation details, the dependencies specified below are
 # conservative and not optimized.  This is fine as Google Test
 # compiles fast and for ordinary users its source rarely changes.
-gtest-all.o : $(GTEST_SRCS_)
-	$(CXX) $(CPPFLAGS) -I$(GTEST_DIR) -I$(GTEST_DIR)/include -c \
-            $(GTEST_DIR)/src/gtest-all.cc
+gtest-all.o : $(GTEST_SRCS)
+	$(CXX) $(CPPFLAGS) -I$(GTEST_SRCDIR) -I$(GTEST_INCDIR) -c $(GTEST_SRCDIR)/src/gtest-all.cc
 
 # Builds a sample test.  A test should link with either gtest.a or
 # gtest_main.a, depending on whether it defines its own main()
@@ -1862,5 +1875,5 @@ gtest-all.o : $(GTEST_SRCS_)
 GTEST_TESTS_SRCS = $(shell find tests/ -type f -name '*.cpp')
 
 gtests: allsimusrc.cpp $(GTEST_TESTS_SRCS) targets/simu/simpgmspace.cpp *.h tests/gtests.h gtest-all.o
-	g++ -std=gnu++0x $(CPPFLAGS) $(SIMUCPPFLAGS) allsimusrc.cpp $(LUASRC) $(GTEST_TESTS_SRCS) targets/simu/simpgmspace.cpp -I$(GTEST_DIR) ${INCFLAGS} -I$(GTEST_DIR)/include -I/usr/include/qt4 -o gtests -lpthread -MD -DSIMU -lQtCore -lQtGui gtest-all.o -fexceptions
+	g++ -std=gnu++0x $(CPPFLAGS) $(SIMUCPPFLAGS) allsimusrc.cpp $(LUASRC) $(GTEST_TESTS_SRCS) targets/simu/simpgmspace.cpp ${INCFLAGS} -I$(GTEST_INCDIR) -I/usr/include/qt4 -o gtests -lpthread -MD -DSIMU -lQtCore -lQtGui gtest-all.o -fexceptions
 

radio/src/audio_arm.cpp

@@ -213,10 +213,10 @@ uint32_t sdAvailablePhaseAudioFiles = 0;
 uint64_t sdAvailableSwitchAudioFiles = 0;
 uint64_t sdAvailableLogicalSwitchAudioFiles = 0;
 
-#define MASK_SYSTEM_AUDIO_FILE(index)                 ((uint64_t)1 << index)
-#define MASK_PHASE_AUDIO_FILE(index, event)           ((uint32_t)1 << (2*index+event))
-#define MASK_SWITCH_AUDIO_FILE(index)                 ((uint64_t)1 << index)
-#define MASK_LOGICAL_SWITCH_AUDIO_FILE(index, event)  ((uint64_t)1 << (2*index+event))
+#define MASK_SYSTEM_AUDIO_FILE(index)                 ((uint64_t)1 << (index))
+#define MASK_PHASE_AUDIO_FILE(index, event)           ((uint32_t)1 << (2*(index)+(event)))
+#define MASK_SWITCH_AUDIO_FILE(index)                 ((uint64_t)1 << (index))
+#define MASK_LOGICAL_SWITCH_AUDIO_FILE(index, event)  ((uint64_t)1 << (2*(index)+(event)))
 
 char * getAudioPath(char * path)
 {
@@ -302,7 +302,7 @@ void getPhaseAudioFile(char * filename, int index, unsigned int event)
   strcat(tmp, SOUNDS_EXT);
 }
 
-void getSwitchAudioFile(char * filename, int index)
+void getSwitchAudioFile(char * filename, swsrc_t index)
 {
   char * str = getModelAudioPath(filename);
 
@@ -333,10 +333,24 @@ void getSwitchAudioFile(char * filename, int index)
 void getLogicalSwitchAudioFile(char * filename, int index, unsigned int event)
 {
   char * str = getModelAudioPath(filename);
+
+#if defined(PCBTARANIS)
+  *str++ = 'L';
+  if (index >= 9) {
+    div_t qr = div(index+1, 10);
+    *str++ = '0' + qr.quot;
+    *str++ = '0' + qr.rem;
+  }
+  else {
+    *str++ = '1' + index;
+  }
+#else
   int len = STR_VSWITCHES[0];
   strncpy(str, &STR_VSWITCHES[1+len*(index+SWSRC_FIRST_LOGICAL_SWITCH)], len);
-  str[len] = '\0';
-  strcat(str, suffixes[event]);
+  str += len;
+#endif
+
+  strcpy(str, suffixes[event]);
   strcat(str, SOUNDS_EXT);
 }
 
@@ -389,7 +403,7 @@ void referenceModelAudioFiles()
         getSwitchAudioFile(path, i);
         // TRACE("referenceModelAudioFiles(): searching for %s in %s", filename, fn);
         if (!strcasecmp(filename, fn)) {
-          sdAvailableSwitchAudioFiles |= MASK_SWITCH_AUDIO_FILE(i);
+          sdAvailableSwitchAudioFiles |= MASK_SWITCH_AUDIO_FILE(i-SWSRC_FIRST_SWITCH);
           found = true;
           TRACE("\tfound: %s", filename);
         }
@@ -435,7 +449,7 @@ bool isAudioFileReferenced(uint32_t i, char * filename)
   }
   else if (category == SWITCH_AUDIO_CATEGORY) {
     if (sdAvailableSwitchAudioFiles & MASK_SWITCH_AUDIO_FILE(index)) {
-      getSwitchAudioFile(filename, index);
+      getSwitchAudioFile(filename, SWSRC_FIRST_SWITCH+index);
       return true;
     }
   }