Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r940437fb1298c036eeffbbfc8db1d43195e04927 -rf0aec0f46d5e85250430ecc95e4654200cf2ed83
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 940437fb1298c036eeffbbfc8db1d43195e04927)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision f0aec0f46d5e85250430ecc95e4654200cf2ed83)
@@ -129,28 +129,21 @@
     { 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 },
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST,              &testDDConductivitySensorDataPublishIntervalOverride },
     { MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                     &testFPConductivitySensorDataPublishIntervalOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testConductivitySensorReadingsOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testConductivitySensorTemperatureOverride },
+    { MSG_ID_FP_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testConductivitySensorReadingsOverride },
+    { MSG_ID_FP_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testConductivitySensorTemperatureOverride },
     { MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST,                                     &testSetTeenyConductivityModel },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_READINGS_OVERRIDE_REQUEST,                      &testTeensyConductivitySensorReadingsOverride },
-    { MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST,                   &testTeensyConductivitySensorTemperatureReadingsOverride },
     { MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST,                    &testTeensyConductivitySensorResistanceReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_OVERRIDE_REQUEST,                                      &testTeensyConductivitySensorReadingsOverride },
-    { MSG_ID_FP_CONDUCTIVITY_TEMP_OVERRIDE_REQUEST,                                 &testTeensyConductivitySensorTemperatureReadingsOverride },
     { MSG_ID_FP_CONDUCTIVITY_SENSOR_RESISTANCE_OVERRIDE_REQUEST,                    &testTeensyConductivitySensorResistanceReadingsOverride },
-#else
-    { 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_CONDUCTIVITY_SENSOR_CONDUCTIVITY_READ_COUNTER_OVERRIDE_REQUEST,     &testConductivitySensorConductivityReadCounterOverride },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_CONDUCTIVITY_ERROR_COUNTER_OVERRIDE_REQUEST,    &testConductivitySensorConductivityErrorCounterOverride },
+    { MSG_ID_FP_CONDUCTIVITY_SENSOR_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST,       &testConductivitySensorConductivityReadCounterOverride },
+    { MSG_ID_FP_CONDUCTIVITY_SENSOR_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST,      &testConductivitySensorConductivityErrorCounterOverride },
+
     { 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 },
@@ -284,6 +277,12 @@
     { 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 },
+    { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
+    { MSG_ID_FP_SET_RECOVERY_VALVES_REQUEST,                                        &testIOFPSetValveRecoveryConfig },
+    { MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST,             &testDryBiCartBicarbDoseVolControlKpGainOverride },
+    { MSG_ID_DD_BICARB_DOSE_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST,             &testDryBiCartBicarbDoseVolControlKiGainOverride },
+    { MSG_ID_DD_ACID_DOSE_VOL_CONTROL_KP_GAIN_COEFF_OVERRIDE_REQUEST,               &testDryBiCartAcidDoseVolControlKpGainOverride },
+    { MSG_ID_DD_ACID_DOSE_VOL_CONTROL_KI_GAIN_COEFF_OVERRIDE_REQUEST,               &testDryBiCartAcidDoseVolControlKiGainOverride },
     { MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST,                                     &testSetFPOperationSubMode },
 };
 
@@ -577,7 +576,7 @@
  * @param alarm ID of alarm triggered
  * @param almData1 1st data associated with alarm
  * @param almData2 2nd data associated with alarm
- * @return TRUE if msg successfully queued for transmit, FALSE if not
+ * @return TRUE if msg successfully queued for transmit, FALSE if not.
  *************************************************************************/
 BOOL broadcastAlarmTriggered( U32 alarm, ALARM_DATA_T almData1, ALARM_DATA_T almData2, ALARM_SOURCE_T almSource )
 {