Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -re6c6e39765c3f993b6a2b965188e7c13e93ffa92 -r3f5c0e277e979078c3153421274c660258e8a68b
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision e6c6e39765c3f993b6a2b965188e7c13e93ffa92)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 3f5c0e277e979078c3153421274c660258e8a68b)
@@ -58,8 +58,6 @@
 #define ROP_FLOW_TO_PWM(flow)                       ( ROP_FLOW_TO_PWM_SLOPE * flow + ROP_FLOW_TO_PWM_INTERCEPT )             ///< PWM line equation for flow.
 #define ROP_PRESSURE_TO_PWM(pres)                   ( ROP_PRESSURE_TO_PWM_SLOPE * pres + ROP_PRESSURE_TO_PWM_INTERCEPT )     ///< PWM line equation for pressure.
 
-
-
 /// Enumeration of RO pump states.
 typedef enum ROPump_States
 {
@@ -96,7 +94,6 @@
 static void stopROPump( void );
 static void publishROPumpData( void );
 
-
 /*********************************************************************//**
  * @brief
  * The initROPump function initializes the RO Pump module.
@@ -270,7 +267,7 @@
  * @brief
  * The handleROPumpControlToTargetFlowState function handles the control to
  * target flow state of the RO pump controller state machine.
- * @details Inputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter
+ * @details Inputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter, roPumpControlMode
  * @details Outputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter
  * @return next state of the controller state machine
  *************************************************************************/
@@ -293,7 +290,7 @@
  * @brief
  * The handleROPumpControlToMaxPressureState function handles the control
  * to target pressure state of the RO pump controller state machine.
- * @details Inputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter
+ * @details Inputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter, roPumpControlMode
  * @details Outputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter
  * @return next state of the controller state machine
  *************************************************************************/
@@ -339,11 +336,11 @@
         // Clear previous target data
         if ( getTargetROPumpPressure() > 0.0F )
         {
-            targetROPumpPressure.data = 0.0F;;
+            targetROPumpPressure.data = 0.0F;
         }
         if ( roPumpOpenLoopTargetDutyCycle > 0.0F )
         {
-            roPumpOpenLoopTargetDutyCycle = 0.0F;;
+            roPumpOpenLoopTargetDutyCycle = 0.0F;
         }
         result = TRUE;
     }
@@ -382,11 +379,11 @@
         // Clear previous target data
         if ( getTargetROPumpFlowRateLPM() > 0.0F )
         {
-            targetROPumpFlowRate.data = 0.0F;;
+            targetROPumpFlowRate.data = 0.0F;
         }
         if ( roPumpOpenLoopTargetDutyCycle > 0.0F )
         {
-            roPumpOpenLoopTargetDutyCycle = 0.0F;;
+            roPumpOpenLoopTargetDutyCycle = 0.0F;
         }
         result = TRUE;
     }
@@ -425,11 +422,11 @@
         // Clear previous target data
         if ( getTargetROPumpFlowRateLPM() > 0.0F )
         {
-            targetROPumpFlowRate.data = 0.0F;;
+            targetROPumpFlowRate.data = 0.0F;
         }
         if ( getTargetROPumpPressure() > 0.0F )
         {
-            targetROPumpPressure.data = 0.0F;;
+            targetROPumpPressure.data = 0.0F;
         }
     }
     else