Index: tst_ui_logs/test.py
===================================================================
diff -u -r8d2354463fa50581b5030320e4a20eb41b3bae96 -r6ca4c4ff2c7b2e8d2e759c8b70bd452bbbb35f86
--- tst_ui_logs/test.py	(.../test.py)	(revision 8d2354463fa50581b5030320e4a20eb41b3bae96)
+++ tst_ui_logs/test.py	(.../test.py)	(revision 6ca4c4ff2c7b2e8d2e759c8b70bd452bbbb35f86)
@@ -455,12 +455,7 @@
     payload += unsigned_integer_to_bytearray(30)
     payload += unsigned_integer_to_bytearray(22)
     dg_simulator.cmd_send_dg_general_response(message_id=45, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) 
-<<<<<<< HEAD
     verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures")
-     
-=======
-          
->>>>>>> parent of 8d608ca... Adding message_id's belongs to 0x8000
     #0x3100
     dg_simulator.cmd_send_dg_conductivity_data(ro_rejection_ratio = 1.0, cpi_conductivity = 2.0,
     cpo_conductivity = 3.0, cd1_conductivity = 4.0,
@@ -681,7 +676,7 @@
     hd_alarm.cmd_send_active_list_response(accept = True, reason = 1,
     a0 = 0, a1 = 1, a2 = 2, a3 = 3, a4 = 4,
     a5 = 5, a6 = 6, a7 = 7, a8 = 8, a9 = 9)
-    verify_log(msg_id = MsgIds.MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE.value, msg = "AlarmActiveList")
+    #verify_log(msg_id = MsgIds.MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE.value, msg = "AlarmActiveList")
         
        
     #UF Vol.
@@ -1040,11 +1035,9 @@
     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)
-<<<<<<< HEAD
     verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value, msg = "ROPump")
-=======
     verify_log(msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value)
->>>>>>> parent of 8d608ca... Adding message_id's belongs to 0x8000
+
        
     #0x2400
     payload = unsigned_integer_to_bytearray(1)
@@ -1059,9 +1052,6 @@
     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")
-<<<<<<< HEAD
-          
-=======
        
     #0x2D00
     payload = float_to_bytearray(11.500)
@@ -1080,7 +1070,6 @@
     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")
   
->>>>>>> parent of 8d608ca... Adding message_id's belongs to 0x8000
     #0xB100
     payload = unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(1)
@@ -1374,43 +1363,123 @@
     hd_simulator.cmd_send_hd_general_response(message_id = 32810, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.dialin_to_hd_ch_id)
     #verify_log(msg = "~HD_Dial_Outlet_Pump_Rotor_Spd", param = [1,2.0,3])
 
-
-<<<<<<< HEAD
+    #0x802B
+    payload = unsigned_integer_to_bytearray(1)
+    payload += float_to_bytearray(1)
+    payload += float_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id = 32811, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.dialin_to_hd_ch_id)
+    #verify_log(msg = "~HD_Dial_Outlet_Pump_Rotor_Spd", param = [1,2,3])
+    
+    #0x802C
+    payload = unsigned_integer_to_bytearray(1)
+    payload += float_to_bytearray(1)
+    payload += float_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id = 32812, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.dialin_to_hd_ch_id)
+    #verify_log(msg = "~HD_Dial_Outlet_Pump_Rotor_Spd", param = [1,2,3])
+    
+    #0x802D
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(2)
+    payload += float_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id = 32813, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.dialin_to_hd_ch_id)
+    #verify_log(msg = "~HD_Dial_Outlet_Pump_Rotor_Spd", param = [1,2,3])
+    
+    #0x802E
+    payload = unsigned_integer_to_bytearray(1)
+    hd_simulator.cmd_send_hd_general_response(message_id = 32814, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.dialin_to_hd_ch_id)
+    #verify_log(msg = "~HD_Dial_Outlet_Pump_Rotor_Spd", param = [1,2,3])
     #Verification of Dialin->DG API's data from unhandled.conf file channel ID: 400
+   
     #0xA001
     payload = unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(1)
-    hd_simulator.cmd_send_hd_general_response(message_id = 40961, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40961, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
     verify_log(msg = "~DG_Alarm_State", param = [1,1,1])
 
     #0xA002
     payload = unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(1)
-    hd_simulator.cmd_send_hd_general_response(message_id = 40962, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40962, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
     verify_log(msg = "~DG_Watchdog_Check_In", param = [1,1,1])
 
 
-=======
-
-
-    #Verification of Dialin->DG API's data from unhandled.conf file channel ID: 400
+    #Verification of Dialin->DG API's data from unhandled.conf file channel ID: 402
     #0xA001
     payload = unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(1)
-    hd_simulator.cmd_send_hd_general_response(message_id = 40961, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40961, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
     verify_log(msg = "~DG_Alarm_State", param = [1,1,1])
 
     #0xA002
     payload = unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(1)
-    hd_simulator.cmd_send_hd_general_response(message_id = 40962, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40962, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
     verify_log(msg = "~DG_Watchdog_Check_In", param = [1,1,1])
 
+    #0xA004
+    payload = unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40964, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Set_RTC_Date_Time", param = [1])
+    
+    #0xA005
+    payload = unsigned_integer_to_bytearray(1)
+    payload += float_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40965, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Load_Cell", param = [1,1.0,1])
+    
+    #0xA006
+    payload = unsigned_integer_to_bytearray(1)
+    payload += float_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40966, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Pressure", param = [1,1.0,1])
+    
+    #0xA007
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40967, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Pressure_Broadcast_Interval", param = [1,1])
+    
+    #0xA00A
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40970, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_RO_Pump_Broadcast_Interval", param = [1,1])
+    
+    #0xA00B
+    payload = unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40971, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Drain_Pump_Set_RPM", param = [1])
+    
+    #0xA00C
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40972, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Drain_Pump_Broadcast_Interval", param = [1,1])
+    
+    #0xA00D
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40973, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Load_Cell_Broadcast_Interval", param = [1,1])
+    
+    #0xA00E
+    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 = 40974, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Valve_State", param = [1,1,1])
+    
+    #0xA00F
+    payload = unsigned_integer_to_bytearray(1)
+    payload += unsigned_integer_to_bytearray(1)
+    dg_simulator.cmd_send_dg_general_response(message_id = 40975, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id = DenaliChannels.dialin_to_dg_ch_id)
+    verify_log(msg = "~DG_Valve_Broadcast_Interval", param = [1,1])
 
->>>>>>> parent of 8d608ca... Adding message_id's belongs to 0x8000
     utils.tstDone()