Index: firmware/App/Monitors/Conductivity.h
===================================================================
diff -u -r44d7a987b5c6b91396ddb2cc8163b36c21f59bde -rb9d148dce4c70d0dca63f34fce73c22a7bfd4fbc
--- firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision 44d7a987b5c6b91396ddb2cc8163b36c21f59bde)
+++ firmware/App/Monitors/Conductivity.h	(.../Conductivity.h)	(revision b9d148dce4c70d0dca63f34fce73c22a7bfd4fbc)
@@ -46,13 +46,27 @@
     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
 } 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
 } FP_CONDUCTIVITY_DATA_T;
 
 /// RO rejection ratio data struct.
@@ -65,31 +79,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
-    F32 d17UncompCond;
-    F32 d27UncompCond;
-    F32 d29UncompCond;
-    F32 d43UncompCond;
-    F32 d74UncompCond;
-    F32 p9UncompCond;
-    F32 p18UncompCond;
-} CONDUCTIVITY_RESISTANCE_DATA_T;
-
 #pragma pack(pop)
 
 // ********** public function prototypes **********