Index: firmware/App/Monitors/WaterQualityMonitor.c
===================================================================
diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -r6dd382e3988fac2f9ee041b4738d67305e17a6a2
--- firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0)
+++ firmware/App/Monitors/WaterQualityMonitor.c	(.../WaterQualityMonitor.c)	(revision 6dd382e3988fac2f9ee041b4738d67305e17a6a2)
@@ -35,8 +35,6 @@
 
 
 // ********** private definitions **********
-#define TEMP_SENSORS_DATA_PUBLISH_INTERVAL                  ( MS_PER_SECOND / TASK_PRIORITY_INTERVAL )              ///< Temperature sensors publish data time interval.
-#define DATA_PUBLISH_COUNTER_START_COUNT                    30                                                      ///< Data publish counter start count.
 #define INLET_TEMPERATURE_LOW_THRESHOLD_C                   5.0F                                                    ///< Minimum allowed Inlet temperature in C.
 #define INLET_TEMPERATURE_HIGH_THRESHOLD_C                  30.0F                                                   ///< Maximum allowed Inlet temperature in C.
 #define INLET_TEMPERATURE_PERSISTENCE_TIMER_MS              ( 5 * MS_PER_SECOND / TASK_PRIORITY_INTERVAL )          ///< Persistence timer to trigger alarm in ms.
@@ -61,11 +59,8 @@
 
 
 // ********** private data **********
-static OVERRIDE_U32_T tempSensorsPublishInterval;                                                                   ///< Temperature sensor data publication counter.
-static U32 dataPublicationTimerCounter;                                                                             ///< Timer counter used to schedule temp sensor data publication to CAN bus.
 
 // ********** private function prototypes **********
-static void publishTemperatureSensorsData( void );
 
 /*********************************************************************//**
  * @brief
@@ -76,13 +71,7 @@
  *************************************************************************/
 void initWaterQualityMonitor( void )
 {
-    dataPublicationTimerCounter            = DATA_PUBLISH_COUNTER_START_COUNT;
 
-    tempSensorsPublishInterval.data        = TEMP_SENSORS_DATA_PUBLISH_INTERVAL;
-    tempSensorsPublishInterval.ovData      = TEMP_SENSORS_DATA_PUBLISH_INTERVAL;
-    tempSensorsPublishInterval.ovInitData  = 0;
-    tempSensorsPublishInterval.override    = OVERRIDE_RESET;
-
     // Pressure alarms
     initPersistentAlarm( ALARM_ID_FP_INLET_PRESSURE_OUT_LOW_RANGE, INLET_WATER_PRES_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_FP_INLET_PRESSURE_OUT_HIGH_RANGE, INLET_WATER_PRES_OUT_OF_RANGE_CLEAR_MS, INLET_WATER_PRES_OUT_OF_RANGE_TIMEOUT_MS );
@@ -101,19 +90,6 @@
 
 /*********************************************************************//**
  * @brief
- * The execWaterQualityMonitor function executes the water quality
- * state machine.
- * @details \b Inputs: none
- * @details \b Outputs: none
- * @return none
- *************************************************************************/
-void execWaterQualityMonitor( void )
-{
-    publishTemperatureSensorsData();
-}
-
-/*********************************************************************//**
- * @brief
  * The checkInletPressures function checks the inlet water pressure
  * against the pressure threshold and alarm if the pressure is out of range.
  * @details \b Inputs: pressureM1
@@ -259,62 +235,10 @@
     checkPersistentAlarm( ALARM_ID_FP_RO_OUTLET_CONDUCTIVITY_HIGH_RANGE, isConductivityOutOfLowRange, conductivityP18, OUTLET_CONDUCTIVITY_HIGH_THRESHOLD_US );
 }
 
-/*********************************************************************//**
- * @brief
- * The publishTemperatureSensorsData function broadcasts the temperature
- * sensors data at the publication interval.
- * @details \b Inputs: dataPublicationTimerCounter, tempSensorsPublishInterval
- * @details \b Outputs: dataPublicationTimerCounter
- * @details \b Message \b Sent: MSG_ID_FP_TEMPERATURE_DATA publishes the temperature
- * data in a periodic interval.
- * @return none
- *************************************************************************/
-static void publishTemperatureSensorsData( void )
-{
-    if ( ++dataPublicationTimerCounter >= getU32OverrideValue( &tempSensorsPublishInterval ) )
-    {
-        TEMPERATURE_SENSORS_DATA_T data;
 
-        data.p10Temp = getFilteredConductivitySensorTemperature( P9_COND );
-        data.p19Temp = getFilteredConductivitySensorTemperature( P18_COND );
-        data.m1Temp = getFilteredPressureSensorTemperature( M1_PRES );
-        data.m3Temp = getFilteredPressureSensorTemperature( M3_PRES );
-        data.p8Temp = getFilteredPressureSensorTemperature( P8_PRES );
-        data.p13Temp = getFilteredPressureSensorTemperature( P13_PRES );
-        data.p17Temp = getFilteredPressureSensorTemperature( P17_PRES );
-        data.x1Temp = getFilteredPressureSensorTemperature( X1_PRES );
-        data.x2Temp = getFilteredPressureSensorTemperature( X2_PRES );
-        data.x3Temp = getFilteredPressureSensorTemperature( X3_PRES );
-        data.x4Temp = getFilteredPressureSensorTemperature( X4_PRES );
-        data.p7Temp = getFilteredFlowSensorTemperature( P7_FLOW );
-        data.p16Temp = getFilteredFlowSensorTemperature( P16_FLOW );
-
-        broadcastData( MSG_ID_FP_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_FP_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
-        dataPublicationTimerCounter = 0;
-    }
-}
-
-
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
 
-/*********************************************************************//**
- * @brief
- * The testTemperatureSensorsDataPublishIntervalOverride function overrides the
- * temperature sensors data publish interval.
- * @details \b Inputs: none
- * @details \b Outputs: tempSensorsPublishInterval
- * @param Override message from Dialin which includes the interval
- * (in ms) to override the temperature sensor data broadcast interval to.
- * @return TRUE if override successful, FALSE if not
- *************************************************************************/
-BOOL testTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message )
-{
-    BOOL result = u32BroadcastIntervalOverride( message, &tempSensorsPublishInterval, TASK_PRIORITY_INTERVAL );
-
-    return result;
-}
-
 /**@}*/