Index: firmware/App/Controllers/TemperatureSensors.c
===================================================================
diff -u -r630cc5cf1131589109bfe4a3424fdce8cba9fd45 -rf581314a2793e712cf6da87b211911a615ca3456
--- firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision 630cc5cf1131589109bfe4a3424fdce8cba9fd45)
+++ firmware/App/Controllers/TemperatureSensors.c	(.../TemperatureSensors.c)	(revision f581314a2793e712cf6da87b211911a615ca3456)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2020-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-2024 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    TemperatureSensors.c
 *
-* @author  (last)      Vinayakam Mani
-* @date    (last)      03-Oct-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      30-May-2024
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  08-Apr-2020
@@ -223,6 +223,7 @@
 static void adjustTemperatureSensorsRefResistance( void );
 static void checkBaroSensorCRC( void );
 static void processDialTemperatureData( void );
+static void getCalibrationAppliedTemperatureValue( U32 sesnorIndex, F32* temperature );
 
 /*********************************************************************//**
  * @brief
@@ -388,7 +389,7 @@
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
     BOOL calStatus = getNVRecord2Driver( GET_CAL_TEMP_SENSORS, (U08*)&tempSensorCalRecord, sizeof( DG_TEMP_SENSORS_CAL_RECORD_T ),
-                                         NUM_OF_CAL_DATA_TEMP_SENSORS, ALARM_ID_NO_ALARM );
+                                         NUM_OF_CAL_DATA_TEMP_SENSORS, ALARM_ID_DG_TEMPERATURE_SENSORS_INVALID_CAL_RECORD );
 
     if ( TRUE == calStatus )
     {
@@ -412,6 +413,13 @@
  *************************************************************************/
 void execTemperatureSensors( void )
 {
+    // Check if a new calibration is available
+    if ( TRUE == isNewCalibrationRecordAvailable() )
+    {
+        getNVRecord2Driver( GET_CAL_TEMP_SENSORS, (U08*)&tempSensorCalRecord, sizeof( DG_TEMP_SENSORS_CAL_RECORD_T ),
+                            NUM_OF_CAL_DATA_TEMP_SENSORS, ALARM_ID_DG_TEMPERATURE_SENSORS_INVALID_CAL_RECORD );
+    }
+
     // Check the status of the software configuration
     adjustTemperatureSensorsRefResistance();
 
@@ -858,10 +866,12 @@
 
         case TEMPSENSORS_BAROMETRIC_TEMP_SENSOR:
         {
-            tempSensors[ sensorIndex ].baroTempSnsrDiff = (S32)avgADCReads - ( baroConvConsts.refTemperature * TWO_TO_POWER_OF_8 );
-            S64 baroSnsrTemperature                     = BARO_SENSOR_REFERENCE_TEMP_C + ( ( tempSensors[ sensorIndex ].baroTempSnsrDiff *
-                                                                                             baroConvConsts.temperatureCoeff ) / TWO_TO_POWER_OF_23 );
-            temperature                                 = (F32)( (U32)( baroSnsrTemperature ) / 100 );
+            S32 baroTempSensorsDiff                     = (S32)avgADCReads - ( baroConvConsts.refTemperature * TWO_TO_POWER_OF_8 );
+            S64 differenceTimesCoefficient              = (S64)baroTempSensorsDiff * (S64)baroConvConsts.temperatureCoeff;
+            S64 baroSnsrTemperature                     = BARO_SENSOR_REFERENCE_TEMP_C + ( differenceTimesCoefficient / TWO_TO_POWER_OF_23 );
+
+            temperature                                 = (F32)( baroSnsrTemperature / 100.0F );
+            tempSensors[ sensorIndex ].baroTempSnsrDiff = baroTempSensorsDiff;
         }
             break;
 
@@ -873,6 +883,7 @@
             break;
     }
 
+    getCalibrationAppliedTemperatureValue( sensorIndex, &temperature );
     // Update the temperature
     tempSensors[ sensorIndex ].temperatureValues.data = temperature;
 }
@@ -1197,7 +1208,72 @@
     }
 }
 
+/*********************************************************************//**
+ * @brief
+ * The getCalibrationAppliedTemperatureValue function applies the calibration
+ * values to the provided temperature value
+ * @details Inputs: tempSensorCalRecord
+ * @details Outputs: none
+ * @param sensorIndex Temperature sensor index
+ * @param temperature pointer to the calculated temperature value
+ * @return none
+ *************************************************************************/
+static void getCalibrationAppliedTemperatureValue( U32 sesnorIndex, F32* temperature )
+{
+    CAL_DATA_DG_TEMP_SENSORS_T calId;
+    F32 tempTemperature = *temperature;
 
+    switch( sesnorIndex )
+    {
+        case TEMPSENSORS_INLET_PRIMARY_HEATER:
+            calId = CAL_DATA_INLET_PRIMARY_HEATER_TEMP;
+            break;
+
+        case TEMPSENSORS_OUTLET_PRIMARY_HEATER:
+            calId = CAL_DATA_OUTLET_PRIMARY_HEATER_TEMP;
+            break;
+
+        case TEMPSENSORS_CONDUCTIVITY_SENSOR_1:
+            calId = CAL_DATA_COND_SENSOR_1_TEMP;
+            break;
+
+        case TEMPSENSORS_CONDUCTIVITY_SENSOR_2:
+            calId = CAL_DATA_COND_SENSOR_2_TEMP;
+            break;
+
+        case TEMPSENSORS_OUTLET_REDUNDANT:
+            calId = CAL_DATA_OUTLET_REDUNDANT_TEMP;
+            break;
+
+        case TEMPSENSORS_INLET_DIALYSATE:
+            calId = CAL_DATA_INLET_DIALYSATE_TEMP;
+            break;
+
+        case TEMPSENSORS_HEAT_DISINFECT:
+            calId = CAL_DATA_HEAT_DISINFECT_TEMP;
+            break;
+
+        case TEMPSENSORS_BAROMETRIC_TEMP_SENSOR:
+            calId = CAL_DATA_BARMOTERIC_TEMP;
+            break;
+
+        default:
+            // Set the calibration temperature value as num of meaning calibration is not needed for the provided sensor
+            calId = NUM_OF_CAL_DATA_TEMP_SENSORS;
+            break;
+    }
+
+    if ( calId != NUM_OF_CAL_DATA_TEMP_SENSORS )
+    {
+        *temperature = pow( tempTemperature, 4 ) * tempSensorCalRecord.tempSensors[ calId ].fourthOrderCoeff +
+                       pow( tempTemperature, 3 ) * tempSensorCalRecord.tempSensors[ calId ].thirdOrderCoeff  +
+                       pow( tempTemperature, 2 ) * tempSensorCalRecord.tempSensors[ calId ].secondOrderCoeff +
+                            tempTemperature      * tempSensorCalRecord.tempSensors[ calId ].gain             +
+                                                   tempSensorCalRecord.tempSensors[ calId ].offset;
+    }
+}
+
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/