Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r2475e55c224cbd841d61b76f1618451efe6be1f5 -r95e6caaa6bb9214dedb498c16b6ff064e498a8ab
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 2475e55c224cbd841d61b76f1618451efe6be1f5)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 95e6caaa6bb9214dedb498c16b6ff064e498a8ab)
@@ -30,6 +30,7 @@
 #include "FluidPump.h"
 #include "FlushConcentrate.h"
 #include "FlushFilter.h"
+#include "FlushFilterDefeatured.h"
 #include "FlushPermeate.h"
 #include "FpgaDD.h"
 #include "FPModeFault.h"
@@ -43,8 +44,10 @@
 #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"
@@ -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 },
@@ -240,8 +245,20 @@
     { MSG_ID_FP_RO_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                          &testROPumpDataPublishIntervalOverride },
     { MSG_ID_DD_RINSE_PUMP_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testRinsePumpDataPublishIntervalOverride },
     { 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_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},
 };
 
 /// Calculation for number of entries in the incoming message function handler look-up table.