Index: leahi_dialin/fp/modules/pressure_sensors.py
===================================================================
diff -u -rd2774cbe954e861f6ec31d44134e74c8e9d66f22 -re60ad12bcc58d5905d7268bbeaae139d8233e023
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision d2774cbe954e861f6ec31d44134e74c8e9d66f22)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision e60ad12bcc58d5905d7268bbeaae139d8233e023)
@@ -18,8 +18,9 @@
 from logging import Logger
 
 from .constants import RESET, NO_RESET
+from leahi_dialin.common.fp_defs import fp_enum_repository
+from leahi_dialin.common.global_vars import GlobalVariables
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.fp_defs import FPPressureSensorNames
 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
@@ -47,12 +48,13 @@
                                                                        self._handler_pressure_sync)
 
         self.fp_pressures = {
-            FPPressureSensorNames.M3_PRES.name: 0.0,
-            FPPressureSensorNames.P8_PRES.name: 0.0,
-            FPPressureSensorNames.P13_PRES.name: 0.0,
-            FPPressureSensorNames.P17_PRES.name: 0.0,
-            FPPressureSensorNames.P46_PRES.name: 0.0
+            fp_enum_repository.FPPressureSensorNames.M3_PRES.name: 0.0,
+            fp_enum_repository.FPPressureSensorNames.P8_PRES.name: 0.0,
+            fp_enum_repository.FPPressureSensorNames.P13_PRES.name: 0.0,
+            fp_enum_repository.FPPressureSensorNames.P17_PRES.name: 0.0
         }
+        if GlobalVariables.NEXT_GEN_HW:
+            self.fp_temperatures[fp_enum_repository.FPTemperatureSensorNames.P46_PRES.name] = 0.0
 
         self.fp_pressure_timestamp = 0.0
 
@@ -66,16 +68,17 @@
         @return: none
         """
 
-        self.fp_pressures[FPPressureSensorNames.M3_PRES.name] = struct.unpack('f', bytearray(
+        self.fp_pressures[fp_enum_repository.FPPressureSensorNames.M3_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0]
-        self.fp_pressures[FPPressureSensorNames.P8_PRES.name] = struct.unpack('f', bytearray(
+        self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P8_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0]
-        self.fp_pressures[FPPressureSensorNames.P13_PRES.name] = struct.unpack('f', bytearray(
+        self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P13_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0]
-        self.fp_pressures[FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray(
+        self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0]
-        self.fp_pressures[FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
+        if GlobalVariables.NEXT_GEN_HW:
+            self.fp_pressures[fp_enum_repository.FPPressureSensorNames.P46_PRES.name] = struct.unpack('f', bytearray(
+                message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0]
 
         self.fp_pressure_timestamp = timestamp