Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r0c296cef29037819be204c45a23d4d38a52b2718 -r5738118966dd400f3d985329cf5a521dfe41c703
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 0c296cef29037819be204c45a23d4d38a52b2718)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 5738118966dd400f3d985329cf5a521dfe41c703)
@@ -76,7 +76,7 @@
  /// Initial conversion factor from target flow rate to PWM duty cycle estimate.
 #define ROP_FLOW_TO_PWM_DC(flow)                       ( ROP_FLOW_TO_PWM_SLOPE * flow + ROP_FLOW_TO_PWM_INTERCEPT )
 #define MAX_ALLOWED_FLOW_DEVIATION                     0.1F                                        ///< Max allowed deviation from target flow.
-#define FLOW_OUT_OF_RANGE_TIME_OUT_MS                  ( 12 * MS_PER_SECOND )                      ///< Flow out of range time out in counts.
+#define FLOW_OUT_OF_RANGE_TIME_OUT_MS                  ( 30 * MS_PER_SECOND )                      ///< Flow out of range time out in counts.
 #define MAX_PRESSURE_TARGET_TOLERANCE                  5                                           ///< Pressure tolerance from maximum set pressure by user in psi.
 #define MAX_ALLOWED_PRESSURE_PSI                       130                                         ///< Maximum allowed pressure that the RO pump can go to.
 #define MIN_ALLOWED_PRESSURE_PSI                       10                                          ///< Minimum allowed pressure that the RO pump can go to.
@@ -366,6 +366,11 @@
             checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, isFlowOutOfUpperRange, currentFlow, targetFlow );
             checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, isFlowOutOfLowerRange, currentFlow, targetFlow );
         }
+        else
+        {
+            checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, FALSE, 0.0F, 0.0F );
+            checkPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, FALSE, 0.0F, 0.0F );
+        }
 
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) != SW_CONFIG_ENABLE_VALUE )
@@ -450,6 +455,22 @@
 
 /*********************************************************************//**
  * @brief
+ * The execROPumpSelfTest function executes the RO pump's self-test.
+ * @details Inputs: none
+ * @details Outputs: none
+ * @return PressuresSelfTestResult (SELF_TEST_STATUS_T)
+ *************************************************************************/
+SELF_TEST_STATUS_T execROPumpSelfTest( void )
+{
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
+
+    // TODO is there anything else needed in POST for the RO pump?
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The isROPumpRunning function returns the on/off status of RO pump.
  * @details Inputs: isROPumpOn
  * @details Outputs: none
@@ -479,7 +500,7 @@
  * The getTargetROPumpPressurePSI function gets the current target RO pump
  * pressure.
  * @details Inputs: none
- * @details Outputs: none
+ * @details Outputs: targetROPumpMaxPressure
  * @return the current target RO pump pressure in psi.
  *************************************************************************/
 F32 getTargetROPumpPressurePSI( void )