Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r2475e55c224cbd841d61b76f1618451efe6be1f5 -r3678601eac45b69684724bb46fe913049985c410
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 2475e55c224cbd841d61b76f1618451efe6be1f5)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 3678601eac45b69684724bb46fe913049985c410)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2024-2025 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2024-2026 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    Messaging.c
 *
 * @author  (last)      “rkallala”
-* @date    (last)      09-Dec-2025
+* @date    (last)      16-Jan-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
@@ -28,23 +28,21 @@
 #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 +53,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 +66,7 @@
 #include "Ultrafiltration.h"
 #include "Valves.h"
 #include "Voltages.h"
+#include "WaterQualityMonitor.h"
 
 /**
  *  @addtogroup Messaging
@@ -191,6 +195,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 },
@@ -239,9 +244,27 @@
     { MSG_ID_FP_PERMEATE_TANK_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                    &testPermeateTankDataPublishIntervalOverride },
     { MSG_ID_FP_RO_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testROPumpDataPublishIntervalOverride },
     { MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testRinsePumpDataPublishIntervalOverride },
+    { 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_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testRORejectionRatioDataPublishIntervalOverride },
-    {  MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                      &testRORejectionRatioFilteredOverride },
+    { 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 },
+    { MSG_ID_FP_GET_TEST_CONFIGURATION,                                             &testGetTestConfiguration },
+    { MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS,                                      &testResetAllTestConfigurations },
+    { MSG_ID_FP_RO_GET_CALCULATED_DUTY_CYCLE_REQUEST,                               &testROGetCurrentCalculatedDutyCycle },
+    { MSG_ID_FP_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testFilterFlushDataPublishIntervalOverride },
+    { MSG_ID_FP_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST,                                &testFilterFlushTimerOverride },
+    { MSG_ID_FP_FLUSH_PERMEATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                   &testPermeateFlushDataPublishIntervalOverride },
+    { MSG_ID_FP_FLUSH_PERMEATE_TIMER_OVERRIDE_REQUEST,                              &testPermeateFlushTimerOverride },
+    { MSG_ID_FP_FLUSH_PERMEATE_ALARM_TIMER_OVERRIDE_REQUEST,                        &testPermeateFlushAlarmTimerOverride },
+    { MSG_ID_FP_FLUSH_CONCENTRATE_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                &testConcentrateFlushDataPublishIntervalOverride },
+    { MSG_ID_FP_FLUSH_CONCENTRATE_TIMER_OVERRIDE_REQUEST,                           &testConcentrateFlushTimerOverride },
+    { MSG_ID_FP_DEF_FLUSH_FILTER_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                 &testFilterFlushDefDataPublishIntervalOverride },
+    { MSG_ID_FP_DEF_FLUSH_FILTER_TIMER_OVERRIDE_REQUEST,                            &testFilterFlushDefTimerOverride },
+    { 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 },
 };
 
 /// Calculation for number of entries in the incoming message function handler look-up table.