Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r26f63d0260a3c35277e3e6dbca3573c253775318 -r622eebf6fb7f1c6c232ffd82bc072dd30a7b3f94
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 26f63d0260a3c35277e3e6dbca3573c253775318)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 622eebf6fb7f1c6c232ffd82bc072dd30a7b3f94)
@@ -20,6 +20,7 @@
 #include "DrainPump.h"
 #include "Heaters.h"
 #include "LoadCell.h"
+#include "MessageSupport.h"
 #include "ModeChemicalDisinfect.h"
 #include "ModeFault.h"
 #include "ModeStandby.h"
@@ -2031,10 +2032,10 @@
         data.chemDisinfectUIState           = chemDisinfectUIState;
 
         // General data publish channel
-        broadcastChemicalDisinfectData( &data );
+        broadcastData( MSG_ID_DG_CHEM_DISINFECT_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( MODE_CHEMICAL_DISINFECT_DATA_T ) );
 
-        // Data publish channel to UI
-        broadcastChemicalDisinfectData2UI( &uiData );
+        // Publish data to UI
+        broadcastData( MSG_ID_DG_CHEM_DISINFECT_TIME_DATA, COMM_BUFFER_OUT_CAN_DG_2_UI, (U08*)&uiData, sizeof( MODE_CHEMICAL_DISINFECT_UI_DATA_T ) );
 
         dataPublishCounter = 0;
     }