Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rd748813399d38ef5b71d760e327e368cc82d7a38 -rf554e391302359aa2b252c6c13603d831c11cb77
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision d748813399d38ef5b71d760e327e368cc82d7a38)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f554e391302359aa2b252c6c13603d831c11cb77)
@@ -236,7 +236,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
@@ -273,7 +280,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 );