Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r8f4112033e1c247f629202cdc97389ffd5cb0170 -rd39ef6232e746a4f2d425135208602670fae60bd
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 8f4112033e1c247f629202cdc97389ffd5cb0170)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d39ef6232e746a4f2d425135208602670fae60bd)
@@ -2260,26 +2260,6 @@
     // TODO - how to know if DG stops sending these?
 }
 
-/*********************************************************************//**
- * @brief
- * The handleROPumpData function handles an RO pump data broadcast
- * message from the DG.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleROPumpData( MESSAGE_T *message )
-{
-    if ( message->hdr.payloadLen == sizeof(DG_RO_PUMP_DATA_PAYLOAD_T) )
-    {
-        DG_RO_PUMP_DATA_PAYLOAD_T payload;
-
-        memcpy( &payload, message->payload, sizeof(DG_RO_PUMP_DATA_PAYLOAD_T) );
-        setDGROPumpData( payload.setPtPSI, payload.measFlowRateMlMin );
-    }
-}
-
 /*********************************************************************//**
  * @brief
  * The handleDialysateFlowData function handles dialysate flow data broadcast
@@ -2300,48 +2280,8 @@
     }
 }
 
-/*********************************************************************//**
- * @brief
- * The handleDrainPumpData function handles a drain pump broadcast
- * message from the DG.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleDrainPumpData( MESSAGE_T *message )
-{
-     if ( message->hdr.payloadLen == sizeof(DG_DRAIN_PUMP_DATA_PAYLOAD_T) )
-     {
-         DG_DRAIN_PUMP_DATA_PAYLOAD_T payload;
-
-         memcpy( &payload, message->payload, sizeof(DG_DRAIN_PUMP_DATA_PAYLOAD_T) );
-         setDGDrainPumpData( payload.setPtRPM );
-     }
-}
-
-/*********************************************************************//**
- * @brief
- * The handleDGPressuresData function handles a DG pressure sensor readings
- * broadcast message from the DG.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleDGPressuresData( MESSAGE_T *message )
-{
-     if ( message->hdr.payloadLen == sizeof(DG_PRESSURES_DATA_PAYLOAD_T) )
-     {
-         DG_PRESSURES_DATA_PAYLOAD_T payload;
-
-         memcpy( &payload, message->payload, sizeof(DG_PRESSURES_DATA_PAYLOAD_T) );
-         setDGPressures( payload.roInPSI, payload.roOutPSI, payload.drainInPSI, payload.drainOutPSI );
-     }
-}
-
-/*********************************************************************//**
- * @brief
+/*********************************************************************//**
+ * @brief
  * The handleDGReservoirData function handles a reservoir data broadcast
  * message from the DG.
  * @details Inputs: none
@@ -3576,17 +3516,16 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-#ifdef USE_FMB_FLOW_SENSOR
 /*********************************************************************//**
  * @brief
- * The handleTestBloodFlowSignalStrengthOverrideRequest function handles a
- * request to override the measured blood flow signal strength (%).
+ * The handleHDBloodPumpRotorCountOverrideRequest function handles a request to
+ * override the blood pump rotor count.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestBloodFlowSignalStrengthOverrideRequest( MESSAGE_T *message )
+void handleHDBloodPumpRotorCountOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
@@ -3597,19 +3536,50 @@
         memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
         if ( FALSE == payload.reset )
         {
-            result = testSetMeasuredBloodFlowSignalStrengthOverride( payload.state.f32 );
+            result = testSetBloodPumpRotorCountOverride( payload.state.u32 );
         }
         else
         {
-            result = testResetMeasuredBloodFlowSignalStrengthOverride();
+            result = testResetBloodPumpRotorCountOverride();
         }
     }
 
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
-#endif
-
+
+/*********************************************************************//**
+ * @brief
+ * The handleHDSetArterialPressureOffsetRequest function handles a request to
+ * set the arterial pressure offset.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleHDSetArterialPressureOffsetRequest( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // Verify payload length
+    if ( sizeof(TEST_OVERRIDE_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetArterialPressureOffsetOverride( payload.state.f32 );
+        }
+        else
+        {
+            result = testResetArterialPressureOffsetOverride();
+        }
+    }
+
+    // Respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
 /*********************************************************************//**
  * @brief
  * The handleTestBloodPumpRotorMeasuredSpeedOverrideRequest function handles a request to