Index: firmware/App/Services/Messaging.c
===================================================================
diff -u -r75c88080ce5d5a435e140566da54e4e181d49e93 -r4cdcb589ad34efa472c94180e6de938132cbc89b
--- firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 75c88080ce5d5a435e140566da54e4e181d49e93)
+++ firmware/App/Services/Messaging.c	(.../Messaging.c)	(revision 4cdcb589ad34efa472c94180e6de938132cbc89b)
@@ -8,7 +8,7 @@
 * @file    Messaging.c
 *
 * @author  (last)      Michael Garthwaite
-* @date    (last)      10-Feb-2026
+* @date    (last)      07-Apr-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
@@ -129,28 +129,19 @@
     { 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 },
@@ -260,6 +251,12 @@
     { 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 },
+    { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST,                           &testDryBiCartFillRequestOverride },
+    { MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST,                       &testBiCarbChamberFillRequestOverride },
+    { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
+    { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },
     { MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST,               &testRORejectionRatioDataPublishIntervalOverride },
     { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
     { MSG_ID_FP_SET_TEST_CONFIGURATION,                                             &testSetTestConfiguration },
@@ -278,12 +275,10 @@
     { 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_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST,                  &testDryBiCartDataPublishIntervalOverride },
-    { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST,                         &testDryBiCartFillCycleMaxCountOverride },
-    { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST,                           &testDryBiCartFillRequestOverride },
-    { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST,                       &testRORejectionRatioFilteredOverride },
-    { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST,                              &testDryBiCartDrainRequestOverride },
-    { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST,                           &testDryBiCartTypeOverride },
+    { MSG_ID_FP_SET_OPERATION_SUB_MODE_REQUEST,                                     &testSetFPOperationSubMode },
+    { MSG_ID_FP_BOOST_PUMP_INSTALL_STATUS_REQUEST,                                  &testGetFPBoostPumpInstallStatus },
+    { MSG_ID_DD_CONDUCTIVITY_SENSOR_VERSION_REQUEST,                                &testHandleConductivitySensorVersionRequest },
+    { MSG_ID_FP_CONDUCTIVITY_SENSOR_VERSION_REQUEST,                                &testHandleConductivitySensorVersionRequest },
     { MSG_ID_DD_TEMPERATURE_SENSOR_FILTERED_TEMP_OVERRIDE_REQUEST,                  &testDDTemperatureSensorFilteredReadingsOverride },
 };
 
@@ -577,7 +572,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 )
 {