Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -re2e51b0219db0132cebb6f65f3dbd803e1f01e30 -rdc3647b737971d298748796d2455b3e021325d8a
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision e2e51b0219db0132cebb6f65f3dbd803e1f01e30)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision dc3647b737971d298748796d2455b3e021325d8a)
@@ -74,11 +74,12 @@
 
     //control conductivity sensor
     // TODO : need more clarity on why and when to execute following control.
+#if 0
     handleConductivitySensorsReset();
     handleConductivitySensorsInitProcedure();
     execConductivitySensorWrite();
     execConductivitySensorRead();
-
+#endif
     // publish conductivity sensors
     publishConductivitySensorsData();
 }
@@ -99,14 +100,11 @@
     {
         CONDUCTIVITY_DATA_T data;
 
-        data.cd1    = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-        data.cd2    = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
-        data.cd3    = getConductivityValue( CONDUCTIVITYSENSORS_CD3_SENSOR );
-        data.cd4    = getConductivityValue( CONDUCTIVITYSENSORS_CD4_SENSOR );
-        data.td1    = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-        data.td2    = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
-        data.td3    = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD3_SENSOR );
-        data.td4    = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD4_SENSOR );
+        data.d17Cond        = getConductivityValue( D17_COND );
+        data.d27Cond        = getConductivityValue( D27_COND );
+        data.d29Cond        = getConductivityValue( D29_COND );
+        data.d43Cond        = getConductivityValue( D43_COND );
+        data.d74Cond        = getConductivityValue( D74_COND );
         conductivityPublishTimerCounter        = 0;
 
         broadcastData( MSG_ID_DD_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_DATA_T ) );
@@ -131,29 +129,8 @@
  *************************************************************************/
 BOOL testConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message )
 {
-    BOOL                    result = FALSE;
-    TEST_OVERRIDE_PAYLOAD_T override;
-    OVERRIDE_TYPE_T         ovType = getOverridePayloadFromMessage( message, &override );
+    BOOL result = u32BroadcastIntervalOverride( message, &conductivityDataPublishInterval, TASK_PRIORITY_INTERVAL );
 
-    // Verify tester has logged in with DD and override type is valid
-    if ( ( TRUE == isTestingActivated() ) && ( ovType != OVERRIDE_INVALID ) && ( ovType < NUM_OF_OVERRIDE_TYPES ) )
-    {
-        if ( OVERRIDE_OVERRIDE == ovType )
-        {
-            U32 intvl = override.state.u32 / TASK_PRIORITY_INTERVAL;
-
-            conductivityDataPublishInterval.ovData      = intvl;
-            conductivityDataPublishInterval.override    = OVERRIDE_KEY;
-        }
-        else
-        {
-            conductivityDataPublishInterval.override    = OVERRIDE_RESET;
-            conductivityDataPublishInterval.ovData      = conductivityDataPublishInterval.ovInitData;
-        }
-
-        result = TRUE;
-    }
-
     return result;
 }