Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r729561329c224146d94b91bce5992cddec51f7c6 -r7c3b6244988008cd65d6e49c11d6e8bcef81726b
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 729561329c224146d94b91bce5992cddec51f7c6)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 7c3b6244988008cd65d6e49c11d6e8bcef81726b)
@@ -82,7 +82,7 @@
 static U32 dialysateDrainStartTime;                                                                    ///< Dialysate drain start time.
 static U32 dataPublishCounter;                                                                         ///< Used to schedule drain mode data publication to CAN bus.
 static OVERRIDE_U32_T drainModeDataPublishInterval = { DRAIN_MODE_DATA_PUB_INTERVAL,
-                                                      DRAIN_MODE_DATA_PUB_INTERVAL, 0, 0 };             ///< Interval (in ms) at which to publish drain mode data to CAN bus.
+                                                      DRAIN_MODE_DATA_PUB_INTERVAL, 0, 0 };            ///< Interval (in ms) at which to publish drain mode data to CAN bus.
 // ********** private function prototypes **********
 static DG_DRAIN_STATE_T handleDrainStateStart( void );
 static DG_DRAIN_STATE_T handleDrainStateDrain( void );
@@ -94,6 +94,7 @@
  * The initDrainMode function initializes the drain mode module.
  * @details Inputs: none
  * @details Outputs: drainState, drainEmptyTareTimerCtr, dialysateDrainStartTime,
+ * dataPublishCounter
  * rinseConcentrateLinesTimerCtr
  * @return none
  *************************************************************************/
@@ -405,23 +406,19 @@
 
 /*********************************************************************//**
  * @brief
- * The publishFillModeData function publishes fill mode data
+ * The publishDrainModeData function publishes fill mode data
  * at the set interval.
- * @details Inputs: fillModeDataPublicationTimerCounter, fillModeDataPublishInterval
- * @details Outputs: fillModeData
+ * @details Inputs: dataPublishCounter, drainModeDataPublishInterval
+ * @details Outputs: drainModeData
  * @return none
  *************************************************************************/
 static void publishDrainModeData( void )
 {
     // publish Drain mode data on interval
-    if ( ++dataPublishCounter >= getU32OverrideValue( &fillModeDataPublishInterval ) )
+    if ( ++dataPublishCounter >= getU32OverrideValue( &drainModeDataPublishInterval ) )
     {
         DG_DRAIN_MODE_DATA_T drainModeData;
 
-        U32 drainModeState;         ///< Drain Mode state.
-        U32 badFillSignal;          ///< Gen Idle bad fill signal.
-        U32 badFillState;           ///< Gen Idle bad fill substate.
-
         drainModeData.drainModeState    = drainState;
         drainModeData.badFillSignal     = getCurrentBadFillSignal();
         drainModeData.badFillState      = getCurrentGenIdleBadFillState()