Index: TD_AirTrap/loader.py
===================================================================
diff -u -rf05537cca2e7e054a5124d4f5f9ed3ad26264458 -r05dd1cb113fc0c22b48930390cf00ec2ea930774
--- TD_AirTrap/loader.py	(.../loader.py)	(revision f05537cca2e7e054a5124d4f5f9ed3ad26264458)
+++ TD_AirTrap/loader.py	(.../loader.py)	(revision 05dd1cb113fc0c22b48930390cf00ec2ea930774)
@@ -11,10 +11,6 @@
 # parent
 from engine.dynamicloader   import DynamicLoader
 
-# plugin specific
-from leahi_dialin.common.td_defs  import TDOpModes
-from leahi_dialin.common.td_defs  import TDStandbyStates
-
 # hd Simulator
 from leahi_dialin.ui.td_messaging import TD_Messaging
 
@@ -37,12 +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        = self.find_widget(QtWidgets.QSpinBox   , 'valveStateSpinBox'   )
-        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):
         """
@@ -51,42 +51,39 @@
         """
         self.tbReset.clicked.connect(self._init_widgets)
         self.tbSend.clicked.connect(self.do_air_trap)
-        # self.tblOpMode.currentCellChanged.connect(self.do_treatment_states)
-        # self.tblSubMode.currentCellChanged.connect(self.do_treatment_states)
 
     @Slot()
     def _init_widgets(self):
         """
         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.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
-        """
-        low_level = self.low_level.value()
-        upper_level = self.upper_level.value()
-        lower_level_raw = self.low_level_raw.value()
-        upper_level_raw = self.upper_level_raw.value()
-        valve_state = self.valve_state.value()
-
-        controlling = self.control.isChecked()
-        # print(f"{low_level}\n{upper_level}\n{lower_level_raw}\n{upper_level_raw}\n{valve_state}\n{controlling}")
+        """        
         self.td_interface.td_air_trap(
-            low_level,
-            upper_level,
-            lower_level_raw,
-            upper_level_raw,
-            valve_state,
-            controlling
-        )
\ No newline at end of file
+            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()
+        )