Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -r3b64586791accd0b9e8d8978b40e2509bb86dfbe -re63a226f9b88b706ccdbb91358b7aaadfabd095c
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 3b64586791accd0b9e8d8978b40e2509bb86dfbe)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision e63a226f9b88b706ccdbb91358b7aaadfabd095c)
@@ -46,13 +46,34 @@
     F32 d29Cond;                                            ///< D29 conductivity sensor value
     F32 d43Cond;                                            ///< D43 conductivity sensor value
     F32 d74Cond;                                            ///< D74 conductivity sensor value
+    F32 d17CondResist;                                      ///< D17 raw resistance value from conductivity
+    F32 d27CondResist;                                      ///< D27 raw resistance value from conductivity
+    F32 d29CondResist;                                      ///< D29 raw resistance value from conductivity
+    F32 d43CondResist;                                      ///< D43 raw resistance value from conductivity
+    F32 d74CondResist;                                      ///< D74 raw resistance value from conductivity
+    F32 d17RTDResist;                                       ///< D17 raw resistance value from RTD
+    F32 d27RTDResist;                                       ///< D27 raw resistance value from RTD
+    F32 d29RTDResist;                                       ///< D29 raw resistance value from RTD
+    F32 d43RTDResist;                                       ///< D43 raw resistance value from RTD
+    F32 d74RTDResist;                                       ///< D74 raw resistance value from RTD
+    F32 d17CondUncomp;                                      ///< D17 conductivity sensor value without temperature compensation
+    F32 d27CondUncomp;                                      ///< D27 conductivity sensor value without temperature compensation
+    F32 d29CondUncomp;                                      ///< D29 conductivity sensor value without temperature compensation
+    F32 d43CondUncomp;                                      ///< D43 conductivity sensor value without temperature compensation
+    F32 d74CondUncomp;                                      ///< D74 conductivity sensor value without temperature compensation
 } DD_CONDUCTIVITY_DATA_T;
 
 /// Conductivity data struct.
 typedef struct
 {
     F32 p9Conductivity;                                     ///< P9 conductivity sensor value
     F32 p18Conductivity;                                    ///< P18 conductivity sensor value
+    F32 p9CondResist;                                       ///< P9 raw resistance value from conductivity
+    F32 p18CondResist;                                      ///< P18 raw resistance value from conductivity
+    F32 p9RTDResist;                                        ///< P9 raw resistance value from RTD
+    F32 p18RTDResist;                                       ///< P18 raw resistance value from RTD
+    F32 p9CondUncomp;                                       ///< P9 conductivity sensor value without temperature compensation
+    F32 p18CondUncomp;                                      ///< P18 conductivity sensor value without temperature compensation
 } FP_CONDUCTIVITY_DATA_T;
 
 /// RO rejection ratio data struct.
@@ -65,24 +86,6 @@
     U32 genPermeateState;                                   ///< Permeate tank state
 } RO_REJECTION_RATIO_DATA_T;
 
-typedef struct
-{
-    F32 d17CondResist;                                      ///< D17 raw resistance value from conductivity
-    F32 d27CondResist;                                      ///< D27 raw resistance value from conductivity
-    F32 d29CondResist;                                      ///< D29 raw resistance value from conductivity
-    F32 d43CondResist;                                      ///< D43 raw resistance value from conductivity
-    F32 d74CondResist;                                      ///< D74 raw resistance value from conductivity
-    F32 p9CondResist;                                       ///< P9 raw resistance value from conductivity
-    F32 p18CondResist;                                      ///< P18 raw resistance value from conductivity
-    F32 d17RTDResist;                                       ///< D17 raw resistance value from RTD
-    F32 d27RTDResist;                                       ///< D27 raw resistance value from RTD
-    F32 d29RTDResist;                                       ///< D29 raw resistance value from RTD
-    F32 d43RTDResist;                                       ///< D43 raw resistance value from RTD
-    F32 d74RTDResist;                                       ///< D74 raw resistance value from RTD
-    F32 p9RTDResist;                                        ///< P9 raw resistance value from RTD
-    F32 p18RTDResist;                                       ///< P18 raw resistance value from RTD
-} CONDUCTIVITY_RESISTANCE_DATA_T;
-
 #pragma pack(pop)
 
 // ********** public function prototypes **********
@@ -95,6 +98,7 @@
 F32 getTankFillRORejectionRatio( void );
 F32 getRORRAverage( void );
 F32 getTankFillRORRAverage( void );
+F32 getFilteredUConductivity( CONDUCTIVITY_SENSORS_T sensor );
 
 BOOL testDDConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message );
 BOOL testDDConductivitySensorFilteredReadingsOverride( MESSAGE_T *message );