Index: firmware/App/Controllers/Temperatures.c
===================================================================
diff -u -r5bfaf341319b9fd763d07ad0a68a986028c37587 -r24622a1d81efb7a24b200e44f682f16ec9adba15
--- firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision 5bfaf341319b9fd763d07ad0a68a986028c37587)
+++ firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision 24622a1d81efb7a24b200e44f682f16ec9adba15)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2021 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2019-2022 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    Temperatures.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      14-Oct-2021
+* @author  (last)      Sean Nash
+* @date    (last)      12-Nov-2021
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  01-Aug-2021
@@ -19,6 +19,7 @@
 
 #include "FPGA.h"
 #include "InternalADC.h"
+#include "NVDataMgmt.h"
 #include "PersistentAlarm.h"
 #include "SystemCommMessages.h"
 #include "Temperatures.h"
@@ -45,6 +46,7 @@
 #define MIN_ALLOWED_TEMPERATURE                   0.0                                                    ///< Thermistors/sensors minimum allowed temperature reading.
 #define MAX_ALLOWED_TEMPERATURE                   80.0                                                   ///< Thermistors/sensors maximum allowed temperature reading.
 #define MAX_ALLOWED_TEMP_OUT_OF_RANGE_PERIOD      ( 5 * MS_PER_SECOND )                                  ///< Thermistors/sensors maximum allowed temperature out of range period.
+#define DATA_PUBLISH_COUNTER_START_COUNT          6                                                      ///< Data publish counter start count.
 
 /// Temperatures exec states
 typedef enum thermistors_Exec_States
@@ -69,6 +71,7 @@
                                                       TEMPERATURES_DATA_PUBLISH_INTERVAL, 0, 0 };        ///< Temperatures publish time interval override.
 static U32 dataPublishCounter;                                                                           ///< Temperatures data publish timer counter.
 static U32 adcReadCounter;                                                                               ///< Temperatures ADC read counter.
+static HD_TEMP_SENSORS_CAL_RECORD_T temperaturesCalRecord;                                               ///< Temperatures calibration record.
 
 static const F32 THERMISTOR_VOLTAGE_CONV_COEFF                = THERMISTOR_REFERENCE_VOLTAGE /
                                                                 (F32)TWELVE_BIT_RESOLUTION;              ///< On board thermistor ADC to voltage conversion coefficient.
@@ -101,7 +104,7 @@
     U08 i;
 
     temperaturesExecState = TEMPERATURES_EXEC_STATE_START_STATE;
-    dataPublishCounter    = 0;
+    dataPublishCounter    = DATA_PUBLISH_COUNTER_START_COUNT;
 
     for ( i = 0; i < NUM_OF_TEMPERATURES; i++ )
     {
@@ -122,13 +125,21 @@
  *************************************************************************/
 SELF_TEST_STATUS_T execTemperaturesSelfTest( void )
 {
-    SELF_TEST_STATUS_T status = SELF_TEST_STATUS_IN_PROGRESS;
+    SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
-    // TODO implement the calibration processing function.
-    // It returns a pass for now
-    status = SELF_TEST_STATUS_PASSED;
+    BOOL calStatus = getNVRecord2Driver( GET_CAL_TEMPERATURE_SESNORS, (U08*)&temperaturesCalRecord, sizeof( HD_TEMP_SENSORS_CAL_RECORD_T ),
+                                         NUM_OF_CAL_DATA_HD_TEMP_SENSORS, ALARM_ID_NO_ALARM );
 
-    return status;
+    if ( TRUE == calStatus )
+    {
+        result = SELF_TEST_STATUS_PASSED;
+    }
+    else
+    {
+        result = SELF_TEST_STATUS_FAILED;
+    }
+
+    return result;
 }
 
 /*********************************************************************//**
@@ -140,6 +151,13 @@
  *************************************************************************/
 void execTemperatures( void )
 {
+    // Check if a new calibration is available
+    if ( TRUE == isNewCalibrationRecordAvailable() )
+    {
+        getNVRecord2Driver( GET_CAL_TEMPERATURE_SESNORS, (U08*)&temperaturesCalRecord, sizeof( HD_TEMP_SENSORS_CAL_RECORD_T ),
+                            NUM_OF_CAL_DATA_HD_TEMP_SENSORS, ALARM_ID_NO_ALARM );
+    }
+
     // Read the sensors all the time
     switch ( temperaturesExecState )
     {
@@ -283,7 +301,7 @@
 
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE, isTempOutOfRange ) )
     {
-        SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE, lastFaultSensor, faultSensorTemp );
+        //SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE, lastFaultSensor, faultSensorTemp );
     }
 }
 
@@ -338,7 +356,13 @@
                 break;
         }
 
-        temperaturesStatus[ sensor ].temperatureValue.data = temperature;
+        // Apply the calibration record the temperature values prior to updating the structures
+        temperaturesStatus[ sensor ].temperatureValue.data  =
+                         pow(temperature, 4) * temperaturesCalRecord.hdTemperatureSensors[ (CAL_DATA_HD_TEMEPERATURE_SENSORS_T)sensor ].fourthOrderCoeff +
+                         pow(temperature, 3) * temperaturesCalRecord.hdTemperatureSensors[ (CAL_DATA_HD_TEMEPERATURE_SENSORS_T)sensor ].thirdOrderCoeff  +
+                         pow(temperature, 3) * temperaturesCalRecord.hdTemperatureSensors[ (CAL_DATA_HD_TEMEPERATURE_SENSORS_T)sensor ].secondOrderCoeff +
+                             temperature     * temperaturesCalRecord.hdTemperatureSensors[ (CAL_DATA_HD_TEMEPERATURE_SENSORS_T)sensor ].gain             +
+                                               temperaturesCalRecord.hdTemperatureSensors[ (CAL_DATA_HD_TEMEPERATURE_SENSORS_T)sensor ].offset;
     }
 }