Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -reff7b1575f008f81b29ef906f6346fac6012d3ab -r6b6b337c1c0e7dd7c1b7311a39596473d7214ee4
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision eff7b1575f008f81b29ef906f6346fac6012d3ab)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6b6b337c1c0e7dd7c1b7311a39596473d7214ee4)
@@ -20,6 +20,7 @@
 
 #include "Common.h"
 #include "AlarmLamp.h"
+#include "BloodFlow.h"
 #include "Buttons.h"
 #include "MsgQueues.h"
 #include "WatchdogMgmt.h"
@@ -293,29 +294,8 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestOffButtonStateOverrideRequest( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_CARGO_T cargo;
-    BOOL result = FALSE;
+DATA_OVERRIDE_HANDLER_FUNC( BUTTON_STATE_T, handleTestOffButtonStateOverrideRequest, testSetOffButtonStateOverride, testResetOffButtonStateOverride )
 
-    // verify cargo length
-    if ( sizeof(TEST_OVERRIDE_CARGO_T) == message->hdr.cargoLen )
-    {
-        memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_CARGO_T) );
-
-        if ( FALSE == cargo.reset )
-        {
-            result = testSetOffButtonStateOverride( (BUTTON_STATE_T)(cargo.state) );
-        }
-        else
-        {
-            result = testResetOffButtonStateOverride();
-        }
-    }
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
 /*************************************************************************
  * @brief handleTestStopButtonStateOverrideRequest
  * The handleTestStopButtonStateOverrideRequest function handles a request to \n
@@ -326,29 +306,8 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestStopButtonStateOverrideRequest( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_CARGO_T cargo;
-    BOOL result = FALSE;
+DATA_OVERRIDE_HANDLER_FUNC( BUTTON_STATE_T, handleTestStopButtonStateOverrideRequest, testSetStopButtonStateOverride, testResetStopButtonStateOverride )
 
-    // verify cargo length
-    if ( sizeof(TEST_OVERRIDE_CARGO_T) == message->hdr.cargoLen )
-    {
-        memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_CARGO_T) );
-
-        if ( FALSE == cargo.reset )
-        {
-            result = testSetStopButtonStateOverride( (BUTTON_STATE_T)(cargo.state) );
-        }
-        else
-        {
-            result = testResetStopButtonStateOverride();
-        }
-    }
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
 /*************************************************************************
  * @brief handleTestAlarmLampPatternOverrideRequest
  * The handleTestAlarmLampPatternOverrideRequest function handles a request to \n
@@ -359,59 +318,77 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestAlarmLampPatternOverrideRequest( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_CARGO_T cargo;
-    BOOL result = FALSE;
+DATA_OVERRIDE_HANDLER_FUNC( LAMP_PATTERN_T, handleTestAlarmLampPatternOverrideRequest, testSetCurrentLampPatternOverride, testResetCurrentLampPatternOverride )
 
-    // verify cargo length
-    if ( sizeof(TEST_OVERRIDE_CARGO_T) == message->hdr.cargoLen )
-    {
-        memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_CARGO_T) );
+/*************************************************************************
+ * @brief handleTestWatchdogCheckInStateOverrideRequest
+ * The handleTestWatchdogCheckInStateOverrideRequest function handles a \n
+ * request to override the check-in status of a given task.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_ARRAY_OVERRIDE_HANDLER_FUNC( BOOL, handleTestWatchdogCheckInStateOverrideRequest, testSetWatchdogTaskCheckInOverride, testResetWatchdogTaskCheckInOverride )
 
-        if ( FALSE == cargo.reset )
-        {
-            result = testSetCurrentLampPatternOverride( (LAMP_PATTERN_T)(cargo.state) );
-        }
-        else
-        {
-            result = testResetCurrentLampPatternOverride();
-        }
-    }
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
+/*************************************************************************
+ * @brief handleTestAlarmStateOverrideRequest
+ * The handleTestAlarmStateOverrideRequest function handles a request to \n
+ * override the active status of a given alarm.
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+//DATA_ARRAY_OVERRIDE_HANDLER_FUNC( BOOL, handleTestAlarmStateOverrideRequest, testSetAlarmStateOverride, testResetAlarmStateOverride )
 
 /*************************************************************************
- * @brief handleTestAlarmLampPatternOverrideRequest
- * The handleTestAlarmLampPatternOverrideRequest function handles a request to \n
- * override the alarm lamp pattern.
+ * @brief handleTestBloodFlowSetPointOverrideRequest
+ * The handleTestBloodFlowSetPointOverrideRequest function handles a request to \n
+ * override the set point for the blood flow rate (mL/min).
  * @details
  * Inputs : none
  * Outputs : message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestWatchdogCheckInStateOverrideRequest( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_CARGO_T cargo;
-    BOOL result = FALSE;
+DATA_OVERRIDE_HANDLER_FUNC( U32, handleTestBloodFlowSetPointOverrideRequest, testSetTargetBloodFlowRateOverride, testResetTargetBloodFlowRateOverride )
 
-    // verify cargo length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_CARGO_T) == message->hdr.cargoLen )
-    {
-        memcpy( &cargo, message->cargo, sizeof(TEST_OVERRIDE_ARRAY_CARGO_T) );
+/*************************************************************************
+ * @brief handleTestBloodFlowMeasuredOverrideRequest
+ * The handleTestBloodFlowMeasuredOverrideRequest function handles a request to \n
+ * override the measured blood flow rate (mL/min).
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC( F32, handleTestBloodFlowMeasuredOverrideRequest, testSetMeasuredBloodFlowRateOverride, testResetMeasuredBloodFlowRateOverride )
 
-        if ( FALSE == cargo.reset )
-        {
-            result = testSetWatchdogTaskCheckInOverride( cargo.index, (BOOL)(cargo.state) );
-        }
-        else
-        {
-            result = testResetWatchdogTaskCheckInOverride( cargo.index );
-        }
-    }
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
+/*************************************************************************
+ * @brief handleTestBloodPumpMeasuredSpeedOverrideRequest
+ * The handleTestBloodPumpMeasuredSpeedOverrideRequest function handles a request to \n
+ * override the measured blood pump speed (RPM).
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC( F32, handleTestBloodPumpMeasuredSpeedOverrideRequest, testSetMeasuredBloodPumpSpeedOverride, testResetMeasuredBloodPumpSpeedOverride )
 
+/*************************************************************************
+ * @brief handleTestBloodPumpMeasuredCurrentOverrideRequest
+ * The handleTestBloodPumpMeasuredCurrentOverrideRequest function handles a request to \n
+ * override the measured blood pump current (mA).
+ * @details
+ * Inputs : none
+ * Outputs : message handled
+ * @param message : a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+DATA_OVERRIDE_HANDLER_FUNC( F32, handleTestBloodPumpMeasuredCurrentOverrideRequest, testSetMeasuredBloodPumpCurrentOverride, testResetMeasuredBloodPumpCurrentOverride )
+