Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r9c0f227670dcf68439c5ea86768d116cc6f9585e -rae88c96592543ce53f30a3a5a18964c5198d5250
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 9c0f227670dcf68439c5ea86768d116cc6f9585e)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision ae88c96592543ce53f30a3a5a18964c5198d5250)
@@ -7,8 +7,8 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      29-Dec-2025
+* @author  (last)      “rkallala”
+* @date    (last)      16-Jan-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
@@ -25,26 +25,25 @@
 #include "Compatible.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
+#include "DryBiCart.h"
 #include "Flow.h"
 #include "FlowSensor.h"
 #include "FluidPump.h"
-#include "FlushConcentrate.h"
-#include "FlushFilter.h"
-#include "FlushPermeate.h"
 #include "FpgaDD.h"
 #include "FPModeFault.h"
 #include "FPModeInitPOST.h"
 #include "FPModeStandby.h"
 #include "FPOperationModes.h"
 #include "Heaters.h"
-#include "InletPressureCheck.h"
 #include "Level.h"
 #include "Messaging.h"
 #include "MessagePayloads.h"
 #include "ModeGenDialysate.h"
 #include "ModeGenPermeate.h"
+#include "ModeGenPermeateDefeatured.h"
 #include "ModePreGenDialysate.h"
 #include "ModePreGenPermeate.h"
+#include "ModePreGenPermeateDefeatured.h"
 #include "ModePostGenDialysate.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
@@ -55,6 +54,11 @@
 #include "ROPump.h"
 #include "SafetyShutdown.h"
 #include "SpentChamberFill.h"
+#include "StateFlushConcentrate.h"
+#include "StateFlushFilter.h"
+#include "StateFlushFilterDefeatured.h"
+#include "StateFlushPermeate.h"
+#include "StateInletPressureCheck.h"
 #include "SystemCommDD.h"
 #include "Temperature.h"
 #include "TestSupport.h"
@@ -63,6 +67,7 @@
 #include "Ultrafiltration.h"
 #include "Valves.h"
 #include "Voltages.h"
+#include "WaterQualityMonitor.h"
 
 /**
  *  @addtogroup Messaging
@@ -191,6 +196,7 @@
     { MSG_ID_DD_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST,                     &testDDConductivitySensorFilteredReadingsOverride },
     { MSG_ID_DD_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                  &testDDConductivitySensorFilteredTemperatureReadingsOverride },
     { MSG_ID_FP_TESTER_LOGIN_REQUEST,                                               &handleTesterFPLogInRequest },
+    { MSG_ID_FP_SOFTWARE_RESET_REQUEST,                                             &handleDDSoftwareResetRequest },
     { MSG_ID_FP_SET_OPERATION_MODE_REQUEST,                                         &testSetFPOperationMode },
     { MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                   &testSetFPOpModePublishIntervalOverride },
     { MSG_ID_FP_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testPreGenDataPublishIntervalOverride },
@@ -242,6 +248,10 @@
     { 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_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 },