Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r6be1432c0c90124ca24e20544987b09bc4dc59a0 -r7d85bc16d7e6a209a28d0152c8cd7da5d5af1be2
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 6be1432c0c90124ca24e20544987b09bc4dc59a0)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 7d85bc16d7e6a209a28d0152c8cd7da5d5af1be2)
@@ -7,8 +7,8 @@
 *
 * @file    ModeGenDialysate.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      29-Jan-2026
+* @author  (last)      Vinayakam Mani
+* @date    (last)      11-Feb-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  06-Nov-2024
@@ -63,6 +63,7 @@
 #define LOW_DIAL_FLOW_RATE                              150.0F                                      ///< Dialysate flow rate lesser than 150 considered to be low Qds.
 #define ZERO_DIAL_FLOW_RATE                             0.0F                                        ///< Zero dialysate flow rate
 #define SPENT_CHAMBER_FILL_MAX_COUNT                    10                                          ///< Total number of spent chamber fill allowed.
+<<<<<<< HEAD
 #define BICARB_CHAMBER_FILL_TIMEOUT                    ( 1 * MS_PER_SECOND )                        ///< Bicarb chamber fill timeout.
 #define B1B2_HEAT_DIS_FIRST_COEFF                      0.00000000487858F                            ///< First coefficient for Heat loss dissipation calculation from D4 to D28(cubic equation).
 #define B1B2_HEAT_DIS_SEC_COEFF                        0.0000063124F                                ///< Second coefficient for Heat loss dissipation calculation from D4 to D28.
@@ -73,6 +74,9 @@
 #define B3_HEAT_DIS_THIRD_COEFF                        0.0035126F                                   ///< Third coefficient for Heat loss dissipation calculation from D28 to Dialyzer.
 #define B3_HEAT_DIS_FOURTH_COEFF                       0.63893F                                     ///< Fourth coefficient for Heat loss dissipation calculation from D28 to Dialyzer.
 
+=======
+#define BICARB_CHAMBER_FILL_TIMEOUT                     ( 1 * MS_PER_SECOND )                       ///< Bicarb chamber fill timeout.
+>>>>>>> staging
 //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
@@ -229,16 +233,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 );
@@ -258,7 +275,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
 
@@ -268,6 +289,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 );
@@ -280,17 +305,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 );
@@ -302,6 +343,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 );
@@ -326,8 +369,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
@@ -366,7 +414,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 );
@@ -378,7 +425,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: