Index: tst_ui_logs/test.py =================================================================== diff -u -r84c1284ecff1f30169d50afb688be18934eb8506 -r7883bcc9c71da71d09d48d8998a99a9b8ad0640a --- tst_ui_logs/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) +++ tst_ui_logs/test.py (.../test.py) (revision 7883bcc9c71da71d09d48d8998a99a9b8ad0640a) @@ -78,49 +78,56 @@ #HD Broadcast #0x0D00 hd_simulator.cmd_set_treatment_time(sec_total= 470, sec_elapsed= 300, sec_remain= 170) - verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value, msg = "TreatmentTime", param = [470,300,170]) + verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME_DATA.value, msg = "TreatmentTime", param = [470,300,170]) hd_simulator.cmd_set_treatment_time(sec_total= 475, sec_elapsed= 305, sec_remain= 170) - verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value, msg = "TreatmentTime", param = [475,305,170]) + verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME_DATA.value, msg = "TreatmentTime", param = [475,305,170]) hd_simulator.cmd_set_treatment_time(sec_total= 300, sec_elapsed= 150, sec_remain= 150) - verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value, msg = "TreatmentTime", param = [300,150,150]) + verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME_DATA.value, msg = "TreatmentTime", param = [300,150,150]) #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]) + mc_current = 12.5, pwm = 32.3, rotor_count = 30, + pres_flow=50, rotor_hall=10 ) + 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,50,10]) #0x0800 hd_simulator.cmd_set_treatment_dialysate_flow_rate(flow_set_pt=200, measured_flow=100.5, rot_speed = 160.0 , mot_speed = 120.0, mc_speed = 100.0, - mc_current = 0.44, pwm = 20.0) - verify_log(msg_id = MsgIds.MSG_ID_DIALYSATE_FLOW_DATA.value, msg = "DialysateFlow", param = [200,100.5,160.0,120.0,100.0,0.44,20.0]) + mc_current = 0.44, pwm = 20.0, + rotor_count = 30, pres_flow=11, rotor_hall=23 ) + verify_log(msg_id = MsgIds.MSG_ID_DIALYSATE_FLOW_DATA.value, msg = "DialysateFlow", param = [200,100.5,160.0,120.0,100.0,0.44,20.0,30,11,23]) #0x0900 hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs = 54.5, venous_prs = 20.1, blood_pump_occlusion = 100, - dialysate_inlet_pump_occlusion = 200, dialysate_outlet_pump_occlusion = 250) - verify_log(msg_id = MsgIds.MSG_ID_PRESSURE_OCCLUSION_DATA.value, msg = "Pressure/Occlusion", param = [54.5,20.1,100,200,250]) + pressure_state = 10, art_min_limit = 200, art_max_limit = 340, + ven_min_limit = 20, ven_max_limit = 50, filtered_arterial_prs = 30.4, + filtered_venous_prs = 21.4) + verify_log(msg_id = MsgIds.MSG_ID_PRESSURE_OCCLUSION_DATA.value, msg = "Pressure/Occlusion", param = [54.5,20.1,100,10,200,340,20,50,30.4,21.4]) #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]) + mc_current = 21.2, pwm = 322.2, + dop_corr_offset = 15.2, + dop_calc_rate = 16.3, uf_calc_rate = 21.5, rotor_hall = 25, + current_set_uf_rate = 16.5) + 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,15.2,16.3,21.5,25,16.5]) #0x1A00 hd_simulator.cmd_set_treatment_parameter_ranges(min_treatment_duration = 60, max_treatment_duration = 470, min_uf_volume = 22.6, max_uf_volume = 34.2, min_dialysate_flow_rate = 100, max_dialysate_flow_rate = 600) - verify_log(msg_id = str(MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES.value), msg = "TreatmentRanges", param = [60,470,22.6,34.2,100,600]) + verify_log(msg_id = str(MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES_DATA.value), msg = "TreatmentRanges", param = [60,470,22.600,34.200,100,600]) #0x2F00 hd_simulator.cmd_set_treatment_saline_bolus_data(target = 2, cumulative = 100.0, delivered = 300.0) verify_log(msg_id = MsgIds.MSG_ID_SALINE_BOLUS_DATA.value, msg = "Saline", param = [2,100.0,300.0]) #0x4D00 hd_simulator.cmd_set_treatment_heparin_data(cumulative = 0.1, required = 0.1) - verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, msg = "Heparin", param = [0.1,0.1]) + verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA.value, msg = "Heparin", param = [0.1,0.1]) #0x3300 hd_simulator.cmd_send_accelerometer_hd_data(x = 12.3, y = 22.2, z = 4.0, @@ -171,15 +178,12 @@ payload = unsigned_integer_to_bytearray(74) hd_simulator.cmd_send_hd_general_response(message_id=106, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=106, accepted=0, reason=0, 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") + verify_log(msg_id = MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_DATA.value, msg = "~HD_Fluid_Leak_Data") #0x6C00 hd_simulator.cmd_send_hd_blood_leak_data(blood_leak_status = 1, blood_leak_state = 1, - blood_leak_zero_status_counter = 4, blood_leak_counter = 3, - blood_leak_zeroed_status = 5, blood_leak_detect_set_point = 9, - blood_leak_detect_level = 1, blood_leak_st_count = 3, - blood_leak_led_intensity = 7, blood_leak_register_counter = 12) - verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, msg = "BloodLeak", param = [1,1,4,3,5,9,1,3,7,12]) + blood_leak_zero_status_counter = 4, blood_leak_serial_state = 2) + verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, msg = "BloodLeak", param = [1,1,4,2]) #0x9300 hd_simulator.cmd_send_hd_air_bubble_data(venous_air_bubble_status = 2, venous_air_bubble_state = 5) @@ -209,7 +213,7 @@ payload += integer_to_bytearray(1) hd_simulator.cmd_send_hd_general_response(message_id=125, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=125, accepted=0, reason=0, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_ALARM_INFORMATION_DATA.value, msg="~HD_Alarm_Information") #0xA200 payload = unsigned_integer_to_bytearray(20) @@ -257,35 +261,37 @@ for mode in range(mode_data): for sub_mode in range(submode_data): hd_simulator.cmd_send_hd_operation_mode(op_mode = mode, sub_mode = sub_mode) - verify_log(msg_id = MsgIds.MSG_ID_HD_OP_MODE.value, msg = "OpMode", param = [mode,sub_mode]) + verify_log(msg_id = MsgIds.MSG_ID_HD_OP_MODE_DATA.value, msg = "OpMode", param = [mode,sub_mode]) #0x5C00 for s_mode in range(NUMBER_OF_OPMODE): hd_simulator.cmd_send_pre_treatment_state_data(sub_mode = s_mode, water_sample_state = 1, consumables_self_test_state = 2, no_cartridge_self_test_state = 3, installation_state = 4, dry_self_test_state = 5, prime_state = 6, - recirculate_state = 7, patient_connection_state = 8) - verify_log(msg_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE.value, msg = "PreTreatmentStates",param = [s_mode,1,2,3,4,5,6,7,8]) + recirculate_state = 7, patient_connection_state = 8, + wet_selftests_state = 1, pretreatment_rsrvr_state = 2) + verify_log(msg_id = MsgIds.MSG_ID_PRE_TREATMENT_STATE_DATA.value, msg = "PreTreatmentStates",param = [s_mode,1,2,3,4,5,6,7,8,1,2]) #0x0F00 for s_mode in range(NUMBER_OF_TREATMENTMODES): hd_simulator.cmd_set_treatment_states_data(sub_mode = s_mode, uf_state = 1, saline_state = 2, heparin_state = 3, rinseback_state = 4, recirculate_state = 5, blood_prime_state = 6, treatment_end_state = 7, treatment_stop_state = 8, dialysis_state = 9) - verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_STATE.value, msg = "TreatmentStates", param = [s_mode,1,2,3,4,5,6,7,8,9]) + verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_STATE_DATA.value, msg = "TreatmentStates", param = [s_mode,1,2,3,4,5,6,7,8,9]) #0x7700 for s_mode in range(NUMBER_OF_TREATMENTMODES): hd_simulator.cmd_send_hd_general_response(message_id=119, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=119, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) - verify_log(msg_id=MsgIds.MSG_ID_HD_POST_TREATMENT_STATE.value, msg="PostTreatmentStates") + verify_log(msg_id=MsgIds.MSG_ID_HD_POST_TREATMENT_STATE_DATA.value, msg="PostTreatmentStates") #0x7E00 - standby_mode_data = HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value - for standby_mode in range(standby_mode_data): - hd_simulator.cmd_send_hd_disinfection_state(sub_mode = standby_mode, flush_mode = 3, heat_mode = 7, chemical_mode = 9) - verify_log(msg_id = MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, msg = "DisinfectStart") + # TODO need to add or figure out what happened to it + # standby_mode_data = HDStandbyStates.STANDBY_WAIT_FOR_DISINFECT_STATE.value + # for standby_mode in range(standby_mode_data): + # hd_simulator.cmd_send_hd_disinfection_state(sub_mode = standby_mode, flush_mode = 3, heat_mode = 7, chemical_mode = 9) + # verify_log(msg_id = MsgIds.MSG_ID_HD_DISINFECT_STANDBY_DATA.value, msg = "DisinfectStart") #0x8000 @@ -295,7 +301,7 @@ # hd_simulator.cmd_send_hd_general_response(message_id=155, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) # hd_simulator.cmd_send_hd_general_response(message_id=155, accepted=0, reason=0, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_disinfect_response(accepted = False, reason =1) - verify_log(msg_id=MsgIds.MSG_ID_HD_DISINFECT_RESPONSE.value, msg="DisinfectMode") + verify_log(msg_id=MsgIds.MSG_ID_HD_DISINFECT_RESPONSE.value, msg="DisinfectStart") #RINSEBACK @@ -317,7 +323,7 @@ #0x5A00 hd_simulator.cmd_send_treatment_recirculate_data(timeout_total = 120, timeout_count_down = 20) - verify_log(msg_id = MsgIds.MSG_ID_HD_RECIRC_PROGRESS.value, msg = "Recirculate", param = [120,20]) + verify_log(msg_id = MsgIds.MSG_ID_HD_RECIRC_PROGRESS_DATA.value, msg = "Recirculate", param = [120,20]) #Treatment End(sub-mode) #0x5800 @@ -330,7 +336,7 @@ #0x5900 #there is an additional parameter in the log hd_simulator.cmd_send_treatment_blood_prime_data(target = 22.2, current = 0.6) - verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, msg = "BloodPrime", param = [22.2,0.6]) + verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS_DATA.value, msg = "BloodPrime", param = [22.2,0.6]) #Treatment Stop(sub-mode) #0x4900 @@ -345,7 +351,7 @@ 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) hd_simulator.cmd_send_hd_general_response(message_id=10, accepted=0, reason=0, 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") + verify_log(msg_id = MsgIds.MSG_ID_RTC_EPOCH_DATA.value, msg = "~HD_RTC_Epoch_Data") #0x6E00 hd_simulator.cmd_send_set_rtc_response(response = 0, reason = 1) @@ -358,11 +364,11 @@ #Power #0x0100 hd_simulator.cmd_send_poweroff_command() - verify_log(msg_id = MsgIds.MSG_ID_POWER_OFF.value, msg = "PowerOff") + verify_log(msg_id = MsgIds.MSG_ID_OFF_BUTTON_PRESS_REQUEST.value, msg = "PowerOff") #0x0E00 hd_simulator.cmd_send_poweroff_imminent() - verify_log(msg_id = MsgIds.MSG_ID_POWER_OFF_IMMINENT.value, msg = "ShuttingDown") + verify_log(msg_id = MsgIds.MSG_ID_POWER_OFF_WARNING.value, msg = "ShuttingDown") #Events #0xA400 @@ -419,15 +425,15 @@ #Versions #0x1D00 hd_simulator.cmd_send_version_hd_data(major=1, minor=1, micro=0, build=1, fpga_id=0, fpga_major=1, fpga_minor=0, fpga_lab=1, compatibility_rev=0) - verify_log(msg_id = MsgIds.MSG_ID_HD_VERSION.value, msg = "VersionRsp", param = [1,1,0,1,0,1,0,1,0]) + verify_log(msg_id = MsgIds.MSG_ID_HD_VERSION_REPONSE.value, msg = "VersionRsp", param = [1,1,0,1,0,1,0,1,0]) #0x1E00 dg_simulator.cmd_send_version_dg_data(major=1, minor=1, micro=0, build=1, fpga_id=0, fpga_major=1, fpga_minor=0, fpga_lab=1, compatibility_rev=0) - verify_log(msg_id = MsgIds.MSG_ID_DG_VERSION.value, msg = "VersionRsp", param = [1,1,0,1,0,1,0,1,0]) + verify_log(msg_id = MsgIds.MSG_ID_DG_VERSION_REPONSE.value, msg = "VersionRsp", param = [1,1,0,1,0,1,0,1,0]) #0x9E00 hd_simulator.cmd_send_hd_request_ui_version() - verify_log(msg_id = MsgIds.MSG_ID_HD_UI_VERSION_INFO_RESPONSE.value, msg = "VersionReq") + verify_log(msg_id = MsgIds.MSG_ID_HD_UI_VERSION_INFO_REQUEST.value, msg = "VersionReq") #0x2000 dg_simulator.cmd_set_dg_pressures_data(ro_inlet_pressure = 200.0, ro_outlet_pressure = 100.0, drain_inlet_pressure = 295.0, drain_outlet_pressure = 300.0) @@ -457,7 +463,7 @@ dg_simulator.cmd_send_dg_general_response(message_id=42, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) dg_simulator.cmd_send_dg_general_response(message_id=42, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) dg_simulator.cmd_set_dg_valves_states(valves_states = 3) - verify_log(msg_id = MsgIds.MSG_ID_DG_VALVES_STATES.value, msg = "ValvesStates") + verify_log(msg_id = MsgIds.MSG_ID_DG_VALVES_STATES_DATA.value, msg = "ValvesStates") #0x2C00 #there is a parameter mismatch here as the log contains a 3 float values [0.0,0.0,0.0] instead of 3 given integers @@ -466,7 +472,7 @@ #0x0C00 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]) + verify_log(msg_id = MsgIds.MSG_ID_LOAD_CELL_READINGS_DATA.value, msg = "LoadCell", param = [1.0,2.0,3.0,4.0]) #0x2D00(broadcast) payload = float_to_bytearray(200.22) @@ -563,10 +569,10 @@ #0x6B00 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_DATA.value, msg="~DG_Fluid_Leak_Data") payload = integer_to_bytearray(1) dg_simulator.cmd_send_dg_general_response(message_id=107, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_DATA.value, msg="~DG_Fluid_Leak_Data") #0x7A00 @@ -623,10 +629,10 @@ #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, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) - verify_log(msg_id=MsgIds.MSG_ID_DG_ALARM_INFO.value, msg=None) + verify_log(msg_id=MsgIds.MSG_ID_DG_ALARM_INFO_DATA.value, msg=None) payload = integer_to_bytearray(0) dg_simulator.cmd_send_dg_general_response(message_id=167, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) - verify_log(msg_id=MsgIds.MSG_ID_DG_ALARM_INFO.value, msg=None) + verify_log(msg_id=MsgIds.MSG_ID_DG_ALARM_INFO_DATA.value, msg=None) #0xAA00 @@ -690,7 +696,7 @@ payload += unsigned_short_to_bytearray(72) hd_simulator.cmd_send_hd_general_response(message_id=2, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) hd_simulator.cmd_send_hd_general_response(message_id=2, accepted=0, reason=0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) - verify_log(msg_id = MsgIds.MSG_ID_ALARM_STATUS.value, msg = "AlarmStatus") + verify_log(msg_id = MsgIds.MSG_ID_ALARM_STATUS_DATA.value, msg = "AlarmStatus") #0x0300 #parameter data type mismatch @@ -820,14 +826,14 @@ #PRS-58: In-Line Blood Pressure Limits #0x4700 - hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted = 1, reason = 1,arterial_low = 2, arterial_high = 3, venous_low = 4, venous_high = 5) - verify_log(msg_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, msg = "AdjustPressuresLimits", param = [1, 1, 2, 3, 4, 5]) - hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted = 0, reason = 1,arterial_low = 2, arterial_high = 3, venous_low = 4, venous_high = 5) - verify_log(msg_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, msg = "AdjustPressuresLimits", param = [0, 1, 2, 3, 4, 5]) + hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted = 1, reason = 1,art_pressure_limit_window = 2, ven_pressure_limit_window = 3, ven_pressure_asym_limit_window = 4) + verify_log(msg_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, msg = "AdjustPressuresLimits", param = [1, 1, 2, 3, 4]) + hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted = 1, reason = 1,art_pressure_limit_window = 2, ven_pressure_limit_window = 3, ven_pressure_asym_limit_window = 4) + verify_log(msg_id = MsgIds.MSG_ID_HD_PRESSURE_LIMITS_CHANGE_RESPONSE.value, msg = "AdjustPressuresLimits", param = [0, 1, 2, 3, 4]) #Service Information #0x8A00 - hd_simulator._handler_system_usage_response() + # hd_simulator._handler_system_usage_response() payload = integer_to_bytearray(1619628663) payload += integer_to_bytearray(1619887863) hd_simulator.cmd_send_hd_general_response(message_id=138, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) @@ -840,7 +846,7 @@ payload += integer_to_bytearray(1661167101) dg_simulator.cmd_send_dg_general_response(message_id=140, accepted=0, reason=1) dg_simulator.cmd_send_dg_general_response(message_id=140, accepted=1, 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_TO_UI.value, msg="ServiceDate") #System Usage Information #0x8B00 @@ -860,14 +866,14 @@ 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) hd_simulator.cmd_send_hd_general_response(message_id=33, accepted=1, 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") + verify_log(msg_id=MsgIds. MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST.value, msg="~DG_Switch_Res_Cmd") #0x2200 payload = unsigned_integer_to_bytearray(6) payload += unsigned_integer_to_bytearray(0) hd_simulator.cmd_send_hd_general_response(message_id=34, accepted=0, reason=1, is_pure_data= False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=34, accepted=1, 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") + verify_log(msg_id=MsgIds. MSG_ID_DG_FILL_CMD_REQUEST.value, msg="~DG_Fill_Cmd") #0x2300 payload = unsigned_integer_to_bytearray(6) @@ -876,7 +882,7 @@ 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) hd_simulator.cmd_send_hd_general_response(message_id=35, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_DRAIN_CMD_REQUEST.value, msg="~DG_Drain_Cmd") #0x1900 payload = float_to_bytearray(10.5) @@ -892,34 +898,34 @@ 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) hd_simulator.cmd_send_hd_general_response(message_id=38, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_STARTING_STOPPING_TREATMENT_CMD_REQUEST.value, msg="~DG_Cmd") #0x2900 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) hd_simulator.cmd_send_hd_general_response(message_id=41, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST.value, msg="~DG_Sample_Water_Cmd") #0x2B00 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) hd_simulator.cmd_send_hd_general_response(message_id=43, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST.value, msg="~DG_Trimmer_Htr_Cmd") #0x3000 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) hd_simulator.cmd_send_hd_general_response(message_id=48, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST.value, msg="~DG_Heat_Disinfect_Cmd") #0x5B00 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST.value, msg="~DG_Chg_Valves_Cmd") payload = unsigned_integer_to_bytearray(0) 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST.value, msg="~DG_Chg_Valves_Cmd") #0x5100 @@ -940,12 +946,12 @@ 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) hd_simulator.cmd_send_hd_general_response(message_id=121, accepted=1, 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") + verify_log(msg_id = MsgIds.MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST.value, msg = "~DG_Flush_Cmd") #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) hd_simulator.cmd_send_hd_general_response(message_id=169, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_DG_CONCENTRATE_MIXING_RATIOS_REQUEST.value, msg="~DG_Mixing_Ratio_Fill_Prep_Request") #FW Debug #0xF1FF @@ -1003,12 +1009,12 @@ #ID:0x6000 dg_simulator.cmd_send_dg_pre_treatment_filter_flush_progress_data(total = 120, countdown = 60) - verify_log(msg_id = MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS.value, msg = "FilterFlush", param = [120,60]) + verify_log(msg_id = MsgIds.MSG_ID_DG_FILTER_FLUSH_PROGRESS_DATA.value, msg = "FilterFlush", param = [120,60]) #Pre-Treatment No Cartridge Self-Test (sub-mode) #ID:0x6100 hd_simulator.cmd_send_pre_treatment_self_test_no_cartridge_progress_data(total = 120, countdown = 60) - verify_log(msg_id = MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS.value, msg = "SelfTestNoCartridge", param = [120,60]) + verify_log(msg_id = MsgIds.MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS_DATA.value, msg = "SelfTestNoCartridge", param = [120,60]) #Pre-Treatment Disposable Installation (sub-mode) #ID:0xAD00 @@ -1023,7 +1029,7 @@ #Pre-Treatment Dry Self-Test (sub-mode) #ID:0x6300 hd_simulator.cmd_send_pre_treatment_self_test_dry_progress_data(total = 120, countdown = 60) - verify_log(msg_id = MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS.value, msg = "SelfTestDry", param = [120,60]) + verify_log(msg_id = MsgIds.MSG_ID_HD_DRY_SELF_TEST_PROGRESS_DATA.value, msg = "SelfTestDry", param = [120,60]) #Pre-Treatment Prime (sub-mode) #ID:0x3D00 @@ -1186,21 +1192,22 @@ #verify_log(msg_id = MsgIds.MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE.value, msg = "AdjustPatientConnectionBegin", param = [0,1]) - #ID:0x8200 - payload = unsigned_integer_to_bytearray(0) - payload += unsigned_integer_to_bytearray(7) - hd_simulator.cmd_send_hd_general_response(message_id=130, accepted=1, reason=1, is_pure_data = True, has_parameters = True, parameters_payload = payload) - hd_simulator.cmd_send_hd_general_response(message_id=130, accepted=0, reason=0, is_pure_data = True, has_parameters = True, parameters_payload = payload) - hd_simulator.cmd_send_hd_disinfect_chemical_confirm(accepted = 1, reason = 0) - hd_simulator.cmd_send_hd_disinfect_chemical_confirm(accepted = 0, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE.value, msg = "Chemical Disinfect User Confirm Response") + # #ID:0x8200 + # TODO Determine if check still valid + # payload = unsigned_integer_to_bytearray(0) + # payload += unsigned_integer_to_bytearray(7) + # hd_simulator.cmd_send_hd_general_response(message_id=130, accepted=1, reason=1, is_pure_data = True, has_parameters = True, parameters_payload = payload) + # hd_simulator.cmd_send_hd_general_response(message_id=130, accepted=0, reason=0, is_pure_data = True, has_parameters = True, parameters_payload = payload) + # hd_simulator.cmd_send_hd_disinfect_chemical_confirm(accepted = 1, reason = 0) + # hd_simulator.cmd_send_hd_disinfect_chemical_confirm(accepted = 0, reason = 0) + # verify_log(msg_id = MsgIds.MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE.value, msg = "Chemical Disinfect User Confirm Response") #ID:0x8300 payload = unsigned_integer_to_bytearray(0) payload += unsigned_integer_to_bytearray(7) dg_simulator.cmd_send_dg_general_response(message_id=131, accepted=1, reason=1, is_pure_data = True, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_dg_general_response(message_id=131, accepted=0, reason=0, is_pure_data = True, has_parameters = True, parameters_payload = payload) - dg_simulator.cmd_send_dg_disinfect_progress_time_flush(total = 0, countdown = 60) + # dg_simulator.cmd_send_dg_disinfect_progress_time_flush(total = 0, countdown = 60) #verify_log(msg_id = MsgIds.MSG_ID_DG_FLUSH_TIME_DATA.value, msg = "DisinfectDGFlushTime") #ID:0x8400 @@ -1224,14 +1231,14 @@ hd_simulator.cmd_send_hd_general_response(message_id=153, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) hd_simulator.cmd_send_hd_general_response(message_id=153, accepted=0, reason=0, is_pure_data = False, has_parameters = True, parameters_payload = payload, channel_id=DenaliChannels.hd_alarm_broadcast_ch_id) hd_simulator.cmd_send_serial_hd_data(serial = 'AGHHG1234GHJABC') - verify_log(msg_id = MsgIds.MSG_ID_HD_SERIAL_NUMBER.value, msg = "Serial", param = ['AGHHG1234GHJABC']) + verify_log(msg_id = MsgIds.MSG_ID_HD_SERIAL_NUMBER_RESPONSE.value, msg = "Serial", param = ['AGHHG1234GHJABC']) #0x8800 payload = unsigned_byte_to_bytearray(8) dg_simulator.cmd_send_dg_general_response(message_id=136, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_dg_general_response(message_id=136, accepted=0, reason=0, is_pure_data = False, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_serial_dg_data(serial = 'AGHHG1234GHJABC') - verify_log(msg_id = MsgIds.MSG_ID_DG_SERIAL_NUMBER.value, msg = "Serial", param = ['AGHHG1234GHJABC']) + verify_log(msg_id = MsgIds.MSG_ID_DG_SERIAL_NUMBER_RESPONSE.value, msg = "Serial", param = ['AGHHG1234GHJABC']) #0x1F00 payload = float_to_bytearray(11.2) @@ -1260,7 +1267,7 @@ payload += unsigned_integer_to_bytearray(1) dg_simulator.cmd_send_dg_general_response(message_id=39, accepted=0, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) 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") + verify_log(msg_id = MsgIds.MSG_ID_DG_OP_MODE_DATA.value, msg = "OpMode") #0x2D00(request) payload = float_to_bytearray(11.500) @@ -1288,11 +1295,11 @@ verify_log(msg_id = MsgIds.MSG_ID_HD_RESPONSE_SERVICE_MODE_REQUEST.value, msg = "ServiceMode", param = [1,1]) - #0x0600 + #0xA06A dg_simulator.cmd_send_checkin_dg() dg_simulator.cmd_send_dg_general_response(message_id=6, accepted=0, reason=0, is_pure_data = False, has_parameters = False, parameters_payload = None) dg_simulator.cmd_send_dg_general_response(message_id=6, accepted=1, reason=1, is_pure_data = False, has_parameters = False, parameters_payload = None) - verify_log(msg_id = MsgIds.MSG_ID_DG_CHECK_IN.value, msg = "DG check-in w/ HD") + verify_log(msg_id = MsgIds.MSG_ID_DG_DIALIN_CHECK_IN.value, msg = "DG check-in w/ HD") dg_simulator.cmd_send_checkin_dg() dg_simulator.cmd_send_checkin_dg() @@ -1315,7 +1322,7 @@ #0x8100 hd_simulator.cmd_send_hd_general_response(message_id=129, accepted=1, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None) hd_simulator.cmd_send_hd_general_response(message_id=129, accepted=0, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None) - verify_log(msg_id = MsgIds.MSG_ID_UI_CHEM_DISINFECT_CONFIRM.value, msg = "Chemical Disinfect User Confirm") + # verify_log(msg_id = MsgIds.MSG_ID_UI_CHEM_DISINFECT_CONFIRM.value, msg = "Chemical Disinfect User Confirm") #0xB000 hd_simulator.cmd_send_hd_general_response(message_id=176, accepted=1, reason=0, is_pure_data = True, has_parameters = False, parameters_payload = None) @@ -1637,7 +1644,7 @@ """ startApplication(config.AUT_NAME+" -d"+ " -i"+ " -f"+ " -b"+ " -u"+ " -c"+ " -0"+ " -m") - verif_ui_logs_api() + #verif_ui_logs_api() verify_missing_path_verification() utils.tstDone()