Release note updated (scripts use this version tag in the Makefile)

Release notes updated

DONATIONS.txt

@@ -673,3 +673,8 @@ John Hennig
 RK Custom Homes
 James Houck
 Piet Teekens
+Tommy Widenflycht
+Johan Petrus Theophilus Maria van Melis
+Ralph Gustafson
+Paul Luby
+Andrew Duncan

companion/releasenotes.txt

@@ -1,4 +1,10 @@
-<h2>Version 2.0.14 / todo</h2>
+<h2>Version 2.0.15 / 2015-01-13</h2>
+<ul>
+<li>Firmware was not written correctly on radio when compatibility warning check enabled</li>
+<li>Time format for Special Functions Set Timers</li>
+</ul>
+
+<h2>Version 2.0.14 / 2015-01-12</h2>
 <ul>
 <li>OpenTX Companion and Companion9x can now be installed side by side on Linux</li>
 <li>Improved TAB order in dialogs</li>
@@ -12,7 +18,7 @@
 <li>Added Debug Output window</li>
 <li>Various texts and translations corrections</li>
 <li>Various small bug-fixes</li>
-<li>More reliable method of writing EEPROM.BIN and FRIMWARE.BIN to radio</li>
+<li>More reliable method of writing EEPROM.BIN and FIRMWARE.BIN to radio</li>
 <li>Fixed issue with Edge function INSTANT for V1>2s</li>
 <li>Fixed buffer overflow in Joystick code</li>
 </ul>
@@ -87,13 +93,13 @@
 <ul>
 <li>Sound should be ok on all platforms</li>
 <li>Min/Max reviewed in Logical switches (for the whole telemetry)</li>
-<li>Various bug fixes</li> 
+<li>Various bug fixes</li>
 </ul>
 
 <h2>Version 2.0.3</h2>
 <ul>
 <li>EEPROM import bug on AdjustGVAR function</li>
-<li>Timers correctly displayed in logical switches tab</li> 
+<li>Timers correctly displayed in logical switches tab</li>
 </ul>
 
 <h2>Version 2.0.2</h2>
@@ -267,4 +273,4 @@
 <li>Try to reduce modeledit window form MAC</li>
 <li>Wrong init of RF-Module data</li>
 <li>Read flash from TX didn't worked for Taranis</li>
-</ul>
+</ul>

companion/src/CMakeLists.txt

@@ -2,7 +2,7 @@ PROJECT( companion )
 
 SET( C9X_VERSION_MAJOR "2" )
 SET( C9X_VERSION_MINOR "0" )
-SET( C9X_VERSION_REVISION "14" )
+SET( C9X_VERSION_REVISION "15" )
 SET( C9X_VERSION ${C9X_VERSION_MAJOR}.${C9X_VERSION_MINOR}.${C9X_VERSION_REVISION} )
 
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
@@ -354,6 +354,7 @@ endif()
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
     INSTALL( TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
+    INSTALL( TARGETS simulator DESTINATION ${CMAKE_INSTALL_PREFIX}/bin )
     INSTALL( FILES companion.desktop DESTINATION share/applications )
     INSTALL( FILES images/linuxicons/16x16/companion.png    DESTINATION /usr/share/icons/hicolor/16x16/apps )
     INSTALL( FILES images/linuxicons/22x22/companion.png    DESTINATION /usr/share/icons/hicolor/22x22/apps )

companion/src/burndialog.cpp

@@ -426,6 +426,7 @@ void burnDialog::on_BurnFlashButton_clicked()
             tempFile = generateProcessUniqueTempFileName("flash.hex");
           else
             tempFile = generateProcessUniqueTempFileName("flash.bin");
+          qDebug() << "burnDialog::on_BurnFlashButton_clicked(): patching" << fileName << "with custom splash screen and saving to" << tempFile;
           FlashInterface flash(fileName);
           flash.setSplash(image);
           if (flash.saveFlash(tempFile) > 0) {

companion/src/helpers.cpp

@@ -1038,6 +1038,11 @@ QString generateProcessUniqueTempFileName(const QString & fileName)
   return QDir::tempPath() + QString("/%1-").arg(QCoreApplication::applicationPid()) + sanitizedFileName;
 }
 
+bool isTempFileName(const QString & fileName)
+{
+  return fileName.startsWith(QDir::tempPath());
+}
+
 QString getSoundsPath(const GeneralSettings &generalSettings)
 {
   QString path = g.profile[g.id()].sdPath() + "/SOUNDS/";

companion/src/helpers.h

@@ -154,6 +154,7 @@ class QTimeS : public QTime
 int qunlink(const QString & fileName);
 
 QString generateProcessUniqueTempFileName(const QString & fileName);
+bool isTempFileName(const QString & fileName);
 
 QString getSoundsPath(const GeneralSettings &generalSettings);
 QSet<QString> getFilesSet(const QString &path, const QStringList &filter, int maxLen);

companion/src/mainwindow.cpp

@@ -982,6 +982,7 @@ bool MainWindow::readFirmwareFromRadio(const QString filename)
   if (IS_ARM(GetCurrentFirmware()->getBoard())) {
     QString path = FindMassstoragePath("FIRMWARE.BIN");
     if (!path.isEmpty()) {
+      qDebug() << "MainWindow::readFirmwareFromRadio(): reading" << path << "into" << filename;
       QStringList str;
       str << path << filename;
       avrOutputDialog *ad = new avrOutputDialog(this, "", str, message);
@@ -994,6 +995,7 @@ bool MainWindow::readFirmwareFromRadio(const QString filename)
 
   if (result == false) {
     QStringList str = GetReceiveFlashCommand(filename);
+    qDebug() << "MainWindow::readFirmwareFromRadio(): reading" << filename << "with avrdude:" << str;
     avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, message);
     ad->setWindowIcon(CompanionIcon("read_flash.png"));
     ad->exec();
@@ -1016,6 +1018,7 @@ bool MainWindow::writeFirmwareToRadio(const QString filename)
   if (IS_ARM(GetCurrentFirmware()->getBoard())) {
     QString path = FindMassstoragePath("FIRMWARE.BIN");
     if (!path.isEmpty()) {
+      qDebug() << "MainWindow::writeFirmwareToRadio(): writing" << path << "from" << filename;
       QStringList str;
       str << filename << path;
       avrOutputDialog *ad = new avrOutputDialog(this, "", str, message);
@@ -1028,6 +1031,7 @@ bool MainWindow::writeFirmwareToRadio(const QString filename)
 
   if (result == false) {
     QStringList str = GetSendFlashCommand(filename);
+    qDebug() << "MainWindow::writeFirmwareToRadio(): writing" << filename << "with avrdude:" << str;
     avrOutputDialog *ad = new avrOutputDialog(this, GetAvrdudeLocation(), str, message, AVR_DIALOG_CLOSE_IF_SUCCESSFUL);
     CompanionIcon iconw("write_flash.png");
     ad->setWindowIcon(iconw);
@@ -1294,92 +1298,109 @@ bool MainWindow::convertEEPROM(QString backupFile, QString restoreFile, QString
 
 void MainWindow::writeFlash(QString fileToFlash)
 {
-    QString fileName;
-    bool backup = g.backupOnFlash();
-    if(!fileToFlash.isEmpty())
-      fileName = fileToFlash;
-    burnDialog *cd = new burnDialog(this, 2, &fileName, &backup);
-    cd->exec();
-    if (IS_TARANIS(GetEepromInterface()->getBoard()))
-      backup=false;
-    if (!fileName.isEmpty()) {
-      if (g.checkHardwareCompatibility()) {
-        QString tempFlash = generateProcessUniqueTempFileName("flash.bin");
-        if (!readFirmwareFromRadio(tempFlash)) {
-          QMessageBox::warning(this, tr("Firmware check failed"), tr("Could not check firmware from radio"));
-          return;
-        }
-        FlashInterface previousFlash(tempFlash);
-        FlashInterface newFlash(fileName);
-        if (!newFlash.isHardwareCompatible(previousFlash)) {
-          QMessageBox::warning(this, tr("Firmware check failed"), tr("New firmware is not compatible with the one currently installed!"));
-          return;
-        }
-      }
-      g.backupOnFlash(backup);
-      if (backup) {
-        QString backupFile = generateProcessUniqueTempFileName("backup.bin");
-        bool backupEnable=g.enableBackup();
-        QString backupPath=g.backupDir();
-        if (!backupPath.isEmpty() && !IS_TARANIS(GetEepromInterface()->getBoard())) {
-          if (!QDir(backupPath).exists()) {
-            if (backupEnable) {
-              QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist"));
-            }
-            backupEnable=false;
-          }
-        }
-        else {
-          backupEnable=false;
-        }
+  qDebug() << "MainWindow::writeFlash(): started with" << fileToFlash;
+  QString fileName;
+  bool backup = g.backupOnFlash();
+  if(!fileToFlash.isEmpty()) {
+    fileName = fileToFlash;
+  }
 
-        if (backupEnable) {
-          QDateTime datetime;
-          backupFile.clear();
-          backupFile = backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin";
-        }
+  burnDialog *cd = new burnDialog(this, 2, &fileName, &backup);
+  cd->exec();
+  qDebug() << "MainWindow::writeFlash(): flashing " << fileName;
+  
+  if (IS_TARANIS(GetEepromInterface()->getBoard())) {
+    backup=false;
+  }
 
-        if (readEepromFromRadio(backupFile, tr("Backup Models and Settings From Radio"))) {
-          sleep(2);
-          int res = writeFirmwareToRadio(fileName);
-          if (res) {
-            QString restoreFile = generateProcessUniqueTempFileName("restore.bin");
-            if (!convertEEPROM(backupFile, restoreFile, fileName)) {
-              QMessageBox::warning(this, tr("Conversion failed"), tr("Cannot convert Models and Settings for use with this firmware, original data will be used"));
-              restoreFile = backupFile;
-            }
-            sleep(2);
-            if (!writeEepromToRadio(restoreFile, tr("Restore Models and Settings To Radio"))) {
-              QMessageBox::warning(this, tr("Restore failed"), tr("Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1").arg(backupFile));
-            }
-          }
-          else {
-            QMessageBox::warning(this, tr("Firmware write failed"), tr("Could not write firmware to radio. The models and settings data file can be found at: %1").arg(backupFile));
-          }
-        }
-        else {
-          QMessageBox::warning(this, tr("Backup failed"), tr("Cannot backup existing Models and Settings from Radio. Firmware write process aborted"));
-        }
+  if (!fileName.isEmpty()) {
+    if (g.checkHardwareCompatibility()) {
+      QString tempFlash = generateProcessUniqueTempFileName("flash-check.bin");
+      if (!readFirmwareFromRadio(tempFlash)) {
+        QMessageBox::warning(this, tr("Firmware check failed"), tr("Could not check firmware from radio"));
+        return;
       }
-      else {
-        bool backupEnable=g.enableBackup();
-        QString backupPath=g.backupDir();
+      FlashInterface previousFlash(tempFlash);
+      qunlink(tempFlash);
+      FlashInterface newFlash(fileName);
+      qDebug() << "MainWindow::writeFlash(): checking firmware compatibility between " << tempFlash << "and" << fileName;
+      if (!newFlash.isHardwareCompatible(previousFlash)) {
+        QMessageBox::warning(this, tr("Firmware check failed"), tr("New firmware is not compatible with the one currently installed!"));
+        if (isTempFileName(fileName)) {
+          qDebug() << "MainWindow::writeFlash(): removing temporary file" << fileName;
+          qunlink(fileName);
+        }
+        return;
+      }
+    }
+    g.backupOnFlash(backup);
+    if (backup) {
+      QString backupFile = generateProcessUniqueTempFileName("backup.bin");
+      bool backupEnable=g.enableBackup();
+      QString backupPath=g.backupDir();
+      if (!backupPath.isEmpty() && !IS_TARANIS(GetEepromInterface()->getBoard())) {
         if (!QDir(backupPath).exists()) {
           if (backupEnable) {
             QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist"));
           }
           backupEnable=false;
         }
-        if (backupEnable && !IS_TARANIS(GetEepromInterface()->getBoard())) {
-          QDateTime datetime;
-          QString backupFile = backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin";
-          readEepromFromRadio(backupFile, tr("Backup Models and Settings From Radio"));
-          sleep(2);
-        }
+      }
+      else {
+        backupEnable=false;
+      }
 
-        writeFirmwareToRadio(fileName);
+      if (backupEnable) {
+        QDateTime datetime;
+        backupFile.clear();
+        backupFile = backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin";
+      }
+
+      if (readEepromFromRadio(backupFile, tr("Backup Models and Settings From Radio"))) {
+        sleep(2);
+        int res = writeFirmwareToRadio(fileName);
+        if (res) {
+          QString restoreFile = generateProcessUniqueTempFileName("restore.bin");
+          if (!convertEEPROM(backupFile, restoreFile, fileName)) {
+            QMessageBox::warning(this, tr("Conversion failed"), tr("Cannot convert Models and Settings for use with this firmware, original data will be used"));
+            restoreFile = backupFile;
+          }
+          sleep(2);
+          if (!writeEepromToRadio(restoreFile, tr("Restore Models and Settings To Radio"))) {
+            QMessageBox::warning(this, tr("Restore failed"), tr("Could not restore Models and Settings to Radio. The models and settings data file can be found at: %1").arg(backupFile));
+          }
+        }
+        else {
+          QMessageBox::warning(this, tr("Firmware write failed"), tr("Could not write firmware to radio. The models and settings data file can be found at: %1").arg(backupFile));
+        }
+      }
+      else {
+        QMessageBox::warning(this, tr("Backup failed"), tr("Cannot backup existing Models and Settings from Radio. Firmware write process aborted"));
       }
     }
+    else {
+      bool backupEnable=g.enableBackup();
+      QString backupPath=g.backupDir();
+      if (!QDir(backupPath).exists()) {
+        if (backupEnable) {
+          QMessageBox::warning(this, tr("Backup is impossible"), tr("The backup dir set in preferences does not exist"));
+        }
+        backupEnable=false;
+      }
+      if (backupEnable && !IS_TARANIS(GetEepromInterface()->getBoard())) {
+        QDateTime datetime;
+        QString backupFile = backupPath+"/backup-"+QDateTime().currentDateTime().toString("yyyy-MM-dd-hhmmss")+".bin";
+        readEepromFromRadio(backupFile, tr("Backup Models and Settings From Radio"));
+        sleep(2);
+      }
+
+      writeFirmwareToRadio(fileName);
+    }
+    if (isTempFileName(fileName)) {
+      qDebug() << "MainWindow::writeFlash(): removing temporary file" << fileName;
+      qunlink(fileName);
+    }
+  }
 }
 
 void MainWindow::readBackup()

companion/src/modeledit/customfunctions.cpp

@@ -1,10 +1,4 @@
 #include "customfunctions.h"
-#include <QLabel>
-#include <QLineEdit>
-#include <QSpinBox>
-#include <QComboBox>
-#include <QCheckBox>
-#include <QDoubleSpinBox>
 #include "helpers.h"
 #include "appdata.h"
 
@@ -142,6 +136,13 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
     connect(fswtchParam[i], SIGNAL(editingFinished()), this, SLOT(customFunctionEdited()));
     paramLayout->addWidget(fswtchParam[i]);
 
+    fswtchParamTime[i] = new QTimeEdit(this);
+    fswtchParamTime[i]->setProperty("index", i);
+    fswtchParamTime[i]->setAccelerated(true);
+    fswtchParamTime[i]->setDisplayFormat("hh:mm:ss");
+    connect(fswtchParamTime[i], SIGNAL(editingFinished()), this, SLOT(customFunctionEdited()));
+    paramLayout->addWidget(fswtchParamTime[i]);
+
     fswtchParamT[i] = new QComboBox(this);
     fswtchParamT[i]->setProperty("index", i);
     paramLayout->addWidget(fswtchParamT[i]);
@@ -154,7 +155,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
 
     connect(fswtchParamArmT[i], SIGNAL(currentIndexChanged(int)), this, SLOT(customFunctionEdited()));
     connect(fswtchParamArmT[i], SIGNAL(editTextChanged ( const QString)), this, SLOT(customFunctionEdited()));
-    
+
     fswtchBLcolor[i] = new QSlider(this);
     fswtchBLcolor[i]->setProperty("index", i);
     fswtchBLcolor[i]->setMinimum(0);
@@ -190,7 +191,7 @@ CustomFunctionsPanel::CustomFunctionsPanel(QWidget * parent, ModelData & model,
   addDoubleSpring(gridLayout, 5, num_fsw+1);
 
   disableMouseScrolling();
-  
+
   lock = false;
 }
 
@@ -274,12 +275,13 @@ void CustomFunctionsPanel::playMusic()
 #define CUSTOM_FUNCTION_NUMERIC_PARAM  (1<<0)
 #define CUSTOM_FUNCTION_SOURCE_PARAM   (1<<1)
 #define CUSTOM_FUNCTION_FILE_PARAM     (1<<2)
-#define CUSTOM_FUNCTION_GV_MODE        (1<<3)
-#define CUSTOM_FUNCTION_GV_TOOGLE      (1<<4)
-#define CUSTOM_FUNCTION_ENABLE         (1<<5)
-#define CUSTOM_FUNCTION_REPEAT         (1<<6)
-#define CUSTOM_FUNCTION_PLAY           (1<<7)
-#define CUSTOM_FUNCTION_BL_COLOR       (1<<8)
+#define CUSTOM_FUNCTION_TIME_PARAM     (1<<3)
+#define CUSTOM_FUNCTION_GV_MODE        (1<<4)
+#define CUSTOM_FUNCTION_GV_TOOGLE      (1<<5)
+#define CUSTOM_FUNCTION_ENABLE         (1<<6)
+#define CUSTOM_FUNCTION_REPEAT         (1<<7)
+#define CUSTOM_FUNCTION_PLAY           (1<<8)
+#define CUSTOM_FUNCTION_BL_COLOR       (1<<9)
 
 void CustomFunctionsPanel::customFunctionEdited()
 {
@@ -372,13 +374,11 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
       widgetsMask |= CUSTOM_FUNCTION_SOURCE_PARAM | CUSTOM_FUNCTION_ENABLE;
     }
     else if (index>=FuncSetTimer1 && index<=FuncSetTimer2) {
-      if (modified) model.funcSw[i].param = fswtchParam[i]->value();
-      fswtchParam[i]->setDecimals(0);
-      fswtchParam[i]->setSingleStep(1);
-      fswtchParam[i]->setMinimum(0);
-      fswtchParam[i]->setMaximum(59*60+59);
-      fswtchParam[i]->setValue(model.funcSw[i].param);
-      widgetsMask |= CUSTOM_FUNCTION_NUMERIC_PARAM + CUSTOM_FUNCTION_ENABLE;
+      if (modified) model.funcSw[i].param = QTimeS(fswtchParamTime[i]->time()).seconds();
+      fswtchParamTime[i]->setMinimumTime(QTime(0, 0, 0));
+      fswtchParamTime[i]->setMaximumTime(QTime(0, 59, 59));
+      fswtchParamTime[i]->setTime(QTimeS(model.funcSw[i].param));
+      widgetsMask |= CUSTOM_FUNCTION_TIME_PARAM + CUSTOM_FUNCTION_ENABLE;
     }
     else if (index==FuncVolume) {
       if (modified) model.funcSw[i].param = fswtchParamT[i]->itemData(fswtchParamT[i]->currentIndex()).toInt();
@@ -501,6 +501,7 @@ void CustomFunctionsPanel::refreshCustomFunction(int i, bool modified)
     }
 
     fswtchParam[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_NUMERIC_PARAM);
+    fswtchParamTime[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_TIME_PARAM);
     fswtchParamGV[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_GV_TOOGLE);
     fswtchParamT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_SOURCE_PARAM);
     fswtchParamArmT[i]->setVisible(widgetsMask & CUSTOM_FUNCTION_FILE_PARAM);

companion/src/modeledit/customfunctions.h

@@ -7,6 +7,7 @@
 #include <QComboBox>
 #include <QDoubleSpinBox>
 #include <QPushButton>
+#include <QTimeEdit>
 #ifdef PHONON
 #include <phonon/audiooutput.h>
 #include <phonon/mediaobject.h>
@@ -70,6 +71,7 @@ class CustomFunctionsPanel : public ModelPanel
     QComboBox * fswtchFunc[C9X_MAX_CUSTOM_FUNCTIONS];
     QCheckBox * fswtchParamGV[C9X_MAX_CUSTOM_FUNCTIONS];
     QDoubleSpinBox * fswtchParam[C9X_MAX_CUSTOM_FUNCTIONS];
+    QTimeEdit * fswtchParamTime[C9X_MAX_CUSTOM_FUNCTIONS];
     QPushButton * playBT[C9X_MAX_CUSTOM_FUNCTIONS];
     QComboBox * fswtchParamT[C9X_MAX_CUSTOM_FUNCTIONS];
     QComboBox * fswtchParamArmT[C9X_MAX_CUSTOM_FUNCTIONS];

radio/releasenotes.txt

@@ -1,4 +1,8 @@
-<h2>Version 2.0.14 / todo</h2>
+<h2>Version 2.0.15 / 2015-01-13</h2>
+
+Nothing new (only Companion fixes)
+
+<h2>Version 2.0.14 / 2015-01-12</h2>
 
 [Taranis]
 <ul>

radio/src/Makefile

@@ -314,7 +314,7 @@ SHELL = sh
 IMG2LBM = -python ../util/img2lbm.py
 BIN2LBM = -python ../util/bin2lbm.py
 TRANSLATE = -python ../util/translate.py
-VERSION = 2.0.14
+VERSION = 2.0.15
 
 SRC =
 CPPSRC =