Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rd27dcf1fbbc9651636f211028917a1c0702bb56a -rc65ad0538ff99c3e13d7d7866ac15e38a1ef6002
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision d27dcf1fbbc9651636f211028917a1c0702bb56a)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision c65ad0538ff99c3e13d7d7866ac15e38a1ef6002)
@@ -55,11 +55,11 @@
 #define PREVENT_UF_VOL_CHANGE_IF_NEARLY_DONE_SEC    ( 10 * SEC_PER_MIN )                    ///< Prevent UF volume change if treatment within this much time from end of treatment (in seconds).
 
 /// Interval (ms/task time) at which the treatment time data is published on the CAN bus.
-static const U32 TREATMENT_TIME_DATA_PUB_INTERVAL  = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
+#define TREATMENT_TIME_DATA_PUB_INTERVAL        ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
 /// Interval (ms/task time) at which the treatment state data is published on the CAN bus.
-static const U32 TREATMENT_STATE_DATA_PUB_INTERVAL = ( 250 / TASK_GENERAL_INTERVAL );
+#define TREATMENT_STATE_DATA_PUB_INTERVAL       ( 250 / TASK_GENERAL_INTERVAL )
 /// Interval (ms/task time) at which updated, valid treatment setting ranges are published on the CAN bus.
-static const U32 TREATMENT_SETTINGS_RANGES_PUB_INTERVAL = ( ( 60 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL );
+#define TREATMENT_SETTINGS_RANGES_PUB_INTERVAL  ( ( 60 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL )
 
 #define CALC_ELAPSED_TREAT_TIME_IN_SECS()       ( treatmentTimeMS / MS_PER_SECOND )         ///< Macro to calculate the elapsed treatment time in seconds.
 /// Macro to calculate the elapsed treatment time in minutes.
@@ -86,6 +86,12 @@
 static U32 treatmentTimeBroadcastTimerCtr;                      ///< Treatment time data broadcast timer counter used to schedule when to transmit data.
 static U32 treatmentStateBroadcastTimerCtr;                     ///< Treatment state data broadcast timer counter used to schedule when to transmit data.
 static U32 treatmentParamsRangesBroadcastTimerCtr;              ///< Treatment parameter ranges broadcast timer counter used to schedule when to transmit updated ranges.
+/// Interval (in task intervals) at which to publish alarm status to CAN bus.
+static OVERRIDE_U32_T treatmentTimePublishInterval = { TREATMENT_TIME_DATA_PUB_INTERVAL, TREATMENT_TIME_DATA_PUB_INTERVAL, TREATMENT_TIME_DATA_PUB_INTERVAL, 0 };
+/// Interval (in task intervals) at which to publish alarm status to CAN bus.
+static OVERRIDE_U32_T treatmentStatePublishInterval = { TREATMENT_STATE_DATA_PUB_INTERVAL, TREATMENT_STATE_DATA_PUB_INTERVAL, TREATMENT_STATE_DATA_PUB_INTERVAL, 0 };
+/// Interval (in task intervals) at which to publish alarm status to CAN bus.
+static OVERRIDE_U32_T treatmentParamRangesPublishInterval = { TREATMENT_SETTINGS_RANGES_PUB_INTERVAL, TREATMENT_SETTINGS_RANGES_PUB_INTERVAL, TREATMENT_SETTINGS_RANGES_PUB_INTERVAL, 0 };
 
 static BOOL resumeTreatmentAlarmResponseRequest;                ///< Flag indicates user has requested treatment resume.
 static BOOL initiateRinsebackAlarmResponseRequest;              ///< Flag indicates user has requested rinseback.
@@ -113,6 +119,9 @@
 static TREATMENT_STATE_T handleTreatmentRinsebackState( void );
 static TREATMENT_STATE_T handleTreatmentRecircState( void );
 static TREATMENT_STATE_T handleTreatmentEndState( void );
+static U32 getPublishTreatmentTimeInterval( void );
+static U32 getPublishTreatmentStateInterval( void );
+static U32 getPublishTreatmentParamRangesInterval( void );
 
 /*********************************************************************//**
  * @brief
@@ -1146,7 +1155,7 @@
     // Update treatment time stats and broadcast - end treatment if time
     elapsedTreatmentTimeInSecs = CALC_ELAPSED_TREAT_TIME_IN_SECS();
     // Broadcast treatment time data at interval
-    if ( ++treatmentTimeBroadcastTimerCtr >= TREATMENT_TIME_DATA_PUB_INTERVAL )
+    if ( ++treatmentTimeBroadcastTimerCtr >= getPublishTreatmentTimeInterval() )
     {
         if ( isTreatmentCompleted() != TRUE )
         {
@@ -1161,7 +1170,7 @@
         treatmentTimeBroadcastTimerCtr = 0;
     }
     // Broadcast treatment state data at interval
-    if ( ++treatmentStateBroadcastTimerCtr >= TREATMENT_STATE_DATA_PUB_INTERVAL )
+    if ( ++treatmentStateBroadcastTimerCtr >= getPublishTreatmentStateInterval() )
     {
         TREATMENT_STATE_DATA_T payload;
 
@@ -1183,6 +1192,66 @@
 
 /*********************************************************************//**
  * @brief
+ * The getPublishTreatmentTimeInterval function gets the treatment time data
+ * publication interval.
+ * @details Inputs: treatmentTimePublishInterval
+ * @details Outputs: none
+ * @return the current treatment time data publication interval (in task intervals).
+ *************************************************************************/
+static U32 getPublishTreatmentTimeInterval( void )
+{
+    U32 result = treatmentTimePublishInterval.data;
+
+    if ( OVERRIDE_KEY == treatmentTimePublishInterval.override )
+    {
+        result = treatmentTimePublishInterval.ovData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The getPublishTreatmentStateInterval function gets the treatment state data
+ * publication interval.
+ * @details Inputs: treatmentStatePublishInterval
+ * @details Outputs: none
+ * @return the current treatment state data publication interval (in task intervals).
+ *************************************************************************/
+static U32 getPublishTreatmentStateInterval( void )
+{
+    U32 result = treatmentStatePublishInterval.data;
+
+    if ( OVERRIDE_KEY == treatmentStatePublishInterval.override )
+    {
+        result = treatmentStatePublishInterval.ovData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The getPublishTreatmentParamRangesInterval function gets the treatment param
+ * range data publication interval.
+ * @details Inputs: treatmentParamRangesPublishInterval
+ * @details Outputs: none
+ * @return the current treatment param range data publication interval (in task intervals).
+ *************************************************************************/
+static U32 getPublishTreatmentParamRangesInterval( void )
+{
+    U32 result = treatmentParamRangesPublishInterval.data;
+
+    if ( OVERRIDE_KEY == treatmentParamRangesPublishInterval.override )
+    {
+        result = treatmentParamRangesPublishInterval.ovData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The broadcastTreatmentSettingsRanges function computes and broadcasts
  * updated treatment parameter ranges that the user may change during treatment.
  * It is assumed that prescription settings have already been set prior to calling
@@ -1193,7 +1262,7 @@
  *************************************************************************/
 static void broadcastTreatmentSettingsRanges( void )
 {
-    if ( ++treatmentParamsRangesBroadcastTimerCtr >= TREATMENT_SETTINGS_RANGES_PUB_INTERVAL )
+    if ( ++treatmentParamsRangesBroadcastTimerCtr >= getPublishTreatmentParamRangesInterval() )
     {
         // Compute minimum treatment duration
         U32 presTime = ( presTreatmentTimeSecs / SEC_PER_MIN );
@@ -1256,4 +1325,145 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The testSetTreatmentTimePublishIntervalOverride function sets the override of the
+ * treatment time data publication interval.
+ * @details Inputs: none
+ * @details Outputs: treatmentTimePublishInterval
+ * @param ms milliseconds between treatment time broadcasts
+ * @return TRUE if override set successful, FALSE if not
+ *************************************************************************/
+BOOL testSetTreatmentTimePublishIntervalOverride( U32 ms )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        U32 intvl = ms / TASK_GENERAL_INTERVAL;
+
+        result = TRUE;
+        treatmentTimePublishInterval.ovData = intvl;
+        treatmentTimePublishInterval.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetTreatmentTimePublishIntervalOverride function resets the override of the
+ * treatment time data publication interval.
+ * @details Inputs: none
+ * @details Outputs: treatmentTimePublishInterval
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetTreatmentTimePublishIntervalOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        treatmentTimePublishInterval.override = OVERRIDE_RESET;
+        treatmentTimePublishInterval.ovData = treatmentTimePublishInterval.ovInitData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testSetTreatmentStatePublishIntervalOverride function sets the override of the
+ * treatment state data publication interval.
+ * @details Inputs: none
+ * @details Outputs: treatmentStatePublishInterval
+ * @param ms milliseconds between treatment state broadcasts
+ * @return TRUE if override set successful, FALSE if not
+ *************************************************************************/
+BOOL testSetTreatmentStatePublishIntervalOverride( U32 ms )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        U32 intvl = ms / TASK_GENERAL_INTERVAL;
+
+        result = TRUE;
+        treatmentStatePublishInterval.ovData = intvl;
+        treatmentStatePublishInterval.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetTreatmentStatePublishIntervalOverride function resets the override of the
+ * treatment state data publication interval.
+ * @details Inputs: none
+ * @details Outputs: treatmentStatePublishInterval
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetTreatmentStatePublishIntervalOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        treatmentStatePublishInterval.override = OVERRIDE_RESET;
+        treatmentStatePublishInterval.ovData = treatmentStatePublishInterval.ovInitData;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testSetTreatmentParamRangesPublishIntervalOverride function sets the override of the
+ * treatment param ranges data publication interval.
+ * @details Inputs: none
+ * @details Outputs: treatmentParamRangesPublishInterval
+ * @param ms milliseconds between treatment param range broadcasts
+ * @return TRUE if override set successful, FALSE if not
+ *************************************************************************/
+BOOL testSetTreatmentParamRangesPublishIntervalOverride( U32 ms )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        U32 intvl = ms / TASK_GENERAL_INTERVAL;
+
+        result = TRUE;
+        treatmentParamRangesPublishInterval.ovData = intvl;
+        treatmentParamRangesPublishInterval.override = OVERRIDE_KEY;
+    }
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The testResetTreatmentParamRangesPublishIntervalOverride function resets the override of the
+ * treatment param ranges data publication interval.
+ * @details Inputs: none
+ * @details Outputs: treatmentParamRangesPublishInterval
+ * @return TRUE if override reset successful, FALSE if not
+ *************************************************************************/
+BOOL testResetTreatmentParamRangesPublishIntervalOverride( void )
+{
+    BOOL result = FALSE;
+
+    if ( TRUE == isTestingActivated() )
+    {
+        result = TRUE;
+        treatmentParamRangesPublishInterval.override = OVERRIDE_RESET;
+        treatmentParamRangesPublishInterval.ovData = treatmentParamRangesPublishInterval.ovInitData;
+    }
+
+    return result;
+}
+
 /**@}*/