Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -rae88c96592543ce53f30a3a5a18964c5198d5250 -r58e5721497be626929b6cdc0c5187e18b34bbaad
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision ae88c96592543ce53f30a3a5a18964c5198d5250)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 58e5721497be626929b6cdc0c5187e18b34bbaad)
@@ -7,8 +7,8 @@
 *
 * @file    Messaging.c
 *
-* @author  (last)      “rkallala”
-* @date    (last)      16-Jan-2026
+* @author  (last)      Michael Garthwaite
+* @date    (last)      29-Jan-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
@@ -129,11 +129,18 @@
     { MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDDPressureSensorDataPublishIntervalOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_READINGS_OVERRIDE_REQUEST,                   &testDDPressureSensorFilteredReadingsOverride },
     { MSG_ID_DD_PRESSURE_SENSOR_FILTER_TEMPERATURE_OVERRIDE_REQUEST,                &testDDPressureSensorFilteredTemperatureReadingsOverride },
+#ifndef __TEENSY_CONDUCTIVITY_DRIVER__
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testDDConductivitySensorReadingsOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testDDConductivitySensorTemperatureReadingsOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_READ_COUNTER_OVERRIDE_REQUEST,                  &testDDConductivitySensorReadCounterOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_ERROR_COUNTER_OVERRIDE_REQUEST,                 &testDDConductivitySensorErrorCounterOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testDDConductivitySensorDataPublishIntervalOverride },
+    { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testFPConductivitySensorDataPublishIntervalOverride },
+    { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST,                                      &testFPConductivitySensorReadingsOverride },
+    { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                                 &testFPConductivitySensorTemperatureReadingsOverride },
+    { MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,                           &testFPConductivitySensorReadCounterOverride },
+    { MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,                          &testFPConductivitySensorErrorCounterOverride },
+#endif
     { MSG_ID_DD_CONCENTRATE_PUMP_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                 &testConcentratePumpDataPublishIntervalOverride },
     { MSG_ID_DD_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE_REQUEST,                     &testConcentratePumpTargetSpeedOverride },
     { MSG_ID_DD_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE_REQUEST,                   &testConcentratePumpMeasuredSpeedOverride },
@@ -230,11 +237,6 @@
     { MSG_ID_FP_FILTERED_FLOW_TEMP_OVERRIDE_REQUEST,                                &testFlowSensorFilteredTemperatureReadingsOverride },
     { MSG_ID_FP_ALARM_STATE_OVERRIDE_REQUEST,                                       &testAlarmStateOverride },
     { MSG_ID_FP_ALARM_CLEAR_ALL_ALARMS_REQUEST,                                     &testFPClearAllAlarms },
-    { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testFPConductivitySensorDataPublishIntervalOverride },
-    { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST,                                      &testFPConductivitySensorReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                                 &testFPConductivitySensorTemperatureReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,                           &testFPConductivitySensorReadCounterOverride },
-    { MSG_ID_FP_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,                          &testFPConductivitySensorErrorCounterOverride },
     { MSG_ID_FP_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST,                     &testFPConductivitySensorFilteredReadingsOverride },
     { MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                  &testFPConductivitySensorFilteredTemperatureReadingsOverride },
     { MSG_ID_DD_VOLTAGE_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testVoltageDataPublishIntervalOverride },
@@ -257,6 +259,22 @@
     { 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 },
+#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+    { MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST,                                     &testSetTeenyConductivityModel },
+#endif
 };
 
 /// Calculation for number of entries in the incoming message function handler look-up table.