Index: tst_ui_logs/test.py =================================================================== diff -u -r7883bcc9c71da71d09d48d8998a99a9b8ad0640a -rc79559a8ecd6dc676c7aed956ba1a5d1e45534a0 --- tst_ui_logs/test.py (.../test.py) (revision 7883bcc9c71da71d09d48d8998a99a9b8ad0640a) +++ tst_ui_logs/test.py (.../test.py) (revision c79559a8ecd6dc676c7aed956ba1a5d1e45534a0) @@ -28,6 +28,7 @@ from dialin.ui import utils from configuration import utility from configuration import config +from configuration import application_init as application_init from dialin.common.msg_ids import MsgIds from dialin.common.hd_defs import HDStandbyStates, HDOpModes from dialin.common import msg_defs @@ -83,14 +84,15 @@ 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_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, 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, @@ -103,7 +105,7 @@ 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]) + verify_log(msg_id = MsgIds.MSG_ID_PRESSURE_OCCLUSION_DATA.value, msg = "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, @@ -150,7 +152,7 @@ payload += unsigned_integer_to_bytearray(50) hd_simulator.cmd_send_hd_general_response(message_id=58, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=58, accepted=0, reason=0, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_VALVES_DATA.value, msg="~VALVES") #0x3E00 hd_simulator.cmd_send_hd_general_response(message_id = 62, accepted = 1, reason = 1) @@ -178,7 +180,7 @@ 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_DATA.value, msg = "~HD_Fluid_Leak_Data") + verify_log(msg_id = MsgIds.MSG_ID_HD_FLUID_LEAK_STATE_DATA.value, msg = "~FLD_LEAK") #0x6C00 hd_simulator.cmd_send_hd_blood_leak_data(blood_leak_status = 1, blood_leak_state = 1, @@ -203,7 +205,7 @@ payload += float_to_bytearray(11.2) hd_simulator.cmd_send_hd_general_response(message_id=123, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=123, accepted=0, reason=0, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_VOLTAGES_DATA.value, msg="~VOLTAGES") #0x7D00 payload = unsigned_integer_to_bytearray(10) @@ -213,14 +215,14 @@ 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_DATA.value, msg="~HD_Alarm_Information") + verify_log(msg_id=MsgIds.MSG_ID_HD_ALARM_INFORMATION_DATA.value, msg="~ALARM_INFORMATION") #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) hd_simulator.cmd_send_hd_general_response(message_id=162, accepted=0, reason=0, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_SWITCHES_DATA.value, msg="~SWITCHES") #0x9D00 payload = float_to_bytearray(11.2) @@ -230,7 +232,7 @@ payload += float_to_bytearray(95.6) hd_simulator.cmd_send_hd_general_response(message_id=157, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=157, accepted=0, reason=0, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_TEMPERATURES_DATA.value, msg="~TEMPERATURES") #0xA300 payload = float_to_bytearray(33.3) @@ -239,7 +241,7 @@ payload += unsigned_integer_to_bytearray(7) hd_simulator.cmd_send_hd_general_response(message_id=163, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=163, accepted=0, reason=0, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_FANS_DATA.value, msg="~FANS") #0xA800 payload = unsigned_integer_to_bytearray(1) @@ -251,7 +253,7 @@ payload += unsigned_integer_to_bytearray(133) hd_simulator.cmd_send_hd_general_response(message_id=168, accepted=1, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) hd_simulator.cmd_send_hd_general_response(message_id=168, accepted=0, reason=0, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_RESERVOIRS_DATA.value, msg="~RESERVOIRS") #HD Operation Mode @@ -351,7 +353,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_DATA.value, msg = "~HD_RTC_Epoch_Data") + verify_log(msg_id = MsgIds.MSG_ID_RTC_EPOCH_DATA.value, msg = "HDRTCEpoch") #0x6E00 hd_simulator.cmd_send_set_rtc_response(response = 0, reason = 1) @@ -452,6 +454,9 @@ payload += float_to_bytearray(36.0) payload += float_to_bytearray(35.0) payload += float_to_bytearray(29.0) + payload += float_to_bytearray(36.0) + payload += float_to_bytearray(35.0) + payload += float_to_bytearray(29.0) dg_simulator.cmd_send_dg_general_response(message_id=40, 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=40, 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_reservoir_data(active_reservoir = 5, fill_to_vol_ml = 10, drain_to_vol_ml = 2) @@ -466,6 +471,8 @@ verify_log(msg_id = MsgIds.MSG_ID_DG_VALVES_STATES_DATA.value, msg = "ValvesStates") #0x2C00 + #TODO need to update the dg simulator code + test.log("TODO need to update the dg_simulator.cmd_set_dg_heaters_data function to match param list") #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 dg_simulator.cmd_set_dg_heaters_data(main_primary_dc = 1, small_primary_dc = 2, trimmer_dc = 3) verify_log(msg_id = MsgIds.MSG_ID_DG_HEATERS_DATA.value, msg = "Heaters", param = [0.0, 0.0, 0.0]) @@ -505,6 +512,9 @@ verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures") #0x3100 + #TODO need to update the dg simulator code + test.log("TODO need to update the dg_simulator.cmd_send_dg_conductivity_data function to match param list") + dg_simulator.cmd_send_dg_conductivity_data(ro_rejection_ratio = 1.0, cpi_conductivity = 2.0, cpo_conductivity = 3.0, cd1_conductivity = 4.0, cd2_conductivity = 5.0) @@ -521,7 +531,7 @@ 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) dg_simulator.cmd_send_dg_general_response(message_id=55, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_HEAT_DISINFECT_DATA.value, msg = "~HEAT_DISINFECT") #0x4200 payload = float_to_bytearray(2.22) @@ -530,7 +540,7 @@ 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) dg_simulator.cmd_send_dg_general_response(message_id=66, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_CONCENTRATE_PUMP_DATA.value, msg="~CONCENTRATE_PUMP") #0x4400 payload = integer_to_bytearray(10) @@ -539,15 +549,15 @@ 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) dg_simulator.cmd_send_dg_general_response(message_id=68, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_UV_REACTORS_DATA.value, msg="~UV_REACTOR") #0x4500 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) dg_simulator.cmd_send_dg_general_response(message_id=69, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_THERMISTORS_DATA.value, msg="~THERMISTORS") #0x4800 payload = float_to_bytearray(1.9) @@ -560,7 +570,7 @@ 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) dg_simulator.cmd_send_dg_general_response(message_id=72, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_FANS_DATA.value, msg="~FANS") #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) @@ -569,10 +579,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_DATA.value, msg="~DG_Fluid_Leak_Data") + verify_log(msg_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_DATA.value, msg="~FLD_LEAK") 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_DATA.value, msg="~DG_Fluid_Leak_Data") + verify_log(msg_id=MsgIds.MSG_ID_DG_FLUID_LEAK_STATE_DATA.value, msg="~FLD_LEAK") #0x7A00 @@ -581,7 +591,7 @@ payload += unsigned_integer_to_bytearray(31) dg_simulator.cmd_send_dg_general_response(message_id=122, accepted=0, reason=1, is_pure_data=False, has_parameters=True, parameters_payload=payload) dg_simulator.cmd_send_dg_general_response(message_id=122, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_FLUSH_DATA.value, msg="~FLUSH") #0x8600 payload = float_to_bytearray(1.0) @@ -601,7 +611,7 @@ 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) dg_simulator.cmd_send_dg_general_response(message_id=134, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_VOLTAGES_DATA.value, msg="~VOLTAGES") #0x8700 payload = integer_to_bytearray(1) @@ -615,15 +625,15 @@ 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) dg_simulator.cmd_send_dg_general_response(message_id=135, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_CHEM_DISINFECT_DATA.value, msg="~CHEM_DISINFECT") #0xA100 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) dg_simulator.cmd_send_dg_general_response(message_id=161, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_SWITCHES_DATA.value, msg="~SWITCHES") #0xA700 #TODO: Payload values need to been changed after discussion @@ -654,7 +664,7 @@ #TODO: Payload values need to been changed after discussion dg_simulator.cmd_send_dg_general_response(message_id=171, accepted=0, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) dg_simulator.cmd_send_dg_general_response(message_id=171, accepted=1, reason=1, is_pure_data=False, has_parameters=False, parameters_payload=None, channel_id=DenaliChannels.dg_sync_broadcast_ch_id) - 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="~SCHEDULED_RUNS") #0xAC00 #TODO: Payload values need to been changed after discussion @@ -866,14 +876,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_REQUEST.value, msg="~DG_Switch_Res_Cmd") + verify_log(msg_id=MsgIds. MSG_ID_DG_SWITCH_RESERVOIR_CMD_REQUEST.value, msg="~SWITCH_RESERVOIR") #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_REQUEST.value, msg="~DG_Fill_Cmd") + verify_log(msg_id=MsgIds. MSG_ID_DG_FILL_CMD_REQUEST.value, msg="~FILL") #0x2300 payload = unsigned_integer_to_bytearray(6) @@ -882,7 +892,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_REQUEST.value, msg="~DG_Drain_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_DRAIN_CMD_REQUEST.value, msg="~DRAIN") #0x1900 payload = float_to_bytearray(10.5) @@ -892,7 +902,7 @@ payload += float_to_bytearray(20.5) hd_simulator.cmd_send_hd_general_response(message_id=25, accepted=0, reason=1) hd_simulator.cmd_send_hd_general_response(message_id=25, accepted=1, 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="~SET__DIALYSATE_TEMP_TARGETS") #0x2600 payload = unsigned_integer_to_bytearray(1) @@ -904,28 +914,28 @@ 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_REQUEST.value, msg="~DG_Sample_Water_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_SAMPLE_WATER_CMD_REQUEST.value, msg="~SAMPLE_WATER") #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_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST.value, msg="~DG_Trimmer_Htr_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_HD_START_STOP_TRIMMER_HEATER_CMD_REQUEST.value, msg="~START_STOP_TRIMMER_HEATER") #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_CMD_REQUEST.value, msg="~DG_Heat_Disinfect_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_START_STOP_HEAT_DISINFECT_CMD_REQUEST.value, msg="~START_STOP_HEAT_DISINFECT") #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_REQUEST.value, msg="~DG_Chg_Valves_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST.value, msg="~CHANGE_VALVE_SETTING") 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_REQUEST.value, msg="~DG_Chg_Valves_Cmd") + verify_log(msg_id=MsgIds.MSG_ID_DG_CHANGE_VALVE_SETTING_CMD_REQUEST.value, msg="~CHANGE_VALVE_SETTING") #0x5100 @@ -934,24 +944,24 @@ 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) hd_simulator.cmd_send_hd_general_response(message_id=81, accepted=1, 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") + verify_log(msg_id = MsgIds.MSG_ID_DG_COMMAND_RESPONSE.value, msg="~COMMAND") #0x7800 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) hd_simulator.cmd_send_hd_general_response(message_id=120, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_DG_START_STOP_CHEM_DISINFECT.value, msg="~START_STOP_CHEM_DISINFECT") #0x7900 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_CMD_REQUEST.value, msg = "~DG_Flush_Cmd") + verify_log(msg_id = MsgIds.MSG_ID_DG_START_STOP_FLUSH_CMD_REQUEST.value, msg = "~START_STOP_FLUSH") #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_DG_CONCENTRATE_MIXING_RATIOS_REQUEST.value, msg="~DG_Mixing_Ratio_Fill_Prep_Request") + verify_log(msg_id=MsgIds.MSG_ID_HD_DG_CONCENTRATE_MIXING_RATIOS_REQUEST.value, msg="~CONCENTRATE_MIXING_RATIOS") #FW Debug #0xF1FF @@ -994,10 +1004,9 @@ 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) hd_simulator.cmd_send_hd_general_response(message_id=54, accepted=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_NEW_TREATMENT_PARAMS_RESPONSE.value, msg="ParametersValidation") #Pre-Treatment Water Sample (sub-mode) #ID:0x5E00 @@ -1048,9 +1057,9 @@ 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_PATIENT_CONNECTION_BEGIN_RESPONSE.value, msg="AdjustPatientConnectionBegin") hd_simulator.cmd_send_hd_general_response(message_id=101, accepted=0, reason=1, 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") + verify_log(msg_id=MsgIds.MSG_ID_HD_PATIENT_CONNECTION_BEGIN_RESPONSE.value, msg="AdjustPatientConnectionBegin") #Pre-Treatment Ultrafiltration (Init) Volume Adjustment @@ -1060,13 +1069,13 @@ 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) hd_simulator.cmd_set_treatment_adjust_ultrafiltration_init_response(accepted= 1, reason= 1, volume= 0.600) - verify_log(msg_id=MsgIds.MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE.value, msg="Pre UF Volume Adjustment Response") + verify_log(msg_id=MsgIds.MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE.value, msg="AdjustUFInit") #Pre-Treatment Patient Connection Confirm #ID:0x6700 hd_simulator.cmd_send_pre_treatment_patient_connection_confirm_response(accepted = 1, reason = 0) hd_simulator.cmd_send_pre_treatment_patient_connection_confirm_response(accepted = 0, reason = 0) - verify_log(msg_id = MsgIds.MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE.value, msg = "AdjustPatientConnectionBegin", param = [1,0]) + verify_log(msg_id = MsgIds.MSG_ID_HD_PATIENT_CONNECTION_CONFIRM_RESPONSE.value, msg = "AdjustPatientConnectionConfirm", param = [1,0]) #Start Treatment @@ -1258,6 +1267,9 @@ payload += unsigned_integer_to_bytearray(17) payload += unsigned_integer_to_bytearray(19) payload += unsigned_integer_to_bytearray(12) + payload += float_to_bytearray(0.0) + payload += float_to_bytearray(0.0) + payload += unsigned_integer_to_bytearray(12) dg_simulator.cmd_send_dg_general_response(message_id=36, accepted=1, reason=1, is_pure_data = False, has_parameters = True, parameters_payload = payload) dg_simulator.cmd_send_dg_general_response(message_id=36, accepted=0, reason=0, is_pure_data = False, has_parameters = True, parameters_payload = payload) verify_log(msg_id = MsgIds.MSG_ID_DRAIN_PUMP_DATA.value, msg = "DrainPump") @@ -1283,6 +1295,14 @@ 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) dg_simulator.cmd_send_dg_general_response(message_id=45, accepted=0, reason=0, is_pure_data = False, has_parameters = True, parameters_payload = payload) verify_log(msg_id = MsgIds.MSG_ID_DG_TEMPERATURE_DATA.value, msg = "Temperatures") @@ -1642,9 +1662,15 @@ -k, --enable-check-in-log Enables Check-In Log -K, --enable-acknow-log Enables Acknowledgment Log """ - - startApplication(config.AUT_NAME+" -d"+ " -i"+ " -f"+ " -b"+ " -u"+ " -c"+ " -0"+ " -m") - #verif_ui_logs_api() - verify_missing_path_verification() + application_init.setup_post_log_successful_start() + + startApplication(config.AUT_NAME_ONLY + "-q"+" -d"+ " -i"+ " -f"+ " -b"+ " -u"+ " -c"+ " -0"+ " -m") + verif_ui_logs_api() + + #TODO need to figure out a better way to do this missing path verification. The current + # method is causing the application folder to be removed entirely if test breaks or + # paused in the middle. Possibly need to move this test into its own test case because + # folder removal should happen before application starts + # verify_missing_path_verification() utils.tstDone()