Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r0bd88516052944cca76c6eb6ef4be851929e1215 -rd305a91c82fe89a76d9accbb8faa3d81e3106341
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 0bd88516052944cca76c6eb6ef4be851929e1215)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision d305a91c82fe89a76d9accbb8faa3d81e3106341)
@@ -123,11 +123,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 },
@@ -223,11 +230,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 },