Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r173e4fbf9bd750bccb2e758eb1c7ef36ed8db5a0 -r647f8950c1a9f936e16a7b51e36f582c3d03a40e
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 173e4fbf9bd750bccb2e758eb1c7ef36ed8db5a0)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 647f8950c1a9f936e16a7b51e36f582c3d03a40e)
@@ -2330,13 +2330,13 @@
     {
         TEMPERATURE_SENSORS_DATA_T payload;
 
-        memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
-        setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
-    }
-    // TODO - what to do if invalid payload length?
-    // TODO - how to know if DG stops sending these?
-}
-
+        memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
+        setDialysateTemperatureReadings( payload.TDi, payload.TRo );
+    }
+    // TODO - what to do if invalid payload length?
+    // TODO - how to know if DG stops sending these?
+}
+
 /*********************************************************************//**
  * @brief
  * The handleDialysateFlowData function handles dialysate flow data broadcast
@@ -5126,6 +5126,7 @@
     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 );
@@ -7001,15 +7002,26 @@
 {
     BOOL status = FALSE;
     HD_OP_MODE_T currentMode = getCurrentOperationMode();
+    DG_OP_MODE_T currentDGMode = getDGOpMode();
     REQUEST_REJECT_REASON_CODE_T reject;
 
     if ( 0 == message->hdr.payloadLen )
     {
         if ( ( MODE_STAN == currentMode ) || ( MODE_FAUL == currentMode ) )
         {
-            status = TRUE;
+
             requestNewOperationMode( MODE_SERV );
-            reject = REQUEST_REJECT_REASON_NONE;
+
+            if ( (DG_MODE_STAN == currentDGMode) || (DG_MODE_FAUL == currentDGMode) )
+            {
+                status = TRUE;
+                cmdSetDGToServiceMode();
+                reject = REQUEST_REJECT_REASON_NONE;
+            }
+            else
+            {
+                reject = REQUEST_REJECT_REASON_DG_NOT_IN_STANDBY_IDLE_STATE;
+            }
         }
         else
         {
@@ -7287,4 +7299,28 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*********************************************************************//**
+ * @brief
+ * The sendDGServiceModeRequest function constructs a service mode request msg
+ * to the DG and queues the msg for transmit on the appropriate CAN channel.
+ * @details Inputs: none
+ * @details Outputs: DG Service mode request msg constructed and queued.
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL sendDGServiceModeRequest()
+{
+    BOOL result;
+    MESSAGE_T msg;
+
+    // Create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_HD_REQUEST_DG_SERVICE_MODE;
+    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;
+}
+
 /**@}*/