updated from branch "next"

Merge branch 'next'

companion/src/apppreferencesdialog.cpp

@@ -2,6 +2,7 @@
 #include "ui_apppreferencesdialog.h"
 #include "mainwindow.h"
 #include "helpers.h"
+#include "flashinterface.h"
 #ifdef JOYSTICKS
 #include "joystick.h"
 #include "joystickdialog.h"
@@ -339,16 +340,26 @@ void appPreferencesDialog::on_removeProfileButton_clicked()
 
 bool appPreferencesDialog::displayImage( QString fileName )
 {
+  QSettings settings;
+
   QImage image(fileName);
   if (image.isNull()) 
-  {
-    QMessageBox::critical(this, tr("Error"), tr("Cannot load %1.").arg(fileName));
     return false;
-  }
 
-  int width=ui->imageLabel->width();
-  ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(width, 64)));
-  if (width==212) {
+// This code below just figures out if the width of the latest firmware is 128 or 212. It works , but...
+  QString filePath1 = settings.value("lastFlashDir", "").toString() + "/" + settings.value("firmware", "").toString() + ".bin";
+  QString filePath2 = settings.value("lastFlashDir", "").toString() + "/" + settings.value("firmware", "").toString() + ".hex";
+  QFile file(filePath1);
+  if (!file.exists())
+    filePath1 = filePath2;
+  int width = SPLASH_WIDTH;
+  FlashInterface flash(filePath1);
+  if (flash.hasSplash())
+    width = flash.getSplashWidth(); // Returns SPLASHX9D_HEIGHT if filePath1 does not exist!
+// There must be a cleaner way of finding out the width of the firmware splash!
+
+  ui->imageLabel->setPixmap(QPixmap::fromImage(image.scaled(width, SPLASH_HEIGHT)));
+  if (width==SPLASHX9D_WIDTH) {
     image=image.convertToFormat(QImage::Format_RGB32);
     QRgb col;
     int gray, height = image.height();
@@ -364,6 +375,11 @@ bool appPreferencesDialog::displayImage( QString fileName )
   else {
     ui->imageLabel->setPixmap(QPixmap::fromImage(image.convertToFormat(QImage::Format_Mono)));
   }
+  if (width == SPLASH_WIDTH)
+      ui->imageLabel->setFixedSize(SPLASH_WIDTH, SPLASH_HEIGHT);
+  else
+     ui->imageLabel->setFixedSize(SPLASHX9D_WIDTH, SPLASHX9D_HEIGHT);
+
   return true;
 }
 

companion/src/apppreferencesdialog.ui

@@ -805,47 +805,6 @@ This is used by the templated to determine which channel goes to what number out
          </property>
         </widget>
        </item>
-       <item row="7" column="6">
-        <widget class="QPushButton" name="SplashSelect">
-         <property name="text">
-          <string>Select Image</string>
-         </property>
-        </widget>
-       </item>
-       <item row="4" column="6">
-        <widget class="QLabel" name="imageLabel">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="minimumSize">
-          <size>
-           <width>128</width>
-           <height>64</height>
-          </size>
-         </property>
-         <property name="maximumSize">
-          <size>
-           <width>128</width>
-           <height>64</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 row="2" column="5">
         <spacer name="horizontalSpacer">
          <property name="orientation">
@@ -873,13 +832,6 @@ This is used by the templated to determine which channel goes to what number out
          </property>
         </widget>
        </item>
-       <item row="8" column="6">
-        <widget class="QPushButton" name="clearImageButton">
-         <property name="text">
-          <string>Clear Image</string>
-         </property>
-        </widget>
-       </item>
        <item row="2" column="6">
         <widget class="QPushButton" name="sdPathButton">
          <property name="text">
@@ -947,6 +899,54 @@ This is used by the templated to determine which channel goes to what number out
          </property>
         </widget>
        </item>
+       <item row="7" column="1">
+        <widget class="QLabel" name="imageLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>128</width>
+           <height>64</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>212</width>
+           <height>64</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 row="4" column="6">
+        <widget class="QPushButton" name="SplashSelect">
+         <property name="text">
+          <string>Select Image</string>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="6">
+        <widget class="QPushButton" name="clearImageButton">
+         <property name="text">
+          <string>Clear Image</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
     </widget>

companion/src/companion.qrc

@@ -981,5 +981,177 @@
     <file>themes/monowhite/48/contributors.png</file>
     <file>themes/monowhite/48/stop.png</file>
     <file>themes/monowhite/48/write_eeprom.png</file>
+    <file>themes/new/16/paintbrush.png</file>
+    <file>themes/new/16/open.png</file>
+    <file>themes/new/16/edit.png</file>
+    <file>themes/new/16/information.png</file>
+    <file>themes/new/16/configure.png</file>
+    <file>themes/new/16/list.png</file>
+    <file>themes/new/16/wizard.png</file>
+    <file>themes/new/16/logs.png</file>
+    <file>themes/new/16/new.png</file>
+    <file>themes/new/16/save.png</file>
+    <file>themes/new/16/recentdocument.png</file>
+    <file>themes/new/16/simulate.png</file>
+    <file>themes/new/16/changelog.png</file>
+    <file>themes/new/16/copy.png</file>
+    <file>themes/new/16/write_flash.png</file>
+    <file>themes/new/16/read_eeprom_file.png</file>
+    <file>themes/new/16/clear.png</file>
+    <file>themes/new/16/play.png</file>
+    <file>themes/new/16/fuses.png</file>
+    <file>themes/new/16/arrow-right.png</file>
+    <file>themes/new/16/exit.png</file>
+    <file>themes/new/16/moveup.png</file>
+    <file>themes/new/16/read_eeprom.png</file>
+    <file>themes/new/16/cut.png</file>
+    <file>themes/new/16/arrow-left.png</file>
+    <file>themes/new/16/write_eeprom_file.png</file>
+    <file>themes/new/16/library.png</file>
+    <file>themes/new/16/profiles.png</file>
+    <file>themes/new/16/paste.png</file>
+    <file>themes/new/16/print.png</file>
+    <file>themes/new/16/compare.png</file>
+    <file>themes/new/16/saveas.png</file>
+    <file>themes/new/16/apppreferences.png</file>
+    <file>themes/new/16/fwpreferences.png</file>
+    <file>themes/new/16/movedown.png</file>
+    <file>themes/new/16/currentmodel.png</file>
+    <file>themes/new/16/read_flash.png</file>
+    <file>themes/new/16/duplicate.png</file>
+    <file>themes/new/16/add.png</file>
+    <file>themes/new/16/update.png</file>
+    <file>themes/new/16/contributors.png</file>
+    <file>themes/new/16/stop.png</file>
+    <file>themes/new/16/write_eeprom.png</file>
+    <file>themes/new/24/paintbrush.png</file>
+    <file>themes/new/24/open.png</file>
+    <file>themes/new/24/edit.png</file>
+    <file>themes/new/24/information.png</file>
+    <file>themes/new/24/configure.png</file>
+    <file>themes/new/24/list.png</file>
+    <file>themes/new/24/wizard.png</file>
+    <file>themes/new/24/logs.png</file>
+    <file>themes/new/24/new.png</file>
+    <file>themes/new/24/save.png</file>
+    <file>themes/new/24/recentdocument.png</file>
+    <file>themes/new/24/simulate.png</file>
+    <file>themes/new/24/changelog.png</file>
+    <file>themes/new/24/copy.png</file>
+    <file>themes/new/24/write_flash.png</file>
+    <file>themes/new/24/read_eeprom_file.png</file>
+    <file>themes/new/24/clear.png</file>
+    <file>themes/new/24/play.png</file>
+    <file>themes/new/24/fuses.png</file>
+    <file>themes/new/24/arrow-right.png</file>
+    <file>themes/new/24/exit.png</file>
+    <file>themes/new/24/moveup.png</file>
+    <file>themes/new/24/read_eeprom.png</file>
+    <file>themes/new/24/cut.png</file>
+    <file>themes/new/24/arrow-left.png</file>
+    <file>themes/new/24/write_eeprom_file.png</file>
+    <file>themes/new/24/library.png</file>
+    <file>themes/new/24/profiles.png</file>
+    <file>themes/new/24/paste.png</file>
+    <file>themes/new/24/print.png</file>
+    <file>themes/new/24/compare.png</file>
+    <file>themes/new/24/saveas.png</file>
+    <file>themes/new/24/apppreferences.png</file>
+    <file>themes/new/24/fwpreferences.png</file>
+    <file>themes/new/24/movedown.png</file>
+    <file>themes/new/24/currentmodel.png</file>
+    <file>themes/new/24/read_flash.png</file>
+    <file>themes/new/24/duplicate.png</file>
+    <file>themes/new/24/add.png</file>
+    <file>themes/new/24/update.png</file>
+    <file>themes/new/24/contributors.png</file>
+    <file>themes/new/24/stop.png</file>
+    <file>themes/new/24/write_eeprom.png</file>
+    <file>themes/new/32/paintbrush.png</file>
+    <file>themes/new/32/open.png</file>
+    <file>themes/new/32/edit.png</file>
+    <file>themes/new/32/information.png</file>
+    <file>themes/new/32/configure.png</file>
+    <file>themes/new/32/list.png</file>
+    <file>themes/new/32/wizard.png</file>
+    <file>themes/new/32/logs.png</file>
+    <file>themes/new/32/new.png</file>
+    <file>themes/new/32/save.png</file>
+    <file>themes/new/32/recentdocument.png</file>
+    <file>themes/new/32/simulate.png</file>
+    <file>themes/new/32/changelog.png</file>
+    <file>themes/new/32/copy.png</file>
+    <file>themes/new/32/write_flash.png</file>
+    <file>themes/new/32/read_eeprom_file.png</file>
+    <file>themes/new/32/clear.png</file>
+    <file>themes/new/32/play.png</file>
+    <file>themes/new/32/fuses.png</file>
+    <file>themes/new/32/arrow-right.png</file>
+    <file>themes/new/32/exit.png</file>
+    <file>themes/new/32/moveup.png</file>
+    <file>themes/new/32/read_eeprom.png</file>
+    <file>themes/new/32/cut.png</file>
+    <file>themes/new/32/arrow-left.png</file>
+    <file>themes/new/32/write_eeprom_file.png</file>
+    <file>themes/new/32/library.png</file>
+    <file>themes/new/32/profiles.png</file>
+    <file>themes/new/32/paste.png</file>
+    <file>themes/new/32/print.png</file>
+    <file>themes/new/32/compare.png</file>
+    <file>themes/new/32/saveas.png</file>
+    <file>themes/new/32/apppreferences.png</file>
+    <file>themes/new/32/fwpreferences.png</file>
+    <file>themes/new/32/movedown.png</file>
+    <file>themes/new/32/currentmodel.png</file>
+    <file>themes/new/32/read_flash.png</file>
+    <file>themes/new/32/duplicate.png</file>
+    <file>themes/new/32/add.png</file>
+    <file>themes/new/32/update.png</file>
+    <file>themes/new/32/contributors.png</file>
+    <file>themes/new/32/stop.png</file>
+    <file>themes/new/32/write_eeprom.png</file>
+    <file>themes/new/48/paintbrush.png</file>
+    <file>themes/new/48/open.png</file>
+    <file>themes/new/48/edit.png</file>
+    <file>themes/new/48/information.png</file>
+    <file>themes/new/48/configure.png</file>
+    <file>themes/new/48/list.png</file>
+    <file>themes/new/48/wizard.png</file>
+    <file>themes/new/48/logs.png</file>
+    <file>themes/new/48/new.png</file>
+    <file>themes/new/48/save.png</file>
+    <file>themes/new/48/recentdocument.png</file>
+    <file>themes/new/48/simulate.png</file>
+    <file>themes/new/48/changelog.png</file>
+    <file>themes/new/48/copy.png</file>
+    <file>themes/new/48/write_flash.png</file>
+    <file>themes/new/48/read_eeprom_file.png</file>
+    <file>themes/new/48/clear.png</file>
+    <file>themes/new/48/play.png</file>
+    <file>themes/new/48/fuses.png</file>
+    <file>themes/new/48/arrow-right.png</file>
+    <file>themes/new/48/exit.png</file>
+    <file>themes/new/48/moveup.png</file>
+    <file>themes/new/48/read_eeprom.png</file>
+    <file>themes/new/48/cut.png</file>
+    <file>themes/new/48/arrow-left.png</file>
+    <file>themes/new/48/write_eeprom_file.png</file>
+    <file>themes/new/48/library.png</file>
+    <file>themes/new/48/profiles.png</file>
+    <file>themes/new/48/paste.png</file>
+    <file>themes/new/48/print.png</file>
+    <file>themes/new/48/compare.png</file>
+    <file>themes/new/48/saveas.png</file>
+    <file>themes/new/48/apppreferences.png</file>
+    <file>themes/new/48/fwpreferences.png</file>
+    <file>themes/new/48/movedown.png</file>
+    <file>themes/new/48/currentmodel.png</file>
+    <file>themes/new/48/read_flash.png</file>
+    <file>themes/new/48/duplicate.png</file>
+    <file>themes/new/48/add.png</file>
+    <file>themes/new/48/update.png</file>
+    <file>themes/new/48/contributors.png</file>
+    <file>themes/new/48/stop.png</file>
+    <file>themes/new/48/write_eeprom.png</file>
   </qresource>
 </RCC>

companion/src/customizesplashdialog.cpp

@@ -15,6 +15,7 @@ Side::Side(){
   saveButton = 0;
   saveToFileName = new QString("");
   source = new Source(UNDEFINED);
+  format = new LCDFormat(LCDTARANIS);
 }
 
 void Side::copyImage( Side side )
@@ -36,14 +37,17 @@ bool Side::displayImage( QString fileName, Source pictSource )
       return false;
     else
       image = flash.getSplash();
+      *format = flash.getSplashWidth()==WIDTH_TARANIS ? LCDTARANIS : LCD9X;
   }
   else {
    image.load(fileName);
+   if (pictSource== PICT)
+     *format = image.width()>WIDTH_9X ? LCDTARANIS : LCD9X;
   }
   if (image.isNull()) {
     return false;
   }
-  if (imageLabel->width()==424) {
+  if (*format==LCDTARANIS) {
     image=image.convertToFormat(QImage::Format_RGB32);
     QRgb col;
     int gray;
@@ -58,9 +62,14 @@ bool Side::displayImage( QString fileName, Source pictSource )
     }      
     imageLabel->setPixmap(QPixmap::fromImage(image.scaled(imageLabel->width()/2, imageLabel->height()/2)));
   }
-  else {
+  else
     imageLabel->setPixmap(QPixmap::fromImage(image.scaled(imageLabel->width()/2, imageLabel->height()/2).convertToFormat(QImage::Format_Mono)));
-  }
+  
+  if (*format == LCD9X)
+      imageLabel->setFixedSize(WIDTH_9X*2, HEIGHT_9X*2);
+  else
+      imageLabel->setFixedSize(WIDTH_TARANIS*2, HEIGHT_TARANIS*2);
+  
   switch (pictSource){
     case FW:
          fileNameEdit->setText(QObject::tr("FW: %1").arg(fileName));

companion/src/customizesplashdialog.h

@@ -10,7 +10,13 @@ namespace Ui
   class customizeSplashDialog;
 }
 
+const int WIDTH_TARANIS = 212;
+const int HEIGHT_TARANIS = 64;
+const int WIDTH_9X = 128;
+const int HEIGHT_9X = 64;
+
 enum Source {FW, PICT, PROFILE, UNDEFINED};
+enum LCDFormat {LCD9X, LCDTARANIS};
 
 class Side
 {
@@ -31,6 +37,7 @@ public:
 
 private:
   Source *source;
+  LCDFormat *format;
 };
 
 class customizeSplashDialog : public QDialog

companion/src/firmwares/opentx/opentxeeprom.cpp

@@ -1165,7 +1165,10 @@ class LogicalSwitchField: public TransformedField {
       functionsConversionTable(board, version),
       sourcesConversionTable(SourcesConversionTable::getInstance(board, version, variant, (version >= 214 || (!IS_ARM(board) && version >= 213)) ? 0 : FLAG_NOSWITCHES)),
       switchesConversionTable(SwitchesConversionTable::getInstance(board, version)),
-      andswitchesConversionTable(AndSwitchesConversionTable::getInstance(board, version))
+      andswitchesConversionTable(AndSwitchesConversionTable::getInstance(board, version)),
+      v1(0),
+      v2(0),
+      v3(0)
     {
       if (IS_ARM(board) && version >= 216) {
         internalField.Append(new SignedField<8>(v1));
@@ -1202,7 +1205,11 @@ class LogicalSwitchField: public TransformedField {
 
     virtual void beforeExport()
     {
-      if (csw.func == LS_FN_STAY) {
+      if (csw.func == LS_FN_TIMER) {
+        v1 = csw.val1;
+        v2 = csw.val2;
+      }
+      else if (csw.func == LS_FN_STAY) {
         switchesConversionTable->exportValue(csw.val1, v1);
         v2 = csw.val2;
         v3 = csw.val3;
@@ -1215,18 +1222,19 @@ class LogicalSwitchField: public TransformedField {
         sourcesConversionTable->exportValue(csw.val1, v1);
         sourcesConversionTable->exportValue(csw.val2, v2);
       }
-      else {
-        if ((csw.func >= LS_FN_VPOS && csw.func <= LS_FN_ANEG) || (csw.func >= LS_FN_EQUAL && csw.func!=LS_FN_TIMER))
-          sourcesConversionTable->exportValue(csw.val1, v1);
-        else
-          v1 = csw.val1;
+      else if (csw.func != LS_FN_OFF) {
+        sourcesConversionTable->exportValue(csw.val1, v1);
         v2 = csw.val2;
       }
     }
 
     virtual void afterImport()
     {
-      if (csw.func == LS_FN_STAY) {
+      if (csw.func == LS_FN_TIMER) {
+        csw.val1 = v1;
+        csw.val2 = v2;
+      }
+      else if (csw.func == LS_FN_STAY) {
         switchesConversionTable->importValue(v1, csw.val1);
         csw.val2 = v2;
         csw.val3 = v3;
@@ -1236,14 +1244,11 @@ class LogicalSwitchField: public TransformedField {
         switchesConversionTable->importValue(v2, csw.val2);
       }
       else if (csw.func >= LS_FN_EQUAL && csw.func <= LS_FN_ELESS) {
-        sourcesConversionTable->importValue(v1, csw.val1);
-        sourcesConversionTable->importValue(v2, csw.val2);
+        sourcesConversionTable->importValue((uint8_t)v1, csw.val1);
+        sourcesConversionTable->importValue((uint8_t)v2, csw.val2);
       }
-      else {
-        if ((csw.func >= LS_FN_VPOS && csw.func <= LS_FN_ANEG) || (csw.func >= LS_FN_EQUAL && csw.func!=LS_FN_TIMER))
-          sourcesConversionTable->importValue(v1, csw.val1);
-        else
-          csw.val1 = v1;
+      else if (csw.func != LS_FN_OFF) {
+        sourcesConversionTable->importValue((uint8_t)v1, csw.val1);
         csw.val2 = v2;
       }
     }

companion/src/helpers.cpp

@@ -924,10 +924,13 @@ QString getTheme()
       Theme="monowhite";
       break;
     case 3:
+      Theme="monochrome";
+      break;
+    case 4:
       Theme="monoblue";
       break;
     default:
-      Theme="monochrome";
+      Theme="new";
       break;          
   }
   return Theme;