From 1b00fd2a9dbf820ce00f114d427c694725e9a6c4 Mon Sep 17 00:00:00 2001
From: Max Paperno <max@wdg.us>
Date: Wed, 19 Sep 2018 04:00:04 -0400
Subject: [PATCH] [Companion][TelemetrySimulator] Fix sending of A3/A4 values
 (closes #6177); Adjust some min/max value ranges which were too small, and
 individual cell max values which were too high.

---
 companion/src/simulation/telemetrysimu.cpp |   8 +-
 companion/src/simulation/telemetrysimu.ui  | 149 ++++++++++++---------
 2 files changed, 89 insertions(+), 68 deletions(-)

diff --git a/companion/src/simulation/telemetrysimu.cpp b/companion/src/simulation/telemetrysimu.cpp
index e74343651..ea95ab2e0 100644
--- a/companion/src/simulation/telemetrysimu.cpp
+++ b/companion/src/simulation/telemetrysimu.cpp
@@ -336,13 +336,13 @@ void TelemetrySimulator::generateTelemetryFrame()
       break;
 
     case 6:
-      if (ui->A3->value() > 0)
-        generateSportPacket(buffer, ui->a3_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, A3_FIRST_ID, LIMIT<uint32_t>(0, ui->A3->value() * 100.0, 0xFFFFFFFF));
+      if (ui->A3->value() != 0)
+        generateSportPacket(buffer, ui->a3_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, A3_FIRST_ID, LIMIT<int32_t>(-0x7FFFFFFF, ui->A3->value() * 100.0, 0x7FFFFFFF));
       break;
 
     case 7:
-      if (ui->A4->value() > 0)
-        generateSportPacket(buffer, ui->a4_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, A4_FIRST_ID, LIMIT<uint32_t>(0, ui->A4->value() * 100.0, 0xFFFFFFFF));
+      if (ui->A4->value() != 0)
+        generateSportPacket(buffer, ui->a4_inst->text().toInt(&ok, 0) - 1, DATA_FRAME, A4_FIRST_ID, LIMIT<int32_t>(-0x7FFFFFFF, ui->A4->value() * 100.0, 0x7FFFFFFF));
       break;
 
     case 8:
diff --git a/companion/src/simulation/telemetrysimu.ui b/companion/src/simulation/telemetrysimu.ui
index c192c9acb..faf78f53f 100644
--- a/companion/src/simulation/telemetrysimu.ui
+++ b/companion/src/simulation/telemetrysimu.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>715</width>
-    <height>484</height>
+    <height>538</height>
    </rect>
   </property>
   <property name="font">
@@ -107,8 +107,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>329</width>
-           <height>412</height>
+           <width>343</width>
+           <height>422</height>
           </rect>
          </property>
          <property name="sizePolicy">
@@ -661,24 +661,6 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="2">
-           <widget class="QSpinBox" name="A3">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <pointsize>8</pointsize>
-             </font>
-            </property>
-            <property name="maximum">
-             <number>16777215</number>
-            </property>
-           </widget>
-          </item>
           <item row="7" column="0">
            <widget class="QLabel" name="label_8">
             <property name="sizePolicy">
@@ -808,24 +790,6 @@
             </property>
            </widget>
           </item>
-          <item row="6" column="2">
-           <widget class="QSpinBox" name="A4">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="font">
-             <font>
-              <pointsize>8</pointsize>
-             </font>
-            </property>
-            <property name="maximum">
-             <number>16777215</number>
-            </property>
-           </widget>
-          </item>
           <item row="8" column="0">
            <widget class="QLabel" name="label_9">
             <property name="sizePolicy">
@@ -1050,7 +1014,7 @@
              </font>
             </property>
             <property name="text">
-             <string>Deg. C</string>
+             <string>°C</string>
             </property>
            </widget>
           </item>
@@ -1170,10 +1134,10 @@
              <number>2</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-21474836.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>21474836.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
@@ -1245,10 +1209,10 @@
              <number>2</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-21474836.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>21474836.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
@@ -1373,6 +1337,48 @@
             </property>
            </spacer>
           </item>
+          <item row="5" column="2">
+           <widget class="QDoubleSpinBox" name="A3">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <pointsize>8</pointsize>
+             </font>
+            </property>
+            <property name="minimum">
+             <double>-21474836.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>21474836.000000000000000</double>
+            </property>
+           </widget>
+          </item>
+          <item row="6" column="2">
+           <widget class="QDoubleSpinBox" name="A4">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="font">
+             <font>
+              <pointsize>8</pointsize>
+             </font>
+            </property>
+            <property name="minimum">
+             <double>-21474836.000000000000000</double>
+            </property>
+            <property name="maximum">
+             <double>21474836.000000000000000</double>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </widget>
@@ -1402,8 +1408,8 @@
           <rect>
            <x>0</x>
            <y>0</y>
-           <width>330</width>
-           <height>384</height>
+           <width>342</width>
+           <height>422</height>
           </rect>
          </property>
          <property name="sizePolicy">
@@ -1763,10 +1769,10 @@
              <number>2</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-21474836.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>21474836.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
@@ -1790,10 +1796,10 @@
              <number>2</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-21474836.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>21474836.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
@@ -1866,10 +1872,10 @@
              <number>2</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-21474836.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>21474836.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
@@ -1911,10 +1917,10 @@
              <number>2</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-21474836.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>21474836.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
@@ -2104,10 +2110,10 @@ hh:mm:ss</string>
              <number>2</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-21474836.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>21474836.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
@@ -2152,10 +2158,10 @@ hh:mm:ss</string>
              <number>2</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-21474836.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>21474836.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
@@ -2206,10 +2212,10 @@ hh:mm:ss</string>
              <number>1</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-214748364.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>214748364.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
@@ -2288,6 +2294,9 @@ hh:mm:ss</string>
                 <pointsize>8</pointsize>
                </font>
               </property>
+              <property name="maximum">
+               <double>8.190000000000000</double>
+              </property>
               <property name="singleStep">
                <double>0.100000000000000</double>
               </property>
@@ -2306,6 +2315,9 @@ hh:mm:ss</string>
                 <pointsize>8</pointsize>
                </font>
               </property>
+              <property name="maximum">
+               <double>8.190000000000000</double>
+              </property>
               <property name="singleStep">
                <double>0.100000000000000</double>
               </property>
@@ -2324,6 +2336,9 @@ hh:mm:ss</string>
                 <pointsize>8</pointsize>
                </font>
               </property>
+              <property name="maximum">
+               <double>8.190000000000000</double>
+              </property>
               <property name="singleStep">
                <double>0.100000000000000</double>
               </property>
@@ -2342,6 +2357,9 @@ hh:mm:ss</string>
                 <pointsize>8</pointsize>
                </font>
               </property>
+              <property name="maximum">
+               <double>8.190000000000000</double>
+              </property>
               <property name="singleStep">
                <double>0.100000000000000</double>
               </property>
@@ -2360,6 +2378,9 @@ hh:mm:ss</string>
                 <pointsize>8</pointsize>
                </font>
               </property>
+              <property name="maximum">
+               <double>8.190000000000000</double>
+              </property>
               <property name="singleStep">
                <double>0.100000000000000</double>
               </property>
@@ -2513,10 +2534,10 @@ hh:mm:ss</string>
              <number>1</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-214748364.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>214748364.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>
@@ -2579,10 +2600,10 @@ hh:mm:ss</string>
              <number>2</number>
             </property>
             <property name="minimum">
-             <double>-16777215.000000000000000</double>
+             <double>-21474836.000000000000000</double>
             </property>
             <property name="maximum">
-             <double>16777215.000000000000000</double>
+             <double>21474836.000000000000000</double>
             </property>
             <property name="singleStep">
              <double>0.100000000000000</double>