Index: shared/scripts/configuration/config.py =================================================================== diff -u -rb4d2f9ef205d7fb355ffd9cd4e5f647dd2c37e9b -r52bc8f634fc08f78afc721468c23106dff15fe5a --- shared/scripts/configuration/config.py (.../config.py) (revision b4d2f9ef205d7fb355ffd9cd4e5f647dd2c37e9b) +++ shared/scripts/configuration/config.py (.../config.py) (revision 52bc8f634fc08f78afc721468c23106dff15fe5a) @@ -245,8 +245,8 @@ BLOOD_FLOW_BUFFER = 25 FLOW_SLIDER_WIDTH_BUFFER = 37 BLOOD_FLOW_MAXIMUM_VALUE = 500 -DIALYSATE_FLOW_MINIMUM_VALUE = 0 -DIALYSATE_FLOW_MAXIMUM_VALUE = 0 # Seems to be bug. need change +DIALYSATE_FLOW_MINIMUM_VALUE = 100 +DIALYSATE_FLOW_MAXIMUM_VALUE = 600 DIALYSATE_FLOW_BUFFER = 50 DIALYSATE_FLOW_SLIDER_WIDTH_BUFFER = 60 Index: tst_treatment_blood_dialysateflow_rate/test.py =================================================================== diff -u -r2e73714b63ae5fd2ef8b5acca5043e136454feff -r52bc8f634fc08f78afc721468c23106dff15fe5a --- tst_treatment_blood_dialysateflow_rate/test.py (.../test.py) (revision 2e73714b63ae5fd2ef8b5acca5043e136454feff) +++ tst_treatment_blood_dialysateflow_rate/test.py (.../test.py) (revision 52bc8f634fc08f78afc721468c23106dff15fe5a) @@ -19,15 +19,15 @@ BLOOD_DIALYSATE_FLOW_TESTING_OPTION = { - "OPTION_1" : [0, 0, 0, 0, 0, 0, 0, 0, 'None'], + "OPTION_1" : [0, 0, 0, 0, 0, 0, 0, 0,0, 'None'], "OPTION_2" : [100, 1, 1, 1, 1, 1, 1, 1, 1, 'blood'], - "OPTION_3" : [125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 125, 'blood'], - "OPTION_4" : [550, 24, 32, 425, 85, 18, 36, 45,'blood'], - "OPTION_5" : [80, 12, 12, 12, 12, 12, 12, 12, 'blood'], - "OPTION_6" : [100, 0, 0, 0, 0, 0, 0, 0, 'dialysate'], - "OPTION_7" : [180, 1, 1, 1, 1, 1, 1, 1, 'dialysate'], - "OPTION_8" : [220, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 145, 'blood'], - "OPTION_9" : [250, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 145, 'dialysate'], + "OPTION_3" : [125, 1.25, 1.25, 1.25, 1.25, 1.25, 1.25, 125, 125, 'blood'], + "OPTION_4" : [550, 24, 32, 425, 85, 18, 36, 45,550,'blood'], + "OPTION_5" : [80, 12, 12, 12, 12, 12, 12, 12, 80,'blood'], + "OPTION_6" : [100, 0, 0, 0, 0, 0, 0, 0,100, 'dialysate'], + "OPTION_7" : [180, 1, 1, 1, 1, 1, 1, 1,180, 'dialysate'], + "OPTION_8" : [220, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 145,220, 'blood'], + "OPTION_9" : [250, 1.45, 1.45, 1.45, 1.45, 1.45, 1.45, 145,250, 'dialysate'], } DUMMY_INTIGER = 12 #This value is used for arguments which is not part of verification @@ -207,16 +207,19 @@ pwm = blood_dialysate_control_list[6] rot_count = blood_dialysate_control_list[7] flow_type = blood_dialysate_control_list[8] + prescribed_flow = blood_dialysate_control_list[9] # Integration team needs to determine if the new parameters for flow rate commands are needed for verification. if flow_type == config.BLOOD_FLOW_TEXT: hd_simulator.cmd_set_treatment_blood_flow_rate(flow_set_pt, measured_flow, rot_speed, mot_speed, mc_speed, - mc_current, pwm, rot_count,0,0) + mc_current, pwm, rot_count, prescribed_flow) + utils.waitForGUI(0.5) test.compare(str(waitForObjectExists(names.o_treatment_blood_flow_rate).label), str(flow_set_pt)) elif flow_type == config.DIALYSATE_FLOW_TEXT: hd_simulator.cmd_set_treatment_dialysate_flow_rate(flow_set_pt, measured_flow, - rot_speed, mot_speed, mc_speed, mc_current, pwm,0,0,0) + rot_speed, mot_speed, mc_speed, mc_current, pwm, 0,0,0) + utils.waitForGUI(0.5) test.compare(str(waitForObjectExists(names.o_treatment_dialysate_flow_rate).label), str(flow_set_pt)) else :