Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re69a109cc497124ac5f438264647666b17276bf4 -r059eb49a6f8fd2e2277b98b4aee986eb4519820a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e69a109cc497124ac5f438264647666b17276bf4)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 059eb49a6f8fd2e2277b98b4aee986eb4519820a)
@@ -25,6 +25,7 @@
 #include "ConductivitySensors.h"
 #include "CPLD.h"
 #include "Fans.h"
+#include "FlowSensors.h"
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFill.h"
@@ -35,7 +36,6 @@
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
-#include "DialysateFlow.h"
 #include "Pressures.h"
 #include "Reservoirs.h"
 #include "RTC.h"
@@ -369,7 +369,6 @@
     return result;
 }
 
-
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -555,21 +554,19 @@
     getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( DG_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
 
     U08 *payloadPtr = msg.payload;
-    if ( message->hdr.payloadLen == sizeof( U32 ) + sizeof( U32 ) )
-    {
-        // Create a message record
-        blankMessage( &msg );
-        msg.hdr.msgID      = MSG_ID_DG_SERVICE_SCHEDULE_DATA;
-        msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
 
-        // Fill message payload
-        memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
-        payloadPtr += sizeof( U32 );
-        memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
-    }
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_DG_SERVICE_SCHEDULE_DATA;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
 
+    // Fill message payload
+    memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
+
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
-    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_REQUIRED );
+    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED );
 }
 
 /*********************************************************************//**
@@ -890,7 +887,7 @@
     msg.hdr.msgID      = MSG_ID_DG_SCHEDULED_RUNS_DATA;
     msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
 
-    // TODO this message is for Phase 1B.
+    // Do nothing this message is for Phase 1B.
 
     // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_UI, ACK_REQUIRED );
@@ -1471,7 +1468,43 @@
     return status;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleHDRequestDGUsageInfo function handles a request for DG
+ * usage information.
+ * @details Inputs: none
+ * @details Outputs: message handled, response constructed and queued for
+ * transmit.
+ * @return none
+ *************************************************************************/
+void handleHDRequestDGUsageInfo( MESSAGE_T * message )
+{
+    MESSAGE_T msg;
+    DG_USAGE_INFO_RECORD_T usageInfo;
 
+    // Get the service record. There are no arrays of service to check and also, raise no alarm since the service record
+    // has been already checked in POST
+    getNVRecord2Driver( GET_USAGE_RECORD, (U08*)&usageInfo, sizeof( DG_USAGE_INFO_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+
+    U08 *payloadPtr = msg.payload;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_DG_USAGE_DATA;
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 ) + sizeof( BOOL );
+
+    // Fill message payload
+    memcpy( payloadPtr, &usageInfo.lastHeatDisDateEpoch, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &usageInfo.lastChemicalDisDateEpoch, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &usageInfo.isDisinfected, sizeof( BOOL ) );
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_2_HD, ACK_REQUIRED );
+}
+
+
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -1835,32 +1868,31 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-
 /*********************************************************************//**
  * @brief
- * The handleTestROMeasuredFlowOverrideRequest function handles a request to
- * override the RO flow rate.
+ * The handleTestMeasuredFlowOverrideRequest function handles a request to
+ * override the measured flow sensor rate.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestROMeasuredFlowOverrideRequest( MESSAGE_T *message )
+void handleTestMeasuredFlowOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_PAYLOAD_T payload;
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // verify payload length
-    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetMeasuredROFlowRateOverride( payload.state.f32 );
+            result = testSetMeasuredFlowRateOverride( payload.index, payload.state.f32 );
         }
         else
         {
-            result = testResetMeasuredROFlowRateOverride();
+            result = testResetMeasuredFlowRateOverride( payload.index );
         }
     }
 
@@ -1870,38 +1902,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestDialysateMeasuredFlowOverrideRequest function handles a request to
- * override the Dialysate flow rate.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleTestDialysateMeasuredFlowOverrideRequest( 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 = testSetMeasuredDialysateFlowRateOverride( payload.state.f32 );
-        }
-        else
-        {
-            result = testResetMeasuredDialysateFlowRateOverride();
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
- * @brief
  * The handleTestROPumpDataBroadcastIntervalOverrideRequest function handles
  * a request to override the broadcast interval for RO pump data.
  * @details Inputs: none
@@ -1934,14 +1934,14 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestDialysateFlowDataBroadcastIntervalOverrideRequest function handles
- * a request to override the broadcast interval for dialysate flow data.
+ * The handleTestFlowSensorsDataBroadcastIntervalOverrideRequest function handles
+ * a request to override the broadcast interval for the flow sensors data.
  * @details Inputs: none
  * @details Outputs: message handled
  * @param message a pointer to the message to handle
  * @return none
  *************************************************************************/
-void handleTestDialysateFlowDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+void handleTestFlowSensorsDataBroadcastIntervalOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
@@ -1952,11 +1952,11 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
-            result = testSetDialysateFlowDataPublishIntervalOverride( payload.state.u32 );
+            result = testSetFlowDataPublishIntervalOverride( payload.state.u32 );
         }
         else
         {
-            result = testResetDialysateFlowDataPublishIntervalOverride();
+            result = testResetFlowDataPublishIntervalOverride();
         }
     }
 
@@ -3231,37 +3231,6 @@
 }
 
 /*********************************************************************//**
- * @brief
- * The handleFansRPMOverride function handles a request to override a fans RPM value.
- * @details Inputs: none
- * @details Outputs: message handled
- * @param message a pointer to the message to handle
- * @return none
- *************************************************************************/
-void handleFansRPMOverride( MESSAGE_T *message )
-{
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
-    {
-        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
-        if ( FALSE == payload.reset )
-        {
-            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
-        }
-        else
-        {
-            result = testResetFanRPMOverride( payload.index );
-        }
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
 * @brief
 * The handleStopDGRTCClock function handles a request to stop the RTC clock.
 * @details Inputs: none
@@ -3400,10 +3369,41 @@
 
 /*********************************************************************//**
  * @brief
- * The handleTestFansRPMAlarmStartTimeOffsetRequest function handles a
- * request to set the fans RPM alarm start time offset.
+ * The handleFansRPMOverride function handles a request to override a fans RPM value.
  * @details Inputs: none
  * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleFansRPMOverride( MESSAGE_T *message )
+{
+    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
+    {
+        memcpy( &payload, message->payload, sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) );
+        if ( FALSE == payload.reset )
+        {
+            result = testSetFanRPMOverride( payload.index, payload.state.f32 );
+        }
+        else
+        {
+            result = testResetFanRPMOverride( payload.index );
+        }
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleTestFansRPMAlarmStartTimeOverrideRequest function handles a
+ * request to override the fan RPM alarm start time.
+ * @details Inputs: none
+ * @details Outputs: message handled
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
@@ -3426,7 +3426,6 @@
 }
 
 /*********************************************************************//**
- * @brief
  * The handleTestUsedAcidVolumeMLOverrideRequest function handles a
  * request to override the acid volume.
  * @details Inputs: none
@@ -3719,30 +3718,6 @@
 
 /*********************************************************************//**
 * @brief
-* The handleResendAllAlarmsCommand function handles a request to re-send
-* all active DG alarms.
-* @details Inputs: none
-* @details Outputs: message handled
-* @param message a pointer to the message to handle
-* @return none
-*************************************************************************/
-void handleResendAllAlarmsCommand( MESSAGE_T *message )
-{
-    BOOL result = FALSE;
-
-    // verify payload length
-    if ( 0 == message->hdr.payloadLen )
-    {
-        handleResendActiveAlarmsRequest();
-        result = TRUE;
-    }
-
-    // respond to request
-    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
-}
-
-/*********************************************************************//**
-* @brief
 * The handleServiceModeRequest function handles a request to enter service
 * mode.
 * @details Inputs: none
@@ -3812,6 +3787,33 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleResendAllAlarmsCommand function handles a request to re-send
+ * all active DG alarms.
+ * The sendUIServiceModeResponse function sends out the DG response to a
+ * UI request to go to service mode.
+ * @details Inputs: none
+ * @details Outputs: Service mode request response msg constructed and queued
+ * @param accepted TRUE if request was accepted, FALSE if not
+ * @param rejCode Reject reason code explaining why request was rejected
+ * @return none
+ *************************************************************************/
+void handleResendAllAlarmsCommand( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    // verify payload length
+    if ( 0 == message->hdr.payloadLen )
+    {
+        handleResendActiveAlarmsRequest();
+        result = TRUE;
+    }
+
+    // respond to request
+    sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleCpldStatusRequest function handles a CPLD Status request message.
  * @details Inputs: none
  * @details Outputs: message handled