Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rc49ab370df876258ed3c805b33b2a2311a8ac0e3 -r3643a2e648ab2b216fd08579e56bdc02fb94836d
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision c49ab370df876258ed3c805b33b2a2311a8ac0e3)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 3643a2e648ab2b216fd08579e56bdc02fb94836d)
@@ -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
@@ -29,23 +29,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"
@@ -56,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"
@@ -64,6 +67,7 @@
 #include "Ultrafiltration.h"
 #include "Valves.h"
 #include "Voltages.h"
+#include "WaterQualityMonitor.h"
 
 /**
  *  @addtogroup Messaging
@@ -192,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 },
@@ -240,6 +245,8 @@
     { 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_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDryBiCartDataPublishIntervalOverride },
     { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST,                         &testDryBiCartFillCycleMaxCountOverride },