Index: tests/test_ro.py =================================================================== diff -u -r16a7827a894df3bd7f325bf874f69643257edec6 -r270356fb1edd1ea15b16cb322d36f5558e84cc47 --- tests/test_ro.py (.../test_ro.py) (revision 16a7827a894df3bd7f325bf874f69643257edec6) +++ tests/test_ro.py (.../test_ro.py) (revision 270356fb1edd1ea15b16cb322d36f5558e84cc47) @@ -22,6 +22,8 @@ from leahi_dialin.ro.modules.boost_pump import ROPumpNames from leahi_dialin.ro.modules.valves import ROValveNames from leahi_dialin.ro.modules.valves import ROValveStates +from leahi_dialin.ro.modules.levels import ROFloaterLevels +from leahi_dialin.ro.modules.flow_sensors import ROFlowSensorNames if __name__ == "__main__": # create a RO object called ro @@ -31,14 +33,17 @@ if ro.cmd_log_in_to_ro() == 0: exit(1) - ro.valves.cmd_valve_override(ROValveNames.VCR.value,ROValveStates.VALVE_STATE_CLOSED.value) + # ro.valves.cmd_valve_override(ROValveNames.VCR.value,ROValveStates.VALVE_STATE_CLOSED.value) # sleep(15) - #ro.valves.cmd_valve_override(ROValveNames.VCR.value,ROValveStates.VALVE_STATE_CLOSED.value) + # ro.valves.cmd_valve_override(ROValveNames.VCR.value,ROValveStates.VALVE_STATE_CLOSED.value) # ro.pumps.cmd_boost_pump_set_pwm_request(ROPumpNames.PUMP_RO.value,100) # sleep(15) # ro.pumps.cmd_boost_pump_set_pwm_request(ROPumpNames.PUMP_RO.value,0) + # ro.levels.cmd_level_state_override(ROFloaterLevels.LEVEL_STATE_HIGH.value) + # ro.flows.cmd_flow_rate_override(ROFlowSensorNames.FLOW_SENSOR_RO_OUTLET.value, 0.5) + # create log file with open("RO_test.log", "w") as f: @@ -64,6 +69,9 @@ ", VCb, " + '{:4d}'.format(ro.valves.valve_state_VCB.get("state")) + \ ", VCd, " + '{:4d}'.format(ro.valves.valve_state_VCD.get("state")) + \ ", VROD, " + '{:4d}'.format(ro.valves.valve_state_VROD.get("state")) + level = ", LRO, " + '{:4d}'.format(ro.levels.floater) + flows = ", FMS, " + '{:9.2f}'.format(ro.flows.flowFMS) + \ + ", FMP, " + '{9.2f}'.format(ro.flows.flowFMP) # alarms = ", AL.s, " + '{:1d}'.format(td.alarms.get_current_alarms_state()) + \ # ", AL.t, " + '{:4d}'.format(td.alarms.alarm_top) @@ -72,6 +80,8 @@ f.write(pumps) f.write(press) f.write(valves) + f.write(level) + f.write(flows) # f.write(alarms) f.write("\n") @@ -80,5 +90,7 @@ print(" Pumps: "+pumps) print(" Pressures: "+press) print(" Valves: "+valves) + print(" Level: "+level) + print(" Flows: "+flows) # print(" Alarms: "+alarms)