Index: firmware/App/Controllers/TemperatureSensors.h
===================================================================
diff -u -r922516483829939a2a387d4a2fddeccdb4c454d4 -r3b70632c04247a6973960e1f37ae73eb4384a6b7
--- firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision 922516483829939a2a387d4a2fddeccdb4c454d4)
+++ firmware/App/Controllers/TemperatureSensors.h	(.../TemperatureSensors.h)	(revision 3b70632c04247a6973960e1f37ae73eb4384a6b7)
@@ -1,24 +1,25 @@
 /**************************************************************************
 *
-* Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2020-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 TemperatureSensors.h
+* @file    TemperatureSensors.h
 *
-* @author (last) Quang Nguyen
-* @date (last) 25-Aug-2020
+* @author  (last)      Michael Garthwaite
+* @date    (last)      30-Aug-2022
 *
-* @author (original) Dara Navaei
-* @date (original) 08-Apr-2020
+* @author  (original)  Dara Navaei
+* @date    (original)  08-Apr-2020
 *
 ***************************************************************************/
 
 #ifndef __TEMPERATURESENSORS_H__
 #define __TEMPERATURESENSORS_H__
 
 #include "DGCommon.h"
+#include "NVDataMgmt.h"
 
 /**
  *  @defgroup TemperatureSensors TemperatureSensors
@@ -52,14 +53,17 @@
     TEMPSENSORS_LOAD_CELL_A2_B2,                ///< Load cell A2/B2 temperature sensor
     TEMPSENSORS_INTERNAL_TRO_RTD,               ///< TRo RTD internal temperature sensor
     TEMPSENSORS_INTERNAL_TDI_RTD,               ///< TDi RTD internal temperature sensor
+    TEMPSENSORS_INTERNAL_THD_RTD,               ///< THd RTD internal temperature sensor
     TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR,      ///< Conductivity sensor temperature sensor
+    TEMPSENSORS_BAROMETRIC_TEMP_SENSOR,         ///< Barometric temperature sensor
     NUM_OF_TEMPERATURE_SENSORS                  ///< Number of temperature sensors
 } TEMPERATURE_SENSORS_T;
 
 /// Temperature sensors data.
 typedef struct
 {
     F32 inletPrimaryHeater;                     ///< Inlet primary heater temperature sensor
+    F32 heatDisinfect;                          ///< Heat Disinfect temperature sensor
     F32 outletPrimaryHeater;                    ///< Outlet primary heater temperature sensor
     F32 conductivitySensor1;                    ///< Conductivity sensor 1 temperature sensor
     F32 conductivitySensor2;                    ///< Conductivity sensor 2 temperature sensor
@@ -76,13 +80,14 @@
     F32 loadCellA2B2;                           ///< Load cell A2/B2 temperature sensor
     F32 internalTHDORTD;                        ///< THDo RTD channel temperature sensor
     F32 internalTDIRTD;                         ///< TDI RTD channel temperature sensor
+    F32 interalTHDRTD;                          ///< THd RTD channel temperature sensor
     F32 internalCondSnsrTemp;                   ///< Conductivity Sensor internal temperature sensor
-    U32 primaryThermoCoupleRaw;                 ///< Primary heaters thermocouple raw ADC value
-    U32 primaryColdjuncRaw;                     ///< Primary heaters cold junction raw ADC value
-    U32 trimmerThermoCoupleRaw;                 ///< Trimmer heater thermocouple raw ADC value
-    U32 trimmerColdjuncRaw;                     ///< Trimmer heater cold junction raw ADC value
-    S32 cond1Raw;                               ///< Conductivity sensor 1 raw temperature ADC value
-    S32 cond2Raw;                               ///< Conductivity sensor 2 raw temperature ADC value
+    U32 primaryThermoCoupleRaw;                 ///< Primary heaters thermocouple raw ADC value             // TODO remove later?
+    U32 primaryColdjuncRaw;                     ///< Primary heaters cold junction raw ADC value            // TODO remove later?
+    U32 trimmerThermoCoupleRaw;                 ///< Trimmer heater thermocouple raw ADC value              // TODO remove later?
+    U32 trimmerColdjuncRaw;                     ///< Trimmer heater cold junction raw ADC value             // TODO remove later?
+    S32 cond1Raw;                               ///< Conductivity sensor 1 raw temperature ADC value        // TODO remove later?
+    S32 cond2Raw;                               ///< Conductivity sensor 2 raw temperature ADC value        // TODO remove later?
 } TEMPERATURE_SENSORS_DATA_T;
 
 // ********** public function prototypes **********