Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rdfbd800e10847db992bd6a9981c26d1f8d763c6f -r1d9be2f5baf7d1416ef8a79c2ed93a279738f97a
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision dfbd800e10847db992bd6a9981c26d1f8d763c6f)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 1d9be2f5baf7d1416ef8a79c2ed93a279738f97a)
@@ -89,9 +89,7 @@
 static U32 roRRCount;                                                                                                   ///< RO rejection ratio Number of samples in average buffer.
 static F32 roRRTankFillAvg;                                                                                             ///< Average RO rejection ratio during permeate tank fill state.
 static U32 roRRSampleIntervalCounter;                                                                                   ///< RO rejection ratio sample collection timer counter.
-static U32 conductivityResistancePublishTimerCounter;                                                                   ///< DD and FP Conductivity data publication counter.
 static U32 conductivityFilterSize;                                                                                      ///< Active conductivity filter sample count.
-static OVERRIDE_U32_T conductivityResistanceDataPublishInterval;                                                        ///< DD and FP Conductivity sensors publish time interval override.
 
 // ********** private function prototypes **********
 
@@ -101,7 +99,6 @@
 static void filterConductivitySensorTemperatureReadings( void );
 static void calcRORejectionRatio( void );
 static void filterRORejectionRatioReadings( void );
-static void broadcastResistanceData( void );
 static U32 getConductivityFilterSize( void );
 static void resetConductivityFilterReadings( void );
 
@@ -122,7 +119,6 @@
     ddConductivityPublishTimerCounter           = DD_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT;
     fpConductivityPublishTimerCounter           = FP_CONDUCTIVITY_DATA_PUBLISH_COUNTER_START_COUNT;
     roRRPublishTimerCounter                     = RO_DATA_PUBLISH_COUNTER_START_COUNT;
-    conductivityResistancePublishTimerCounter   = RESISTANCE_DATA_PUBLISH_COUNTER_START_COUNT;
     roRejectionRatio                            = 0.0F;
     roRejectionRatioTankFill                    = 0.0F;
     roRRRunningSum                              = 0.0F;
@@ -141,6 +137,7 @@
     // Initialize override structures for each conductivity sensor
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
+
         filteredcurrentConductivityReadings[ sensor ].data = 0.0F;
         filteredcurrentConductivityReadings[ sensor ].ovData = 0.0F;
         filteredcurrentConductivityReadings[ sensor ].ovInitData = 0.0F;
@@ -178,11 +175,6 @@
     roRRDataPublishInterval.ovInitData                      = 0;
     roRRDataPublishInterval.override                        = OVERRIDE_RESET;
 
-    conductivityResistanceDataPublishInterval.data          = COND_SENSOR_REPORT_PERIOD;
-    conductivityResistanceDataPublishInterval.ovData        = COND_SENSOR_REPORT_PERIOD;
-    conductivityResistanceDataPublishInterval.ovInitData    = 0;
-    conductivityResistanceDataPublishInterval.override      = OVERRIDE_RESET;
-
 }
 
 /*********************************************************************//**
@@ -314,6 +306,7 @@
             filteredConductivityReadings[ sensor ].conductivityReadingsIdx = INC_WRAP( filteredConductivityReadings[ sensor ].conductivityReadingsIdx, 0, conductivityFilterSize - 1 );
             filteredConductivityReadings[ sensor ].conductivityReadingsCount = INC_CAP( filteredConductivityReadings[ sensor ].conductivityReadingsCount, conductivityFilterSize );
             filteredcurrentConductivityReadings[ sensor ].data = filteredConductivityReadings[ sensor ].conductivityReadingsTotal / (F32)filteredConductivityReadings[ sensor ].conductivityReadingsCount;
+
         }
     }
 }
@@ -611,6 +604,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 ) );
@@ -623,6 +626,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 ) );
@@ -643,49 +650,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
  *************************************************************************/