Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rf4a444de1b2b78922a911448a65cfcc8677f86cb -r1747702a2e89998cd3fa1348907eeb623e9c16c8
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision f4a444de1b2b78922a911448a65cfcc8677f86cb)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 1747702a2e89998cd3fa1348907eeb623e9c16c8)
@@ -8,7 +8,7 @@
 * @file    ModeFlush.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      28-Feb-2022
+* @date    (last)      30-Apr-2022
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  20-Dec-2019
@@ -52,10 +52,10 @@
 #define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * 60 * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds.
 
 // Flush dialysate state defines
-#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 0.5F * 60 * MS_PER_SECOND )                     ///< Flush dialysate wait time in milliseconds.
+#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 60 * MS_PER_SECOND )                            ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
-#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5F * 60 * MS_PER_SECOND )                     ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
+#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 3 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
 #define ACID_PUMP_SPEED_ML_PER_MIN                  -30.0F                                            ///< Acid pump speed in mL/min.
 
 // The bicarb pump is 2% faster than the acid pump to create a flow from acid to bicarb line during flush