Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -r9b9ab4a5135966c607c657eb18fe368c30247113 -rfd42b31a0572ab85c862ebf94997766f27dd8e97
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 9b9ab4a5135966c607c657eb18fe368c30247113)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision fd42b31a0572ab85c862ebf94997766f27dd8e97)
@@ -112,8 +112,7 @@
 static void filterTemperatureReadings( void );
 static void filterDialTemperatureReadings( void );
 static void getTempMovingAverageTimeInterval( void );
-static void publishDDTemperatureSensorsData( void );
-static void publishFPTemperatureSensorsData( void );
+static void publishTemperatureSensorsData( void );
 /*********************************************************************//**
  * @brief
  * The initTemperature function initializes the temperature unit.
@@ -232,8 +231,7 @@
     filterTemperatureReadings();
 
     // Publish the data
-    publishDDTemperatureSensorsData();
-    publishFPTemperatureSensorsData();
+    publishTemperatureSensorsData();
 }
 
 /*********************************************************************//**
@@ -445,16 +443,18 @@
 
 /*********************************************************************//**
  * @brief
- * The publishDDTemperatureSensorsData function broadcasts the DD
+ * The publishTemperatureSensorsData function broadcasts the
  * temperature sensors data at the publication interval.
- * @details \b Inputs: ddTempDataPublicationTimerCounter and publish interval time.
- * @details \b Outputs: ddTempDataPublicationTimerCounter
- * @details \b Message \b Sent: MSG_ID_DD_TEMPERATURE_DATA publishes the temperature
- * data in a periodic interval.
+ * @details \b Inputs: ddTempDataPublicationTimerCounter
+ * fpTempDataPublicationTimerCounter and publish interval time.
+ * @details \b Outputs: ddTempDataPublicationTimerCounter, fpTempDataPublicationTimerCounter
+ * @details \b Message \b Sent: MSG_ID_DD_TEMPERATURE_DATA, MSG_ID_FP_TEMPERATURE_DATA
+ *  publishes the temperature data in a periodic interval.
  * @return none
  *************************************************************************/
-static void publishDDTemperatureSensorsData( void )
+static void publishTemperatureSensorsData( void )
 {
+    // publish DD temperature data on interval
     if ( ++ddTempDataPublicationTimerCounter >= getU32OverrideValue( &ddTempSensorsPublishInterval ) )
     {
         TEMPERATURE_SENSORS_DD_DATA_T data;
@@ -483,20 +483,7 @@
         broadcastData( MSG_ID_DD_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_DD_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DD_DATA_T ) );
         ddTempDataPublicationTimerCounter = 0;
     }
-}
-
-/*********************************************************************//**
- * @brief
- * The publishFPTemperatureSensorsData function broadcasts the FP
- * temperature sensors data at the publication interval.
- * @details \b Inputs: fpTempDataPublicationTimerCounter, tempSensorsPublishInterval
- * @details \b Outputs: fpTempDataPublicationTimerCounter
- * @details \b Message \b Sent: MSG_ID_FP_TEMPERATURE_DATA publishes the temperature
- * data in a periodic interval.
- * @return none
- *************************************************************************/
-static void publishFPTemperatureSensorsData( void )
-{
+    // publish FP temperature data on interval
     if ( ++fpTempDataPublicationTimerCounter >= getU32OverrideValue( &fpTempSensorsPublishInterval ) )
     {
         TEMPERATURE_SENSORS_FP_DATA_T data;
@@ -541,15 +528,15 @@
 
 /*********************************************************************//**
  * @brief
- * The testFPTemperatureSensorsDataPublishIntervalOverride function
- * overrides the FP temperature sensors data publish interval.
+ * The testIOFPTemperatureSensorsDataPublishIntervalOverride function
+ * overrides the IOFP temperature sensors data publish interval.
  * @details \b Inputs: none
  * @details \b Outputs: fpTempSensorsPublishInterval
  * @param Override message from Dialin which includes the interval
- * (in ms) to override the FP temperature sensor data broadcast interval to.
+ * (in ms) to override the IOFP temperature sensor data broadcast interval to.
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testFPTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message )
+BOOL testIOFPTemperatureSensorsDataPublishIntervalOverride( MESSAGE_T *message )
 {
     BOOL result = u32BroadcastIntervalOverride( message, &fpTempSensorsPublishInterval, TASK_PRIORITY_INTERVAL );