Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re44aad7a9d5fa48aeaa55c65bd28ad9acde6ce05 -r6190a4ad94521b74164f1e1fbd79ed359c7c27fb
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e44aad7a9d5fa48aeaa55c65bd28ad9acde6ce05)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 6190a4ad94521b74164f1e1fbd79ed359c7c27fb)
@@ -26,7 +26,6 @@
 #include "FPGA.h"
 #include "Heaters.h"
 #include "LoadCell.h"
-#include "ModeChemicalDisinfect.h"
 #include "ModeFlush.h"
 #include "ModeStandby.h"
 #include "ModeRecirculate.h"
@@ -1109,6 +1108,62 @@
 
 /*********************************************************************//**
  * @brief
+ * The broadcastChemicalDisinfectData2UI function sends out the chemical
+ * disinfect mode data to the UI.
+ * @details Inputs: none
+ * @details Outputs: chemical disinfect UI data msg constructed and queued
+ * @param chemDisinfectUIData which is flush msg constructed and queued
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastChemicalDisinfectData2UI( MODE_CHEMICAL_DISINFECT_UI_DATA_T *chemDisinfectUIData )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_CHEM_DISINFECT_TIME_DATA;
+    msg.hdr.payloadLen = sizeof( MODE_CHEMICAL_DISINFECT_UI_DATA_T );
+
+    memcpy( payloadPtr, chemDisinfectUIData, sizeof( MODE_CHEMICAL_DISINFECT_UI_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_2_UI, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The broadcastChemicalDisinfectData2UI function sends out the heat
+ * disinfect mode data to the UI.
+ * @details Inputs: none
+ * @details Outputs: heat disinfect UI data msg constructed and queued
+ * @param heatDisinfectUIData which is flush msg constructed and queued
+ * @return TRUE if msg successfully queued for transmit, FALSE if not
+ *************************************************************************/
+BOOL broadcastHeatDisinfectData2UI( MODE_HEAT_DISINFECT_UI_DATA_T *heatDisinfectUIData )
+{
+    BOOL result;
+    MESSAGE_T msg;
+    U08 *payloadPtr = msg.payload;
+
+    // create a message record
+    blankMessage( &msg );
+    msg.hdr.msgID = MSG_ID_DG_HEAT_DISINFECT_TIME_DATA;
+    msg.hdr.payloadLen = sizeof( MODE_HEAT_DISINFECT_UI_DATA_T );
+
+    memcpy( payloadPtr, heatDisinfectUIData, sizeof( MODE_HEAT_DISINFECT_UI_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_2_UI, ACK_NOT_REQUIRED );
+
+    return result;
+}
+
+/*********************************************************************//**
+ * @brief
  * The sendDGSystemRecord function sends out the DG system record.
  * @details Inputs: none
  * @details Outputs: DG system record msg constructed and queued