Index: tst_ui_logs/test.py =================================================================== diff -u -rfc6048ad34dd26f056888083d1cc75ca748360cd -rf50eee251fa31d2efc8afe491b7a432f028cbcc4 --- tst_ui_logs/test.py (.../test.py) (revision fc6048ad34dd26f056888083d1cc75ca748360cd) +++ tst_ui_logs/test.py (.../test.py) (revision f50eee251fa31d2efc8afe491b7a432f028cbcc4) @@ -30,7 +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 +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() @@ -311,7 +311,6 @@ verify_log(msg_id=MsgIds.MSG_ID_HD_TREATMENT_STOP_TIMER_DATA.value, msg="Stop") #RTC - #0x0A00 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) @@ -530,7 +529,7 @@ 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 #TODO: Payload values need to been changed after discussion payload = integer_to_bytearray(1) @@ -539,9 +538,9 @@ #0xAA00 #TODO: Payload values need to been changed after discussion - payload = float_to_bytearray(10.0) - payload += float_to_bytearray(5.0) - payload += integer_to_bytearray(60) + 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) @@ -564,17 +563,28 @@ #Fix id : ID not logged for the ones in ACK_NOT_REQUIRED list #46 #0xAE00 #TODO: Payload values need to been changed after discussion - dg_simulator.cmd_send_dg_general_response(message_id=174, accepted=0, reason=1) + 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 #TODO: Payload values need to been changed after discussion - dg_simulator.cmd_send_dg_general_response(message_id=175, accepted=0, reason=1) + 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() @@ -604,7 +614,8 @@ #0x3200 #TODO: Payload values need to been changed after discussion - hd_simulator.cmd_send_hd_general_response(message_id=50, accepted=0, reason=1) + 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 @@ -771,20 +782,18 @@ #0xA900 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 - #TODO: Payload values need to been changed after discussion - payload = byte_to_bytearray(65) + 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 - #TODO: Payload values need to been changed after discussion - payload = byte_to_bytearray(66) + 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) @@ -968,24 +977,44 @@ 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 - hd_simulator.cmd_send_hd_general_response(message_id=31, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [255, 118, 215, 58]) + #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 - hd_simulator.cmd_send_hd_general_response(message_id=36, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [1,2,2]) + 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 - hd_simulator.cmd_send_hd_general_response(message_id=39, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [2,2]) + 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 - hd_simulator.cmd_send_hd_general_response(message_id=45, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = [1,2,3,4,5,6,7,8,9,10,11,12,13]) + 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() - - - \ No newline at end of file