Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r2de8bd54fe7ce6557115820251069611b49aa0ab -r9e43275cfdf3f60042d69d9cbbfc6d74142fa5e5
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 2de8bd54fe7ce6557115820251069611b49aa0ab)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 9e43275cfdf3f60042d69d9cbbfc6d74142fa5e5)
@@ -2251,53 +2251,6 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetSyringePumpDataPublishIntervalOverride function overrides the
- * syringe pump data publish interval.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpDataPublishInterval
- * @param value override syringe pump data publish interval with (in ms)
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testSetSyringePumpDataPublishIntervalOverride( U32 value )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        U32 intvl = value / TASK_PRIORITY_INTERVAL;
-
-        result = TRUE;
-        syringePumpDataPublishInterval.ovData = intvl;
-        syringePumpDataPublishInterval.override = OVERRIDE_KEY;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testResetSyringePumpDataPublishIntervalOverride function resets the override
- * of the syringe pump data publish interval.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpDataPublishInterval
- * @return TRUE if override reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetSyringePumpDataPublishIntervalOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        syringePumpDataPublishInterval.override = OVERRIDE_RESET;
-        syringePumpDataPublishInterval.ovData = syringePumpDataPublishInterval.ovInitData;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
  * The testSyringePumpOperationRequest function requests a given syringe pump
  * operation.
  * @details \b Inputs: none
@@ -2353,499 +2306,196 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetSyringePumpMeasuredRateOverride function overrides the measured
- * rate of the syringe pump.
+ * The testSyringePumpDataPublishIntervalOverride function overrides the
+ * syringe pump data publish interval.
  * @details \b Inputs: none
- * @details \b Outputs: syringePumpMeasRate
- * @param value override syringe pump measured rate with this value (in mL/hr)
+ * @details \b Outputs: syringePumpDataPublishInterval
+ * @param value override syringe pump data publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetSyringePumpMeasuredRateOverride( F32 value )
+BOOL testSyringePumpDataPublishIntervalOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = u32BroadcastIntervalOverride( message, &syringePumpDataPublishInterval, TASK_PRIORITY_INTERVAL );
 
-    if ( ( TRUE == isTestingActivated() ) && ( value <= SYRINGE_PUMP_MAX_RATE ) )
-    {
-        result = TRUE;
-        syringePumpMeasRate.ovData = value;
-        syringePumpMeasRate.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetSyringePumpMeasuredRateOverride function resets the override
- * of the syringe pump measured rate.
+ * The testSyringePumpMeasuredRateOverride function overrides the measured
+ * rate of the syringe pump.
  * @details \b Inputs: none
  * @details \b Outputs: syringePumpMeasRate
- * @return TRUE if reset successful, FALSE if not
+ * @param value override syringe pump measured rate with this value (in mL/hr)
+ * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testResetSyringePumpMeasuredRateOverride( void )
+BOOL testSyringePumpMeasuredRateOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = f32Override( message, &syringePumpMeasRate );
 
-     if ( TRUE == isTestingActivated() )
-     {
-         result = TRUE;
-         syringePumpMeasRate.override = OVERRIDE_RESET;
-         syringePumpMeasRate.ovData = syringePumpMeasRate.ovInitData;
-     }
-
-     return result;
+    return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testSetSyringePumpMeasuredForceOverride function overrides the measured
+ * The testSyringePumpMeasuredForceOverride function overrides the measured
  * force analog signal of the syringe pump.
  * @details \b Inputs: none
  * @details \b Outputs: syringePumpMeasForce
  * @param value override syringe pump measured force signal with this value (in V)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetSyringePumpMeasuredForceOverride( F32 value )
+BOOL testSyringePumpMeasuredForceOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = f32Override( message, &syringePumpMeasForce );
 
-    if ( ( TRUE == isTestingActivated() ) && ( value >= 0.0 ) && ( value <= SYRINGE_PUMP_ADC_REF_V ) )
-    {
-        result = TRUE;
-        syringePumpMeasForce.ovData = value;
-        syringePumpMeasForce.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetSyringePumpMeasuredForceOverride function resets the override
- * of the syringe pump measured force analog signal.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpMeasForce
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetSyringePumpMeasuredForceOverride( void )
-{
-    BOOL result = FALSE;
-
-     if ( TRUE == isTestingActivated() )
-     {
-         result = TRUE;
-         syringePumpMeasForce.override = OVERRIDE_RESET;
-         syringePumpMeasForce.ovData = syringePumpMeasForce.ovInitData;
-     }
-
-     return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetSyringePumpMeasuredSyringeDetectOverride function overrides the measured
+ * The testSyringePumpMeasuredSyringeDetectOverride function overrides the measured
  * syringe detect analog signal of the syringe pump.
  * @details \b Inputs: none
  * @details \b Outputs: syringePumpMeasSyringeDetectionSwitch
  * @param value override syringe pump measured syringe detection signal with this value (in V)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetSyringePumpMeasuredSyringeDetectOverride( F32 value )
+BOOL testSyringePumpMeasuredSyringeDetectOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = f32Override( message, &syringePumpMeasSyringeDetectionSwitch );
 
-    if ( ( TRUE == isTestingActivated() ) && ( value >= 0.0 ) && ( value <= SYRINGE_PUMP_ADC_REF_V ) )
-    {
-        result = TRUE;
-        syringePumpMeasSyringeDetectionSwitch.ovData = value;
-        syringePumpMeasSyringeDetectionSwitch.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetSyringePumpMeasuredSyringeDetectOverride function resets the override
- * of the syringe pump measured syringe detect analog signal.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpMeasSyringeDetectionSwitch
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetSyringePumpMeasuredSyringeDetectOverride( void )
-{
-    BOOL result = FALSE;
-
-     if ( TRUE == isTestingActivated() )
-     {
-         result = TRUE;
-         syringePumpMeasSyringeDetectionSwitch.override = OVERRIDE_RESET;
-         syringePumpMeasSyringeDetectionSwitch.ovData = syringePumpMeasSyringeDetectionSwitch.ovInitData;
-     }
-
-     return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetSyringePumpMeasuredHomeOverride function overrides the measured
+ * The testSyringePumpMeasuredHomeOverride function overrides the measured
  * home analog signal of the syringe pump.
- * @details \b Inputs: none
+ * @details \b Inputs: syringePumpMeasHome
  * @details \b Outputs: syringePumpMeasHome
  * @param value override syringe pump measured home signal with this value (in V)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetSyringePumpMeasuredHomeOverride( F32 value )
+BOOL testSyringePumpMeasuredHomeOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = f32Override( message, &syringePumpMeasHome );
 
-    if ( ( TRUE == isTestingActivated() ) && ( value >= 0.0 ) && ( value <= SYRINGE_PUMP_ADC_REF_V ) )
-    {
-        result = TRUE;
-        syringePumpMeasHome.ovData = value;
-        syringePumpMeasHome.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetSyringePumpMeasuredHomeOverride function resets the override
- * of the syringe pump measured home analog signal.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpMeasHome
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetSyringePumpMeasuredHomeOverride( void )
-{
-    BOOL result = FALSE;
-
-     if ( TRUE == isTestingActivated() )
-     {
-         result = TRUE;
-         syringePumpMeasHome.override = OVERRIDE_RESET;
-         syringePumpMeasHome.ovData = syringePumpMeasHome.ovInitData;
-     }
-
-     return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetSyringePumpMeasuredPositionOverride function overrides the measured
+ * The testSyringePumpMeasuredPositionOverride function overrides the measured
  * position of the syringe pump.
- * @details \b Inputs: none
+ * @details \b Inputs: syringePumpPosition
  * @details \b Outputs: syringePumpPosition
- * @param value override syringe pump measured position with this value (in encoder counts)
+ * @param message Override message from Dialin which includes the override
+ * value to override the syringe pump measured position (in encoder counts)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetSyringePumpMeasuredPositionOverride( S32 value )
+BOOL testSyringePumpMeasuredPositionOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = s32Override( message, &syringePumpPosition );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        syringePumpPosition.ovData = value;
-        syringePumpPosition.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetSyringePumpMeasuredPositionOverride function resets the override
- * of the syringe pump measured position.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpPosition
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetSyringePumpMeasuredPositionOverride( void )
-{
-    BOOL result = FALSE;
-
-     if ( TRUE == isTestingActivated() )
-     {
-         result = TRUE;
-         syringePumpPosition.override = OVERRIDE_RESET;
-         syringePumpPosition.ovData = syringePumpPosition.ovInitData;
-     }
-
-     return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetSyringePumpMeasuredVolumeOverride function overrides the measured
+ * The testSyringePumpMeasuredVolumeOverride function overrides the measured
  * rate of the syringe pump measured volume delivered.
- * @details \b Inputs: none
+ * @details \b Inputs: syringePumpVolumeDelivered
  * @details \b Outputs: syringePumpVolumeDelivered
- * @param value override syringe pump measured volume with this value (in mL)
+ * @param message Override message from Dialin which includes the override
+ * value to override the syringe pump measured volume (in mL).
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetSyringePumpMeasuredVolumeOverride( F32 value )
+BOOL testSyringePumpMeasuredVolumeOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = f32Override( message, &syringePumpVolumeDelivered );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        syringePumpVolumeDelivered.ovData = value;
-        syringePumpVolumeDelivered.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetSyringePumpMeasuredVolumeOverride function resets the override
- * of the syringe pump measured volume delivered.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpVolumeDelivered
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetSyringePumpMeasuredVolumeOverride( void )
-{
-    BOOL result = FALSE;
-
-     if ( TRUE == isTestingActivated() )
-     {
-         result = TRUE;
-         syringePumpVolumeDelivered.override = OVERRIDE_RESET;
-         syringePumpVolumeDelivered.ovData = syringePumpVolumeDelivered.ovInitData;
-     }
-
-     return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetHeprinBolusTargetRateOverride function overrides the
+ * The testHeprinBolusTargetRateOverride function overrides the
  * heprine bolus target rate.
  * @details \b Inputs: heprinBolusTargetRate
  * @details \b Outputs: heprinBolusTargetRate
  * @param: value : override heprinBolusTargetRate (in mL/hour)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetHeprinBolusTargetRateOverride( F32 value )
+BOOL testHeprinBolusTargetRateOverride( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = f32Override( message, &heparinBolusTargetRate );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        heparinBolusTargetRate.ovInitData = heparinBolusTargetRate.data;
-        heparinBolusTargetRate.ovData     = value;
-        heparinBolusTargetRate.override   = OVERRIDE_KEY;
-        result = TRUE;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetHeprinBolusTargetRateOverride function resets the override
- * of the heprin bolus target rate.
- * @details \b Inputs: heprinBolusTargetRate
- * @details \b Outputs: heprinBolusTargetRate
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testResetHeprinBolusTargetRateOverride( void )
-{
-    BOOL result = FALSE;
-
-    if ( TRUE == isTestingActivated() )
-    {
-        heparinBolusTargetRate.override   = OVERRIDE_RESET;
-        heparinBolusTargetRate.ovData     = heparinBolusTargetRate.ovInitData;
-        heparinBolusTargetRate.ovInitData = 0.0;
-        result = TRUE;
-    }
-
-    return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetSyringePumpStatus function overrides the syringe pump
+ * The testSyringePumpStatus function overrides the syringe pump
  * status.
  * @details \b Inputs: none
  * @details \b Outputs: syringePumpStatus
  * @param status override syringe pump status with this value
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetSyringePumpStatus( U32 status )
+BOOL testSyringePumpStatus( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = u32Override( message, &syringePumpStatus, 0, 255 );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        syringePumpStatus.ovData = status;
-        syringePumpStatus.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetSyringePumpStatus function resets the override of the
- * syringe pump status.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpStatus
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetSyringePumpStatus( void )
-{
-    BOOL result = FALSE;
-
-     if ( TRUE == isTestingActivated() )
-     {
-         result = TRUE;
-         syringePumpStatus.override = OVERRIDE_RESET;
-         syringePumpStatus.ovData = syringePumpStatus.ovInitData;
-     }
-
-     return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetSyringePumpEncoderStatus function overrides the syringe
+ * The testSyringePumpEncoderStatus function overrides the syringe
  * pump encoder status.
  * @details \b Inputs: none
  * @details \b Outputs: syringePumpEncoderStatus
  * @param status override syringe pump encoder status with this value
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetSyringePumpEncoderStatus( U32 status )
+BOOL testSyringePumpEncoderStatus( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = u32Override( message, &syringePumpEncoderStatus, 0, 255 );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        syringePumpEncoderStatus.ovData = status;
-        syringePumpEncoderStatus.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetSyringePumpEncoderStatus function resets the override
- * of the syringe pump encoder status.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpEncoderStatus
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetSyringePumpEncoderStatus( void )
-{
-    BOOL result = FALSE;
-
-     if ( TRUE == isTestingActivated() )
-     {
-         result = TRUE;
-         syringePumpEncoderStatus.override = OVERRIDE_RESET;
-         syringePumpEncoderStatus.ovData = syringePumpEncoderStatus.ovInitData;
-     }
-
-     return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetSyringePumpADCandDACStatus function overrides the syringe
+ * The testSyringePumpADCandDACStatus function overrides the syringe
  * pump ADC and DAC status.
  * @details \b Inputs: none
  * @details \b Outputs: syringePumpADCandDACStatus
  * @param status override syringe pump ADC and DAC status with this value
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetSyringePumpADCandDACStatus( U32 status )
+BOOL testSyringePumpADCandDACStatus( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = u32Override( message, &syringePumpADCandDACStatus, 0, 255 );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        syringePumpADCandDACStatus.ovData = status;
-        syringePumpADCandDACStatus.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The testResetSyringePumpADCandDACStatus function resets the override
- * of the syringe pump ADC and DAC status.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpADCandDACStatus
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetSyringePumpADCandDACStatus( void )
-{
-    BOOL result = FALSE;
-
-     if ( TRUE == isTestingActivated() )
-     {
-         result = TRUE;
-         syringePumpADCandDACStatus.override = OVERRIDE_RESET;
-         syringePumpADCandDACStatus.ovData = syringePumpADCandDACStatus.ovInitData;
-     }
-
-     return result;
-}
-
-/*********************************************************************//**
- * @brief
- * The testSetSyringePumpADCReadCounter function overrides the syringe
+ * The testSyringePumpADCReadCounter function overrides the syringe
  * pump ADC read counter.
  * @details \b Inputs: none
  * @details \b Outputs: syringePumpADCReadCtr
  * @param ctr override syringe pump ADC read counter with this value
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetSyringePumpADCReadCounter( U32 ctr )
+BOOL testSyringePumpADCReadCounter( MESSAGE_T *message )
 {
-    BOOL result = FALSE;
+    BOOL result = u32Override( message, &syringePumpADCReadCtr, 0, 255 );
 
-    if ( TRUE == isTestingActivated() )
-    {
-        result = TRUE;
-        syringePumpADCReadCtr.ovData = ctr;
-        syringePumpADCReadCtr.override = OVERRIDE_KEY;
-    }
-
     return result;
 }
 
-/*********************************************************************//**
- * @brief
- * The testResetSyringePumpADCReadCounter function resets the override
- * of the syringe pump ADC read counter.
- * @details \b Inputs: none
- * @details \b Outputs: syringePumpADCReadCtr
- * @return TRUE if reset successful, FALSE if not
- *************************************************************************/
-BOOL testResetSyringePumpADCReadCounter( void )
-{
-    BOOL result = FALSE;
-
-     if ( TRUE == isTestingActivated() )
-     {
-         result = TRUE;
-         syringePumpADCReadCtr.override = OVERRIDE_RESET;
-         syringePumpADCReadCtr.ovData = syringePumpADCReadCtr.ovInitData;
-     }
-
-     return result;
-}
-
 /**@}*/