Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r2300599935a7171e3050a15d3b4690aa7d0bb7ef -r16c5398fed27670d52609b19ad870a5f99111534
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 2300599935a7171e3050a15d3b4690aa7d0bb7ef)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 16c5398fed27670d52609b19ad870a5f99111534)
@@ -6,7 +6,7 @@
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    BalancingChamber.c
-*
+*f
 * @author  (last)      Dara Navaei
 * @date    (last)      18-Mar-2026
 *
@@ -91,9 +91,8 @@
 static BOOL isBalChamberSwitchingActive;                                                        ///< Flag indicating balancing chamber switching is active or not.
 static BOOL isBalChamberSwitchingOnRequested;                                                   ///< Flag indicating that a request was made to activate balancing chamber switching.
 static BOOL isBalChamberSwitchingOffRequested;                                                  ///< Flag indicating that a request was made to deactivate balancing chamber switching.
-
 //TODO: remove later once level sensor working
-static U32 bicarbChamberPeriodicFillCounter;  
+static U32 bicarbChamberPeriodicFillCounter;
 
 // ********** private function prototypes **********
 
@@ -493,6 +492,17 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
+    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() );
+    }
+
     // Check fresh dialysate pressure in range or BC switch only flag set or BC pressure alarms are disabled
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) ) ||
          ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )
@@ -743,6 +753,17 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
+    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() );
+    }
+
     // Check fresh dialysate pressure in range
     if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )  ||
          ( TRUE == getBalChamberSwitchingOnlyStatus() ) || ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_BC_PRESSURE_ALARMS ) ) )