Index: tst_ui_logs/test.py =================================================================== diff -u -r5fcae0bb8a2191cbc69c72efa28174720f7fad62 -r20b6422d0e1ac8045463a787878dc13070961a8e --- tst_ui_logs/test.py (.../test.py) (revision 5fcae0bb8a2191cbc69c72efa28174720f7fad62) +++ tst_ui_logs/test.py (.../test.py) (revision 20b6422d0e1ac8045463a787878dc13070961a8e) @@ -75,8 +75,8 @@ #HD Broadcast #0x0D00 - hd_simulator.cmd_set_treatment_time(200,60,0) - verify_log(msg_id = MsgIds.MSG_ID_TREATMENT_TIME.value, msg = "TreatmentTime", param = [200,60,0]) + 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]) #0x0500 hd_simulator.cmd_set_treatment_blood_flow_rate(flow_set_pt = 20, measured_flow = 10.5, @@ -85,15 +85,15 @@ 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]) #0x0800 - hd_simulator.cmd_set_treatment_dialysate_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) - verify_log(msg_id = MsgIds.MSG_ID_DIALYSATE_FLOW_DATA.value, msg = "DialysateFlow", param = [20,10.5,112.2,120.3,100.0,12.5,32.3]) + 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]) #0x0900 - hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs = 54.5, venous_prs = 20.1, blood_pump_occlusion = 3, - dialysate_inlet_pump_occlusion = 2, dialysate_outlet_pump_occlusion = 5) - verify_log(msg_id = MsgIds.MSG_ID_PRESSURE_OCCLUSION_DATA.value, msg = "Pressure/Occlusion", param = [54.5,20.1,3,2,5]) + 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]) #0x0B00 hd_simulator.cmd_set_treatment_ultrafiltration_outlet_flow_data(ref_uf_vol = 77.5, measured_uf_vol = 22.6, @@ -102,19 +102,19 @@ 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]) #0x1A00 - hd_simulator.cmd_set_treatment_parameter_ranges(min_treatment_duration = 300, max_treatment_duration = 500, + 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 = 3, max_dialysate_flow_rate = 5) + 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 = [300,500,22.6,34.2,3,5]) + verify_log(msg_id = str(MsgIds.MSG_ID_TREATMENT_PARAM_CHANGE_RANGES.value), msg = "TreatmentRanges", param = [60,470,22.6,34.2,100,600]) #0x2F00 - hd_simulator.cmd_set_treatment_saline_bolus_data(target = 2, cumulative = 90.0, delivered = 67.2) - verify_log(msg_id = MsgIds.MSG_ID_SALINE_BOLUS_DATA.value, msg = "Saline", param = [2,90.0,67.2]) + 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 = 54.7) - verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, msg = "Heparin", param = [54.7]) + hd_simulator.cmd_set_treatment_heparin_data(cumulative = 0.1) + verify_log(msg_id = MsgIds.MSG_ID_HD_HEPARIN_DATA_BROADCAST.value, msg = "Heparin", param = [0.1]) #0x3300 hd_simulator.cmd_send_accelerometer_hd_data(x = 12.3, y = 22.2, z = 4.0, @@ -303,8 +303,8 @@ verify_log(msg_id = MsgIds.MSG_ID_HD_RINSEBACK_PROGRESS.value, msg = "Rinseback", param = [2.4,1.9,1,4,8,True]) #0x5A00 - hd_simulator.cmd_send_treatment_recirculate_data(timeout_total = 200, timeout_count_down = 100) - verify_log(msg_id = MsgIds.MSG_ID_HD_RECIRC_PROGRESS.value, msg = "Recirculate", param = [200,100]) + 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]) #Treatment End(sub-mode) #0x5800 @@ -314,8 +314,8 @@ #Treatment Blood Prime(sub-mode) #0x5900 #there is an additional parameter in the log - hd_simulator.cmd_send_treatment_blood_prime_data(target = 22.2, current = 33.3) - verify_log(msg_id = MsgIds.MSG_ID_HD_BLOOD_PRIME_PROGRESS.value, msg = "BloodPrime", param = [22.2,33.3,0]) + 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,0.0]) #Treatment Stop(sub-mode) #0x4900 @@ -392,12 +392,12 @@ #Versions #0x1D00 - hd_simulator.cmd_send_version_hd_data(major=1, minor=1, micro=0, build=4, fpga_id=5, fpga_major=1, fpga_minor=2, fpga_lab=3, compatibility_rev=6) - verify_log(msg_id = MsgIds.MSG_ID_HD_VERSION.value, msg = "VersionRsp", param = [1,1,0,4,5,1,2,3,6]) + 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]) #0x1E00 - dg_simulator.cmd_send_version_dg_data(major=1, minor=1, micro=0, build=4, fpga_id=5, fpga_major=1, fpga_minor=2, fpga_lab=3, compatibility_rev=6) - verify_log(msg_id = MsgIds.MSG_ID_DG_VERSION.value, msg = "VersionRsp", param = [1,1,0,4,5,1,2,3,6]) + 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]) #0x9E00 hd_simulator.cmd_send_hd_request_ui_version() @@ -428,31 +428,31 @@ verify_log(msg_id = MsgIds.MSG_ID_LOAD_CELL_READINGS.value, msg = "LoadCell", param = [1.0,2.0,3.0,4.0]) #0x2D00(broadcast) - payload = float_to_bytearray(2.22) - payload += float_to_bytearray(1.45) - payload += float_to_bytearray(4.67) - payload += float_to_bytearray(5.93) - payload += float_to_bytearray(1.45) - payload += float_to_bytearray(4.67) - payload += float_to_bytearray(5.93) - payload += float_to_bytearray(4.67) - payload += float_to_bytearray(5.93) - payload += float_to_bytearray(1.45) - payload += float_to_bytearray(4.67) - payload += float_to_bytearray(5.93) - payload += float_to_bytearray(4.67) - payload += float_to_bytearray(5.93) - payload += float_to_bytearray(1.45) - payload += float_to_bytearray(4.67) - payload += float_to_bytearray(5.93) - payload += float_to_bytearray(4.67) - payload += float_to_bytearray(5.93) - payload += integer_to_bytearray(15) - payload += integer_to_bytearray(30) - payload += integer_to_bytearray(25) - payload += integer_to_bytearray(25) - payload += unsigned_integer_to_bytearray(30) - payload += unsigned_integer_to_bytearray(22) + payload = float_to_bytearray(200.22) + payload += float_to_bytearray(100.45) + payload += float_to_bytearray(400.67) + payload += float_to_bytearray(500.93) + payload += float_to_bytearray(100.45) + payload += float_to_bytearray(400.67) + payload += float_to_bytearray(500.93) + payload += float_to_bytearray(400.67) + payload += float_to_bytearray(500.93) + payload += float_to_bytearray(100.45) + payload += float_to_bytearray(400.67) + payload += float_to_bytearray(500.93) + payload += float_to_bytearray(400.67) + payload += float_to_bytearray(500.93) + payload += float_to_bytearray(100.45) + payload += float_to_bytearray(400.67) + payload += float_to_bytearray(500.93) + payload += float_to_bytearray(400.67) + payload += float_to_bytearray(500.93) + payload += integer_to_bytearray(105) + payload += integer_to_bytearray(300) + payload += integer_to_bytearray(250) + payload += integer_to_bytearray(250) + payload += unsigned_integer_to_bytearray(300) + payload += unsigned_integer_to_bytearray(220) dg_simulator.cmd_send_dg_general_response(message_id=45, accepted=0, 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") @@ -695,18 +695,22 @@ #0x1300 #TODO: Payload values need to been changed after discussion payload = unsigned_integer_to_bytearray(1) - payload += unsigned_integer_to_bytearray(6) - payload += float_to_bytearray(8.4) - payload += unsigned_integer_to_bytearray(14) - payload += unsigned_integer_to_bytearray(6) - payload += float_to_bytearray(5.2) - payload += float_to_bytearray(5.8) - payload += float_to_bytearray(2.3) + payload += unsigned_integer_to_bytearray(1) + payload += float_to_bytearray(0.600) + payload += unsigned_integer_to_bytearray(300) + payload += unsigned_integer_to_bytearray(15) + payload += float_to_bytearray(100.0) + payload += float_to_bytearray(25.0) + payload += float_to_bytearray(50.0) hd_simulator.cmd_send_hd_general_response(message_id=19, accepted=1, reason=1, is_pure_data= False, has_parameters = True,parameters_payload = payload) - verify_log(msg_id=MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE.value, msg="AdjustUFEdit",param = [1, 6, 8.4, 14, 6, 5.2, 5.8, 2.3] ) + hd_simulator.cmd_set_treatment_adjust_ultrafiltration_edit_response(accepted= 1, reason= 1, volume= 0.600, duration= 300, duration_diff= 15, rate= 100.0 , rate_diff= 25.0, rate_old= 50.0) + verify_log(msg_id=MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_RESPONSE.value, msg="AdjustUFEdit",param = [1, 1, 0.600, 300, 15, 100.0, 25.0, 50.0] ) #0x2E00 #parameter mismatch : expected 1 int but 3 integers are logged + hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_response(accepted= 1, reason= 1, volume= 0.600, duration= 470, rate= 300) + verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value, msg = "AdjustUFConfirm") + hd_simulator.cmd_set_treatment_adjust_ultrafiltration_confirm_rejected(reason = 1) verify_log(msg_id = MsgIds.MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE.value, msg = "AdjustUFConfirm") @@ -926,6 +930,7 @@ payload += unsigned_integer_to_bytearray(0) 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") #Pre-Treatment Patient Connection Confirm @@ -1109,6 +1114,11 @@ 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") + #0x5000 + hd_simulator.cmd_send_uf_treatment_response(accepted= 1, reason= 1, volume= 0.1) + #0x4100 + hd_simulator.cmd_set_treatment_adjust_ultrafiltration_state_response(accepted=1, reason= 10, state= 5) + utils.tstDone()