Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rd0a2037b16f76e661dc02296e039f099ce5d9ea8 -rd5c94536929ded738e5c8d139d8c46b1d3e035ef
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision d0a2037b16f76e661dc02296e039f099ce5d9ea8)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision d5c94536929ded738e5c8d139d8c46b1d3e035ef)
@@ -7,8 +7,8 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      10-Feb-2026
+* @author  (last)      Sameer Kalliadan Poyil
+* @date    (last)      06-Mar-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
@@ -260,6 +260,12 @@
     { MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST,                            &testRinsePumpPWMPercentOverride },
     { MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST,                                     &testRinsePumpTurnOnOffRequest },
     { MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST,                                    &testSetGeneratePermeateSignal },
+    { MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDryBiCartDataPublishIntervalOverride },
+    { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST,                         &testDryBiCartFillCycleMaxCountOverride },
+    { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST,                           &testDryBiCartFillRequestOverride },
+    { MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST,                       &testBiCarbChamberFillRequestOverride },
+    { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
+    { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },
     { MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testRORejectionRatioDataPublishIntervalOverride },
     { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
     { MSG_ID_FP_SET_TEST_CONFIGURATION,                                             &testSetTestConfiguration },
@@ -278,16 +284,9 @@
     { MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                      &testPreGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testGenPermeateDefDataPublishIntervalOverride},
     { MSG_ID_FP_DEF_STATUS_REQUEST,                                                 &testGetFPDefeaturedStatus },
-    { MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDryBiCartDataPublishIntervalOverride },
-    { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST,                         &testDryBiCartFillCycleMaxCountOverride },
-    { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST,                           &testDryBiCartFillRequestOverride },
-    { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
-    { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
-    { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },
 
     { 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 },
-
     { MSG_ID_DD_ACID_DOSE_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST,               &testDryBiCartAcidDoseVolControlKpGainOverride },
     { MSG_ID_DD_ACID_DOSE_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST,               &testDryBiCartAcidDoseVolControlKiGainOverride },
 };