Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -rc7dcb245c2378b1c96eeaa02f120f61dff598b11 -r2205857f59dd884c4af450239381387cfb560c2e
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision c7dcb245c2378b1c96eeaa02f120f61dff598b11)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 2205857f59dd884c4af450239381387cfb560c2e)
@@ -7,13 +7,14 @@
 *
 * @file    Conductivity.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      10-Sep-2024
+* @author  (last)      Sean Nash
+* @date    (last)      09-Nov-2024
 *
-* @author  (original)  Vinayakam Mani
-* @date    (original)  10-Sep-2024
+* @author  (original)  Sean Nash
+* @date    (original)  09-Nov-2024
 *
 ***************************************************************************/
+
 #include <math.h>               // Used for calculating the polynomial calibration equation.
 #include <string.h>             // For memcpy
 
@@ -36,25 +37,29 @@
 
 // ********** private data **********
 
-static U32 conductivityPublishTimerCounter;
-static OVERRIDE_U32_T conductivityDataPublishInterval = { COND_SENSOR_REPORT_PERIOD,
-                                                          COND_SENSOR_REPORT_PERIOD, 0, 0 };            ///< Conductivity sensors publish time interval override.
+static U32 conductivityPublishTimerCounter;                                                             ///< Conductivity data publication counter.
+static OVERRIDE_U32_T conductivityDataPublishInterval;                                                  ///< Conductivity sensors publish time interval override.
 
 // ********** private function prototypes **********
 
-static void publishConductivitySensorsData( void );
+//static void publishConductivitySensorsData( void );
 
 /*********************************************************************//**
  * @brief
- * The initConductivity function initializes the ConductivitySensors module.
+ * The initConductivity function initializes the Conductivity unit.
  * @details \b Inputs: none
  * @details \b Outputs: Conductivity unit variables initialized
  * @return none
  *************************************************************************/
 void initConductivity( void )
 {
-    conductivityPublishTimerCounter = DATA_PUBLISH_COUNTER_START_COUNT;
+    conductivityPublishTimerCounter            = DATA_PUBLISH_COUNTER_START_COUNT;
 
+    conductivityDataPublishInterval.data       = COND_SENSOR_REPORT_PERIOD;
+    conductivityDataPublishInterval.ovData     = COND_SENSOR_REPORT_PERIOD;
+    conductivityDataPublishInterval.ovInitData = 0;
+    conductivityDataPublishInterval.override   = OVERRIDE_RESET;
+
     initConductivitySensors();
 }
 
@@ -74,13 +79,13 @@
 
     //control conductivity sensor
     // TODO : need more clarity on why and when to execute following control.
-    handleConductivitySensorsReset();
-    handleConductivitySensorsInitProcedure();
-    execConductivitySensorWrite();
-    execConductivitySensorRead();
-
-    // publish conductivity sensors
-    publishConductivitySensorsData();
+//    handleConductivitySensorsReset();
+//    handleConductivitySensorsInitProcedure();
+//    execConductivitySensorWrite();
+//    execConductivitySensorRead();
+//
+//    // publish conductivity sensors
+//    publishConductivitySensorsData();
 }
 
 /*********************************************************************//**
@@ -89,31 +94,27 @@
  * at a set interval.
  * @details \b Inputs: conductivityPublishTimerCounter
  * @details \b Outputs: conductivityPublishTimerCounter
- * @details \b Message \b Sent: MSG_ID_DD_CONDUCTIVITY_DATA to publish conductivity data.
+ * @details \b Message \b Sent: MSG_ID_RO_CONDUCTIVITY_DATA to publish conductivity data.
  * @return none
  *************************************************************************/
-static void publishConductivitySensorsData( void )
-{
-    // publish pressure/occlusion data on interval
-    if ( ++conductivityPublishTimerCounter >= getU32OverrideValue( &conductivityDataPublishInterval ) )
-    {
-        CONDUCTIVITY_DATA_T data;
+//static void publishConductivitySensorsData( void )
+//{
+//    // publish pressure/occlusion data on interval
+//    if ( ++conductivityPublishTimerCounter >= getU32OverrideValue( &conductivityDataPublishInterval ) )
+//    {
+//        CONDUCTIVITY_DATA_T data;
+//
+//        data.cd1    = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
+//        data.cd2    = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
+//        data.td1    = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
+//        data.td2    = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
+//        conductivityPublishTimerCounter        = 0;
+//
+//        broadcastData( MSG_ID_RO_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_DATA_T ) );
+//    }
+//}
 
-        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 );
-        conductivityPublishTimerCounter        = 0;
 
-        broadcastData( MSG_ID_DD_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_DATA_T ) );
-    }
-}
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
@@ -129,11 +130,11 @@
  * that override valves states publish interval with (in ms)
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message )
-{
-    BOOL result = u32BroadcastIntervalOverride( message, &conductivityDataPublishInterval, TASK_PRIORITY_INTERVAL );
+//BOOL testConductivitySensorDataPublishIntervalOverride( MESSAGE_T *message )
+//{
+//    BOOL result = u32BroadcastIntervalOverride( message, &conductivityDataPublishInterval, TASK_PRIORITY_INTERVAL );
+//
+//    return result;
+//}
 
-    return result;
-}
-
 /**@}*/