Index: leahi_dialin/ro/modules/boost_pump.py =================================================================== diff -u -r436032f8b559f7afe7e9c90324973cf228090486 -r48cc95ba4170b8e0d698fea5393ccf904be59b8f --- leahi_dialin/ro/modules/boost_pump.py (.../boost_pump.py) (revision 436032f8b559f7afe7e9c90324973cf228090486) +++ leahi_dialin/ro/modules/boost_pump.py (.../boost_pump.py) (revision 48cc95ba4170b8e0d698fea5393ccf904be59b8f) @@ -15,7 +15,9 @@ ############################################################################ import struct from logging import Logger +from enum import unique +from leahi_dialin.utils.base import DialinEnum from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels Index: tests/test_ro.py =================================================================== diff -u -rf57dc553d3b4af35cdd40cfb5051c4955da0cff2 -r48cc95ba4170b8e0d698fea5393ccf904be59b8f --- tests/test_ro.py (.../test_ro.py) (revision f57dc553d3b4af35cdd40cfb5051c4955da0cff2) +++ tests/test_ro.py (.../test_ro.py) (revision 48cc95ba4170b8e0d698fea5393ccf904be59b8f) @@ -31,13 +31,13 @@ if ro.cmd_log_in_to_ro() == 0: exit(1) - ro.valves.cmd_valve_override(ROValveNames.VWI,ROValveStates.VALVE_STATE_OPEN) - sleep(15) - ro.valves.cmd_valve_override(ROValveNames.VWI,ROValveStates.VALVE_STATE_CLOSED) + # ro.valves.cmd_valve_override(ROValveNames.VWI,ROValveStates.VALVE_STATE_OPEN) + # sleep(15) + # ro.valves.cmd_valve_override(ROValveNames.VWI,ROValveStates.VALVE_STATE_CLOSED) - ro.pumps.cmd_boost_pump_set_pwm_request(ROPumpNames.PUMP_RO,50) - sleep(15) - ro.pumps.cmd_boost_pump_set_pwm_request(ROPumpNames.PUMP_RO,0) + 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) # create log file with open("RO_test.log", "w") as f: @@ -55,29 +55,29 @@ ", PC2o, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_water_inlet_pre_cond) + \ ", PPo, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_pre_ro_filter) + \ ", PMp, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_post_ro_filter) - 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) + \ + # ", 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) # 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("Pump Set Pts: "+pumps) print(" Pressures: "+press) - print(" Valves: "+valves) + # print(" Valves: "+valves) # print(" Alarms: "+alarms)