Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -rff82c2f697e729f16098416acad3d98e337a38cd -r7392f6b2662bbdb91ea4dfcdb788abf64619e10a
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision ff82c2f697e729f16098416acad3d98e337a38cd)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 7392f6b2662bbdb91ea4dfcdb788abf64619e10a)
@@ -7,8 +7,8 @@
 *
 * @file    Conductivity.h
 *
-* @author  (last)      “rkallala”
-* @date    (last)      09-Dec-2025
+* @author  (last)      Michael Garthwaite
+* @date    (last)      06-Mar-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  13-Sep-2024
@@ -19,11 +19,9 @@
 #define __CONDUCTIVITY_H__
 
 #include "DDCommon.h"
-#ifdef __TEENSY_CONDUCTIVITY_DRIVER__
+#include "DDDefs.h"
 #include "ConductivityTeensy.h"
-#else
-#include "ConductivitySensor.h"
-#endif
+#include "ConductivitySensors.h"
 
 /**
  *  @defgroup Conductivity Conductivity
@@ -87,6 +85,8 @@
 BOOL testFPConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );
 BOOL testRORejectionRatioDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testRORejectionRatioFilteredOverride( MESSAGE_T *message );
+BOOL testConductivitySensorReadingsOverride( MESSAGE_T *message );
+BOOL testConductivitySensorTemperatureOverride( MESSAGE_T *message );
 
 /**@}*/