Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -rea58258093207cb49785aa04ab1e19065166cac6 -r938ebb5c798d4f4a5a7ebf664e7f443f18d2237c
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision ea58258093207cb49785aa04ab1e19065166cac6)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 938ebb5c798d4f4a5a7ebf664e7f443f18d2237c)
@@ -114,6 +114,13 @@
 #define D5_HEAT_OUT_DEADBAND_CONTROL                               0.1F                                                            ///< Heater outer loop dead band range for control.
 #define HIGH_DIAL_FLOW_RATE                                        300.0F                                                          ///< Decide outer loop heater control based on the dialysate flow rate
 
+#define QUAD_FIRST_COEFFICIENT                                     0.0006F                                                         ///< First coefficient used in adjusted dialysate temperature quadratic calculation for low Qds
+#define QUAD_SECOND_COEFFICIENT                                   -0.1743F                                                         ///< Second coefficient used in adjusted dialysate temperature quadratic calculation for low Qds
+#define QUAD_THIRD_COEFFICIENT                                     17.3F                                                           ///< Third coefficient used in adjusted dialysate temperature quadratic calculation for low Qds
+#define LINEAR_SLOPE_FACTOR                                       -0.0029F                                                         ///< Slope factor used in adjusted dialysate temperature linear calculation for high Qds
+#define LINEAR_INTERCEPT_FACTOR                                    3.47F                                                           ///< Intercept factor used in adjusted dialysate temperature linear calculation for high Qds
+#define LOW_DIAL_FLOW_RATE                                         150.0F                                                          ///< Dialysate flow rate lesser than 150 considered to be low Qds.
+
 #define B1B2_HEAT_DIS_FIRST_COEFF                                  0.00000000487858F                                               ///< First coefficient for Heat loss dissipation calculation from D4 to D28(cubic equation).
 #define B1B2_HEAT_DIS_SEC_COEFF                                    0.0000063124F                                                   ///< Second coefficient for Heat loss dissipation calculation from D4 to D28.
 #define B1B2_HEAT_DIS_THIRD_COEFF                                  0.00258513F                                                     ///< Third coefficient for Heat loss dissipation calculation from D4 to D28.
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rea58258093207cb49785aa04ab1e19065166cac6 -r938ebb5c798d4f4a5a7ebf664e7f443f18d2237c
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision ea58258093207cb49785aa04ab1e19065166cac6)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 938ebb5c798d4f4a5a7ebf664e7f443f18d2237c)
@@ -56,12 +56,6 @@
 #define DIALYSATE_TEMP_UPPER_SAFETY_LIMIT_C             42.0F                                       ///< Dialysate upper bound safety temperature limit in C.
 #define DIALYSATE_TEMP_LOWER_SAFETY_LIMIT_C             33.0F                                       ///< Dialysate lower bound safety temperature limit in C.
 #define DIALYSATE_TEMP_CLEAR_TIMEOUT_MS                 ( 10 * MS_PER_SECOND )                      ///< Dialysate temperature clear persistence timeout.
-#define QUAD_FIRST_COEFFICIENT                          0.0006F                                     ///< First coefficient used in adjusted dialysate temperature quadratic calculation for low Qds
-#define QUAD_SECOND_COEFFICIENT                         -0.1743F                                    ///< Second coefficient used in adjusted dialysate temperature quadratic calculation for low Qds
-#define QUAD_THIRD_COEFFICIENT                          17.3F                                       ///< Third coefficient used in adjusted dialysate temperature quadratic calculation for low Qds
-#define LINEAR_SLOPE_FACTOR                             -0.0029F                                    ///< Slope factor used in adjusted dialysate temperature linear calculation for high Qds
-#define LINEAR_INTERCEPT_FACTOR                         3.47F                                       ///< Intercept factor used in adjusted dialysate temperature linear calculation for high Qds
-#define LOW_DIAL_FLOW_RATE                              150.0F                                      ///< Dialysate flow rate lesser than 150 considered to be low Qds.
 #define ZERO_DIAL_FLOW_RATE                             0.0F                                        ///< Zero dialysate flow rate
 #define SPENT_CHAMBER_FILL_MAX_COUNT                    10                                          ///< Total number of spent chamber fill allowed.
 #define BICARB_CHAMBER_FILL_TIMEOUT                     ( 1 * MS_PER_SECOND )                       ///< Bicarb chamber fill timeout.