Index: tst_ui_logs/test.py
===================================================================
diff -u -r909d58d594727fa3565b98ba0a08d39f566cac8c -r9082f1184e4bf21eb92b080096305a8ffd302ee4
--- tst_ui_logs/test.py	(.../test.py)	(revision 909d58d594727fa3565b98ba0a08d39f566cac8c)
+++ tst_ui_logs/test.py	(.../test.py)	(revision 9082f1184e4bf21eb92b080096305a8ffd302ee4)
@@ -19,17 +19,17 @@
 # NOTE:
 # This test verifies the logs for the messages provided
 
-from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator
+import builtins
 import logging
-from dialin.protocols.CAN import DenaliCanMessenger
+from dialin.ui.hd_simulator_alarms import HDAlarmsSimulator
+from dialin.protocols.CAN import DenaliCanMessenger, DenaliChannels 
 from dialin.ui import HDSimulator
 from dialin.ui import DGSimulator
 from dialin.ui import utils
 from configuration import utility
 from configuration import config
-import builtins
 from dialin.common.msg_ids import MsgIds
-from dialin.common.hd_defs import HDOpSubModes, HDOpModes  
+from dialin.common.hd_defs import HDOpSubModes, HDOpModes 
 from dialin.common import msg_defs
 from dialin.utils.conversions import integer_to_bytearray, float_to_bytearray, short_to_bytearray, unsigned_integer_to_bytearray, integer_to_bit_array
 
@@ -72,7 +72,7 @@
     utils.tstStart(__file__)
     startApplication(config.AUT_NAME+" -d")
      
-
+    
     #HD Broadcast
     #0x0D00 
     hd_simulator.cmd_set_treatment_time(200,60,0)
@@ -428,15 +428,6 @@
     dg_simulator.cmd_set_dg_load_cell_readings_data(reservoir1_primary = 1.0, reservoir1_backup = 2.0,reservoir2_primary = 3.0, reservoir2_backup = 4.0)
     verify_log(msg_id = MsgIds.MSG_ID_LOAD_CELL_READINGS.value, msg = "LoadCell", param = [1.0,2.0,3.0,4.0])
        
-#     #0x2D00
-#     dg_simulator.cmd_set_dg_temperatures_data(inlet_primary_heater = 1.0, outlet_primary_heater = 2.0,
-#     conductivity_sensor1 = 3.0, conductivity_sensor2 = 4.0,
-#     outlet_redundancy = 5.0, inlet_dialysate = 6.0,
-#     primary_heater_thermocouple = 7.0, trimmer_heater_thermocouple = 8.0,
-#     primary_heater_cold_junction = 9.0, trimmer_heater_cold_junction = 10.0,
-#     primary_heater_internal_temp = 11.0, trimmer_heater_internal_temp = 12.0)
-#     verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures")
-
     #0x2D00
     payload = float_to_bytearray(2.22)
     payload += float_to_bytearray(1.45)
@@ -1112,33 +1103,37 @@
     hd_simulator.cmd_send_hd_general_response(message_id=176,  accepted=1, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None)
     verify_log(msg = "DG check-in w/ HD")
     
+    
+    
     #Verification of Dialin->HD API's data from unhandled.conf file channel ID: 400
     #0x8019
     payload = unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(2)
-    hd_simulator.cmd_send_hd_general_response(message_id = 32770, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=0x400)
+    hd_simulator.cmd_send_hd_general_response(message_id = 32770, 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_Off_Button_State", param = [1,2])
 
     #0x801A
     payload = unsigned_integer_to_bytearray(1)
     payload += unsigned_integer_to_bytearray(2)
-    hd_simulator.cmd_send_hd_general_response(message_id = 32794, accepted = 1, reason = 0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=0x400)
+    hd_simulator.cmd_send_hd_general_response(message_id = 32794, 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_Blood_Pump_Rotor_Count", param = [1,2])
 
 
+
+
     #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=0x402)
+    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)
     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=0x402)
+    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)
     verify_log(msg = "~DG_Watchdog_Check_In", param = [1,1,1])