Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r44d7a987b5c6b91396ddb2cc8163b36c21f59bde -rb9d148dce4c70d0dca63f34fce73c22a7bfd4fbc
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 44d7a987b5c6b91396ddb2cc8163b36c21f59bde)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision b9d148dce4c70d0dca63f34fce73c22a7bfd4fbc)
@@ -553,6 +553,16 @@
         data.d29Cond        = getFilteredConductivity( D29_COND );
         data.d43Cond        = getFilteredConductivity( D43_COND );
         data.d74Cond        = getFilteredConductivity( D74_COND );
+        data.d17CondResist = getConductivityRawResistance( D17_COND );
+        data.d27CondResist = getConductivityRawResistance( D27_COND );
+        data.d29CondResist = getConductivityRawResistance( D29_COND );
+        data.d43CondResist = getConductivityRawResistance( D43_COND );
+        data.d74CondResist = getConductivityRawResistance( D74_COND );
+        data.d17RTDResist  = getConductivityRawRTD( D17_COND );
+        data.d27RTDResist  = getConductivityRawRTD( D27_COND );
+        data.d29RTDResist  = getConductivityRawRTD( D29_COND );
+        data.d43RTDResist  = getConductivityRawRTD( D43_COND );
+        data.d74RTDResist  = getConductivityRawRTD( D74_COND );
         ddConductivityPublishTimerCounter        = 0;
 
         broadcastData( MSG_ID_DD_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( DD_CONDUCTIVITY_DATA_T ) );
@@ -565,6 +575,10 @@
 
         data.p9Conductivity     = getFilteredConductivity( P9_COND );
         data.p18Conductivity    = getFilteredConductivity( P18_COND );
+        data.p9CondResist  = getConductivityRawResistance( P9_COND );
+        data.p18CondResist = getConductivityRawResistance( P18_COND );
+        data.p9RTDResist   = getConductivityRawRTD( P9_COND );
+        data.p18RTDResist   = getConductivityRawRTD( P18_COND );
         fpConductivityPublishTimerCounter = 0;
 
         broadcastData( MSG_ID_FP_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( FP_CONDUCTIVITY_DATA_T ) );
@@ -585,49 +599,8 @@
         broadcastData( MSG_ID_FP_RO_REJECTION_RATIO_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( RO_REJECTION_RATIO_DATA_T ) );
     }
 
-    if ( FALSE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
-    {
-        // publish conductivity resistance data on interval
-        if ( ++conductivityResistancePublishTimerCounter >= getU32OverrideValue( &conductivityResistanceDataPublishInterval ) )
-        {
-            broadcastResistanceData();
-        }
-    }
 }
 
-/*********************************************************************//**
- * @brief
- * The broadcastResistanceData function publishes DD resistance data.
- * @details \b Inputs: conductivityResistancePublishTimerCounter
- * @details \b Outputs: resistance data
- * roRRPublishTimerCounter, DD & FP resistance data is sent
- * @details \b Message \b Sent: MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA to publish DD resistance data.
- * @return none
- *************************************************************************/
-static void broadcastResistanceData( void )
-{
-    CONDUCTIVITY_RESISTANCE_DATA_T data;
-
-    data.d17CondResist = getConductivityRawResistance( D17_COND );
-    data.d27CondResist = getConductivityRawResistance( D27_COND );
-    data.d29CondResist = getConductivityRawResistance( D29_COND );
-    data.d43CondResist = getConductivityRawResistance( D43_COND );
-    data.d74CondResist = getConductivityRawResistance( D74_COND );
-    data.p9CondResist  = getConductivityRawResistance( P9_COND );
-    data.p18CondResist = getConductivityRawResistance( P18_COND );
-    data.d17RTDResist  = getConductivityRawRTD( D17_COND );
-    data.d27RTDResist  = getConductivityRawRTD( D27_COND );
-    data.d29RTDResist  = getConductivityRawRTD( D29_COND );
-    data.d43RTDResist  = getConductivityRawRTD( D43_COND );
-    data.d74RTDResist  = getConductivityRawRTD( D74_COND );
-    data.p9RTDResist   = getConductivityRawRTD( P9_COND );
-    data.p18RTDResist   = getConductivityRawRTD( P18_COND );
-    conductivityResistancePublishTimerCounter = 0;
-
-    broadcastData( MSG_ID_DD_CONDUCTIVITY_SENSOR_RESISTANCE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_RESISTANCE_DATA_T ) );
-
-}
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
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 **********