Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3b70632c04247a6973960e1f37ae73eb4384a6b7 -rd5f2ac4d84453feb1b782f35f9d69432977a95f6
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3b70632c04247a6973960e1f37ae73eb4384a6b7)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision d5f2ac4d84453feb1b782f35f9d69432977a95f6)
@@ -301,6 +301,9 @@
     payloadPtr += sizeof( U32 );
     data = almData2.data.uInt.data;
     memcpy( payloadPtr, &data, sizeof( U32 ) );
+    // Pad with space for 3 U32s - set to zero - unused for DG
+    payloadPtr += ( sizeof( U32) * 3 );
+    memset( payloadPtr, 0, sizeof( U32) * 3 );
 
     // 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_DG_ALARM, ACK_REQUIRED );
@@ -390,6 +393,30 @@
 
 /*********************************************************************//**
  * @brief
+ * The handleRTCSyncFromHD function handles an HD date/time broadcast message
+ * from the HD.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message a pointer to the message to handle
+ * @return none
+ *************************************************************************/
+void handleRTCSyncFromHD( MESSAGE_T *message )
+{
+    // Only sync RTC to HD date/time when ...
+    if ( TRUE == syncDG2HDDateTime() )
+    {
+        if ( sizeof( RTC_DATA_T ) == message->hdr.payloadLen )
+        {
+            RTC_DATA_T epoch;
+
+            memcpy( &epoch, message->payload, sizeof( RTC_DATA_T ) );
+            setRTCEpoch( epoch.epochTime );
+        }
+    }
+}
+
+/*********************************************************************//**
+ * @brief
  * The handleAlarmClear function handles a clear alarm message from the HD.
  * @details Inputs: none
  * @details Outputs: message handled
@@ -556,14 +583,15 @@
 void handleDGSendConcentrateMixingRatios( MESSAGE_T *message )
 {
     MESSAGE_T msg;
-
-    DG_ACID_CONCENTRATES_RECORD_T acid     = getAcidConcentrateCalRecord();
-    DG_BICARB_CONCENTRATES_RECORD_T bicarb = getBicarbConcentrateCalRecord();
+    DG_ACID_CONCENTRATES_RECORD_T acid;
+    DG_BICARB_CONCENTRATES_RECORD_T bicarb;
     // By the time these are requested, the prepare time is no longer needed since the concentrate lines are
     // primed before the actual treatment starts
-    U32 fillPrepTimeMS                     = 0;
+    U32 fillPrepTimeMS = 0;
+    U08 *payloadPtr    = msg.payload;
 
-    U08 *payloadPtr = msg.payload;
+    getAcidConcentrateCalRecord( &acid );
+    getBicarbConcentrateCalRecord( &bicarb );
 
     // Create a message record
     blankMessage( &msg );
@@ -1103,7 +1131,7 @@
 
         if ( TRUE == heaterCmd.startHeater )
         {
-            BOOL isSet = setHeaterTargetTemperature( DG_TRIMMER_HEATER, heaterCmd.targetTemp );
+            BOOL isSet = setHeaterTargetTemperature( DG_TRIMMER_HEATER, getTrimmerHeaterTargetTemperature() );
 
             if ( TRUE == isSet )
             {
@@ -1431,12 +1459,13 @@
     if ( message->hdr.payloadLen == sizeof( U32 ) + sizeof( U32 ) )
     {
         U32 mode;
+        U32 subMode;
 
-        // NOTE: the HD operations modes broadcast message contains the mode and submode states
-        // In this case, only the mode is needed. The mode is received to check if HD is in treatment
-        // and therefore, DG can void the last disinfect.
         memcpy( payloadPtr, &mode, sizeof( U32 ) );
-        setHDOperationMode( mode );
+        payloadPtr += sizeof( U32 );
+        memcpy( payloadPtr, &subMode, sizeof( U32 ) );
+
+        setHDOperationMode( mode, subMode );
         status = TRUE;
     }
 
@@ -3691,6 +3720,30 @@
 
 /*********************************************************************//**
 * @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