Index: FP_Temperature/interface.ui
===================================================================
diff -u -r639e60ab542d69ff6c7b489c0e86bef287519c32 -rd7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7
--- FP_Temperature/interface.ui	(.../interface.ui)	(revision 639e60ab542d69ff6c7b489c0e86bef287519c32)
+++ FP_Temperature/interface.ui	(.../interface.ui)	(revision d7132e0ca83f0ad1f6ecc526544f84ed6c63c8b7)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1043</width>
-    <height>466</height>
+    <width>334</width>
+    <height>252</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -26,58 +26,6 @@
    <string>&amp;7 FP info/&amp;8 Temperatures</string>
   </property>
   <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="spacing">
-      <number>2</number>
-     </property>
-     <item>
-      <widget class="QLabel" name="label">
-       <property name="sizePolicy">
-        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="minimumSize">
-        <size>
-         <width>352</width>
-         <height>0</height>
-        </size>
-       </property>
-       <property name="font">
-        <font>
-         <pointsize>10</pointsize>
-        </font>
-       </property>
-       <property name="styleSheet">
-        <string notr="true">color: rgb(238, 238, 236);
-background-color: rgb(49, 6, 77)</string>
-       </property>
-       <property name="text">
-        <string>57 : [0x3900] : FP Temperatures</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="tbSend">
-       <property name="text">
-        <string>Send</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QToolButton" name="tbReset">
-       <property name="text">
-        <string>reset</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
    <item row="1" column="0">
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0">
@@ -86,305 +34,261 @@
         <widget class="QLabel" name="label_2">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Inlet conductivity (P10)</string>
+          <string>M3</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbP10InletConductivity">
+        <widget class="QDoubleSpinBox" name="dsbM3Temp">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="0" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_8">
-       <item>
-        <widget class="QLabel" name="label_8">
-         <property name="minimumSize">
-          <size>
-           <width>230</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Before RO Pump (X1)</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDoubleSpinBox" name="dsbX1BeforeROPump">
-         <property name="maximum">
-          <double>10000.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
      <item row="1" column="0">
       <layout class="QHBoxLayout" name="horizontalLayout_6">
        <item>
         <widget class="QLabel" name="label_6">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Outlet Conductivity (P19)</string>
+          <string>P8</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbP19OutletConductivity">
+        <widget class="QDoubleSpinBox" name="dsbP8Temp">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="1" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_11">
-       <item>
-        <widget class="QLabel" name="label_11">
-         <property name="minimumSize">
-          <size>
-           <width>230</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>RO Concentrate (X2)</string>
-         </property>
-        </widget>
-       </item>
-       <item>
-        <widget class="QDoubleSpinBox" name="dsbX2ROConcentrate">
-         <property name="maximum">
-          <double>10000.000000000000000</double>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </item>
      <item row="2" column="0">
       <layout class="QHBoxLayout" name="horizontalLayout_5">
        <item>
         <widget class="QLabel" name="label_5">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Before Pressure Regulator (M1)</string>
+          <string>P13</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbM1BeforePressureRegulator">
+        <widget class="QDoubleSpinBox" name="dsbP13Temp">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="2" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_7">
+     <item row="3" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_3">
        <item>
-        <widget class="QLabel" name="label_7">
+        <widget class="QLabel" name="label_3">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>RO Concentrate Pump (X3)</string>
+          <string>P17</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbX3ROConcentratePump">
+        <widget class="QDoubleSpinBox" name="dsbP17Temp">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="3" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_3">
+     <item row="4" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_4">
        <item>
-        <widget class="QLabel" name="label_3">
+        <widget class="QLabel" name="label_4">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>After Pressure Regulator (M3)</string>
+          <string>P46</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbM3AfterPressureRegulator">
+        <widget class="QDoubleSpinBox" name="dsbP46Temp">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="3" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_15">
+     <item row="4" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_14">
        <item>
-        <widget class="QLabel" name="label_15">
-         <property name="minimumSize">
-          <size>
-           <width>230</width>
-           <height>0</height>
-          </size>
-         </property>
-         <property name="text">
-          <string>Drain Drop (X4)</string>
-         </property>
-        </widget>
+        <layout class="QHBoxLayout" name="horizontalLayout_15">
+         <item>
+          <widget class="QLabel" name="label_15">
+           <property name="minimumSize">
+            <size>
+             <width>0</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="text">
+            <string>P16 Internal</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QDoubleSpinBox" name="dsbP16InternalTemp">
+           <property name="maximum">
+            <double>10000.000000000000000</double>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
-       <item>
-        <widget class="QDoubleSpinBox" name="dsbX4DrainDrop">
-         <property name="maximum">
-          <double>10000.000000000000000</double>
-         </property>
-        </widget>
-       </item>
       </layout>
      </item>
-     <item row="4" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_4">
+     <item row="5" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout_10">
        <item>
-        <widget class="QLabel" name="label_4">
+        <widget class="QLabel" name="label_10">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Before Inlet Conductivity (P8)</string>
+          <string>P10</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbP8BeforeInletConductivity">
+        <widget class="QDoubleSpinBox" name="dsbP10Temp">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="4" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_14">
+     <item row="3" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_7">
        <item>
-        <widget class="QLabel" name="label_14">
+        <widget class="QLabel" name="label_7">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>RO Inlet (P7)</string>
+          <string>P7 Internal</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbP7ROInlet">
+        <widget class="QDoubleSpinBox" name="dsbP7InternalTemp">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="5" column="0">
-      <layout class="QHBoxLayout" name="horizontalLayout_10">
+     <item row="2" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_11">
        <item>
-        <widget class="QLabel" name="label_10">
+        <widget class="QLabel" name="label_11">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>Before RO Filter (P13)</string>
+          <string>P16</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbP13ROFilter">
+        <widget class="QDoubleSpinBox" name="dsbP16Temp">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="5" column="1">
-      <layout class="QHBoxLayout" name="horizontalLayout_13">
+     <item row="1" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout_8">
        <item>
-        <widget class="QLabel" name="label_13">
+        <widget class="QLabel" name="label_8">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>RO Outlet (P16)</string>
+          <string>P7</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbP16ROOutlet">
+        <widget class="QDoubleSpinBox" name="dsbP7Temp">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
         </widget>
        </item>
       </layout>
      </item>
-     <item row="6" column="0">
+     <item row="0" column="1">
       <layout class="QHBoxLayout" name="horizontalLayout_9">
        <item>
         <widget class="QLabel" name="label_9">
          <property name="minimumSize">
           <size>
-           <width>230</width>
+           <width>0</width>
            <height>0</height>
           </size>
          </property>
          <property name="text">
-          <string>After RO Filter (P17)</string>
+          <string>P19</string>
          </property>
         </widget>
        </item>
        <item>
-        <widget class="QDoubleSpinBox" name="dsbP17AfterROFilter">
+        <widget class="QDoubleSpinBox" name="dsbP19Temp">
          <property name="maximum">
           <double>10000.000000000000000</double>
          </property>
@@ -394,35 +298,72 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+   <item row="0" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>2</number>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>0</width>
+         <height>0</height>
+        </size>
+       </property>
+       <property name="font">
+        <font>
+         <pointsize>10</pointsize>
+        </font>
+       </property>
+       <property name="styleSheet">
+        <string notr="true">color: rgb(238, 238, 236);
+background-color: rgb(49, 6, 77)</string>
+       </property>
+       <property name="text">
+        <string>57 : [0x3900] : FP Temperatures</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="tbSend">
+       <property name="text">
+        <string>Send</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="tbReset">
+       <property name="text">
+        <string>reset</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
  <tabstops>
-  <tabstop>dsbP10InletConductivity</tabstop>
-  <tabstop>dsbP19OutletConductivity</tabstop>
-  <tabstop>dsbM1BeforePressureRegulator</tabstop>
-  <tabstop>dsbM3AfterPressureRegulator</tabstop>
-  <tabstop>dsbP8BeforeInletConductivity</tabstop>
-  <tabstop>dsbP13ROFilter</tabstop>
-  <tabstop>dsbP17AfterROFilter</tabstop>
-  <tabstop>dsbX1BeforeROPump</tabstop>
-  <tabstop>dsbX2ROConcentrate</tabstop>
-  <tabstop>dsbX3ROConcentratePump</tabstop>
-  <tabstop>dsbX4DrainDrop</tabstop>
-  <tabstop>dsbP7ROInlet</tabstop>
-  <tabstop>dsbP16ROOutlet</tabstop>
+  <tabstop>dsbM3Temp</tabstop>
+  <tabstop>dsbP8Temp</tabstop>
+  <tabstop>dsbP13Temp</tabstop>
+  <tabstop>dsbP17Temp</tabstop>
+  <tabstop>dsbP46Temp</tabstop>
+  <tabstop>dsbP10Temp</tabstop>
+  <tabstop>dsbP19Temp</tabstop>
+  <tabstop>dsbP7Temp</tabstop>
+  <tabstop>dsbP16Temp</tabstop>
+  <tabstop>dsbP7InternalTemp</tabstop>
+  <tabstop>dsbP16InternalTemp</tabstop>
   <tabstop>tbSend</tabstop>
   <tabstop>tbReset</tabstop>
  </tabstops>