Index: dialin/ui/hd_simulator.py
===================================================================
diff -u -rbaf0bd4f8f1b6c76bfefe7f4aec53bef6b2450cb -rd45ebd9da5b356cb88f9e1cc2b3d71f8cb0ddbab
--- dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision baf0bd4f8f1b6c76bfefe7f4aec53bef6b2450cb)
+++ dialin/ui/hd_simulator.py	(.../hd_simulator.py)	(revision d45ebd9da5b356cb88f9e1cc2b3d71f8cb0ddbab)
@@ -328,11 +328,11 @@
                 self.demoCount = 0
                 self.demoCounter = 0
 
-            elif msg_id == MsgIds.MSG_ID_UI_SERVICE_MODE_REQUEST:               # 0xB0
-                rsp_id = MsgIds.MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST
-                rsp_payload = integer_to_bytearray(EResponse.Accepted)
-                rsp_payload += integer_to_bytearray(RequestRejectReasons.REQUEST_REJECT_REASON_NONE.value)
-                self.demoCount = 0  # immediately
+            # SERVICE MODE
+            elif msg_id == MsgIds.MSG_ID_UI_SERVICE_MODE_REQUEST.value:               # 0xB0
+                rsp_id = MsgIds.MSG_ID_HD_OP_MODE_DATA
+                rsp_payload = integer_to_bytearray(HDOpModes.MODE_SERV.value)
+                rsp_payload += integer_to_bytearray(0)
 
             # INITIATE A NEW TREATMENT SETUP ----------------------------------
             elif msg_id == MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value:
@@ -633,9 +633,7 @@
                 elif params.data_int[0] == 9:   # TBD!! Additional not implemented  9 = return to treatment
                     rsp_payload = integer_to_bytearray(EResponse.Rejected)
 
-            elif msg_id == MsgIds.MSG_ID_UI_PATIENT_DISCONNECTION_CONFIRM_REQUEST.value or \
-                 msg_id == MsgIds.MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST.value:     # _74 x4A
-                # rsp_id = MsgIds.MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE
+            elif msg_id == MsgIds.MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST.value:     # _74 x4A
                 self._send_treatment_log()
 
             elif msg_id == MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM_REQUEST.value:       # 115 x73
@@ -1215,7 +1213,7 @@
                 rsp_payload = integer_to_bytearray(HDOpModes.MODE_POST.value)
                 rsp_payload += integer_to_bytearray(PostTreatmentStates.HD_POST_TREATMENT_DRAIN_RESERVOIRS_STATE.value)
                 self.message_queue_mutex.acquire()
-                self._send_treatment_log()
+                # self._send_treatment_log()
                 self.message_queue_mutex.release()
                 self.demoSelection = 0
                 self.demoCount = 0