Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rd231742b36c0fcdfd3b2d822bebf5dc8a00729a3 -r8cc2ab43a8f0f051dd0ccb2a4768c0b12f4e44bc
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision d231742b36c0fcdfd3b2d822bebf5dc8a00729a3)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 8cc2ab43a8f0f051dd0ccb2a4768c0b12f4e44bc)
@@ -7,8 +7,8 @@
 *
 * @file    BalancingChamber.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      11-Feb-2026
+* @author  (last)      Sameer Kalliadan Poyil
+* @date    (last)      22-Feb-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  28-Jan-2025
@@ -553,8 +553,16 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
-    //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
-    setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+    {
+        //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
+        setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+    }
+    else
+    {
+        //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
+        setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+    }
 
     BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
     BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
@@ -655,12 +663,13 @@
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState1ValvesClose( void )
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE1_VALVES_CLOSE;
-    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
-    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
 
     freshDialPressure = getFilteredPressure( D18_PRES );
     spentDialPressure = getFilteredPressure( D51_PRES );
 
+    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
+    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
+
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
     if ( TRUE == isFreshDialysatePressureInRange && TRUE == isSpentDialysatePressureInRange )
     {
@@ -783,8 +792,16 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
-    //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
-    setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+    {
+        //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
+        setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+    }
+    else
+    {
+        //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
+        setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+    }
 
     BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
     BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
@@ -834,12 +851,13 @@
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2ValvesClose( void )
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE2_VALVES_CLOSE;
-    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
-    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
 
     freshDialPressure = getFilteredPressure( D18_PRES );
     spentDialPressure = getFilteredPressure( D51_PRES );
 
+    BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
+    BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
+
     // Check fresh and spent dialysate pressure back in range to indicate fill complete.
     if ( ( TRUE == isFreshDialysatePressureInRange ) && ( TRUE == isSpentDialysatePressureInRange ) )
     {