Index: simulator/plugins/disinfection/loader.py
===================================================================
diff -u -re25c762014f029632c278b0b324b05f353ea8986 -r1b402ab005844b85b8361ae611664731cfa39e0b
--- simulator/plugins/disinfection/loader.py	(.../loader.py)	(revision e25c762014f029632c278b0b324b05f353ea8986)
+++ simulator/plugins/disinfection/loader.py	(.../loader.py)	(revision 1b402ab005844b85b8361ae611664731cfa39e0b)
@@ -9,7 +9,7 @@
 # parent
 from simulator.dynamicloader import DynamicLoader
 # hd Simulator
-from dialin.ui.hd_simulator import HDSimulator, TXStates
+from dialin.ui.hd_simulator import HDSimulator
 # plugin specific
 # -- none --
 
@@ -98,9 +98,8 @@
         the slot for accept button
         :return: none
         """
-        # The FW enums have not been defined yet so put the msg here only to test, later shall be moved to a common file
-        self.hd_simulator.cmd_send_general_response(128, True, 0)
-        self.lblAction.setText('Accepted ')
+        self.hd_simulator.cmd_send_hd_disinfect_response(True, 0)
+        self.lblActionDisinfect.setText('Accepted ')
 
     @Slot()
     def do_reject_disinfect(self):
@@ -109,8 +108,7 @@
         :return: none
         """
         reason = self.spnReasonDisinfect.value()
-        # The FW enums have not been defined yet so put the msg here only to test, later shall be moved to a common file
-        self.hd_simulator.cmd_send_general_response(128, False, reason)
+        self.hd_simulator.cmd_send_hd_disinfect_response(False, reason)
         self.lblActionDisinfect.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -119,8 +117,7 @@
         the slot for accept button
         :return: none
         """
-        # The FW enums have not been defined yet so put the msg here only to test, later shall be moved to a common file
-        self.hd_simulator.cmd_send_general_response(130, True, 0)
+        self.hd_simulator.cmd_send_hd_disinfect_chemical_confirm(True, 0)
         self.lblAction.setText('Accepted ')
 
     @Slot()
@@ -130,8 +127,7 @@
         :return: none
         """
         reason = self.spnReasonDisinfect.value()
-        # The FW enums have not been defined yet so put the msg here only to test, later shall be moved to a common file
-        self.hd_simulator.cmd_send_general_response(130, False, reason)
+        self.hd_simulator.cmd_send_hd_disinfect_chemical_confirm(False, reason)
         self.lblActionDisinfect.setText('Rejected ' + "{}".format(reason))
 
     @Slot()
@@ -143,8 +139,7 @@
         """
         timeout_total = self.sldTimeoutTotalFlush.value()
         timeout_countdown = self.sldTimeoutCountDownFlush.value()
-        # The FW enums have not been defined yet so put the msg here only to test, later shall be moved to a common file
-        self.hd_simulator.cmd_send_general_progress_data(131, timeout_total, timeout_countdown, False)
+        self.hd_simulator.cmd_send_dg_disinfect_progress_time_flush(timeout_total, timeout_countdown)
 
     @Slot()
     def do_data_heat(self):
@@ -155,8 +150,7 @@
         """
         timeout_total = self.sldTimeoutTotalHeat.value()
         timeout_countdown = self.sldTimeoutCountDownHeat.value()
-        # The FW enums have not been defined yet so put the msg here only to test, later shall be moved to a common file
-        self.hd_simulator.cmd_send_general_progress_data(132, timeout_total, timeout_countdown, False)
+        self.hd_simulator.cmd_send_dg_disinfect_progress_time_heat(timeout_total, timeout_countdown)
 
     @Slot()
     def do_data_chemical(self):
@@ -167,5 +161,4 @@
         """
         timeout_total = self.sldTimeoutTotalChemical.value()
         timeout_countdown = self.sldTimeoutCountDownChemical.value()
-        # The FW enums have not been defined yet so put the msg here only to test, later shall be moved to a common file
-        self.hd_simulator.cmd_send_general_progress_data(133, timeout_total, timeout_countdown, False)
+        self.hd_simulator.cmd_send_dg_disinfect_progress_time_checmical(timeout_total, timeout_countdown)