Index: tests/test_ro.py =================================================================== diff -u -rfd6afc8cae0125a31ecde91cb364dc55b3afb2d9 -r16a7827a894df3bd7f325bf874f69643257edec6 --- tests/test_ro.py (.../test_ro.py) (revision fd6afc8cae0125a31ecde91cb364dc55b3afb2d9) +++ tests/test_ro.py (.../test_ro.py) (revision 16a7827a894df3bd7f325bf874f69643257edec6) @@ -31,9 +31,9 @@ if ro.cmd_log_in_to_ro() == 0: exit(1) - # ro.valves.cmd_valve_override(ROValveNames.VROD.value,ROValveStates.VALVE_STATE_OPEN.value) + ro.valves.cmd_valve_override(ROValveNames.VCR.value,ROValveStates.VALVE_STATE_CLOSED.value) # sleep(15) - #ro.valves.cmd_valve_override(ROValveNames.VROD.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) @@ -56,29 +56,29 @@ ", PPo, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_pre_ro_filter) + \ ", PMp, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_post_ro_filter) + \ ", PPi, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_pre_ro_pump) - # valves = ", VWi, " + '{:4d}'.format(ro.valves.valve_state_VWI) + \ - # ", VFb, " + '{:4d}'.format(ro.valves.valve_state_VFB) + \ - # ", VFf, " + '{:4d}'.format(ro.valves.valve_state_VFF) + \ - # ", VPi, " + '{:4d}'.format(ro.valves.valve_state_VPI) + \ - # ", VCr, " + '{:4d}'.format(ro.valves.valve_state_VCR) + \ - # ", VCb, " + '{:4d}'.format(ro.valves.valve_state_VCB) + \ - # ", VCd, " + '{:4d}'.format(ro.valves.valve_state_VCD) + \ - # ", VROD, " + '{:4d}'.format(ro.valves.valve_state_VROD) + valves = ", VWi, " + '{:4d}'.format(ro.valves.valve_state_VWI.get("state")) + \ + ", VFb, " + '{:4d}'.format(ro.valves.valve_state_VFB.get("state")) + \ + ", VFf, " + '{:4d}'.format(ro.valves.valve_state_VFF.get("state")) + \ + ", VPi, " + '{:4d}'.format(ro.valves.valve_state_VPI.get("state")) + \ + ", VCr, " + '{:4d}'.format(ro.valves.valve_state_VCR.get("state")) + \ + ", 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")) # alarms = ", AL.s, " + '{:1d}'.format(td.alarms.get_current_alarms_state()) + \ # ", AL.t, " + '{:4d}'.format(td.alarms.alarm_top) # log data f.write(modes) f.write(pumps) f.write(press) - # f.write(valves) + f.write(valves) # f.write(alarms) f.write("\n") # print to console print(" Modes: "+modes) print(" Pumps: "+pumps) print(" Pressures: "+press) - # print(" Valves: "+valves) + print(" Valves: "+valves) # print(" Alarms: "+alarms)