Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -rcd3f58205f4dab89291b29ee73b7fa9c31773abc -r33d262afee2fd0dd9d714ed86a21b8907ed84e25
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision cd3f58205f4dab89291b29ee73b7fa9c31773abc)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 33d262afee2fd0dd9d714ed86a21b8907ed84e25)
@@ -37,9 +37,6 @@
 #include "TaskPriority.h"
 #include "Timers.h"
 #include "Valves.h"
-#ifdef EMC_TEST_BUILD
-#include "Heaters.h"
-#endif
 
 /**
  *  @addtogroup ROPump
@@ -118,31 +115,25 @@
 
 // ********** private data **********
 
-static RO_PUMP_STATE_T roPumpState = RO_PUMP_OFF_STATE;                                            ///< Current state of RO pump controller state machine.
-static U32 roPumpDataPublicationTimerCounter = 0;                                                  ///< Used to schedule RO pump data publication to CAN bus.
-static BOOL isROPumpOn = FALSE;                                                                    ///< RO pump is currently running.
-static F32 roPumpPWMDutyCyclePct = 0.0;                                                            ///< Initial RO pump PWM duty cycle.
-static F32 roPumpDutyCyclePctSet = 0.0;                                                            ///< Currently set RO pump PWM duty cycle.
-static F32 roPumpFeedbackDutyCyclePct = 0.0;                                                       ///< RO pump feedback duty cycle in percent.
-static PUMP_CONTROL_MODE_T roPumpControlMode = PUMP_CONTROL_MODE_CLOSED_LOOP;                      ///< Requested RO pump control mode.
-
-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.
-static U32 pendingROPumpCmdCountDown = 0;                                                          ///< Delayed (pending) RO pump command count down timer (in task intervals).
-
+static RO_PUMP_STATE_T roPumpState;                                                                ///< Current state of RO pump controller state machine.
+static U32 roPumpDataPublicationTimerCounter;                                                      ///< Used to schedule RO pump data publication to CAN bus.
+static BOOL isROPumpOn;                                                                            ///< RO pump is currently running.
+static F32 roPumpPWMDutyCyclePct;                                                                  ///< Initial RO pump PWM duty cycle.
+static F32 roPumpDutyCyclePctSet;                                                                  ///< Currently set RO pump PWM duty cycle.
+static F32 roPumpFeedbackDutyCyclePct;                                                             ///< RO pump feedback duty cycle in percent.
+static PUMP_CONTROL_MODE_T roPumpControlMode;                                                      ///< Requested RO pump control mode.
+static F32 pendingROPumpCmdMaxPressure;                                                            ///< Delayed (pending) RO pump max pressure (in PSI) setting.
+static F32 pendingROPumpCmdTargetFlow;                                                             ///< Delayed (pending) RO pump target flow rate (in mL/min) setting.
+static U32 pendingROPumpCmdCountDown;                                                              ///< Delayed (pending) RO pump command count down timer (in task intervals).
 static F32 targetROPumpFlowRateLPM;                                                                ///< Target RO flow rate (in L/min).
-static F32 targetROPumpMaxPressure = 0.0;                                                          ///< Target RO max allowed pressure (in PSI).
-
+static F32 targetROPumpMaxPressure;                                                                ///< Target RO max allowed pressure (in PSI).
 static OVERRIDE_U32_T roPumpDataPublishInterval = { RO_PUMP_DATA_PUB_INTERVAL,
                                                     RO_PUMP_DATA_PUB_INTERVAL, 0, 0 };             ///< Interval (in ms) at which to publish RO flow data to CAN bus.
 static OVERRIDE_F32_T measuredROFlowRateLPM = { 0.0, 0.0, 0.0, 0 };                                ///< Measured RO flow rate (in L/min).
-
-static U32 roControlTimerCounter = 0;                                                              ///< Determines when to perform control on RO pump.
-
-static F32 roPumpOpenLoopTargetDutyCycle = 0;                                                      ///< Target RO pump open loop PWM.
-
-static S32 measuredFlowReadingsSum = 0;                                                            ///< Raw flow reading sums for averaging.
-static U32 flowFilterCounter = 0;                                                                  ///< Flow filtering counter.
+static U32 roControlTimerCounter;                                                                  ///< Determines when to perform control on RO pump.
+static F32 roPumpOpenLoopTargetDutyCycle;                                                          ///< Target RO pump open loop PWM.
+static S32 measuredFlowReadingsSum;                                                                ///< Raw flow reading sums for averaging.
+static U32 flowFilterCounter;                                                                      ///< Flow filtering counter.
 static DG_FLOW_SENSORS_CAL_RECORD_T flowSensorsCalRecord;                                          ///< Flow sensors calibration record.
 static OVERRIDE_F32_T measuredROFlowRateWithConcPumpsLPM = { 0.0, 0.0, 0.0, 0 };                   ///< Measure RO flow rate with concentrate pumps (L/min).
 static DG_RO_PUMP_CAL_RECORD_T roPumpCalRecord;                                                    ///< RO pump calibration record.
@@ -167,7 +158,9 @@
  * @details Inputs: roControlTimerCounter,roPumpOpenLoopTargetDutyCycle,
  * roPumpFlowRateRunningSum, roPumpPressureRunningSum, measuredFlowReadingsSum,
  * flowFilterCounter, flowVerificationCounter, roPumpState, roPumpControlMode
- * roPumpDataPublicationTimerCounter, rawFlowLP
+ * roPumpDataPublicationTimerCounter, rawFlowLP, targetROPumpFlowRateLPM,
+ * roPumpPWMDutyCyclePct, roPumpDutyCyclePctSet, pendingROPumpCmdMaxPressure,
+ * pendingROPumpCmdTargetFlow, pendingROPumpCmdCountDown, targetROPumpMaxPressure
  * @details Outputs: none
  * @return none
  *************************************************************************/
@@ -206,6 +199,12 @@
     roPumpFeedbackDutyCyclePct        = 0.0;
     roVolumeL                         = 0.0;
     targetROPumpFlowRateLPM           = 0.0;
+    roPumpPWMDutyCyclePct             = 0.0;
+    roPumpDutyCyclePctSet             = 0.0;
+    pendingROPumpCmdMaxPressure       = 0.0;
+    pendingROPumpCmdTargetFlow        = 0.0;
+    pendingROPumpCmdCountDown         = 0;
+    targetROPumpMaxPressure           = 0.0;
 }
 
 /*********************************************************************//**