Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r3d8b84b8ce7ee9526fbabccb9e51d691a3df6305 -r9f403b860d7767f4fb07e13692ccdc9852a42105
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3d8b84b8ce7ee9526fbabccb9e51d691a3df6305)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 9f403b860d7767f4fb07e13692ccdc9852a42105)
@@ -27,6 +27,7 @@
 #include "Heaters.h"
 #include "LoadCell.h"
 #include "MessagePayloads.h"
+#include "ModeHeatDisinfect.h"
 #include "ModeStandby.h"
 #include "ModeRecirculate.h"
 #include "MsgQueues.h"
@@ -227,7 +228,7 @@
  * @param almData2 2nd data associated with alarm
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastAlarmTriggered( U16 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 )
+BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2 )
 {
     BOOL result;
     MESSAGE_T msg;
@@ -236,10 +237,10 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_TRIGGERED;
-    msg.hdr.payloadLen = sizeof( U16 ) + sizeof( ALARM_DATA_T ) + sizeof( ALARM_DATA_T );
+    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( ALARM_DATA_T ) + sizeof( ALARM_DATA_T );
 
-    memcpy( payloadPtr, &alarm, sizeof( U16 ) );
-    payloadPtr += sizeof( U16 );
+    memcpy( payloadPtr, &alarm, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, &almData1, sizeof( ALARM_DATA_T ) );
     payloadPtr += sizeof( ALARM_DATA_T );
     memcpy( payloadPtr, &almData2, sizeof( ALARM_DATA_T ) );
@@ -419,31 +420,24 @@
 /*********************************************************************//**
  * @brief
  * The broadcastHeatersData function sends out DG heaters data
- * @details Inputs: heaters data
- * @details Outputs: heatears data msg constructed and queued
- * @param mainPrimaryDC main primary heater duty cycle
- * @param smallPrimaryDC small primary heater duty cycle
- * @param trimmerDC trimmer heater duty cycle
+ * @details Inputs: none
+ * @details Outputs: heaters data msg constructed and queued
+ * @param heatersData which is the heaters data structure pointer
  * @return TRUE if msg successfully queued for transmit, FALSE if not
  *************************************************************************/
-BOOL broadcastHeatersData ( U32 mainPrimaryDC, U32 smallPrimaryDC, U32 trimmerDC )
+BOOL broadcastHeatersData ( HEATERS_DATA_T *heatersData )
 {
     BOOL result;
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
-    HEATERS_DATA_T payload;
-
+
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_DG_HEATERS_DATA;
     msg.hdr.payloadLen = sizeof( HEATERS_DATA_T );
 
-    payload.mainPrimayHeaterDC = mainPrimaryDC;
-    payload.smallPrimaryHeaterDC = smallPrimaryDC;
-    payload.trimmerHeaterDC = trimmerDC;
+    memcpy( payloadPtr, heatersData, sizeof( HEATERS_DATA_T ) );
 
-    memcpy( payloadPtr, &payload, sizeof( HEATERS_DATA_T ) );
-
     // 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_BROADCAST, ACK_NOT_REQUIRED );
 
@@ -853,6 +847,34 @@
     return result;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The broadcastHeatDisinfectData function sends out the heat disinfect
+ * mode data.
+ * @details Inputs: none
+ * @details Outputs: heat disinfect data msg constructed and queued
+ * @param heatDisinfectData which is heat disinfect msg constructed and queued
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastHeatDisinfectData( MODE_HEAT_DISINFECT_DATA_T *heatDisinfectData )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_HEAT_DISINFECT_DATA;
+    msg.hdr.payloadLen = sizeof( MODE_HEAT_DISINFECT_DATA_T );
+
+    memcpy( payloadPtr, heatDisinfectData, sizeof( MODE_HEAT_DISINFECT_DATA_T ) );
+
+    // 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_BROADCAST, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
 // ***********************************************************************
 // **************** Message Handling Helper Functions ********************
 // ***********************************************************************
@@ -2365,4 +2387,39 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+/*************************************************************************
+ * @brief
+ * The handleStartStopDGHeatDisinfect function handles a request start or
+ * stop DG heat disifect cycle.
+ * @details Inputs: none
+ * @details Outputs: message handled
+ * @param message: a pointer to the message to handle
+ * @return result
+ *************************************************************************/
+BOOL handleStartStopDGHeatDisinfect( MESSAGE_T *message )
+{
+    BOOL result = FALSE;
+
+    if ( message->hdr.payloadLen == sizeof(U32) )
+    {
+        BOOL startingDGHeatDisinfect;
+
+        memcpy( &startingDGHeatDisinfect, message->payload, sizeof(U32) );
+
+        if ( TRUE == startingDGHeatDisinfect )
+        {
+            startDGHeatDisinfect();
+            result = TRUE;
+        }
+        else
+        {
+            stopDGHeatDisinfect();
+            result = TRUE;
+        }
+    }
+    sendAckResponseMsg( (MSG_ID_T)message->hdr.msgID, COMM_BUFFER_OUT_CAN_DG_2_HD, result );
+
+    return result;
+}
+
 /**@}*/