Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rac5e52d907ff6adad795d8f81ca8206c5cd33c77 -r97eba3d39e6ddf44276b77b1aea1171805ca142d
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision ac5e52d907ff6adad795d8f81ca8206c5cd33c77)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 97eba3d39e6ddf44276b77b1aea1171805ca142d)
@@ -7,8 +7,8 @@
 *
 * @file    ModeGenDialysate.c
 *
-* @author  (last)      Varshini Nagabooshanam
-* @date    (last)      12-Jan-2026
+* @author  (last)      Vinayakam Mani
+* @date    (last)      11-Feb-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
@@ -68,6 +68,8 @@
 #define PUMP_SPEED_INTERCEPT_FACTOR_DIENER_2000         30.0F                                       ///< D48 Diener 2000 pump speed intercept.
 #define PUMP_SPEED_SLOPE_FACTOR_DIENER_1000             2.869F                                      ///< D48 Diener 1000 pump speed slope (y = 2.869x + 25.956).
 #define PUMP_SPEED_INTERCEPT_FACTOR_DIENER_1000         25.956F                                     ///< D48 Diener 1000 pump speed intercept.
+#define BICARB_CHAMBER_FILL_TIMEOUT                     ( 1 * MS_PER_SECOND )                       ///< Bicarb chamber fill timeout.
+
 //Testing
 #define DELAY_BC_SWITCHING_AT_START_UP          ( 10 * MS_PER_SECOND )                              ///< Provide a balancing chamber switching start up delay to stabilize pump speed etc.,
 /// Payload record structure for Gen dialysate execution state set request
@@ -228,16 +230,29 @@
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
-            setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+            setValveState( D8_VALV, VALVE_STATE_CLOSED );
+            setValveState( D54_VALV, VALVE_STATE_CLOSED );
+            setValveState( D81_VALV, VALVE_STATE_CLOSED );
+            setValveState( D85_VALV, VALVE_STATE_CLOSED );
+            setValveState( D31_VALV, VALVE_STATE_CLOSED );
 
+            if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE )
+            {
+                setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+                setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            }
+
             // Turn on the primary heater
             calculateTargetDialysateTemp();
             setHeaterTargetTemperature( D5_HEAT, getGenDialysateTargetTemperature() );
             setD28TempFeedbackControl( TRUE );
             startHeater( D5_HEAT );
 
+            //Turn on Trimmer heater
+            setHeaterTargetTemperature( D45_HEAT,  getD4AverageTemperature() );
+            startHeater( D45_HEAT );
+
             //Testing : Enable close loop once testing is complete
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
@@ -257,7 +272,11 @@
         case DD_GEND_DIALYSATE_DELIVERY_STATE:
             //Previous state
             setValveState( D47_VALV, VALVE_STATE_CLOSED );  // spent chamber purge valve
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            setValveState( D8_VALV, VALVE_STATE_CLOSED );
+            setValveState( D54_VALV, VALVE_STATE_CLOSED );
+            setValveState( D81_VALV, VALVE_STATE_CLOSED );
+            setValveState( D85_VALV, VALVE_STATE_CLOSED );
+            setValveState( D31_VALV, VALVE_STATE_CLOSED );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
 
@@ -267,6 +286,10 @@
             setD28TempFeedbackControl( TRUE );
             startHeater( D5_HEAT );
 
+            //Turn on Trimmer heater
+            setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            startHeater( D45_HEAT );
+
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
             //setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_INITIAL_RPM, FALSE );
@@ -279,17 +302,33 @@
             setValveState( D34_VALV, VALVE_STATE_CLOSED );  // Bypass valve
             setValveState( D35_VALV, VALVE_STATE_OPEN );    // VDI
             setValveState( D40_VALV, VALVE_STATE_OPEN );    // VDO
-            setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+
+            if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE )
+            {
+                setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+                setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            }
             break;
 
         case DD_GEND_SPENT_CHAMBER_FILL_STATE:
             //Set valves and actuators
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
+            setValveState( D8_VALV, VALVE_STATE_CLOSED );
+            setValveState( D54_VALV, VALVE_STATE_CLOSED );
+            setValveState( D81_VALV, VALVE_STATE_CLOSED );
+            setValveState( D85_VALV, VALVE_STATE_CLOSED );
+            setValveState( D31_VALV, VALVE_STATE_CLOSED );
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
-            setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+
+            if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE )
+            {
+                setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+                setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            }
+
             setValveState( D47_VALV, VALVE_STATE_OPEN );    // Spent chamber purge valve
 
             requestConcentratePumpOff( D76_PUMP, FALSE );
@@ -301,6 +340,8 @@
             setHeaterTargetTemperature( D5_HEAT, getGenDialysateTargetTemperature() );
             setD28TempFeedbackControl( TRUE );
             startHeater( D5_HEAT );
+            // Stop trimmer heater
+            stopHeater( D45_HEAT );
 
             setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, TRUE );
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_FILL_RPM, TRUE );
@@ -325,8 +366,13 @@
 
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
-            setValveState( D64_VALV, VALVE_STATE_OPEN );    // Bicarb chamber purge valve
-            setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+
+            if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE )
+            {
+                setValveState( D80_VALV, VALVE_STATE_OPEN );    // Bicarb valve
+                setValveState( D64_VALV, VALVE_STATE_OPEN );    // Bicarb chamber purge valve
+            }
+
             bicarbFillStartTimeMS = getMSTimerCount();
 
             // Turn on the primary heater
@@ -365,7 +411,6 @@
             setValveState( D40_VALV, VALVE_STATE_CLOSED );
             setValveState( D31_VALV, VALVE_STATE_CLOSED );
             setValveState( D47_VALV, VALVE_STATE_CLOSED );
-            setValveState( D64_VALV, VALVE_STATE_CLOSED );
             setValveState( D54_VALV, VALVE_STATE_CLOSED );
             setValveState( D14_VALV, VALVE_STATE_CLOSED );
             setValveState( D52_VALV, VALVE_STATE_CLOSED );
@@ -377,7 +422,12 @@
 
             setValveState( D34_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );
-            setValveState( D80_VALV, VALVE_STATE_OPEN );
+
+            if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == FALSE )
+            {
+                setValveState( D80_VALV, VALVE_STATE_OPEN );
+                setValveState( D64_VALV, VALVE_STATE_CLOSED );
+            }
             break;
 
         case DD_GEND_ISOLATED_UF_STATE:
@@ -662,15 +712,16 @@
         execBalancingChamberControl();
     }
 
-#ifdef __SPENT_CHAMBER_FILL__
-    if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
-        setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
-        pendingSpentChamberFill = FALSE;
-        isDialDeliveryInProgress.data = FALSE;
-        state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+        {
+            setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
+            pendingSpentChamberFill = FALSE;
+            isDialDeliveryInProgress.data = FALSE;
+            state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        }
     }
-#endif
 #ifdef __BICARB_CHAMBER_FILL__
     if ( ( TRUE == pendingBicarbChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
     {
@@ -715,15 +766,16 @@
         isDialDeliveryInProgress.data = FALSE;
         state = DD_GEND_DIALYSATE_BYPASS_STATE;
     }
-#ifdef __SPENT_CHAMBER_FILL__
-    else if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+    else if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_SPENT_CHAMBER_H_FILL ) == TRUE )
     {
-        setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
-        pendingSpentChamberFill = FALSE;
-        isDialDeliveryInProgress.data = FALSE;
-        state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        if ( ( TRUE == pendingSpentChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
+        {
+            setModeGenDStateTransition( DD_GEND_SPENT_CHAMBER_FILL_STATE );
+            pendingSpentChamberFill = FALSE;
+            isDialDeliveryInProgress.data = FALSE;
+            state = DD_GEND_SPENT_CHAMBER_FILL_STATE;
+        }
     }
-#endif
 #ifdef __BICARB_CHAMBER_FILL__
     else if ( ( TRUE == pendingBicarbChamberFill ) && ( FALSE == balancingChambFillInProgress ) )
     {
@@ -1031,7 +1083,7 @@
  *************************************************************************/
 static void checkDialysateTemperature( void )
 {
-    F32 dialysateTemp                   = getConductivityTemperatureValue( D29_COND );  // Assuming the closest temp sensor to dialyzer
+    F32 dialysateTemp                   = getFilteredConductivitySensorTemperature( D29_COND );  // Assuming the closest temp sensor to dialyzer
     F32 targetTemp                      = getTDTargetDialysateTemperature();
     BOOL isDialTempAboveHighSafety      = ( dialysateTemp >= DIALYSATE_TEMP_UPPER_MAX_SAFETY_LIMIT_C ? TRUE : FALSE );
     BOOL isDialTempAboveLowSafety       = ( dialysateTemp > DIALYSATE_TEMP_UPPER_SAFETY_LIMIT_C ? TRUE : FALSE );