Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r1adf63258d838dea53d8e283d752e7c24626ab0b -re832be54a818fe1af79b225e4b43cd148be89fa4
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 1adf63258d838dea53d8e283d752e7c24626ab0b)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision e832be54a818fe1af79b225e4b43cd148be89fa4)
@@ -131,7 +131,8 @@
 static RO_PI_FLOW_PROFILES_T currentROPumpProfile;
 
 ///< RO Pump flow profile table.
-///< Most values are currently the same until future efforts into fine tuning op modes.
+///< Most values are currently the same until future efforts into tuning op modes.
+///< TODO: Fine tune each op mode.
 static PI_CONTROLLER_PROFILE_DATA_T roPIFlowProfiles[ NUM_OF_RO_PI_FLOW_PROFILES ] =
 { // Kp                            Ki                              uMin                    uMax                    maxErrorSumStep     Control Interval
  { ROP_FLOW_CONTROL_P_COEFFICIENT, ROP_FLOW_CONTROL_I_COEFFICIENT, MIN_RO_PUMP_DUTY_CYCLE, MAX_RO_PUMP_DUTY_CYCLE, ROP_PWM_STEP_LIMIT, ROP_CONTROL_INTERVAL }, ///< RO_PI_FLOW_PROFILE_FLUSH
@@ -216,9 +217,9 @@
  * The setROPumpTargetFlowRate function sets a new target flow rate for the
  * RO pump.
  * @details Inputs: targetROPumpPressure, targetROPumpFlowRate,
- * roPumpControlMode, rampUp2FlowTimeoutCounter
+ * roPumpControlMode, rampUp2FlowTimeoutCounter, currentROPumpProfile
  * @details Outputs: targetROPumpPressure, targetROPumpFlowRate,
- * roPumpControlMode, rampUp2FlowTimeoutCounter
+ * roPumpControlMode, rampUp2FlowTimeoutCounter, roPumpPWMDutyCyclePct
  * @param roFlowRate which is target RO flow rate
  * @param maxPressure which is the maximum allowed pressure that the RO pump
  * can reach
@@ -336,10 +337,10 @@
  * The execROPumpMonitor function executes the RO pump monitor. The RO flow
  * sensor is read, filtered, converted to L/min and calibrated.
  * @details Inputs: measuredFlowReadingsSum, flowFilterCounter,
- * measuredROFlowRateLPM, measuredROFlowRateLPM, roPumpState,
- * flowOutOfRangeCounter, roPumpControlMode
+ * measuredROFlowRateLPM, roPumpState, roFeedbackVoltage,
+ * flowOutOfRangeCounter, roPumpControlMode, Ppo
  * @details Outputs: measuredFlowReadingsSum, flowFilterCounter,
- * measuredROFlowRateLPM, measuredROFlowRateLPM
+ * measuredROFlowRateLPM, roVolumeL, roPumpFeedbackDutyCyclePct
  * @return none
  *************************************************************************/
 void execROPumpMonitor( void )
@@ -394,7 +395,7 @@
             // The feedback voltage is on the 0V line so when the duty cycle is 0, the feedback is 2.5V
             // The duty cycle is calculated by getting the 1 - (ratio of feedback / to the voltage at 0 percent duty cycle).
             roPumpFeedbackDutyCyclePct.data = 1.0F - ( roFeedbackVoltage / ROP_FEEDBACK_0_PCT_DUTY_CYCLE_VOLTAGE );
-            isDutyCylceOutOfRange      = ( fabs( getROFeedbackVoltage() - roPumpDutyCyclePctSet ) > ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE ? TRUE : FALSE );
+            isDutyCylceOutOfRange           = ( fabs( getROFeedbackVoltage() - roPumpDutyCyclePctSet ) > ROP_DUTY_CYCLE_OUT_OF_RANGE_TOLERANCE ? TRUE : FALSE );
 
             checkPersistentAlarm( ALARM_ID_RO_PUMP_DUTY_CYCLE_OUT_OF_RANGE, isDutyCylceOutOfRange, getROFeedbackVoltage(), roPumpDutyCyclePctSet );
 
@@ -625,7 +626,7 @@
     RO_PUMP_STATE_T state = RO_PUMP_CONTROL_TO_TARGET_FLOW_STATE;
 
     // Control at set interval
-    if ( ++roControlTimerCounter >= roPumpControlInterval && roPumpControlMode == PUMP_CONTROL_MODE_CLOSED_LOOP )
+    if ( ( ++roControlTimerCounter >= roPumpControlInterval ) && ( PUMP_CONTROL_MODE_CLOSED_LOOP == roPumpControlMode ) )
     {
         // Get the pressure to use it for setting the control
         F32 actualPressure = getMeasuredDGPressure( PRESSURE_SENSOR_RO_PUMP_OUTLET );
@@ -859,6 +860,7 @@
     return dutyCyclePct;
 }
 
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/