Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rb66c3225a5845574b9a4214b391fff4b213e7298 -r457fc704dc96f6da4e14263d576bc3ba479e36a8
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b66c3225a5845574b9a4214b391fff4b213e7298)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 457fc704dc96f6da4e14263d576bc3ba479e36a8)
@@ -2310,17 +2310,36 @@
  *************************************************************************/
 void handleLoadCellReadingsFromDG( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof(LOAD_CELL_READINGS_PAYLOAD_T) )
+    if ( message->hdr.payloadLen == sizeof( LOAD_CELL_DATA_T ) )
     {
-        LOAD_CELL_READINGS_PAYLOAD_T payload;
+        LOAD_CELL_DATA_T payload;
 
-        memcpy( &payload, message->payload, sizeof(LOAD_CELL_READINGS_PAYLOAD_T) );
-        setNewLoadCellReadings( payload.res1PrimaryLoadCell, payload.res1BackupLoadCell, payload.res2PrimaryLoadCell, payload.res2BackupLoadCell );
+        memcpy( &payload, message->payload, sizeof( LOAD_CELL_DATA_T ) );
+        setNewLoadCellReadings( payload.loadCellA1inGram, payload.loadCellA2inGram, payload.loadCellB1inGram, payload.loadCellB2inGram );
     }
 }
 
 /*********************************************************************//**
  * @brief
+ * The handleDGHeatersData function handles the heaters data reading from DG.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleDGHeatersData( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof( HEATERS_DATA_T ) )
+    {
+        HEATERS_DATA_T payload;
+
+        memcpy( &payload, message->payload, sizeof( HEATERS_DATA_T ) );
+        setDGHeatersData( &payload );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleDGTemperatureData function handles a temperature readings
  * broadcast message from the DG.
  * @details Inputs: none
@@ -2350,12 +2369,12 @@
  *************************************************************************/
 void handleDialysateFlowData( MESSAGE_T *message )
 {
-    if ( message->hdr.payloadLen == sizeof( DIALYSATE_FLOW_METER_DATA_T ) )
+    if ( message->hdr.payloadLen == sizeof( FLOW_SENSORS_DATA_T ) )
     {
-        DIALYSATE_FLOW_METER_DATA_T payload;
+        FLOW_SENSORS_DATA_T payload;
 
-        memcpy( &payload, message->payload, sizeof( DIALYSATE_FLOW_METER_DATA_T ) );
-        setDialysateFlowData( payload.measuredDialysateFlowRate );
+        memcpy( &payload, message->payload, sizeof( FLOW_SENSORS_DATA_T ) );
+        setDialysateFlowData( payload.dialysateFlowRateLPM );
     }
 }
 
@@ -3186,23 +3205,26 @@
 {
     MESSAGE_T msg;
     HD_SERVICE_RECORD_T service;
+    DG_SERVICE_AND_USAGE_DATA_T dgData;
 
     getNVRecord2Driver( GET_SRV_RECORD, (U08*)&service, sizeof( HD_SERVICE_RECORD_T ), 0, ALARM_ID_NO_ALARM );
+    getHDVersionDGServiceAndUsageData( &dgData );
 
     U08 *payloadPtr = msg.payload;
 
-    if ( message->hdr.payloadLen == sizeof( U32 ) + sizeof( U32 ) )
-    {
-        // Create a message record
-        blankMessage( &msg );
-        msg.hdr.msgID = MSG_ID_HD_SERVICE_SCHEDULE_DATA;
-        msg.hdr.payloadLen = sizeof( U32 ) + sizeof( U32 );
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_HD_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 ) );
-    }
+    // Fill message payload
+    memcpy( payloadPtr, &service.lastServiceEpochDate, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &service.serviceIntervalSeconds, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &dgData.dgServiceRecord.lastServiceDateEpoch, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &dgData.dgServiceRecord.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_HD_2_UI, ACK_REQUIRED );
@@ -5194,9 +5216,10 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
-            result = testSetBatteryRemainingPercentOverride( payload.state.u32 );
+            result = testSetBatteryRemainingPercentOverride( payload.state.f32 );
         }
         else
         {
@@ -6432,14 +6455,11 @@
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof( F32 ) == message->hdr.payloadLen )
+    if ( sizeof( 0 ) == message->hdr.payloadLen )
     {
         if ( TRUE == isTestingActivated() )
         {
-            F32 dacVRef;
-
-            memcpy( &dacVRef, message->payload, sizeof( F32 ) );  // TODO - Payload no longer used.  Update Dialin command and expected payload len in f/w.
-            result = setSyringePumpDACVref();
+           result = setSyringePumpDACVref();
         }
     }
 
@@ -7158,6 +7178,96 @@
 }
 
 /*********************************************************************//**
+ * @brief
+ * The sendDGUsageInfoRequestToDG function constructs a request msg
+ * to the DG to request the DG usage info and queues the msg for transmit
+ * on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: DG usage info result request msg constructed and queued.
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGUsageInfoRequestToDG( void )
+{
+    BOOL result;
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_HD_REQUEST_DG_USAGE_INFO;
+    msg.hdr.payloadLen = 0;
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The sendDGServiceRequestToDG function constructs a request msg
+ * to the DG to request the DG service record and queues the msg for transmit
+ * on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: DG usage info result request msg constructed and queued.
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGServiceRequestToDG( void )
+{
+    BOOL result;
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID      = MSG_ID_HD_REQUEST_DG_SERVICE_RECORD;
+    msg.hdr.payloadLen = 0;
+
+    // Serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
+    result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_HD_2_DG, ACK_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleDGServiceScheduleData function receives the HD version of the
+ * DG service record.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleDGServiceScheduleData( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof( HD_VERSION_DG_SERVICE_RECORD_T ) )
+    {
+        HD_VERSION_DG_SERVICE_RECORD_T payload;
+
+        memcpy( &payload, message->payload, sizeof( HD_VERSION_DG_SERVICE_RECORD_T ) );
+        setHDVersionDGServiceRecord( &payload );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleDGUsageInfoData function receives the HD version of the
+ * DG usage info.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleDGUsageInfoData( MESSAGE_T *message )
+{
+    if ( message->hdr.payloadLen == sizeof( HD_VERSION_DG_USAGE_INFO_T ) )
+    {
+        HD_VERSION_DG_USAGE_INFO_T payload;
+
+        memcpy( &payload, message->payload, sizeof( HD_VERSION_DG_USAGE_INFO_T ) );
+        setHDVersionDGUsageInfo( &payload );
+    }
+}
+
+/*********************************************************************//**
 * @brief
 * The handleGetHDUsageInfoRecord function handles a request to get the HD
 * usage information record.