Index: leahi_dialin/dd/modules/temperature_sensors.py
===================================================================
diff -u -rd27c40205e18118f4689f62463a266da1f91dba6 -r17b02f26012e7378daf831057c6f62c4ecdcfff0
--- leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision d27c40205e18118f4689f62463a266da1f91dba6)
+++ leahi_dialin/dd/modules/temperature_sensors.py	(.../temperature_sensors.py)	(revision 17b02f26012e7378daf831057c6f62c4ecdcfff0)
@@ -20,6 +20,7 @@
 from .constants import NO_RESET, RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
 from leahi_dialin.common.dd_defs import dd_enum_repository
+from leahi_dialin.common.global_vars import GlobalVariables
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -58,6 +59,10 @@
             dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name: 0.0,
             dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name: 0.0
         }
+        if GlobalVariables().NEXT_GEN_HW:
+            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
@@ -73,63 +78,46 @@
         @param message:  published DD temperature sensors data message
         @returns none
         """
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D1_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
+        sensor_list =[]
+        sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D1_TEMP, 'f'))
+        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().NEXT_GEN_HW:
+            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.BRD_TEMP, 'f'))
+        sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D16_TEMP, 'f'))
+        sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_TEMP, 'f'))
+        sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_TEMP, 'f'))
+        sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D44_TEMP, 'f'))
+        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'))
+        sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP, 'f'))
+        sensor_list.append((dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP, 'f'))
+        if GlobalVariables().NEXT_GEN_HW:
+            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.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().NEXT_GEN_HW:
+            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'))
 
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D78_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
+        i = 1
+        for sensor in sensor_list:
+            start_pos = eval(f'MsgFieldPositions.START_POS_FIELD_{i}')
+            end_pos = eval(f'MsgFieldPositions.END_POS_FIELD_{i}')
+            self.dd_temperatures[sensor[0].name] = struct.unpack(sensor[1],bytearray(message['message'][start_pos:end_pos]))[0]
+            i += 1
 
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D4_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D50_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.BRD_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D16_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D28_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D30_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D44_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D75_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D4_AVG_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D50_AVG_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D28_AVG_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D30_AVG_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D9_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D66_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D51_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D18_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0]
-
-        self.dd_temperatures[dd_enum_repository.DDTemperatureSensorNames.D41_TEMP.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0]
-
         self.dd_temperatures_timestamp = timestamp
 
     def cmd_temperatures_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: