Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rfb596540735c4cf91de9692b7274a28ce3a645f7 -r623587d96bf6c0bafd3ff94d47f8c783b4b999f0
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision fb596540735c4cf91de9692b7274a28ce3a645f7)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 623587d96bf6c0bafd3ff94d47f8c783b4b999f0)
@@ -7,8 +7,8 @@
 *
 * @file    ModeGenDialysate.c
 *
-* @author  (last)      Jashwant Gantyada
-* @date    (last)      13-Mar-2026
+* @author  (last)      Vinayakam Mani
+* @date    (last)      06-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
@@ -272,7 +272,14 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT,  getD4AverageTemperature() );
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            }
+            else
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+            }
             startHeater( D45_HEAT );
 
             //Testing : Enable close loop once testing is complete
@@ -309,7 +316,14 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            }
+            else
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+            }
             startHeater( D45_HEAT );
 
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );