Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -rdea8c26f95f282335261bec6242d60790e8ce9f5 -re14917fa5809c4cce03aca876649904c82feb79c
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision dea8c26f95f282335261bec6242d60790e8ce9f5)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision e14917fa5809c4cce03aca876649904c82feb79c)
@@ -55,8 +55,6 @@
 static BOOL txEndRinsebackRequested;                                        ///< Flag indicates user requesting final rinseback.
 static BOOL txEndDrainCmdSent;                                              ///< Flag indicates DG Drain command has been sent.
 static U32  treatmentEndPublishTimerCtr;                                    ///< Timer counter for determining interval for treatment end status to be published.
-/// Interval (in task intervals) at which to publish treatment end data to CAN bus.
-static OVERRIDE_U32_T treatmentEndPublishInterval = { TREATMENT_END_DATA_PUBLISH_INTERVAL, TREATMENT_END_DATA_PUBLISH_INTERVAL, TREATMENT_END_DATA_PUBLISH_INTERVAL, 0 };
 
 // ********** private function prototypes **********
 
@@ -65,7 +63,6 @@
 static void setupForTxEndWait4RinsebackState( void );
 static void setupForTxEndPausedState( void );
 static void publishTreatmentEndData( void );
-static U32  getPublishTreatmentEndInterval( void );
 
 static TREATMENT_END_STATE_T handleTxEndWait4RinsebackState( void );
 static TREATMENT_END_STATE_T handleTxEndPausedState( void );
@@ -85,6 +82,7 @@
     treatmentEndState = TREATMENT_END_WAIT_FOR_RINSEBACK_STATE;
     txEndTimerCtr = 0;
     bloodSittingTimerCtr = 0;
+    treatmentEndPublishTimerCtr = 0;
     txEndDrainCmdSent = FALSE;
     resetTreatmentEndFlags();
 }
@@ -463,7 +461,7 @@
  *************************************************************************/
 static void publishTreatmentEndData( void )
 {
-    if ( ++treatmentEndPublishTimerCtr >= getPublishTreatmentEndInterval() )
+    if ( ++treatmentEndPublishTimerCtr >= TREATMENT_END_DATA_PUBLISH_INTERVAL )
     {
         TREATMENT_STOP_PAYLOAD_T data;
 
@@ -480,71 +478,4 @@
     }
 }
 
-/*********************************************************************//**
- * @brief
- * The getPublishTreatmentEndInterval function gets the treatment end data
- * publication interval.
- * @details Inputs: treatmentEndPublishInterval
- * @details Outputs: none
- * @return the current treatment end publication interval (in task intervals).
- *************************************************************************/
-static U32 getPublishTreatmentEndInterval( void )
-{
-    U32 result = treatmentEndPublishInterval.data;
-
-    if ( OVERRIDE_KEY == treatmentEndPublishInterval.override )
-    {
-        result = treatmentEndPublishInterval.ovData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetTreatmentEndPublishIntervalOverride function sets the override of the
- * treatment end data publication interval.
- * @details Inputs: none
- * @details Outputs: treatmentEndPublishInterval
- * @param ms milliseconds between treatment end broadcasts
- * @return TRUE if override set successful, FALSE if not
- *************************************************************************/
-BOOL testSetTreatmentEndPublishIntervalOverride( U32 ms )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        U32 intvl = ms / TASK_GENERAL_INTERVAL;
-
-        result = TRUE;
-        treatmentEndPublishInterval.ovData = intvl;
-        treatmentEndPublishInterval.override = OVERRIDE_KEY;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testResetTreatmentEndPublishIntervalOverride function resets the override of the
- * treatment end data publication interval.
- * @details Inputs: none
- * @details Outputs: treatmentEndPublishInterval
- * @return TRUE if override reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetTreatmentEndPublishIntervalOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        treatmentEndPublishInterval.override = OVERRIDE_RESET;
-        treatmentEndPublishInterval.ovData = treatmentEndPublishInterval.ovInitData;
-    }
-
-    return result;
-}
-
 /**@}*/