Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rb93d59e35abc7a815cb108831ffca93635321028 -r67021fbc633259e8e1bce76749dbef7d0cb51998
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision b93d59e35abc7a815cb108831ffca93635321028)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 67021fbc633259e8e1bce76749dbef7d0cb51998)
@@ -113,7 +113,6 @@
 static F32 roPumpPWMDutyCyclePct = 0.0;                                                            ///< Initial RO pump PWM duty cycle.
 static F32 roPumpDutyCyclePctSet = 0.0;                                                            ///< Currently set RO pump PWM duty cycle.
 static PUMP_CONTROL_MODE_T roPumpControlMode = PUMP_CONTROL_MODE_CLOSED_LOOP;                      ///< Requested RO pump control mode.
-static PUMP_CONTROL_MODE_T roPumpControlModeSet = PUMP_CONTROL_MODE_CLOSED_LOOP;                   ///< Currently set RO pump control mode. TODO do we need this?
 
 static F32 pendingROPumpCmdMaxPressure = 0.0;                                                      ///< Delayed (pending) RO pump max pressure (in PSI) setting.
 static F32 pendingROPumpCmdTargetFlow = 0.0;                                                       ///< Delayed (pending) RO pump target flow rate (in mL/min) setting.
@@ -156,7 +155,7 @@
  * @details Inputs: roControlTimerCounter,roPumpOpenLoopTargetDutyCycle,
  * roPumpFlowRateRunningSum, roPumpPressureRunningSum, measuredFlowReadingsSum,
  * flowFilterCounter, flowVerificationCounter, roPumpState, roPumpControlMode
- * roPumpDataPublicationTimerCounter, roPumpControlModeSet
+ * roPumpDataPublicationTimerCounter
  * @details Outputs: none
  * @return none
  *************************************************************************/
@@ -174,7 +173,6 @@
 
     // Initialize the persistent alarm for flow out of upper and lower range
     initPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE, FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL, FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL );
-
     initPersistentAlarm( ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE, FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL, FLOW_OUT_OF_RANGE_PERSISTENT_INTERVAL );
 
     // Initialize the persistent alarm for max allowed pressure out of range
@@ -192,7 +190,6 @@
     roPumpDataPublicationTimerCounter = 0;
     roPumpState                       = RO_PUMP_OFF_STATE;
     roPumpControlMode                 = NUM_OF_PUMP_CONTROL_MODES;
-    roPumpControlModeSet              = roPumpControlMode;
     isROPumpOn                        = FALSE;
 }
 
@@ -402,7 +399,7 @@
         checkPersistentAlarm( ALARM_ID_RO_PUMP_OFF_FAULT, isPumpRunning, pressureInlet, ( pressureInlet + MAX_PRESSURE_TARGET_TOLERANCE ) );
 
         // Check if it has timed out
-        if ( isAlarmActive( ALARM_ID_RO_PUMP_OFF_FAULT ) )
+        if ( TRUE == isAlarmActive( ALARM_ID_RO_PUMP_OFF_FAULT ) )
         {
             activateSafetyShutdown();
         }
@@ -570,7 +567,6 @@
     // If there is a flow, transition to the PI controller to get the corresponding pressure of that flow
     if ( getTargetROPumpFlowRate() > 0 && roPumpControlMode == PUMP_CONTROL_MODE_CLOSED_LOOP )
     {
-        roPumpControlModeSet = PUMP_CONTROL_MODE_CLOSED_LOOP;
         // Set pump to on
         isROPumpOn = TRUE;
         roPumpDutyCyclePctSet = ROP_FLOW_TO_PWM_DC( getTargetROPumpFlowRate() );
@@ -652,7 +648,6 @@
  * The handleROPumpControlToTargetFlowState function handles the control to
  * target flow state of the RO pump controller state machine.
  * @details Inputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter,
- * roPumpControlModeSet
  * @details Outputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter
  * @return next state of the controller state machine
  *************************************************************************/
@@ -690,7 +685,6 @@
  * The handleROPumpControlToMaxPressureState function handles the control
  * to max pressure state of the RO pump controller state machine.
  * @details Inputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter,
- * roPumpControlModeSet
  * @details Outputs: roPumpPWMDutyCyclePctSet, roControlTimerCounter
  * @return next state of the controller state machine
  *************************************************************************/