Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rdbfeaf78c05fc922eba6ff8c7a31ba8a9392c642 -r8466e63f95f65a3ffb18c3af85ac99328e41167b
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision dbfeaf78c05fc922eba6ff8c7a31ba8a9392c642)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 8466e63f95f65a3ffb18c3af85ac99328e41167b)
@@ -56,11 +56,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 )
 /// Interval (ms) at which the treatment periodic data is published on the CAN bus.
 static const U32 TREATMENT_PERIODIC_DATA_PUB_INTERVAL = ( 30 * SEC_PER_MIN * MS_PER_SECOND );
 /// Interval (ms) at which the treatment periodic data is logged.
@@ -91,6 +91,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.
@@ -1197,7 +1203,7 @@
         U32 dialVolume = dialRate * ( (U32)( (F32)presTreatmentTimeSecs / (F32)SEC_PER_MIN ) + 1 );   // In mL
 
         // Validate new rates
-        if ( ( bloodRate >= MIN_BLOOD_FLOW_RATE ) && ( bloodRate <= MAX_BLOOD_FLOW_RATE ) &&
+        if ( ( bloodRate >= MIN_SET_BLOOD_FLOW_RATE ) && ( bloodRate <= MAX_SET_BLOOD_FLOW_RATE ) &&
              ( dialRate >= MIN_DIAL_IN_FLOW_RATE ) && ( dialRate <= MAX_DIAL_IN_FLOW_RATE ) &&
              ( dialVolume <= MAX_DIALYSATE_VOLUME_ML ) )
         {
@@ -1211,7 +1217,7 @@
         }
         else
         {
-            if ( ( bloodRate < MIN_BLOOD_FLOW_RATE ) || ( bloodRate > MAX_BLOOD_FLOW_RATE ) )
+            if ( ( bloodRate < MIN_SET_BLOOD_FLOW_RATE ) || ( bloodRate > MAX_SET_BLOOD_FLOW_RATE ) )
             {
                 rejectReason = REQUEST_REJECT_REASON_BLOOD_FLOW_OUT_OF_RANGE;
             }
@@ -1361,7 +1367,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 >= getU32OverrideValue( &treatmentTimePublishInterval ) )
     {
         if ( isTreatmentCompleted() != TRUE )
         {
@@ -1376,7 +1382,7 @@
         treatmentTimeBroadcastTimerCtr = 0;
     }
     // Broadcast treatment state data at interval
-    if ( ++treatmentStateBroadcastTimerCtr >= TREATMENT_STATE_DATA_PUB_INTERVAL )
+    if ( ++treatmentStateBroadcastTimerCtr >= getU32OverrideValue( &treatmentStatePublishInterval ) )
     {
         TREATMENT_STATE_DATA_T payload;
 
@@ -1389,6 +1395,7 @@
         payload.txStopState = getCurrentTreatmentRecircState();
         payload.txEndState = getCurrentTreatmentEndState();
         payload.heparinState = getHeparinState();
+        payload.dialysisState = getDialysisState();
 
         broadcastTreatmentState( payload );
         treatmentStateBroadcastTimerCtr = 0;
@@ -1407,7 +1414,7 @@
  *************************************************************************/
 static void broadcastTreatmentSettingsRanges( void )
 {
-    if ( ++treatmentParamsRangesBroadcastTimerCtr >= TREATMENT_SETTINGS_RANGES_PUB_INTERVAL )
+    if ( ++treatmentParamsRangesBroadcastTimerCtr >= getU32OverrideValue( &treatmentParamRangesPublishInterval ) )
     {
         // Compute minimum treatment duration
         U32 presTime = ( presTreatmentTimeSecs / SEC_PER_MIN );
@@ -1523,4 +1530,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;
+}
+
 /**@}*/