Index: TD_AirPump/interface.ui
===================================================================
diff -u -r767c7999a57c41783d0269ec5ba296caf5278295 -r05dd1cb113fc0c22b48930390cf00ec2ea930774
--- TD_AirPump/interface.ui	(.../interface.ui)	(revision 767c7999a57c41783d0269ec5ba296caf5278295)
+++ TD_AirPump/interface.ui	(.../interface.ui)	(revision 05dd1cb113fc0c22b48930390cf00ec2ea930774)
@@ -7,16 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>346</width>
-    <height>131</height>
+    <height>226</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>&amp;5 TD info/&amp;9 Air Pump</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="bottomMargin">
-    <number>6</number>
-   </property>
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
@@ -87,7 +84,7 @@
          <item row="1" column="0">
           <widget class="QLabel" name="stepsMinLabel">
            <property name="text">
-            <string>Power (H12)</string>
+            <string>RPM (H12)</string>
            </property>
           </widget>
          </item>
@@ -102,32 +99,49 @@
           <widget class="QSpinBox" name="sbState"/>
          </item>
          <item row="1" column="1">
-          <widget class="QSpinBox" name="sbPower"/>
+          <widget class="QSpinBox" name="sbRPM"/>
          </item>
+         <item row="2" column="0">
+          <widget class="QLabel" name="positionLabel_2">
+           <property name="text">
+            <string>Power (H12)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QLabel" name="positionLabel_3">
+           <property name="text">
+            <string>FPGA RPM (H12)</string>
+           </property>
+          </widget>
+         </item>
+         <item row="4" column="0">
+          <widget class="QLabel" name="positionLabel_4">
+           <property name="text">
+            <string>Scalar Power</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="1">
+          <widget class="QSpinBox" name="sbFPGARPM"/>
+         </item>
+         <item row="4" column="1">
+          <widget class="QSpinBox" name="sbScalarPower"/>
+         </item>
+         <item row="2" column="1">
+          <widget class="QDoubleSpinBox" name="sbPower"/>
+         </item>
         </layout>
        </item>
       </layout>
      </item>
     </layout>
    </item>
-   <item row="1" column="0">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
   </layout>
  </widget>
  <tabstops>
   <tabstop>sbState</tabstop>
-  <tabstop>sbPower</tabstop>
+  <tabstop>sbRPM</tabstop>
   <tabstop>tbSend</tabstop>
   <tabstop>tbReset</tabstop>
  </tabstops>
Index: TD_AirPump/loader.py
===================================================================
diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -r05dd1cb113fc0c22b48930390cf00ec2ea930774
--- TD_AirPump/loader.py	(.../loader.py)	(revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b)
+++ TD_AirPump/loader.py	(.../loader.py)	(revision 05dd1cb113fc0c22b48930390cf00ec2ea930774)
@@ -33,8 +33,11 @@
         self.tbReset    = self.find_widget(QtWidgets.QToolButton    , 'tbReset'                 )   
         self.tbSend     = self.find_widget(QtWidgets.QToolButton    , 'tbSend'                  )
 
-        self.sbState    = self.find_widget(QtWidgets.QSpinBox       , 'sbState'                 )
-        self.sbPower    = self.find_widget(QtWidgets.QSpinBox       , 'sbPower'                 )
+        self.sbState        = self.find_widget(QtWidgets.QSpinBox       , 'sbState'             )
+        self.sbRPM          = self.find_widget(QtWidgets.QSpinBox       , 'sbRPM'               )
+        self.sbPower        = self.find_widget(QtWidgets.QDoubleSpinBox , 'sbPower'             )
+        self.sbFPGARPM      = self.find_widget(QtWidgets.QSpinBox       , 'sbFPGARPM'           )
+        self.sbScalarPower  = self.find_widget(QtWidgets.QSpinBox       , 'sbScalarPower'       )
 
     def _init_connections(self):
         """
@@ -50,18 +53,22 @@
         initializes the widgets' properties
         :return: none
         """
-        self.sbState .setValue(0)
-        self.sbPower .setValue(0)
+        self.sbState        .setValue(0)
+        self.sbRPM          .setValue(0)
+        self.sbPower        .setValue(0)
+        self.sbFPGARPM      .setValue(0)
+        self.sbScalarPower  .setValue(0)
 
     @Slot()
     def do_air_pump_data(self):
         """
         the slot for air pump change
         :return: none
         """
-        H12_state = self.sbState .value()
-        H12_power = self.sbPower .value()
         self.td_interface.td_air_pump(
-            H12_state ,
-            H12_power
+            self.sbState       .value() ,
+            self.sbRPM         .value() ,
+            self.sbPower       .value() ,
+            self.sbFPGARPM     .value() ,
+            self.sbScalarPower .value()
         )
Index: TD_AirTrap/interface.ui
===================================================================
diff -u -ra4f4b16cfdbaf955c6febbff8a5140aeb2ef5427 -r05dd1cb113fc0c22b48930390cf00ec2ea930774
--- TD_AirTrap/interface.ui	(.../interface.ui)	(revision a4f4b16cfdbaf955c6febbff8a5140aeb2ef5427)
+++ TD_AirTrap/interface.ui	(.../interface.ui)	(revision 05dd1cb113fc0c22b48930390cf00ec2ea930774)
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>476</width>
-    <height>265</height>
+    <width>474</width>
+    <height>364</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -25,7 +25,7 @@
   <property name="windowTitle">
    <string>&amp;5 TD info/&amp;1 TD Air Trap</string>
   </property>
-  <layout class="QFormLayout" name="formLayout">
+  <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="0" colspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <property name="spacing">
@@ -86,7 +86,7 @@
     </widget>
    </item>
    <item row="1" column="1">
-    <widget class="QSpinBox" name="lowLevelSpinBox">
+    <widget class="QSpinBox" name="sbH17State">
      <property name="maximum">
       <number>1000</number>
      </property>
@@ -100,7 +100,7 @@
     </widget>
    </item>
    <item row="2" column="1">
-    <widget class="QSpinBox" name="upperLevelSpinBox">
+    <widget class="QSpinBox" name="sbH16State">
      <property name="maximum">
       <number>1000</number>
      </property>
@@ -114,7 +114,7 @@
     </widget>
    </item>
    <item row="3" column="1">
-    <widget class="QSpinBox" name="lowLevelRawSpinBox">
+    <widget class="QSpinBox" name="sbH17RawState">
      <property name="maximum">
       <number>1000</number>
      </property>
@@ -128,7 +128,7 @@
     </widget>
    </item>
    <item row="4" column="1">
-    <widget class="QSpinBox" name="upperLevelRawSpinBox">
+    <widget class="QSpinBox" name="sbH16RawState">
      <property name="maximum">
       <number>1000</number>
      </property>
@@ -142,7 +142,7 @@
     </widget>
    </item>
    <item row="5" column="1">
-    <widget class="QSpinBox" name="valveStateH13SpinBox">
+    <widget class="QSpinBox" name="sbH13State">
      <property name="maximum">
       <number>1000</number>
      </property>
@@ -156,7 +156,7 @@
     </widget>
    </item>
    <item row="6" column="1">
-    <widget class="QSpinBox" name="valveStateH20SpinBox">
+    <widget class="QSpinBox" name="sbH20State">
      <property name="maximum">
       <number>1000</number>
      </property>
@@ -170,21 +170,54 @@
     </widget>
    </item>
    <item row="7" column="1">
-    <widget class="QCheckBox" name="controlCheckBox"/>
+    <widget class="QSpinBox" name="sbIsAutoControlling">
+     <property name="maximum">
+      <number>1000</number>
+     </property>
+    </widget>
    </item>
-   <item row="8" column="0" colspan="2">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
+   <item row="8" column="0">
+    <widget class="QLabel" name="controlLabel_2">
+     <property name="text">
+      <string>State</string>
      </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>40</height>
-      </size>
+    </widget>
+   </item>
+   <item row="8" column="1">
+    <widget class="QSpinBox" name="sbAirTrapState">
+     <property name="maximum">
+      <number>1000</number>
      </property>
-    </spacer>
+    </widget>
    </item>
+   <item row="9" column="0">
+    <widget class="QLabel" name="controlLabel_3">
+     <property name="text">
+      <string>Pump Lower Power Level</string>
+     </property>
+    </widget>
+   </item>
+   <item row="9" column="1">
+    <widget class="QSpinBox" name="sbAirPumpLowerPowerLevel">
+     <property name="maximum">
+      <number>1000</number>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="0">
+    <widget class="QLabel" name="controlLabel_4">
+     <property name="text">
+      <string>Pump Raise Power Level</string>
+     </property>
+    </widget>
+   </item>
+   <item row="10" column="1">
+    <widget class="QSpinBox" name="sbAirPumpRaisePowerLevel">
+     <property name="maximum">
+      <number>1000</number>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
Index: TD_AirTrap/loader.py
===================================================================
diff -u -r9307b8315113adb7ad1823a19d58df6ea7e4ef8b -r05dd1cb113fc0c22b48930390cf00ec2ea930774
--- TD_AirTrap/loader.py	(.../loader.py)	(revision 9307b8315113adb7ad1823a19d58df6ea7e4ef8b)
+++ TD_AirTrap/loader.py	(.../loader.py)	(revision 05dd1cb113fc0c22b48930390cf00ec2ea930774)
@@ -33,13 +33,16 @@
         self.tbReset            = self.find_widget(QtWidgets.QToolButton    , 'tbReset'         )
         self.tbSend             = self.find_widget(QtWidgets.QToolButton    , 'tbSend'          )
 
-        self.low_level          = self.find_widget(QtWidgets.QSpinBox   , 'lowLevelSpinBox'     )
-        self.upper_level        = self.find_widget(QtWidgets.QSpinBox   , 'upperLevelSpinBox'   )
-        self.low_level_raw      = self.find_widget(QtWidgets.QSpinBox   , 'lowLevelRawSpinBox'  )
-        self.upper_level_raw    = self.find_widget(QtWidgets.QSpinBox   , 'upperLevelRawSpinBox')
-        self.valve_state_inlet  = self.find_widget(QtWidgets.QSpinBox   , 'valveStateH13SpinBox')
-        self.valve_state_outlet = self.find_widget(QtWidgets.QSpinBox   , 'valveStateH20SpinBox')
-        self.control            = self.find_widget(QtWidgets.QCheckBox   , 'controlCheckBox'    )
+        self.sbH17State                 = self.find_widget(QtWidgets.QSpinBox   , 'sbH17State'              )
+        self.sbH16State                 = self.find_widget(QtWidgets.QSpinBox   , 'sbH16State'              )
+        self.sbH17RawState              = self.find_widget(QtWidgets.QSpinBox   , 'sbH17RawState'           )
+        self.sbH16RawState              = self.find_widget(QtWidgets.QSpinBox   , 'sbH16RawState'           )
+        self.sbH13State                 = self.find_widget(QtWidgets.QSpinBox   , 'sbH13State'              )
+        self.sbH20State                 = self.find_widget(QtWidgets.QSpinBox   , 'sbH20State'              )
+        self.sbIsAutoControlling        = self.find_widget(QtWidgets.QSpinBox   , 'sbIsAutoControlling'     )
+        self.sbAirTrapState             = self.find_widget(QtWidgets.QSpinBox   , 'sbAirTrapState'          )
+        self.sbAirPumpLowerPowerLevel   = self.find_widget(QtWidgets.QSpinBox   , 'sbAirPumpLowerPowerLevel')
+        self.sbAirPumpRaisePowerLevel   = self.find_widget(QtWidgets.QSpinBox   , 'sbAirPumpRaisePowerLevel')
 
     def _init_connections(self):
         """
@@ -55,34 +58,32 @@
         initializes the widgets' properties
         :return: none
         """
-        self.low_level.setValue(0)
-        self.upper_level.setValue(0)
-        self.low_level_raw.setValue(0)
-        self.upper_level_raw.setValue(0)
-        self.valve_state_inlet.setValue(0)
-        self.valve_state_outlet.setValue(0)
+        self.sbH17State                 .setValue(0)
+        self.sbH16State                 .setValue(0)
+        self.sbH17RawState              .setValue(0)
+        self.sbH16RawState              .setValue(0)
+        self.sbH13State                 .setValue(0)
+        self.sbH20State                 .setValue(0)
+        self.sbIsAutoControlling        .setValue(0)
+        self.sbAirTrapState             .setValue(0)
+        self.sbAirPumpLowerPowerLevel   .setValue(0)
+        self.sbAirPumpRaisePowerLevel   .setValue(0)
 
-        self.control.setChecked(False)
-
     @Slot()
     def do_air_trap(self):
         """
         the slot for air trap change
         :return: none
-        """
-        H17_state      = self.low_level.value()
-        H16_state      = self.upper_level.value()
-        H17_raw_state  = self.low_level_raw.value()
-        H16_raw_state  = self.upper_level_raw.value()
-        H13_state      = self.valve_state_inlet.value()
-        H20_State      = self.valve_state_outlet.value()
-        controlling    = int(self.control.isChecked())
+        """        
         self.td_interface.td_air_trap(
-            H17_state      ,
-            H16_state      ,
-            H17_raw_state  ,
-            H16_raw_state  ,
-            H13_state      , 
-            H20_State      ,
-            controlling    
+            self.sbH17State                 .value(),
+            self.sbH16State                 .value(),
+            self.sbH17RawState              .value(),
+            self.sbH16RawState              .value(),
+            self.sbH13State                 .value(),
+            self.sbH20State                 .value(),
+            self.sbIsAutoControlling        .value(),
+            self.sbAirTrapState             .value(),
+            self.sbAirPumpLowerPowerLevel   .value(),
+            self.sbAirPumpRaisePowerLevel   .value()
         )