Index: tst_ui_logs/test.py =================================================================== diff -u -r4800083679383c87221a7e55ad35f84b40ffb386 -r5d6a0bb96d04a86cc10936ac3f303c28be3bb249 --- tst_ui_logs/test.py (.../test.py) (revision 4800083679383c87221a7e55ad35f84b40ffb386) +++ tst_ui_logs/test.py (.../test.py) (revision 5d6a0bb96d04a86cc10936ac3f303c28be3bb249) @@ -30,7 +30,7 @@ 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.hd_defs import HDStandbyStates, HDOpModes, BloodLeakZeroingStates 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, unsigned_short_to_bytearray, unsigned_byte_to_bytearray @@ -179,7 +179,12 @@ 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) + hd_simulator.cmd_set_treatment_saline_bolus_data(target = 2, + cumulative = 100.0, + delivered = 300.0, + DPI2BLDVolML = 50.5, + RSRVR2DPIVolML = 23.3, + zeroingRqstStatus = 1) verify_log(msg_id = MsgIds.MSG_ID_SALINE_BOLUS_DATA.value, msg = "Saline", param = [2,100.0,300.0]) #0x4D00 @@ -248,8 +253,16 @@ 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, - blood_leak_zero_status_counter = 4, blood_leak_serial_state = 2) + hd_simulator.cmd_send_hd_blood_leak_data(blood_leak_status = 1, + blood_leak_state = 1, + blood_leak_error_persistent_ctr = 4, + blood_leak_serial_comm_state = 2, + blood_leak_intensity = 3, + blood_leak_blood_detect = 3, + blood_leak_intensity_moving_average =15.26, + blood_leak_time_since_last_zero_ms = 125, + blood_leak_in_range_drift_status = 1, + blood_leak_upper_range_drift_status = 0) verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_LEAK_DATA.value, msg = "BloodLeak", param = [1,1,4,2]) #0x9300 @@ -341,9 +354,17 @@ #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) + 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, + bloodLeakZeoringState = BloodLeakZeroingStates.BLD_ZEROING_IDLE_STATE.value) 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