Index: tst_main_treatment_pressure/test.py =================================================================== diff -u -r84c1284ecff1f30169d50afb688be18934eb8506 -r2e73714b63ae5fd2ef8b5acca5043e136454feff --- tst_main_treatment_pressure/test.py (.../test.py) (revision 84c1284ecff1f30169d50afb688be18934eb8506) +++ tst_main_treatment_pressure/test.py (.../test.py) (revision 2e73714b63ae5fd2ef8b5acca5043e136454feff) @@ -438,12 +438,12 @@ @return: none """ test.log("Set Arterial Low to '{art_low}', Arterial High to '{art_high}', Venous Low to '{ven_low}', and Venous High to '{ven_high}'".format(art_low=art_low, art_high=art_high, ven_low=ven_low, ven_high=ven_high)) + # Integration team needs to re-evaluate pressure adjustment values from low-high to windowed. hd_simulator.cmd_send_treatment_adjust_pressures_limit_response(accepted=accepted, reason=reason, - arterial_low=art_low, - arterial_high=art_high, - venous_low=ven_low, - venous_high=ven_high) + art_pressure_limit_window=art_low, + ven_pressure_limit_window=ven_low, + ven_pressure_asym_limit_window=0) def open_pressure_pop_up(): """ @@ -580,8 +580,13 @@ test.log("Setting arterial pressure {}".format(arterial_prs)) hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs=arterial_prs, venous_prs=0, blood_pump_occlusion=0, - dialysate_inlet_pump_occlusion=0, - dialysate_outlet_pump_occlusion=0) + art_max_limit==0, + art_min_limit=0, + ven_max_limit=0, + ven_min_limit=0, + filtered_arterial_prs=0, + filtered_venous_prs=0 ) + arterial_current_value = waitForObjectExists(names.o_arterial_marker).value arterial_limit_min = waitForObjectExists(names.o_arterial_limitbar).minimum arterial_limit_max = waitForObjectExists(names.o_arterial_limitbar).maximum @@ -609,10 +614,14 @@ open_pressure_pop_up() for venous_prs in range(VENOUS_PRESSURE_MINIMUM, VENOUS_PRESSURE_MAXIMUM + PRESSURE_STEPS, PRESSURE_STEPS * 10): test.log("Setting Venous pressure {}".format(venous_prs)) - hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs=0, venous_prs=venous_prs, + hd_simulator.cmd_set_pressure_occlusion_data(arterial_prs=arterial_prs, venous_prs=0, blood_pump_occlusion=0, - dialysate_inlet_pump_occlusion=0, - dialysate_outlet_pump_occlusion=0) + art_max_limit==0, + art_min_limit=0, + ven_max_limit=0, + ven_min_limit=0, + filtered_arterial_prs=0, + filtered_venous_prs=0 ) venous_current_value = waitForObjectExists(names.o_venous_marker).value venous_limit_min = waitForObjectExists(names.o_venous_limitbar).minimum venous_limit_max = waitForObjectExists(names.o_venous_limitbar).maximum