1 files changed, 55 insertions, 63 deletions
diff --git a/tracker-hatire/ftnoir_hatcontrols.ui b/tracker-hatire/ftnoir_hatcontrols.ui
index c9a449b1..758d8e51 100644
--- a/tracker-hatire/ftnoir_hatcontrols.ui
+++ b/tracker-hatire/ftnoir_hatcontrols.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>389</width>
-    <height>528</height>
+    <height>497</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -103,7 +103,7 @@
              <bool>false</bool>
             </property>
             <property name="sizeAdjustPolicy">
-             <enum>QComboBox::AdjustToMinimumContentsLength</enum>
+             <enum>QComboBox::AdjustToContents</enum>
             </property>
             <property name="modelColumn">
              <number>0</number>
@@ -129,38 +129,6 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QCheckBox" name="serial_bug_workaround">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-              <horstretch>6</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Buggy serial port uses too much CPU</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_6">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>3</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="maximumSize">
-             <size>
-              <width>65536</width>
-              <height>16777215</height>
-             </size>
-            </property>
-            <property name="text">
-             <string>Workaround</string>
-            </property>
-           </widget>
-          </item>
          </layout>
         </widget>
        </item>
@@ -1168,16 +1136,6 @@ p, li { white-space: pre-wrap; }
           <string>Serial Parameters</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_8">
-          <item row="0" column="1">
-           <widget class="QComboBox" name="QCB_Serial_baudRate">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-           </widget>
-          </item>
           <item row="3" column="1">
            <widget class="QComboBox" name="QCB_Serial_stopBits">
             <property name="sizePolicy">
@@ -1195,6 +1153,13 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
+          <item row="0" column="0">
+           <widget class="QLabel" name="baudRateLabel">
+            <property name="text">
+             <string>BaudRate:</string>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="1">
            <widget class="QComboBox" name="QCB_Serial_parity">
             <property name="sizePolicy">
@@ -1205,13 +1170,10 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
-          <item row="4" column="1">
-           <widget class="QComboBox" name="QCB_Serial_flowControl">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+          <item row="1" column="0">
+           <widget class="QLabel" name="dataBitsLabel">
+            <property name="text">
+             <string>Data bits</string>
             </property>
            </widget>
           </item>
@@ -1222,6 +1184,16 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
+          <item row="0" column="1">
+           <widget class="QComboBox" name="QCB_Serial_baudRate">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+           </widget>
+          </item>
           <item row="2" column="0">
            <widget class="QLabel" name="parityLabel">
             <property name="text">
@@ -1229,15 +1201,18 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
-          <item row="0" column="0">
-           <widget class="QLabel" name="baudRateLabel">
-            <property name="text">
-             <string>BaudRate:</string>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="QCB_Serial_dataBits">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="QCB_Serial_dataBits">
+          <item row="4" column="1">
+           <widget class="QComboBox" name="QCB_Serial_flowControl">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
@@ -1246,10 +1221,23 @@ p, li { white-space: pre-wrap; }
             </property>
            </widget>
           </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="dataBitsLabel">
+          <item row="5" column="0">
+           <widget class="QLabel" name="label_6">
             <property name="text">
-             <string>Data bits</string>
+             <string>DTR</string>
+            </property>
+           </widget>
+          </item>
+          <item row="5" column="1">
+           <widget class="QCheckBox" name="QCB_Serial_dtr">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Minimum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string/>
             </property>
            </widget>
           </item>
@@ -1403,6 +1391,7 @@ p, li { white-space: pre-wrap; }
   </layout>
  </widget>
  <tabstops>
+  <tabstop>tabWidget</tabstop>
   <tabstop>cbSerialPort</tabstop>
   <tabstop>btnZero</tabstop>
   <tabstop>btnReset</tabstop>
@@ -1425,24 +1414,27 @@ p, li { white-space: pre-wrap; }
   <tabstop>cb_z</tabstop>
   <tabstop>chkInvertZ</tabstop>
   <tabstop>le_cmd_init</tabstop>
+  <tabstop>spb_BeforeInit</tabstop>
   <tabstop>le_cmd_start</tabstop>
+  <tabstop>spb_BeforeStart</tabstop>
   <tabstop>spb_AfterStart</tabstop>
   <tabstop>le_cmd_stop</tabstop>
   <tabstop>le_cmd_center</tabstop>
   <tabstop>le_cmd_zero</tabstop>
-  <tabstop>le_cmd_reset</tabstop>
   <tabstop>spb_Fps</tabstop>
+  <tabstop>le_cmd_reset</tabstop>
   <tabstop>cb_Endian</tabstop>
   <tabstop>QCB_Serial_baudRate</tabstop>
   <tabstop>QCB_Serial_dataBits</tabstop>
   <tabstop>QCB_Serial_parity</tabstop>
   <tabstop>QCB_Serial_stopBits</tabstop>
   <tabstop>QCB_Serial_flowControl</tabstop>
+  <tabstop>QCB_Serial_dtr</tabstop>
+  <tabstop>btn_icone</tabstop>
+  <tabstop>chkEnableLogging</tabstop>
   <tabstop>lineSend</tabstop>
   <tabstop>btnSend</tabstop>
   <tabstop>pteINFO</tabstop>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>btn_icone</tabstop>
  </tabstops>
  <resources>
   <include location="ftnoir_hat.qrc"/>