Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r1b95ae077de1d01a314be8cc011662ab508fba10 -r2b60564ac818a6692b714dfd9920d2e2fcf0937d
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 1b95ae077de1d01a314be8cc011662ab508fba10)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 2b60564ac818a6692b714dfd9920d2e2fcf0937d)
@@ -1,17 +1,17 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2021 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
-* @file ModeHeatDisinfect.c
+* @file    ModeHeatDisinfect.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 01-Sep-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      06-Nov-2021
 *
-* @author (original) Sean
-* @date (original) 20-Apr-2020
+* @author  (original)  Sean
+* @date    (original)  20-Apr-2020
 *
 ***************************************************************************/
 
@@ -20,6 +20,7 @@
 #include "DrainPump.h"
 #include "Heaters.h"
 #include "LoadCell.h"
+#include "MessageSupport.h"
 #include "ModeFault.h"
 #include "ModeHeatDisinfect.h"
 #include "OperationModes.h"
@@ -38,6 +39,8 @@
  *  @{
  */
 
+// TODO add the cooling, test the higher target flow to reduce the gradient
+
 // ********** private definitions **********
 
 // General defines
@@ -2017,10 +2020,10 @@
             data.R2FillLevel                  = 0.0;
         }
 
-        broadcastHeatDisinfectData( &data );
+        broadcastData( MSG_ID_DG_HEAT_DISINFECT_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( MODE_HEAT_DISINFECT_DATA_T ) );
 
         // Publish data to UI
-        broadcastHeatDisinfectData2UI( &uiData );
+        broadcastData( MSG_ID_DG_HEAT_DISINFECT_TIME_DATA, COMM_BUFFER_OUT_CAN_DG_2_UI, (U08*)&uiData, sizeof( MODE_HEAT_DISINFECT_UI_DATA_T ) );
 
         dataPublishCounter = 0;
     }