Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r34e5bf0c392cad4235b212c51f9b54cf16bb5581 -r214bc36051314945ae212a1869aa87014eb1dbf8
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 34e5bf0c392cad4235b212c51f9b54cf16bb5581)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 214bc36051314945ae212a1869aa87014eb1dbf8)
@@ -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
 *
@@ -19,7 +19,7 @@
 #include "Conductivity.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
-#include "DryBiCart.h" // For request setBicarbChamberFillRequested
+#include "DryBiCart.h"
 #include "FpgaDD.h"
 #include "Heaters.h"
 #include "ModeGenDialysate.h"
@@ -59,7 +59,7 @@
 #define SPENT_DIFF_COUNT_ZERO                       0                                           ///< Zero count difference for spent side fill comparing target count
 #define D48_SPEED_ADJUST_FACTOR                     0.5F                                        ///< D48 speed adjustment factor ( 50% of speed adjustment = 0.5)
 #define D48_SPEED_RANGE_LIMIT                       0.25F                                       ///< D48 speed adjustment range check limit ( D48 speed can vary +/-25% of initial calculated speed)
-#define BICARB_CHAMBER_PERIODIC_FILL_TIME               ( 1 * SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ) ///< Periodic bicarb chamber fill request 60 sec x 20 = 1200
+#define BICARB_CHAMBER_PERIODIC_FILL_TIME          ( 1 * SEC_PER_MIN * ( MS_PER_SECOND / TASK_GENERAL_INTERVAL ) ) ///< Periodic bicarb chamber fill request 60 sec x 20 = 1200
 #define BAL_CHAMBER_FILL_TIMEOUT_FACTOR             1.5                                         ///< Balancing Chamber fill timeout factor (150% of observed fill count)
 
 /// Payload record structure for balancing chamber switch only request
@@ -260,7 +260,7 @@
     currentBalChamberSwitchingCounter += 1;
     currentBalChamberFillCounter += 1;
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE && balChamberExecState > BAL_CHAMBER_STATE_IDLE)
     {
         // Increment counter for dry bicarb chamber fill
         bicarbChamberPeriodicFillCounter += 1;
@@ -508,6 +508,8 @@
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState1FillStart( void )
 {
+    F32 acidVolume;
+    F32 bicarbVolume;
     BAL_CHAMBER_EXEC_STATE_T state      = BAL_CHAMBER_STATE1_FILL_START;
     balChamberSWState                   = BAL_CHAMBER_SW_STATE1;
     balChamberFillTimeoutCount          = 0;
@@ -522,10 +524,20 @@
     spentFillRiseMissCounter            = 0;
     isSpentFillComplete                 = FALSE;
 
-    F32 acidVolume            = getF32OverrideValue( &acidDoseVolume );
-    F32 bicarbVolume          = getF32OverrideValue( &bicarbDoseVolume );
+    if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    {
+        bicarbVolume = getBicarbDoseVol();
+        acidVolume = getAcidDoseVol();
+    }
+    else
+    {
+        acidVolume        = getF32OverrideValue( &acidDoseVolume );
+        bicarbVolume      = getF32OverrideValue( &bicarbDoseVolume );
+    }
+
     freshDialPressure         = getFilteredPressure( D18_PRES );
     spentDialPressure         = getFilteredPressure( D51_PRES );
+
     lastPrevSpentDialPressure = spentDialPressure;
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
@@ -553,8 +565,8 @@
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
             // start acid and bicarb pump with the expected quantity
-            setConcentratePumpTargetSpeed( D11_PUMP, CONCENTRATE_PUMP_MAX_SPEED, acidVolume );
-            setConcentratePumpTargetSpeed( D10_PUMP, CONCENTRATE_PUMP_MAX_SPEED, bicarbVolume );
+            setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, acidVolume );
+            setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, bicarbVolume );
             requestConcentratePumpOn( D11_PUMP );
             requestConcentratePumpOn( D10_PUMP );
         }
@@ -804,6 +816,8 @@
  *************************************************************************/
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2FillStart( void )
 {
+    F32 acidVolume;
+    F32 bicarbVolume;
     BAL_CHAMBER_EXEC_STATE_T state      = BAL_CHAMBER_STATE2_FILL_START;
     isBalChamberFillInProgress          = FALSE;
     isPressureStabilizedDuringFill      = FALSE;
@@ -818,10 +832,20 @@
     spentFillRiseMissCounter            = 0;
     isSpentFillComplete                 = FALSE;
 
-    F32 acidVolume            = getF32OverrideValue( &acidDoseVolume );
-    F32 bicarbVolume          = getF32OverrideValue( &bicarbDoseVolume );
+   if ( getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DRY_BICARB ) == TRUE )
+    {
+        bicarbVolume = getBicarbDoseVol();
+        acidVolume = getAcidDoseVol();
+    }
+    else
+    {
+        acidVolume        = getF32OverrideValue( &acidDoseVolume );
+        bicarbVolume      = getF32OverrideValue( &bicarbDoseVolume );
+    }
+
     freshDialPressure         = getFilteredPressure( D18_PRES );
     spentDialPressure         = getFilteredPressure( D51_PRES );
+
     lastPrevSpentDialPressure = spentDialPressure;
 
     if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
@@ -849,8 +873,8 @@
         if ( TRUE != getBalChamberSwitchingOnlyStatus() )
         {
             // start acid and bicarb pump with the expected quantity
-            setConcentratePumpTargetSpeed( D11_PUMP, CONCENTRATE_PUMP_MAX_SPEED, acidVolume );
-            setConcentratePumpTargetSpeed( D10_PUMP, CONCENTRATE_PUMP_MAX_SPEED, bicarbVolume );
+            setConcentratePumpTargetSpeed( D11_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, acidVolume );
+            setConcentratePumpTargetSpeed( D10_PUMP, DOSING_CONCENTRATE_PUMP_SPEED, bicarbVolume );
             requestConcentratePumpOn( D11_PUMP );
             requestConcentratePumpOn( D10_PUMP );
         }
Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rdeba34e5074da9ac97d8bcbe995f554eec5c70ed -r214bc36051314945ae212a1869aa87014eb1dbf8
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision deba34e5074da9ac97d8bcbe995f554eec5c70ed)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 214bc36051314945ae212a1869aa87014eb1dbf8)
@@ -278,6 +278,7 @@
     { MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_STATUS_REQUEST,                                                 &testGetFPDefeaturedStatus },
     { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
+    { MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST,                                        &testIOFPSetValveRecoveryConfig },
 
     { MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST,             &testDryBiCartBicarbDoseVolControlKpGainOverride },
     { MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST,             &testDryBiCartBicarbDoseVolControlKiGainOverride },