Index: firmware/App/Controllers/DrainPump.c
===================================================================
diff -u -raada74112204bc8e7c004510d0c86afb88cccc14 -r87acb1655edbf974497e4300f2c18eea62f8acba
--- firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision aada74112204bc8e7c004510d0c86afb88cccc14)
+++ firmware/App/Controllers/DrainPump.c	(.../DrainPump.c)	(revision 87acb1655edbf974497e4300f2c18eea62f8acba)
@@ -75,43 +75,43 @@
 /// Enumeration of drain pump states.
 typedef enum DrainPump_States
 {
-    DRAIN_PUMP_OFF_STATE = 0,                       ///< Drain pump off state
-    DRAIN_PUMP_CONTROL_TO_TARGET_STATE,             ///< Drain pump control to target state
-    DRAIN_PUMP_OPEN_LOOP_STATE,                     ///< Drain pump open loop state
-    NUM_OF_DRAIN_PUMP_STATES                        ///< Number of drain pump states
+    DRAIN_PUMP_OFF_STATE = 0,                                                                                   ///< Drain pump off state
+    DRAIN_PUMP_CONTROL_TO_TARGET_STATE,                                                                         ///< Drain pump control to target state
+    DRAIN_PUMP_OPEN_LOOP_STATE,                                                                                 ///< Drain pump open loop state
+    NUM_OF_DRAIN_PUMP_STATES                                                                                    ///< Number of drain pump states
 } DRAIN_PUMP_STATE_T;
 
 /// Enumeration of drain pump self-test states.
 typedef enum DrainPump_Self_Test_States
 {
-    DRAIN_PUMP_SELF_TEST_STATE_START = 0,           ///< Drain pump self-test start state
-    DRAIN_PUMP_TEST_STATE_IN_PROGRESS,              ///< Drain pump self-test in progress state
-    DRAIN_PUMP_TEST_STATE_COMPLETE,                 ///< Drain pump self-test completed state
-    NUM_OF_DRAIN_PUMP_SELF_TEST_STATES              ///< Number of drain pump self-test states
+    DRAIN_PUMP_SELF_TEST_STATE_START = 0,                                                                       ///< Drain pump self-test start state
+    DRAIN_PUMP_TEST_STATE_IN_PROGRESS,                                                                          ///< Drain pump self-test in progress state
+    DRAIN_PUMP_TEST_STATE_COMPLETE,                                                                             ///< Drain pump self-test completed state
+    NUM_OF_DRAIN_PUMP_SELF_TEST_STATES                                                                          ///< Number of drain pump self-test states
 } DRAIN_PUMP_SELF_TEST_STATE_T;
 
 // ********** private data **********
 
-static DRAIN_PUMP_STATE_T drainPumpState = DRAIN_PUMP_OFF_STATE;                    ///< Current state of drain pump controller state machine.
-static U32 drainPumpDataPublicationTimerCounter = 0;                                ///< Used to schedule drain pump data publication to CAN bus.
-static U32 drainPumpDAC = 0;                                                        ///< Initial drain pump DAC value.
-static U32 drainPumpDACSet = 0;                                                     ///< Currently set drain pump DAC value.
-static PUMP_CONTROL_MODE_T drainPumpControlMode = NUM_OF_PUMP_CONTROL_MODES;        ///< Requested drain pump control mode.
-static PUMP_CONTROL_MODE_T drainPumpControlModeSet = PUMP_CONTROL_MODE_CLOSED_LOOP; ///< Currently set drain pump control mode.
+static DRAIN_PUMP_STATE_T drainPumpState = DRAIN_PUMP_OFF_STATE;                                                ///< Current state of drain pump controller state machine.
+static U32 drainPumpDataPublicationTimerCounter = 0;                                                            ///< Used to schedule drain pump data publication to CAN bus.
+static U32 drainPumpDAC = 0;                                                                                    ///< Initial drain pump DAC value.
+static U32 drainPumpDACSet = 0;                                                                                 ///< Currently set drain pump DAC value.
+static PUMP_CONTROL_MODE_T drainPumpControlMode = NUM_OF_PUMP_CONTROL_MODES;                                    ///< Requested drain pump control mode.
+static PUMP_CONTROL_MODE_T drainPumpControlModeSet = PUMP_CONTROL_MODE_CLOSED_LOOP;                             ///< Currently set drain pump control mode.
 
 static OVERRIDE_U32_T drainPumpDataPublishInterval = { DRAIN_PUMP_DATA_PUB_INTERVAL,
                                                        DRAIN_PUMP_DATA_PUB_INTERVAL,
-                                                       0, 0 };                      ///< Interval (in ms) at which to publish RO flow data to CAN bus.
-static U32 targetDrainPumpRPM  = 0;                                                 ///< Target drain pump RPM.
-static F32 targetDrainPumpOutletPressure = 0.0;                                     ///< Target outlet pressure for the drain pump.
+                                                       0, 0 };                                                  ///< Interval (in ms) at which to publish RO flow data to CAN bus.
+static U32 targetDrainPumpRPM  = 0;                                                                             ///< Target drain pump RPM.
+static F32 targetDrainPumpOutletPressure = 0.0;                                                                 ///< Target outlet pressure for the drain pump.
 
-static U32 drainControlTimerCounter = 0;                                            ///< Determines when to perform control on drain pump.
-static BOOL hasClosedLoopBeenRequested = FALSE;                                     ///< Closed loop pump control flag.
-static U32 currentDrainPumpRPM = 0;                                                 ///< Current drain pump RPM from feedback.
+static U32 drainControlTimerCounter = 0;                                                                        ///< Determines when to perform control on drain pump.
+static BOOL hasClosedLoopBeenRequested = FALSE;                                                                 ///< Closed loop pump control flag.
+static U32 currentDrainPumpRPM = 0;                                                                             ///< Current drain pump RPM from feedback.
 
 /* TODO These variables are used for POST. POST will be implemented later
-static DRAIN_PUMP_SELF_TEST_STATE_T drainPumpSelfTestState = DRAIN_PUMP_SELF_TEST_STATE_START;  ///< Current drain pump self test state.
-static U32 drainPumpSelfTestTimerCount = 0;                                                     ///< Timer counter for drain pump self test.
+static DRAIN_PUMP_SELF_TEST_STATE_T drainPumpSelfTestState = DRAIN_PUMP_SELF_TEST_STATE_START;                  ///< Current drain pump self test state.
+static U32 drainPumpSelfTestTimerCount = 0;                                                                     ///< Timer counter for drain pump self test.
 */
 
 /// ADC to RPM conversion coefficient or RPM to ADC conversion.
@@ -137,7 +137,7 @@
 {
     stopDrainPump();
 
-    hasClosedLoopBeenRequested   = FALSE;
+    hasClosedLoopBeenRequested = FALSE;
 
     // Initialize the drain pump PI controller
     initializePIController( PI_CONTROLLER_ID_DRAIN_PUMP, DRAIN_PUMP_MIN_DAC,