Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -re0cdf49eb0f54239e5d765282e0952cea7ded1bd
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision a9315539f527b92523b1598ff91e47db4d71dae2)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision e0cdf49eb0f54239e5d765282e0952cea7ded1bd)
@@ -41,7 +41,7 @@
 
 // General defines
 #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_TARGET_FLOW_RATE_LPM                0.8F                                              ///< 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                       2300                                              ///< Drain pump target RPM during drain.
 
@@ -52,32 +52,32 @@
 #define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * MS_PER_SECOND )                             ///< Flush Drain path wait time in milliseconds. TODo it was 2 minutes
 
 // Flush dialysate state defines
-#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush dialysate wait time in milliseconds.
+#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 0.5F * 60 * MS_PER_SECOND )                     ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
-#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
-#define ACID_PUMP_SPEED_ML_PER_MIN                  -30.0                                             ///< Acid pump speed in mL/min.
+#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5F * 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
-#define BICARB_PUMP_SPEED_ML_PER_MIN                30.6                                              ///< Bicarb pump speed in mL/min.
+#define BICARB_PUMP_SPEED_ML_PER_MIN                30.6F                                             ///< Bicarb pump speed in mL/min.
 
 // Flush and drain R1 and R2 state defines
-#define RSRVRS_FULL_VOL_ML                          1800.0                                            ///< Reservoirs 1 & 2 full volume in mL. TODo original value was 1900
-#define RSRVRS_PARTIAL_FILL_VOL_ML                  500.0                                             ///< Reservoirs 1 & 2 partial volume in mL.
+#define RSRVRS_FULL_VOL_ML                          1800.0F                                           ///< Reservoirs 1 & 2 full volume in mL. TODo original value was 1900
+#define RSRVRS_PARTIAL_FILL_VOL_ML                  500.0F                                            ///< Reservoirs 1 & 2 partial volume in mL.
 #define RSRVRS_FULL_STABLE_TIME_COUNT               ( ( 4 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) ///< Reservoirs 1 & 2 full stable time in counts.
 #define RSRVRS_FILL_UP_TIMEOUT_MS                   ( 5 * 60 * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 full fill up timeout in ms.
 #define RSRVRS_PARTIAL_FILL_TIMEOUT_MS              ( 2 * 60 * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 partial fill up timeout in ms.
 #define RSRVRS_DRAIN_TIMEOUT_MS                     ( 2 * 60 * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 drain timeout in ms.
-#define FINAL_DRAIN_RO_PUMP_FLOW_LPM                0.6                                               ///< Final drain RO pump flow rate in L/min. This is used to flush the drain line during drain.
+#define FINAL_DRAIN_RO_PUMP_FLOW_LPM                0.6F                                              ///< Final drain RO pump flow rate in L/min. This is used to flush the drain line during drain.
 
 // Flush drain line state defines
-#define FLUSH_DRAIN_LINE_VOLUME_L                   0.1                                               ///< Water volume to flush in liters.
+#define FLUSH_DRAIN_LINE_VOLUME_L                   0.1F                                              ///< Water volume to flush in liters.
 #define FLUSH_DRAIN_LINE_TIMEOUT_MS                 ( 1 * 60 * MS_PER_SECOND )                        ///< Flush drain lines timeout in milliseconds.
 
 // Flush circulation state defines
-#define FLUSH_CIRCULATION_WAIT_TIME_MS              ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush circulation wait time in milliseconds.
+#define FLUSH_CIRCULATION_WAIT_TIME_MS              ( 0.5F * 60 * MS_PER_SECOND )                     ///< Flush circulation wait time in milliseconds.
 
 // Flush with fresh water state defines
-#define FLUSH_WITH_FRESH_WATER_WAIT_TIME_MS         ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush with fresh water wait time in milliseconds.
+#define FLUSH_WITH_FRESH_WATER_WAIT_TIME_MS         ( 0.5F * 60 * MS_PER_SECOND )                     ///< Flush with fresh water wait time in milliseconds.
 
 // ********** private data **********