Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r6499ea25921fcf67826fa0c35bb03caf411ba542 -r2c08db070a6e09306caf461e7aceeb53097fd995
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 6499ea25921fcf67826fa0c35bb03caf411ba542)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 2c08db070a6e09306caf461e7aceeb53097fd995)
@@ -155,7 +155,6 @@
 static RO_PUMP_STATE_T handleROPumpOpenLoopState( void );
 
 static F32 roPumpFlowToPWM( RO_PI_FLOW_PROFILES_T profileID, F32 targetFlow );
-static void setROPumpTargetDutyCycle( F32 duty );
 static void setROPumpControlSignalDutyCycle( F32 dutyCycle );
 static void stopROPump( void );
 static void publishROPumpData( void );
@@ -309,6 +308,40 @@
 
 /*********************************************************************//**
  * @brief
+ * The setROPumpTargetDutyCycle function sets the duty cycle that the
+ * pump should run.
+ * @details Inputs: roPumpOpenLoopTargetDutyCycle, roPumpPWMDutyCyclePct,
+ * roPumpPWMDutyCyclePctSet, roPumpControlMode
+ * @details Outputs: roPumpOpenLoopTargetDutyCycle, roPumpPWMDutyCyclePct,
+ * roPumpPWMDutyCyclePctSet, roPumpControlMode
+ * @param: duty which is the duty cycle
+ * @return none
+ *************************************************************************/
+BOOL setROPumpTargetDutyCycle( F32 duty )
+{
+    BOOL status = FALSE;
+
+    if ( ( duty >= MIN_RO_PUMP_DUTY_CYCLE ) && ( duty <= MAX_RO_PUMP_DUTY_CYCLE ) )
+    {
+        roPumpOpenLoopTargetDutyCycle = duty;
+        roPumpPWMDutyCyclePct         = roPumpOpenLoopTargetDutyCycle;
+        roPumpDutyCyclePctSet         = roPumpPWMDutyCyclePct;
+        roPumpControlMode             = PUMP_CONTROL_MODE_OPEN_LOOP;
+        status                        = TRUE;
+
+        // Set the new duty cycle of the pump
+        setROPumpControlSignalDutyCycle( roPumpOpenLoopTargetDutyCycle );
+    }
+    else
+    {
+        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_DG_INVALID_RO_PUMP_DUTY_CYCLE_SELECTED, duty )
+    }
+
+    return status;
+}
+
+/*********************************************************************//**
+ * @brief
  * The signalROPumpHardStop function stops the RO pump immediately and
  * resets all the variables associated with the RO pump run.
  * @details Inputs: targetROPumpFlowRate, roPumpState, roPumpPWMDutyCyclePct,
@@ -327,7 +360,7 @@
     roPumpPWMDutyCyclePct         = 0.0F;
     roPumpOpenLoopTargetDutyCycle = 0.0F;
     roControlTimerCounter         = 0;
-    isROPumpOn                    = FALSE;
+    //isROPumpOn                    = FALSE;  // TODo remove
     targetROPumpMaxPressure       = 0;
     pendingROPumpCmdMaxPressure   = 0.0F;
     pendingROPumpCmdTargetFlow    = 0.0F;
@@ -577,6 +610,7 @@
 static RO_PUMP_STATE_T handleROPumpOffState( void )
 {
     RO_PUMP_STATE_T state = RO_PUMP_OFF_STATE;
+    isROPumpOn            = FALSE;
 
     // If there is a flow, transition to the PI controller to get the corresponding pressure of that flow
     if ( ( getTargetROPumpFlowRateLPM() > 0.0F ) && ( PUMP_CONTROL_MODE_CLOSED_LOOP == roPumpControlMode ) )
@@ -713,28 +747,6 @@
 
 /*********************************************************************//**
  * @brief
- * The setROPumpTargetDutyCycle function sets the duty cycle that the
- * pump should run.
- * @details Inputs: roPumpOpenLoopTargetDutyCycle, roPumpPWMDutyCyclePct,
- * roPumpPWMDutyCyclePctSet, roPumpControlMode
- * @details Outputs: roPumpOpenLoopTargetDutyCycle, roPumpPWMDutyCyclePct,
- * roPumpPWMDutyCyclePctSet, roPumpControlMode
- * @param: duty which is the duty cycle
- * @return none
- *************************************************************************/
-static void setROPumpTargetDutyCycle( F32 duty )
-{
-    roPumpOpenLoopTargetDutyCycle = duty;
-    roPumpPWMDutyCyclePct         = roPumpOpenLoopTargetDutyCycle;
-    roPumpDutyCyclePctSet         = roPumpPWMDutyCyclePct;
-    roPumpControlMode             = PUMP_CONTROL_MODE_OPEN_LOOP;
-
-    // Set the new duty cycle of the pump
-    setROPumpControlSignalDutyCycle( roPumpOpenLoopTargetDutyCycle );
-}
-
-/*********************************************************************//**
- * @brief
  * The setROPumpControlSignalDutyCycle function sets the duty cycle for the
  * RO pump to a given duty cycle.
  * @details Inputs: none
@@ -988,7 +1000,7 @@
     if ( TRUE == isTestingActivated() )
     {
         // Check if duty cycle is within range
-        if ( value >= MIN_RO_PUMP_DUTY_CYCLE && value <= MAX_RO_PUMP_DUTY_CYCLE )
+        if ( ( value >= MIN_RO_PUMP_DUTY_CYCLE ) && ( value <= MAX_RO_PUMP_DUTY_CYCLE ) )
         {
             setROPumpTargetDutyCycle( value );
             result = TRUE;