Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -rdc3647b737971d298748796d2455b3e021325d8a -r89f18a07a6d5837bf9b4559a69046e2b06f32c35
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision dc3647b737971d298748796d2455b3e021325d8a)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35)
@@ -41,14 +41,28 @@
     F32 d29Cond;                                              ///< CD3 conductivity sensor value
     F32 d43Cond;                                              ///< CD4 conductivity sensor value
     F32 d74Cond;                                              ///< CD5 conductivity sensor value
-} CONDUCTIVITY_DATA_T;
+} DD_CONDUCTIVITY_DATA_T;
 
+/// Conductivity data struct.
+typedef struct
+{
+    F32 p9Conductivity;                                       ///< (P9) conductivity sensor value
+    F32 p18Conductivity;                                      ///< (P18) conductivity sensor value
+} FP_CONDUCTIVITY_DATA_T;
+
 // ********** public function prototypes **********
 
 void initConductivity( void );
 void execConductivity( void );
+F32 getFilteredConductivity( CONDUCTIVITY_SENSORS_T sensor );
+F32 getFilteredConductivitySensorTemperature( CONDUCTIVITY_SENSORS_T sensor );
 
-BOOL testConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testDDConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testDDConductivitySensorFilteredReadingsOverride( MESSAGE_T *message );
+BOOL testDDConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );
+BOOL testFPConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message );
+BOOL testFPConductivitySensorFilteredReadingsOverride( MESSAGE_T *message );
+BOOL testFPConductivitySensorFilteredTemperatureReadingsOverride( MESSAGE_T *message );
 
 /**@}*/