Index: leahi_dialin/dd/modules/temperature_sensors.py
===================================================================
diff -u -r38e8dd31728056dbb7f9304c98ab16d7147b75a2 -r3715028b608b10e1d440a8a738c8a4f70d3d411b
--- leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 38e8dd31728056dbb7f9304c98ab16d7147b75a2)
+++ leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 3715028b608b10e1d440a8a738c8a4f70d3d411b)
@@ -19,7 +19,6 @@
 
 from leahi_dialin.common.constants import NO_RESET
 from leahi_dialin.common.dd_defs import dd_enum_repository
-from leahi_dialin.common.global_vars import GlobalVariables
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import DenaliChannels
@@ -34,14 +33,15 @@
         super().__init__()
 
         self.can_interface = can_interface
-        self.logger = logger
+        self.logger: Logger = logger
         # Dictionary of the temperature sensors
         self.dd_temperatures_timestamp = 0.0
         self.dd_temperatures = {
             dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D4_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D50_TEMP.name: 0.0,
+            dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D16_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D28_TEMP.name: 0.0,
@@ -50,17 +50,15 @@
             dd_enum_repository.DDTemperatureSensorNames.D75_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP.name: 0.0,
+            dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name: 0.0,
-            dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0
+            dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0,
+            dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name: 0.0   
         }
-        if GlobalVariables().HW_BETA_1_9:
-            self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name] = 0.0
-            self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name] = 0.0
-            self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name] = 0.0
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.dd_sync_broadcast_ch_id
@@ -82,10 +80,7 @@
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D78_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_TEMP, 'f'))
-        if GlobalVariables().HW_BETA_1_9:
-            if dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name not in self.dd_temperatures:
-                self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_TEMP.name] = 0.0
-            sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_TEMP, 'f'))
+        sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D16_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_TEMP, 'f'))
@@ -94,21 +89,15 @@
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D75_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP, 'f'))
-        if GlobalVariables().HW_BETA_1_9:
-            if dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name not in self.dd_temperatures:
-                self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP.name] = 0.0
-            sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP, 'f'))
+        sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D99_AVG_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D9_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D66_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D51_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D18_TEMP, 'f'))
         sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D41_TEMP, 'f'))
-        if GlobalVariables().HW_BETA_1_9:
-            if dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name not in self.dd_temperatures:
-                self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D87_TEMP.name] = 0.0
-            sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D87_TEMP, 'f'))
+        sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D87_TEMP, 'f'))
 
         i = 1
         for sensor in sensor_list:
@@ -158,6 +147,13 @@
             modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_CONDUCTIVITY_SENSOR.value
             message_id = MsgIds.MSG_ID_DD_CONDUCTIVITY_SENSOR_TEMPERATURE_OVERRIDE_REQUEST
 
+        # DD Conductivity Sensors' Average Temperature Reading Override
+        elif dd_enum_repository.DDTemperatureSensorNames.FIRST_AVERAGE_SENSOR.value <= sensor_index <= dd_enum_repository.DDTemperatureSensorNames.LAST_AVERAGE_SENSOR.value:
+            modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_AVERAGE_SENSOR.value
+            message_id = 'Unknown'
+            self.logger.info('No Msg ID is present for Conductivity sensor Average override! Skipping...')
+            return False
+
         # DD Pressure Sensors' Temperature Reading Override
         elif dd_enum_repository.DDTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value <= sensor_index <= dd_enum_repository.DDTemperatureSensorNames.LAST_PRESSURE_SENSOR.value:
             modified_index= sensor_index - dd_enum_repository.DDTemperatureSensorNames.FIRST_PRESSURE_SENSOR.value