ARM boards now allow 1 blade in Companion. Shift in Stock-9X EEPROM.

companion/src/modeledit/mixes.cpp

@@ -46,7 +46,7 @@ MixesPanel::~MixesPanel()
 QString MixesPanel::getChannelLabel(int curDest)
 {
   QString str;
-  unsigned int outputs = GetEepromInterface()->getCapability(Outputs);
+  int outputs = GetEepromInterface()->getCapability(Outputs);
   if (curDest > outputs) {
     str = QObject::tr("X%1  ").arg(curDest-outputs);
   }

companion/src/modeledit/telemetry.cpp

@@ -488,6 +488,10 @@ TelemetryPanel::TelemetryPanel(QWidget *parent, ModelData & model):
     ui->customScreens->addTab(tab, tr("Telemetry screen %1").arg(i+1));
   }
 
+  if (IS_ARM(GetEepromInterface()->getBoard())) {
+    ui->bladesCount->setMinimum(1);
+  }
+
   setup();
 }
 
@@ -634,7 +638,7 @@ void TelemetryPanel::setup()
 
     ui->frskyProtoCB->setCurrentIndex(model.frsky.usrProto);
     ui->frskyUnitsCB->setCurrentIndex(model.frsky.imperial);
-    ui->frskyBladesCB->setCurrentIndex(model.frsky.blades);
+    ui->bladesCount->setValue(model.frsky.blades);
     ui->frskyCurrentCB->setCurrentIndex(model.frsky.currentSource);
     ui->frskyVoltCB->setCurrentIndex(model.frsky.voltsSource);
 
@@ -648,13 +652,13 @@ void TelemetryPanel::onAnalogModified()
 
 void TelemetryPanel::on_frskyUnitsCB_currentIndexChanged(int index)
 {
-    model.frsky.imperial=index;
+    model.frsky.imperial = index;
     emit modified();
 }
 
-void TelemetryPanel::on_frskyBladesCB_currentIndexChanged(int index)
+void TelemetryPanel::on_bladesCount_editingFinished()
 {
-    model.frsky.blades=index;
+    model.frsky.blades = ui->bladesCount->value();
     emit modified();
 }
 

companion/src/modeledit/telemetry.h

@@ -89,7 +89,7 @@ class TelemetryPanel : public ModelPanel
     void onAnalogModified();
     void on_frskyProtoCB_currentIndexChanged(int index);
     void on_frskyUnitsCB_currentIndexChanged(int index);
-    void on_frskyBladesCB_currentIndexChanged(int index);
+    void on_bladesCount_editingFinished();
     void on_frskyCurrentCB_currentIndexChanged(int index);
     void on_frskyVoltCB_currentIndexChanged(int index);
     void on_AltitudeToolbar_ChkB_toggled(bool checked);

companion/src/modeledit/telemetry.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>713</width>
+    <width>757</width>
     <height>457</height>
    </rect>
   </property>
@@ -382,12 +382,12 @@
         </property>
         <item>
          <layout class="QGridLayout" name="gridLayout_34" columnstretch="0,1,1,1">
-          <property name="rightMargin">
-           <number>0</number>
-          </property>
           <property name="horizontalSpacing">
            <number>9</number>
           </property>
+          <property name="rightMargin">
+           <number>0</number>
+          </property>
           <item row="3" column="0">
            <widget class="QLabel" name="label_4">
             <property name="sizePolicy">
@@ -539,31 +539,6 @@
             </item>
            </widget>
           </item>
-          <item row="2" column="3">
-           <widget class="QComboBox" name="frskyBladesCB">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <item>
-             <property name="text">
-              <string>2</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>3</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>4</string>
-             </property>
-            </item>
-           </widget>
-          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="label_113">
             <property name="sizePolicy">
@@ -609,6 +584,28 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="3">
+           <widget class="QDoubleSpinBox" name="bladesCount">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="decimals">
+             <number>0</number>
+            </property>
+            <property name="minimum">
+             <double>2.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>5.000000000000000</double>
+            </property>
+            <property name="value">
+             <double>2.000000000000000</double>
+            </property>
+           </widget>
+          </item>
          </layout>
         </item>
        </layout>