Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r1b95ae077de1d01a314be8cc011662ab508fba10 -r2b60564ac818a6692b714dfd9920d2e2fcf0937d
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 1b95ae077de1d01a314be8cc011662ab508fba10)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 2b60564ac818a6692b714dfd9920d2e2fcf0937d)
@@ -1,24 +1,25 @@
 /**************************************************************************
 *
-* 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 ModeFlush.c
+* @file    ModeFlush.c
 *
-* @author (last) Quang Nguyen
-* @date (last) 01-Sep-2020
+* @author  (last)      Dara Navaei
+* @date    (last)      09-Nov-2021
 *
-* @author (original) Leonardo Baloa
-* @date (original) 20-Dec-2019
+* @author  (original)  Leonardo Baloa
+* @date    (original)  20-Dec-2019
 *
 ***************************************************************************/
 
 #include "ConcentratePumps.h"
 #include "DrainPump.h"
 #include "Heaters.h"
 #include "LoadCell.h"
+#include "MessageSupport.h"
 #include "ModeFault.h"
 #include "ModeFlush.h"
 #include "OperationModes.h"
@@ -42,7 +43,7 @@
 #define FLUSH_DATA_PUB_INTERVAL                     ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )         ///< Mode flush data publish interval in counts.
 #define RO_PUMP_TARGET_FLOW_RATE_LPM                0.8                                               ///< RO pump target flow rate during flush/fill in L/min.
 #define RO_PUMP_MAX_PRESSURE_PSI                    130                                               ///< Maximum RO pump pressure during flush/fill states in psi.
-#define DRAIN_PUMP_TARGET_RPM                       2400                                              ///< Drain pump target RPM during drain.
+#define DRAIN_PUMP_TARGET_RPM                       2300                                              ///< Drain pump target RPM during drain.
 
 // Drain R1 & R2 states defines
 #define DRAIN_WEIGHT_UNCHANGE_TIMEOUT               ( 6 * MS_PER_SECOND )                             ///< Time period of unchanged weight during draining before timeout.
@@ -1013,7 +1014,7 @@
         data.drainLineVolume    = flushLinesVolumeL;
         data.flushUIState       = (U32)flushUIState;
 
-        broadcastFlushData( &data );
+        broadcastData( MSG_ID_DG_FLUSH_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( MODE_FLUSH_DATA_T ) );
 
         dataPublishCounter = 0;
     }