Index: firmware/App/Controllers/DryBiCart.h
===================================================================
diff -u -rfd897db8177752330ad08d877e0a13620513dbdc -r119b0ed8343d2d739ead1647360aa2f423283ddc
--- firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision fd897db8177752330ad08d877e0a13620513dbdc)
+++ firmware/App/Controllers/DryBiCart.h	(.../DryBiCart.h)	(revision 119b0ed8343d2d739ead1647360aa2f423283ddc)
@@ -8,7 +8,7 @@
 * @file    DryBiCart.h
 *
 * @author  (last)      Sameer Kalliadan Poyil
-* @date    (last)      14-Apr-2026
+* @date    (last)      21-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  19-Nov-2025
@@ -51,17 +51,17 @@
     U32 dryBiCartDrainTimePeriod;                                       ///< Dry bicart drain time based on catridge type (small/large)
 
     // TODO: remove after closed loops stabilized
-    PI_CONTROLLER_SIGNALS_DATA dryBiCartBicarbDosingControl;            ///< Dry bicart bicarb dosing closed loop control signals data
-    PI_CONTROLLER_SIGNALS_DATA dryBiCartAcidDosingControl;              ///< Dry bicart acid dosing closed loop control signals data
+    PI_CONTROLLER_SIGNALS_DATA dryBiCartBicarbMixingControl;            ///< Dry bicart bicarb mixing closed loop control signals data
+    PI_CONTROLLER_SIGNALS_DATA dryBiCartAcidMixingControl;              ///< Dry bicart acid mixing closed loop control signals data
 
-    F32 dryBiCartAcidMixVolume;                                        ///< Dry bicart acid dose volume
-    F32 dryBiCartBicarbMixVolume;                                      ///< Dry bicart bicarb dose volume
+    F32 dryBiCartAcidMixVolume;                                         ///< Dry bicart acid dose volume
+    F32 dryBiCartBicarbMixVolume;                                       ///< Dry bicart bicarb dose volume
 
-    F32 dryBiCartBicarbDosingKPgain;                                    ///< Dry bicart bicarb dosing control kp gain
-    F32 dryBiCartBicarbDosingKIgain;                                    ///< Dry bicart bicarb dosing control ki gain
+    F32 dryBiCartBicarbMixingKPgain;                                    ///< Dry bicart bicarb mixing control kp gain
+    F32 dryBiCartBicarbMixingKIgain;                                    ///< Dry bicart bicarb mixing control ki gain
 
-    F32 dryBiCartAcidDosingKPgain;                                      ///< Dry bicart acid dosing control kp gain
-    F32 dryBiCartAcidDosingKIgain;                                      ///< Dry bicart acid dosing control ki gain
+    F32 dryBiCartAcidMixingKPgain;                                      ///< Dry bicart acid mixing control kp gain
+    F32 dryBiCartAcidMixingKIgain;                                      ///< Dry bicart acid mixing control ki gain
 
  } DRY_BICART_DATA_T;
 
@@ -82,9 +82,6 @@
 F32 getDialysateTargetConductivity( void );
 F32 getDialysateDeltaConductivity( void );
 
-F32 getBicarbTargetConductivity( void );
-F32 getBicarbDeltaConductivity( void );
-
 F32 getBicarbMixVol( void );
 F32 getAcidMixVol( void );
 
@@ -115,6 +112,7 @@
 BOOL testDryBiCartUpperCartPressureOverride( MESSAGE_T *message );
 BOOL testDryBiCartLowerCartPressureOverride( MESSAGE_T *message );
 
+BOOL testDryBiCartMixControlIntervalOverride( MESSAGE_T *message );
 /**@}*/
 
 #endif