Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r6adb8bf244382f7c21d24b1e150aad150b430e9b -r4e77009254d7bc37433a8ec9e70819a4ae121103 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 6adb8bf244382f7c21d24b1e150aad150b430e9b) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 4e77009254d7bc37433a8ec9e70819a4ae121103) @@ -194,6 +194,17 @@ MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00E MSG_ID_RO_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB00F MSG_ID_RO_LEVEL_OVERRIDE_REQUEST = 0xB010 + MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB011, + MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST = 0xB012 + MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST = 0xB013 + MSG_ID_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB014 + MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST = 0xB015 + MSG_ID_RO_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST = 0xB016 + MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST = 0xB017 + MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST = 0xB018 + MSG_ID_RO_TEMPERATURE_OVERRIDE_REQUEST = 0xB019 + MSG_ID_RO_FILTERED_FLOW_RATE_OVERRIDE_REQUEST = 0xB01A + MSG_ID_RO_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST = 0xB01B MSG_ID_TD_DEBUG_EVENT = 0xFFF1 MSG_ID_DD_DEBUG_EVENT = 0xFFF2 Index: tests/test_ro.py =================================================================== diff -u -r270356fb1edd1ea15b16cb322d36f5558e84cc47 -r4e77009254d7bc37433a8ec9e70819a4ae121103 --- tests/test_ro.py (.../test_ro.py) (revision 270356fb1edd1ea15b16cb322d36f5558e84cc47) +++ tests/test_ro.py (.../test_ro.py) (revision 4e77009254d7bc37433a8ec9e70819a4ae121103) @@ -33,7 +33,18 @@ 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.VWI.value,ROValveStates.VALVE_STATE_OPEN.value) + ro.valves.cmd_valve_override(ROValveNames.VPI.value,ROValveStates.VALVE_STATE_OPEN.value) + ro.valves.cmd_valve_override(ROValveNames.VROD.value,ROValveStates.VALVE_STATE_OPEN.value) + ro.valves.cmd_valve_override(ROValveNames.VCR.value,ROValveStates.VALVE_STATE_OPEN.value) + ro.pumps.cmd_boost_pump_set_pwm_request(ROPumpNames.PUMP_RO.value,250) + + # ro.valves.cmd_valve_override(ROValveNames.VWI.value, ROValveStates.VALVE_STATE_CLOSED.value) + # ro.valves.cmd_valve_override(ROValveNames.VPI.value, ROValveStates.VALVE_STATE_CLOSED.value) + # 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,0) + # sleep(15) # ro.valves.cmd_valve_override(ROValveNames.VCR.value,ROValveStates.VALVE_STATE_CLOSED.value) @@ -71,8 +82,8 @@ ", 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()) + \ + ", 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) # log data