Index: tst_ui_logs/test.py
===================================================================
diff -u -r964d5afd05d3a278bad6a930d22a9c70f35ed39a -r1aa64d8752ffcc05db72fa3fbcebc4064d401fd8
--- tst_ui_logs/test.py	(.../test.py)	(revision 964d5afd05d3a278bad6a930d22a9c70f35ed39a)
+++ tst_ui_logs/test.py	(.../test.py)	(revision 1aa64d8752ffcc05db72fa3fbcebc4064d401fd8)
@@ -30,6 +30,7 @@
 import builtins
 from dialin.common.msg_ids import MsgIds
 from dialin.common import msg_defs
+from dialin.utils.conversions import byte_to_bytearray, integer_to_bytearray, float_to_bytearray, short_to_bytearray, unsigned_integer_to_bytearray, integer_to_bit_array
 # from dialin.utils import YES
 
 hd_simulator = HDSimulator()
@@ -40,6 +41,7 @@
 dg_simulator = DGSimulator()
 NUMBER_OF_OPMODE = 9
 NUMBER_OF_TREATMENTMODES = 3
+CONDITIONS = [0,1]
 
 
 def verify_log(msg_id,msg = None, param = None):
@@ -64,70 +66,94 @@
     startApplication(config.AUT_NAME)
     
     #HD Broadcast
-
     #0x0D00 
     hd_simulator.cmd_set_treatment_time(200,60,0)
     verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value, msg = "TreatmentTime", param = [200,60,0])
-    
+     
     #0x0500 
     hd_simulator.cmd_set_treatment_blood_flow_rate(flow_set_pt=20, measured_flow=10.5,
                                           rot_speed = 112.2 , mot_speed = 120.3, mc_speed = 100.0,
                                           mc_current = 12.5, pwm = 32.3, rotor_count = 30)
     verify_log(msg_id = MsgIds.MSG_ID_BLOOD_FLOW_DATA.value, msg = "BloodFlow", param = [20,10.5,112.2,120.3,100.0,12.5,32.3,30])
-    
+     
     #0x0800 
     hd_simulator.cmd_set_treatment_dialysate_flow_rate(flow_set_pt=20, measured_flow=10.5,
                                           rot_speed = 112.2 , mot_speed = 120.3, mc_speed = 100.0,
                                           mc_current = 12.5, pwm = 32.3)
     verify_log(msg_id = MsgIds.MSG_ID_DIALYSATE_FLOW_DATA.value, msg = "DialysateFlow", param = [20,10.5,112.2,120.3,100.0,12.5,32.3])
-    
+     
     #0x0900 
     hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs = 54.5, venous_prs = 20.1, blood_pump_occlusion = 3,
                                         dialysate_inlet_pump_occlusion = 2, dialysate_outlet_pump_occlusion = 5)
     verify_log(msg_id = MsgIds.MSG_ID_PRESSURE_OCCLUSION_DATA.value, msg = "Pressure/Occlusion", param = [54.5,20.1,3,2,5])
-    
+     
     #0x0B00 
     hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(ref_uf_vol = 77.5, measured_uf_vol = 22.6,
                                                            rot_speed = 54.0, mot_speed = 66.2, mc_speed = 33.3,
                                                            mc_current = 21.2, pwm = 322.2)
     verify_log(msg_id = MsgIds.MSG_ID_DIALYSATE_OUT_FLOW_DATA.value, msg = "OutletFlow",param = [77.5,22.6,54.0,66.2,33.3,21.2,322.2])
-    
+     
     #0x1A00 
     hd_simulator.cmd_set_treatment_parameter_ranges(min_treatment_duration = 300, max_treatment_duration = 500,
                                            min_uf_volume = 22.6, max_uf_volume = 34.2,
                                            min_dialysate_flow_rate = 3, max_dialysate_flow_rate = 5)
-    
+     
     verify_log(msg_id = str(MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES.value), msg = "TreatmentRanges", param = [300,500,22.6,34.2,3,5])
-    
+     
     #0x2F00 
     hd_simulator.cmd_set_treatment_saline_bolus_data(target = 2, cumulative = 90.0, delivered = 67.2)
     verify_log(msg_id = MsgIds.MSG_ID_SALINE_BOLUS_DATA.value, msg = "Saline", param = [2,90.0,67.2])
-    
+     
     #0x4D00 
     hd_simulator.cmd_set_treatment_heparin_data(cumulative = 4)
     verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, msg = "Heparin", param = [4])
-    
+     
     #0x3300
     hd_simulator.cmd_send_accelerometer_hd_data(x = 12.3, y = 22.2, z = 4.0,
                                        x_max = 14.0, y_max = 30.2, z_max = 10.5,
                                        x_tilt = 11.0, y_tilt = 22.1, z_tilt = 5.5)
     verify_log(msg_id = MsgIds.MSG_ID_HD_ACCELEROMETER_DATA.value, msg = "Accel", param = [12.3,22.2,4.0,14.0,30.2,10.5,11.0,22.1,5.5])
-    
+     
     #0x3A00
-    hd_simulator.cmd_send_hd_general_response(message_id = 58, accepted = 1, reason = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_VALVES_DATA.value, msg = "~HD_Valves_Data")
-    
+    #TODO: Payload values need to been changed after discussion
+    payload =  unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(MsgIds.MSG_ID_HD_VALVES_DATA.value)
+    payload += short_to_bytearray(3)
+    payload += short_to_bytearray(4)
+    payload += float_to_bytearray(3)
+    payload += short_to_bytearray(7)
+    payload += short_to_bytearray(5)
+    payload += short_to_bytearray(4)
+    payload += unsigned_integer_to_bytearray(3)
+    payload += unsigned_integer_to_bytearray(5)
+    hd_simulator.cmd_send_hd_general_response(message_id=58, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_VALVES_DATA.value, msg="~HD_Valves_Data")
+     
     #0x3E00
-    #hd_simulator.cmd_send_hd_general_response(message_id = 62, accepted = 1, reason = 1)
+    hd_simulator.cmd_send_hd_general_response(message_id = 62, accepted = 1, reason = 1)
     hd_simulator.cmd_send_hd_air_trap_data(lower_level = 1, upper_level = 10)
     verify_log(msg_id = MsgIds.MSG_ID_HD_AIR_TRAP_DATA.value, msg = "AirTrap", param = [1,10])
-    
+     
     #0x6900
-    hd_simulator.cmd_send_hd_general_response(message_id = 105, accepted = 1, reason = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_SYRINGE_PUMP_DATA.value, msg = "Syringe")
+    payload =  unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(0)
+    payload += float_to_bytearray(5.5)
+    payload += float_to_bytearray(1.5)
+    payload += integer_to_bytearray(1)
+    payload += float_to_bytearray(7.5)
+    payload += float_to_bytearray(2.5)
+    payload += float_to_bytearray(1.5)
+    payload += float_to_bytearray(1.2)
+    payload += float_to_bytearray(2)
+    payload +=  unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=105, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_SYRINGE_PUMP_DATA.value, msg="Syringe")
     
+    
     #0x6A00
-    hd_simulator.cmd_send_hd_general_response(message_id = 106, accepted = 1, reason = 1)
+    payload = unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=106, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
     verify_log(msg_id = MsgIds.MSG_ID_HD_FLUID_LEAK_STATE.value, msg = "~HD_Fluid_Leak_Data")
     
     #0x6C00
@@ -143,28 +169,64 @@
     verify_log(msg_id = MsgIds.MSG_ID_HD_BUBBLES_DATA.value, msg = "AirBubble", param = [2,0])
     
     #0x7B00
-    hd_simulator.cmd_send_hd_general_response(message_id = 123, accepted = 1, reason = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_VOLTAGES_DATA.value, msg = "~HD_Voltages_Data")
+    payload = float_to_bytearray(1.1)
+    payload += float_to_bytearray(2.1)
+    payload += float_to_bytearray(4)
+    payload += float_to_bytearray(3)
+    payload += float_to_bytearray(7)
+    payload += float_to_bytearray(6)
+    payload += float_to_bytearray(1)
+    payload += float_to_bytearray(2)
+    payload += float_to_bytearray(3)
+    payload += float_to_bytearray(4)
+    payload += float_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=123, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_VOLTAGES_DATA.value, msg="~HD_Voltages_Data")
     
     #0x7D00
-    hd_simulator.cmd_send_hd_general_response(message_id = 125, accepted = 1, reason = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_ALARM_INFORMATION.value, msg = "~HD_Alarm_Information")
+    payload = unsigned_integer_to_bytearray(10)
+    payload += float_to_bytearray(3)
+    payload += float_to_bytearray(2)
+    payload += float_to_bytearray(0.5)
+    payload += unsigned_integer_to_bytearray(2)
+    hd_simulator.cmd_send_hd_general_response(message_id=125, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_ALARM_INFORMATION.value, msg="~HD_Alarm_Information")
     
-    #0xA200      
-    hd_simulator.cmd_send_hd_general_response(message_id = 162, accepted = 1, reason = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_SWITCHES_DATA.value, msg = "~HD_Switches_Data")
+    #0xA200
+    payload = unsigned_integer_to_bytearray(20)
+    payload += unsigned_integer_to_bytearray(30)
+    hd_simulator.cmd_send_hd_general_response(message_id=162, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_SWITCHES_DATA.value, msg="~HD_Switches_Data")
     
     #0x9D00      
-    hd_simulator.cmd_send_hd_general_response(message_id = 157, accepted = 1, reason = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_TEMPERATURES_DATA.value, msg = "~HD_Temperature_Data")
+    payload = float_to_bytearray(1)
+    payload += float_to_bytearray(1)
+    payload += float_to_bytearray(3)
+    payload += float_to_bytearray(2)
+    payload += float_to_bytearray(5)
+    payload += float_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=157, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_TEMPERATURES_DATA.value, msg="~HD_Temperature_Data")
     
-    #0xA300      
-    hd_simulator.cmd_send_hd_general_response(message_id = 163, accepted = 1, reason = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_FANS_DATA.value, msg = "~HD_Fans_Data")
+    #0xA300
+    payload = float_to_bytearray(3)
+    payload += float_to_bytearray(4)
+    payload += float_to_bytearray(10)
+    payload += unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=163, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_FANS_DATA.value, msg="~HD_Fans_Data")
     
-    #0xA800      
-    hd_simulator.cmd_send_hd_general_response(message_id = 168, accepted = 1, reason = 1) 
-    verify_log(msg_id = MsgIds.MSG_ID_HD_RESERVOIRS_DATA.value, msg = "~HD_Reservoirs_Data")                       
+    #0xA800
+    payload = unsigned_integer_to_bytearray(1)
+    payload += float_to_bytearray(4)
+    payload += float_to_bytearray(10)
+    payload += float_to_bytearray(1)   
+    payload += float_to_bytearray(2)   
+    payload += unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(133) 
+    payload += float_to_bytearray(13) 
+    hd_simulator.cmd_send_hd_general_response(message_id=168, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) 
+    verify_log(msg_id=MsgIds.MSG_ID_HD_RESERVOIRS_DATA.value, msg="~HD_Reservoirs_Data")                       
     
     
     #HD Operation Mode
@@ -189,9 +251,10 @@
         verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_STATE.value, msg = "TreatmentStates", param = [s_mode,0,0,0,0,0,0,0,0,0])
         
     #0x7700
-    #for s_mode in range(3):
-    hd_simulator.cmd_send_hd_general_response(message_id = 119, accepted = 1, reason = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_POST_TREATMENT_STATE.value, msg = "PostTreatmentStates")
+#     for s_mode in range(3):
+    payload = integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=119, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) 
+    verify_log(msg_id=MsgIds.MSG_ID_HD_POST_TREATMENT_STATE.value, msg="PostTreatmentStates")
     
     #0x7E00
     for s_mode in range(NUMBER_OF_TREATMENTMODES):
@@ -202,8 +265,10 @@
     
     #0x9B00
 #     hd_simulator.cmd_send_hd_disinfect_response(accepted = True, reason =1)
-    hd_simulator.cmd_send_hd_general_response(message_id = 155, accepted = 1, reason = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE.value, msg = "~HD_Set_Standby_Disinfect_State_Response")
+    payload = integer_to_bytearray(1)
+    payload += integer_to_bytearray(2)
+    hd_simulator.cmd_send_hd_general_response(message_id=155, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) 
+    verify_log(msg_id=MsgIds.MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE.value, msg="~HD_Set_Standby_Disinfect_State_Response")
     
     #RINSEBACK
     
@@ -241,13 +306,15 @@
     
     #Treatment Stop(sub-mode)
     #0x4900
-    hd_simulator.cmd_send_hd_general_response(message_id = 73, accepted = 1, reason = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_TREATMENT_STOP_TIMER_DATA.value, msg = "Stop")
+    payload = unsigned_integer_to_bytearray(150)
+    payload += unsigned_integer_to_bytearray(300)
+    hd_simulator.cmd_send_hd_general_response(message_id=73, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) 
+    verify_log(msg_id=MsgIds.MSG_ID_HD_TREATMENT_STOP_TIMER_DATA.value, msg="Stop")
     
     #RTC
-    
     #0x0A00
-    hd_simulator.cmd_send_hd_general_response(message_id = 10, accepted = 1, reason = 1)
+    payload = unsigned_integer_to_bytearray(20)
+    hd_simulator.cmd_send_hd_general_response(message_id=10, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
     verify_log(msg_id = MsgIds.MSG_ID_RTC_EPOCH.value, msg = "~HD_RTC_Epoch_Data")
     
     #0x6E00
@@ -269,13 +336,25 @@
     
     #Events
     #0xA400
-    hd_simulator.cmd_send_hd_general_response(message_id=164, accepted=1, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_EVENT.value, msg = "General")
-    
-    #0xA500
-    dg_simulator.cmd_send_dg_general_response(message_id=165, accepted=1, reason=1)
+    for value in CONDITIONS:
+        payload = unsigned_integer_to_bytearray(MsgIds.MSG_ID_HD_EVENT.value)
+        payload += unsigned_integer_to_bytearray(4)
+        payload += integer_to_bytearray(value)
+        payload += unsigned_integer_to_bytearray(4)
+        payload += integer_to_bytearray(value)
+        hd_simulator.cmd_send_hd_general_response(message_id=164, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_EVENT.value, msg="General")
+
+    #0xA500  
+    for value in CONDITIONS:
+        payload = unsigned_integer_to_bytearray(MsgIds.MSG_ID_DG_EVENT.value)
+        payload += unsigned_integer_to_bytearray(4)   
+        payload += integer_to_bytearray(value)
+        payload += unsigned_integer_to_bytearray(4)
+        payload += integer_to_bytearray(value)
+        dg_simulator.cmd_send_dg_general_response(message_id=165, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
     verify_log(msg_id = MsgIds.MSG_ID_DG_EVENT.value)
-    
+
     #Power-On Self-Test [POST]
     #0x8E00
     hd_simulator.cmd_send_hd_post(item = 1, passed = True, done = False)
@@ -294,8 +373,9 @@
     verify_log(msg_id = MsgIds.MSG_ID_DG_POST_FINAL_TEST_RESULT.value, msg = "POSTDone", param = [0])
     
     #0x9C00
-    hd_simulator.cmd_send_hd_general_response(message_id=156, accepted=1, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_DG_POST_RESULT_REQUEST.value)
+    #TODO: Payload values need to been changed after discussion
+    hd_simulator.cmd_send_hd_general_response(message_id=156, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_DG_POST_RESULT_REQUEST.value)
     
     #Versions
     #0x1D00
@@ -310,40 +390,14 @@
     compatibility_rev=6)
     verify_log(msg_id = MsgIds.MSG_ID_DG_VERSION.value, msg = "Version", param = [1,1,0,4,5,1,2,3,6])
     
-    #TODO: message is not displaying in log after API call
-    #0x9900
-    hd_simulator.cmd_send_serial_hd_data(serial = 'AGHHG1234GHJ')
-    verify_log(msg_id = MsgIds.MSG_ID_HD_SERIAL_NUMBER.value, msg = "Serial")
-    
-    #0x8800
-    dg_simulator.cmd_send_serial_dg_data(serial = 'AGHHG1234GHJ')
-    verify_log(msg_id = MsgIds.MSG_ID_DG_SERIAL_NUMBER.value, msg = "Serial")
-    
     #0x9E00
     hd_simulator.cmd_send_hd_request_ui_version()
     verify_log(msg_id = MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, msg = "VersionReq")
 
-    #DG Broadcast Data
-
-    #0x1F00 
-    #To Do: Message is not getting logged, therefore parameter verification is also failing
-    dg_simulator.cmd_set_dg_ro_pump_data(set_pt_pressure = 0, flow_rate = 1.0, pwm = 2.0)
-    verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value, msg = "ROPump")
-    
     #0x2000
     dg_simulator.cmd_set_dg_pressures_data(ro_inlet_pressure = 0.0, ro_outlet_pressure = 1.0, drain_inlet_pressure = 2.0, drain_outlet_pressure = 3.0)
     verify_log(msg_id = MsgIds.MSG_ID_DG_PRESSURES_DATA.value, msg = "Pressures", param = [0.0, 1.0, 2.0, 3.0])
     
-    #0x2400
-    #Message is not getting logged, therefore parameter verification is also failing
-    dg_simulator.cmd_set_dg_drain_pump_data(set_pt_pwm = 1, dac_value = 2)
-    verify_log(msg_id = MsgIds.MSG_ID_DRAIN_PUMP_DATA.value, msg = "DrainPump")
-    
-    #0x2700
-    #Message is not getting logged, therefore parameter verification is also failing
-    dg_simulator.cmd_set_dg_operation_mode(dg_op_mode = 1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_OP_MODE.value, msg = "OpMode")
-    
     #0x2800
     dg_simulator.cmd_set_dg_reservoir_data(active_reservoir = 0, fill_to_vol_ml = 1, drain_to_vol_ml = 2)
     verify_log(msg_id = MsgIds.MSG_ID_DG_RESERVOIRS_DATA.value, msg = "Reservoir", param = [0, 1, 2])
@@ -378,82 +432,162 @@
     verify_log(msg_id = MsgIds.MSG_ID_DG_CONDUCTIVITY_DATA.value, msg = "Conductivity", param = [1.0, 2.0, 3.0, 4.0,5.0])
     
     #0x3700
-    dg_simulator.cmd_send_dg_general_response(message_id=55, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_HEAT_DISINFECT_DATA.value, msg = "~DG_Heat_Disinfect_Data")
+    payload = integer_to_bytearray(1) 
+    payload += integer_to_bytearray(20)     
+    payload += integer_to_bytearray(15)
+    payload += integer_to_bytearray(30)
+    payload += integer_to_bytearray(25)
+    payload += float_to_bytearray(2.0)
+    payload += float_to_bytearray(1.0)
+    payload += integer_to_bytearray(40)
+    dg_simulator.cmd_send_dg_general_response(message_id=55, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_HEAT_DISINFECT_DATA.value, msg = "~DG_Heat_Disinfect_Data")
     
     #0x4200
-    dg_simulator.cmd_send_dg_general_response(message_id=66, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_CONCENTRATE_PUMP_DATA.value, msg = "~DG_Concentrate_Pump_Data")
+    payload = float_to_bytearray(2.22)
+    payload += float_to_bytearray(1.45)
+    payload += float_to_bytearray(4.67)
+    payload += float_to_bytearray(5.93)
+    dg_simulator.cmd_send_dg_general_response(message_id=66, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_CONCENTRATE_PUMP_DATA.value, msg="~DG_Concentrate_Pump_Data")
     
     #0x4400
-    dg_simulator.cmd_send_dg_general_response(message_id=68, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_UV_REACTORS_DATA.value, msg = "~DG_UV_Reactors_Data")
+    payload = integer_to_bytearray(10)     
+    payload += integer_to_bytearray(15)
+    payload += integer_to_bytearray(30)
+    payload += integer_to_bytearray(20)
+    dg_simulator.cmd_send_dg_general_response(message_id=68, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_UV_REACTORS_DATA.value, msg="~DG_UV_Reactors_Data")
     
     #0x4500
-    dg_simulator.cmd_send_dg_general_response(message_id=69, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_THERMISTORS_DATA.value, msg = "~DG_Thermistors_Data")
+    payload = float_to_bytearray(1.25)
+    payload += float_to_bytearray(4.17)
+    payload += float_to_bytearray(5.53)
+    dg_simulator.cmd_send_dg_general_response(message_id=69, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_THERMISTORS_DATA.value, msg="~DG_Thermistors_Data")
     
     #0x4800
-    dg_simulator.cmd_send_dg_general_response(message_id=72, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_FANS_DATA.value, msg = "~DG_Fans_Data")
+    payload = float_to_bytearray(1.9)
+    payload += float_to_bytearray(4.7)
+    payload += float_to_bytearray(9.5)
+    payload += float_to_bytearray(9.3)
+    payload += float_to_bytearray(8.8)
+    payload += float_to_bytearray(5.3)
+    payload += float_to_bytearray(8.1)
+    payload += float_to_bytearray(6.7)
+    dg_simulator.cmd_send_dg_general_response(message_id=72, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_FANS_DATA.value, msg="~DG_Fans_Data")
     
     #0x3400
     dg_simulator.cmd_send_accelerometer_dg_data(x=1.0, y=2.0, z=3.0, x_max=2.0, y_max=2.0, z_max=3.0, x_tilt=2.0, y_tilt=3.0, z_tilt=4.0)
     verify_log(msg_id = MsgIds.MSG_ID_DG_ACCELEROMETER_DATA.value, msg = "Accel", param = [1.0, 2.0, 3.0, 2.0, 2.0, 3.0, 2.0, 3.0, 4.0])
     
     #0x6B00
-    dg_simulator.cmd_send_dg_general_response(message_id=107, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_FLUID_LEAK_STATE.value, msg = "~DG_Fluid_Leak_Data")
+    payload = integer_to_bytearray(0)
+    dg_simulator.cmd_send_dg_general_response(message_id=107, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE.value, msg="~DG_Fluid_Leak_Data")
     
     #0x7A00
-    dg_simulator.cmd_send_dg_general_response(message_id=122, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_FLUSH_DATA.value, msg = "~DG_Flush_Data")
+    payload = integer_to_bytearray(5)
+    payload += integer_to_bytearray(60)
+    payload += integer_to_bytearray(30)
+    dg_simulator.cmd_send_dg_general_response(message_id=122, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_FLUSH_DATA.value, msg="~DG_Flush_Data")
     
     #0x8600
-    dg_simulator.cmd_send_dg_general_response(message_id=134, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_VOLTAGES_DATA.value, msg = "~DG_Voltages_Data")
+    payload = float_to_bytearray(1.0)
+    payload += float_to_bytearray(1.2)
+    payload += float_to_bytearray(1.8)
+    payload += float_to_bytearray(1.8)
+    payload += float_to_bytearray(3.0)
+    payload += float_to_bytearray(3.0)
+    payload += float_to_bytearray(3.0)
+    payload += float_to_bytearray(3.3)
+    payload += float_to_bytearray(3.3)
+    payload += float_to_bytearray(5.0)
+    payload += float_to_bytearray(5.0)
+    payload += float_to_bytearray(5.0)
+    payload += float_to_bytearray(24.0)
+    payload += float_to_bytearray(24.0)
+    payload += float_to_bytearray(24.0)
+    dg_simulator.cmd_send_dg_general_response(message_id=134, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_VOLTAGES_DATA.value, msg="~DG_Voltages_Data")
     
     #0x8700
-    dg_simulator.cmd_send_dg_general_response(message_id=135, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_CHEM_DISINFECT_DATA.value, msg = "~DG_Chemical_Disinfect_Data")
+    payload = integer_to_bytearray(1)
+    payload += integer_to_bytearray(60)
+    payload += integer_to_bytearray(30)
+    payload += integer_to_bytearray(0)
+    payload += float_to_bytearray(2.0)
+    payload += float_to_bytearray(4.0)
+    payload += integer_to_bytearray(24)
+    payload += integer_to_bytearray(30)
+    payload += integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id=135, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_CHEM_DISINFECT_DATA.value, msg="~DG_Chemical_Disinfect_Data")
     
     #0xA100
-    dg_simulator.cmd_send_dg_general_response(message_id=161, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_SWITCHES_DATA.value, msg = "~DG_Switches_Data")
-    
+    payload = integer_to_bytearray(1)
+    payload += integer_to_bytearray(0)
+    payload += integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id=161, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_SWITCHES_DATA.value, msg="~DG_Switches_Data")
+  
     #0xA700
-    dg_simulator.cmd_send_dg_general_response(message_id=167, accepted=1, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_ALARM_INFO.value, msg = None)
+    #TODO: Payload values need to been changed after discussion
+    payload = integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id=167, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_ALARM_INFO.value, msg=None)
     
     #0xAA00
-    dg_simulator.cmd_send_dg_general_response(message_id=170, accepted=1, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA.value, msg = None)
+    #TODO: Payload values need to been changed after discussion
+    payload = float_to_bytearray(88.6)
+    payload += float_to_bytearray(256.8)
+    payload += integer_to_bytearray(156)
+    dg_simulator.cmd_send_dg_general_response(message_id=170, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_CONCENTRATE_MIXING_RATIOS_DATA.value, msg = None)
     
     #0xA600
-    dg_simulator.cmd_send_dg_general_response(message_id=166, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_DIALYSATE_FLOW_METER_DATA.value, msg = "~DG_Dialysate_Flow_Data")
+    payload = float_to_bytearray(22.2)
+    dg_simulator.cmd_send_dg_general_response(message_id=166, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_DIALYSATE_FLOW_METER_DATA.value, msg="~DG_Dialysate_Flow_Data")
     
     #0xAB00
+    #TODO: Payload values need to been changed after discussion
     dg_simulator.cmd_send_dg_general_response(message_id=171, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_SCHEDULED_RUNS_DATA.value, msg = "DG scheduled runs data")
+    verify_log(msg_id=MsgIds.MSG_ID_DG_SCHEDULED_RUNS_DATA.value, msg="DG scheduled runs data")
     
     #0xAC00
+    #TODO: Payload values need to been changed after discussion
     dg_simulator.cmd_send_dg_general_response(message_id=172, accepted=0, reason=1)
     verify_log(msg_id = MsgIds.MSG_ID_DG_SCHEDULED_RUNS_INFO.value, msg = "DG scheduled runs info")
     
     #TODO: Msg_Ids need to be update as per patch file. line number 446 should be uncomment after the fix
     #Fix id : ID not logged for the ones in ACK_NOT_REQUIRED list #46
     #0xAE00
-    dg_simulator.cmd_send_dg_general_response(message_id=174, accepted=0, reason=1)
+    #TODO: Payload values need to been changed after discussion
+    payload = float_to_bytearray(22.2)
+    payload += float_to_bytearray(22.2)
+    payload += integer_to_bytearray(1)
+    payload += float_to_bytearray(22.2)
+    payload += float_to_bytearray(22.2)
+    payload += float_to_bytearray(22.2)
+    dg_simulator.cmd_send_dg_general_response(message_id=174, accepted=0, reason=1, is_pure_data = False,
+                                     has_parameters = True,
+                                     parameters_payload = payload)
     #verify_log(msg_id = MsgIds.MSG_ID_DG_FILL_MODE_DATA.value, msg = None)
     
+    
     #TODO: Msg_Ids need to be update as per patch file. line number 453 should be uncomment after the fix
     #Fix id : ID not logged for the ones in ACK_NOT_REQUIRED list #46
     #0xAF00
-    dg_simulator.cmd_send_dg_general_response(message_id=175, accepted=0, reason=1)
+    #TODO: Payload values need to been changed after discussion
+    payload = unsigned_integer_to_bytearray(456)
+    dg_simulator.cmd_send_dg_general_response(message_id=175, accepted=0, reason=1, is_pure_data = False,
+                                     has_parameters = True,
+                                     parameters_payload = payload)
     #verify_log(msg_id = MsgIds.MSG_ID_DG_IDLE_MODE_BAD_FILL_SUB_STATES.value, msg = None)
     
-    #Alarm
     
     #0x0200
     hd_alarm.cmd_send_clear_alarms()
@@ -477,11 +611,14 @@
     
     
     #0x3F00
+    #TODO: Payload values need to been changed after discussion
     hd_simulator.cmd_send_hd_general_response(message_id=63, accepted=1, reason=1)
     verify_log(msg_id = MsgIds.MSG_ID_ALARM_CONDITION_CLEARED.value, msg = "AlarmCondition")    
     
     #0x3200
-    hd_simulator.cmd_send_hd_general_response(message_id=50, accepted=0, reason=1)
+    #TODO: Payload values need to been changed after discussion
+    payload = unsigned_integer_to_bytearray(6)
+    dg_simulator.cmd_send_dg_general_response(message_id=50, accepted=0, reason=1, is_pure_data= False, has_parameters = True, parameters_payload = payload)
     verify_log(msg_id = MsgIds.MSG_ID_USER_REQUEST_ALARM_SILENCE.value, msg = "AlarmSilence")
     
     #0x9800
@@ -499,8 +636,18 @@
     verify_log(msg_id = MsgIds.MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE.value, msg = "AdjustUFState")
     
     #0x1300
-    hd_simulator.cmd_send_hd_general_response(message_id=19, accepted=1, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE.value, msg = "AdjustUFEdit")
+    #TODO: Payload values need to been changed after discussion
+    payload = unsigned_integer_to_bytearray(4)
+    payload += unsigned_integer_to_bytearray(6)
+    payload += unsigned_integer_to_bytearray(12)
+    payload += float_to_bytearray(8.4)
+    payload += unsigned_integer_to_bytearray(14)
+    payload += short_to_bytearray(6)
+    payload += float_to_bytearray(5.2)
+    payload += float_to_bytearray(5.8)
+    payload += float_to_bytearray(2.3)
+    hd_simulator.cmd_send_hd_general_response(message_id=19, accepted=1, reason=1, is_pure_data= False, has_parameters = True,parameters_payload = payload)
+    verify_log(msg_id=MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE.value, msg="AdjustUFEdit")
     
     #0x2E00
     #parameter mismatch : expected 1 int but 3 integers are logged
@@ -545,94 +692,139 @@
     #0x8A00
     # hd_simulator._handler_system_usage_response()
     hd_simulator.cmd_send_hd_general_response(message_id=138, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_SERVICE_SCHEDULE_DATA.value, msg = "ServiceDate")
+    verify_log(msg_id=MsgIds.MSG_ID_HD_SERVICE_SCHEDULE_DATA.value, msg="ServiceDate")
     
     #0x8C00
     # dg_simulator._handler_system_usage_response()
     dg_simulator.cmd_send_dg_general_response(message_id=140, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_SERVICE_SCHEDULE_DATA.value, msg = "ServiceDate")
+    verify_log(msg_id=MsgIds.MSG_ID_DG_SERVICE_SCHEDULE_DATA.value, msg="ServiceDate")
     
     #System Usage Information
     #0x8B00
-    hd_simulator.cmd_send_hd_general_response(message_id=139, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_USAGE_DATA.value, msg = "~HD_Usage_Data")
+    payload = unsigned_integer_to_bytearray(6)
+    hd_simulator.cmd_send_hd_general_response(message_id=139, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_USAGE_DATA.value, msg="~HD_Usage_Data")
     
     #0x8D00
-    dg_simulator.cmd_send_dg_general_response(message_id=141, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_USAGE_DATA.value, msg = "~DG_Usage_Data")
+    payload = float_to_bytearray(3.5)
+    dg_simulator.cmd_send_dg_general_response(message_id=141, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_USAGE_DATA.value, msg="~DG_Usage_Data")
     
     #DG Command
     #0x2100
-    hd_simulator.cmd_send_hd_general_response(message_id=33, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds. MSG_ID_DG_SWITCH_RESERVOIR_CMD.value, msg = "~DG_Switch_Res_Cmd")
+    payload = unsigned_integer_to_bytearray(6)
+    hd_simulator.cmd_send_hd_general_response(message_id=33, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds. MSG_ID_DG_SWITCH_RESERVOIR_CMD.value, msg="~DG_Switch_Res_Cmd")
     
     #0x2200
-    hd_simulator.cmd_send_hd_general_response(message_id=34, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds. MSG_ID_DG_FILL_CMD.value, msg = "~DG_Fill_Cmd")
+    payload = unsigned_integer_to_bytearray(6)
+    payload += unsigned_integer_to_bytearray(8)
+    hd_simulator.cmd_send_hd_general_response(message_id=34, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds. MSG_ID_DG_FILL_CMD.value, msg="~DG_Fill_Cmd")
     
     #0x2300
-    hd_simulator.cmd_send_hd_general_response(message_id=35, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_DRAIN_CMD.value, msg = "~DG_Drain_Cmd")
+    payload = unsigned_integer_to_bytearray(6)
+    payload += unsigned_integer_to_bytearray(8)
+    payload += unsigned_integer_to_bytearray(6)
+    payload += unsigned_integer_to_bytearray(8)
+    hd_simulator.cmd_send_hd_general_response(message_id=35, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_DRAIN_CMD.value, msg="~DG_Drain_Cmd")
     
     #0x1900
+    payload = float_to_bytearray(10.5)
+    payload += unsigned_integer_to_bytearray(2)
+    payload += float_to_bytearray(1.5)
+    payload += unsigned_integer_to_bytearray(6)
+    payload += float_to_bytearray(20.5)   
     hd_simulator.cmd_send_hd_general_response(message_id=25, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS.value, msg = "~DG_Dialysate_Tgt_Temps")
+    verify_log(msg_id=MsgIds.MSG_ID_SET_DG_DIALYSATE_TEMP_TARGETS.value, msg="~DG_Dialysate_Tgt_Temps")
     
     #0x2600
-    hd_simulator.cmd_send_hd_general_response(message_id=38, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD.value, msg = "~DG_Cmd")
+    payload = unsigned_integer_to_bytearray(1) 
+    hd_simulator.cmd_send_hd_general_response(message_id=38, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD.value, msg="~DG_Cmd")
     
     #0x2900
-    hd_simulator.cmd_send_hd_general_response(message_id=41, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD.value, msg = "~DG_Sample_Water_Cmd")
+    payload = unsigned_integer_to_bytearray(2)
+    hd_simulator.cmd_send_hd_general_response(message_id=41, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD.value, msg="~DG_Sample_Water_Cmd")
     
     #0x2B00
-    hd_simulator.cmd_send_hd_general_response(message_id=43, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds. MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD.value, msg = "~DG_Trimmer_Htr_Cmd")
+    payload = unsigned_integer_to_bytearray(1)
+    payload += float_to_bytearray(20.5)
+    hd_simulator.cmd_send_hd_general_response(message_id=43, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds. MSG_ID_DG_START_STOP_TRIMMER_HEATER_CMD.value, msg="~DG_Trimmer_Htr_Cmd")
     
     #0x3000
-    hd_simulator.cmd_send_hd_general_response(message_id=48, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT.value, msg = "~DG_Heat_Disinfect_Cmd")
+    payload = unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=48, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT.value, msg="~DG_Heat_Disinfect_Cmd")
     
     #0x5B00
-    hd_simulator.cmd_send_hd_general_response(message_id=91, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD.value, msg = "~DG_Chg_Valves_Cmd")
+    payload = unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=91, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD.value, msg="~DG_Chg_Valves_Cmd")
     
     #0x5100
-    hd_simulator.cmd_send_hd_general_response(message_id=81, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_COMMAND_RESPONSE.value, msg = "~DG_Cmd_Rsp")
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(0)
+    payload += unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=81, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id = MsgIds.MSG_ID_DG_COMMAND_RESPONSE.value, msg="~DG_Cmd_Rsp")
     
     #0x7800
-    hd_simulator.cmd_send_hd_general_response(message_id=120, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_START_STOP_CHEM_DISINFECT.value, msg = "~DG_Chem_Disinfect_Cmd")
+    payload = unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=120, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_START_STOP_CHEM_DISINFECT.value, msg="~DG_Chem_Disinfect_Cmd")
     
     #0x7900
-    hd_simulator.cmd_send_hd_general_response(message_id=121, accepted=0, reason=1)
+    payload = unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id=121, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
     verify_log(msg_id = MsgIds.MSG_ID_DG_START_STOP_FLUSH.value, msg = "~DG_Flush_Cmd")
     
     #0xA900
-    hd_simulator.cmd_send_hd_general_response(message_id=169, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS.value, msg = "~DG_Mixing_Ratio_Fill_Prep_Request")
-    
+    hd_simulator.cmd_send_hd_general_response(message_id=169, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=None)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS.value, msg="~DG_Mixing_Ratio_Fill_Prep_Request")
+
     #FW Debug
     #0xF1FF
-    hd_simulator.cmd_send_hd_general_response(message_id=65521, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_DEBUG_EVENT.value, msg = "Debug")
+    payload = integer_to_bit_array(val = 65, num_bits = 42)
+    hd_simulator.cmd_send_hd_general_response(message_id=65521, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_DEBUG_EVENT.value, msg="Debug")
     
     #0xF2FF
-    dg_simulator.cmd_send_dg_general_response(message_id=65522, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_DG_DEBUG_EVENT.value, msg = "Debug")
-    
+    payload = integer_to_bit_array(val = 65, num_bits = 42)
+    dg_simulator.cmd_send_dg_general_response(message_id=65522, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_DG_DEBUG_EVENT.value, msg="Debug")
+
     #Initiate (Create/Select) a Treatment 
     #ID:0x3900
     hd_simulator.cmd_initiate_treatment_response(response = 1, reason = 0)
     verify_log(msg_id = MsgIds.MSG_ID_HD_INITIATE_TREATMENT_RESPONSE.value, msg= "InitTreatment", param = [1,0])    
     
     #Treatment Parameters Validation
-    #ID:0x3600 (API is not reflecting with rejection messages)
-    #hd_simulator.cmd_send_treatment_parameter_validation_response([0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34])
-    hd_simulator.cmd_send_hd_general_response(message_id=54, accepted=0, reason=1)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE.value, msg= "Validate New Create Treatment Response")
+    #ID:0x3600
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(2)
+    payload += unsigned_integer_to_bytearray(3)
+    payload += unsigned_integer_to_bytearray(4)
+    payload += unsigned_integer_to_bytearray(5)
+    payload += unsigned_integer_to_bytearray(6)
+    payload += unsigned_integer_to_bytearray(7)
+    payload += unsigned_integer_to_bytearray(8)
+    payload += unsigned_integer_to_bytearray(9)
+    payload += unsigned_integer_to_bytearray(10)
+    payload += unsigned_integer_to_bytearray(11)
+    payload += unsigned_integer_to_bytearray(12)
+    payload += unsigned_integer_to_bytearray(13)
+    payload += unsigned_integer_to_bytearray(14)
+    payload += unsigned_integer_to_bytearray(15)
+    payload += unsigned_integer_to_bytearray(16)
+    payload += unsigned_integer_to_bytearray(17)
+    payload += unsigned_integer_to_bytearray(18)
+    payload += unsigned_integer_to_bytearray(19)
+    hd_simulator.cmd_send_hd_general_response(message_id=54, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE.value, msg="Validate New Create Treatment Response")
         
     #Pre-Treatment Water Sample (sub-mode)
     #ID:0x5E00
@@ -651,8 +843,10 @@
     #Pre-Treatment Disposable Installation (sub-mode)
     #TODO: Msg_Ids need to be update as per patch file
     #ID:0xAD00(API is missing, also message id is not present in msgs.py file
-    hd_simulator.cmd_send_hd_general_response(message_id=173, accepted=0, reason=1)
-    #verify_log(msg_id = MsgIds.MSG_ID_HD_UI_DISPOSABLE_INSTALLATION_RESPONSE.value, msg = "AdjustDisposablesConfirm", param = [0,1])   
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(0)
+    hd_simulator.cmd_send_hd_general_response(message_id=173, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    #verify_log(msg_id = MsgIds.MSG_ID_HD_UI_DISPOSABLE_INSTALLATION_RESPONSE.value, msg = "AdjustDisposablesConfirm", param = [0,1]) 
     
     #Pre-Treatment Dry Self-Test (sub-mode)
     #ID:0x6300
@@ -668,17 +862,20 @@
     hd_simulator.cmd_send_pre_treatment_disposables_prime_progress_data(timeout = 120, countdown = 60)
     verify_log(msg_id = MsgIds.MSG_ID_HD_PRIMING_STATUS_DATA.value, msg = "DisposablesPrime", param = [120,60])
     
-    
-    
     #Pre-Treatment Patient Connection Begin
     #ID:0x6500
-    hd_simulator.cmd_send_hd_general_response(message_id=101, accepted=1, reason=0)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_PATIENT_CONNECTION_BEGIN_RESPONSE.value, msg = "Patient Connection Begin Response")
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(0)
+    hd_simulator.cmd_send_hd_general_response(message_id=101, accepted=1, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_PATIENT_CONNECTION_BEGIN_RESPONSE.value, msg="Patient Connection Begin Response")
     
     #Pre-Treatment Ultrafiltration (Init) Volume Adjustment
     #ID:0x5000
-    hd_simulator.cmd_send_hd_general_response(message_id=80, accepted=1, reason=0)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE.value, msg = "Pre UF Volume Adjustment Response")
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(0)
+    payload += float_to_bytearray(11.500)
+    hd_simulator.cmd_send_hd_general_response(message_id=80, accepted=1, reason=0, is_pure_data = False, has_parameters=True, parameters_payload=payload)
+    verify_log(msg_id=MsgIds.MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE.value, msg="Pre UF Volume Adjustment Response")
     
     #Pre-Treatment Patient Connection Confirm
     #ID:0x6700
@@ -774,5 +971,53 @@
     #ID:0x8500
     dg_simulator.cmd_send_dg_disinfect_progress_time_checmical(total = 120, countdown = 60)
     verify_log(msg_id = MsgIds.MSG_ID_DG_CHEM_DISINFECT_TIME_DATA.value, msg = "DisinfectDGChemicalTime", param = [120,60])
-        
-    
\ No newline at end of file
+    
+    #0x9900
+    hd_simulator.cmd_send_serial_hd_data(serial = 'AGHHG1234GHJABC')
+    verify_log(msg_id = MsgIds.MSG_ID_HD_SERIAL_NUMBER.value, msg = "Serial", param = ['AGHHG1234GHJABC'])
+    
+    #0x8800
+    dg_simulator.cmd_send_serial_dg_data(serial = 'AGHHG1234GHJABC')
+    verify_log(msg_id = MsgIds.MSG_ID_DG_SERIAL_NUMBER.value, msg = "Serial", param = ['AGHHG1234GHJABC'])
+    
+    #0x1F00
+    payload = float_to_bytearray(1.2)
+    payload += float_to_bytearray(1.2)
+    payload += float_to_bytearray(1.2)
+    payload += unsigned_integer_to_bytearray(2) 
+    dg_simulator.cmd_send_dg_general_response(message_id=31, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload)
+    verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value)
+    
+    #0x2400
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id=36, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload)
+    verify_log(msg_id = MsgIds.MSG_ID_DRAIN_PUMP_DATA.value, msg = "DrainPump")
+    
+    #0x2700
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id=39, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload)
+    verify_log(msg_id = MsgIds.MSG_ID_DG_OP_MODE.value, msg = "OpMode")
+    
+    #0x2D00
+    payload = float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    payload += float_to_bytearray(11.500)
+    dg_simulator.cmd_send_dg_general_response(message_id=45, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload)
+    verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures")
+    
+    utils.tstDone()
+