From 9c0dc91667d73840b349de1250237dd9127ce689 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@gmail.com>
Date: Tue, 2 Dec 2014 19:16:37 +0100
Subject: [PATCH] Trims display parameter added to Companion

---
 companion/src/eeprominterface.h               |   1 +
 .../src/firmwares/opentx/opentxeeprom.cpp     |   8 +-
 companion/src/modeledit/setup.cpp             |   9 ++
 companion/src/modeledit/setup.ui              | 102 +++++++++++++-----
 4 files changed, 91 insertions(+), 29 deletions(-)

diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index 81bd274e0..7ac4ac633 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -994,6 +994,7 @@ class ModelData {
     bool      noGlobalFunctions;
     bool      thrTrim;            // Enable Throttle Trim
     int       trimInc;            // Trim Increments
+    unsigned int trimsDisplay;
     bool      disableThrottleWarning;
 
     unsigned int beepANACenter;      // 1<<0->A1.. 1<<6->A7
diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp
index aa046575f..93510b2a2 100644
--- a/companion/src/firmwares/opentx/opentxeeprom.cpp
+++ b/companion/src/firmwares/opentx/opentxeeprom.cpp
@@ -2794,9 +2794,13 @@ OpenTxModelData::OpenTxModelData(ModelData & modelData, BoardEnum board, unsigne
 
   internalField.Append(new BoolField<1>(modelData.thrTrim));
 
-  if (IS_TARANIS(board) || (IS_ARM(board) && version >= 216)) {
+  if (IS_ARM(board) && version >= 217) {
     internalField.Append(new BoolField<1>(modelData.noGlobalFunctions));
-    internalField.Append(new SpareBitsField<3>());
+    internalField.Append(new UnsignedField<2>(modelData.trimsDisplay));
+    internalField.Append(new SpareBitsField<1>());
+  }
+  else if (IS_TARANIS(board) || (IS_ARM(board) && version >= 216)) {
+    internalField.Append(new SpareBitsField<4>());
   }
   else {
     internalField.Append(new ConversionField< SignedField<4> >(modelData.moduleData[0].channelsCount, &channelsConversionTable, "Channels number", ::QObject::tr("OpenTX doesn't allow this number of channels")));
diff --git a/companion/src/modeledit/setup.cpp b/companion/src/modeledit/setup.cpp
index 4dbfe3fcb..53eef2007 100644
--- a/companion/src/modeledit/setup.cpp
+++ b/companion/src/modeledit/setup.cpp
@@ -520,6 +520,15 @@ SetupPanel::SetupPanel(QWidget *parent, ModelData & model, GeneralSettings & gen
     ui->potWarningMode->hide();
   }
 
+  if (IS_ARM(board)) {
+    ui->trimsDisplay->setField(model.trimsDisplay, this);
+  }
+  else {
+    ui->labelTrimsDisplay->hide();
+    ui->trimsDisplay->hide();
+  }
+
+
   disableMouseScrolling();
 
   lock = false;
diff --git a/companion/src/modeledit/setup.ui b/companion/src/modeledit/setup.ui
index b6dd9291b..bade33288 100644
--- a/companion/src/modeledit/setup.ui
+++ b/companion/src/modeledit/setup.ui
@@ -66,6 +66,36 @@
      </item>
      <item row="5" column="1">
       <layout class="QGridLayout" name="gridLayout_2">
+       <item row="1" column="2">
+        <widget class="QCheckBox" name="extendedTrims">
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+         <property name="text">
+          <string>Extended Trims</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="3">
+        <widget class="QCheckBox" name="displayText">
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+         <property name="text">
+          <string>Display Checklist</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QCheckBox" name="extendedLimits">
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+         <property name="text">
+          <string>Extended Limits</string>
+         </property>
+        </widget>
+       </item>
        <item row="0" column="3">
         <widget class="QCheckBox" name="throttleReverse">
          <property name="whatsThis">
@@ -82,16 +112,6 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
          </property>
         </widget>
        </item>
-       <item row="1" column="1">
-        <widget class="QCheckBox" name="extendedLimits">
-         <property name="layoutDirection">
-          <enum>Qt::LeftToRight</enum>
-         </property>
-         <property name="text">
-          <string>Extended Limits</string>
-         </property>
-        </widget>
-       </item>
        <item row="0" column="0">
         <widget class="QComboBox" name="throttleSource">
          <property name="sizePolicy">
@@ -102,16 +122,6 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
          </property>
         </widget>
        </item>
-       <item row="1" column="2">
-        <widget class="QCheckBox" name="extendedTrims">
-         <property name="layoutDirection">
-          <enum>Qt::LeftToRight</enum>
-         </property>
-         <property name="text">
-          <string>Extended Trims</string>
-         </property>
-        </widget>
-       </item>
        <item row="0" column="1">
         <widget class="QCheckBox" name="throttleTrim">
          <property name="layoutDirection">
@@ -180,14 +190,29 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
          </item>
         </widget>
        </item>
-       <item row="1" column="3">
-        <widget class="QCheckBox" name="displayText">
-         <property name="layoutDirection">
-          <enum>Qt::LeftToRight</enum>
-         </property>
-         <property name="text">
-          <string>Display Checklist</string>
+       <item row="2" column="0">
+        <widget class="AutoComboBox" name="trimsDisplay">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
+         <item>
+          <property name="text">
+           <string>Never</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>On change</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Always</string>
+          </property>
+         </item>
         </widget>
        </item>
       </layout>
@@ -226,6 +251,22 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QLabel" name="labelTrimsDisplay">
+         <property name="font">
+          <font>
+           <weight>50</weight>
+           <bold>false</bold>
+          </font>
+         </property>
+         <property name="text">
+          <string>Trims Display</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
       </layout>
      </item>
      <item row="4" column="1">
@@ -548,6 +589,13 @@ If this is checked the throttle will be reversed.  Idle will be forward, trim wi
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AutoComboBox</class>
+   <extends>QComboBox</extends>
+   <header>autocombobox.h</header>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
 </ui>