Index: leahi_dialin/fp/modules/pressure_sensors.py
===================================================================
diff -u -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a -rc5bfcf84ed942ca5841bf9de155aa0f495b4d28d
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision c5bfcf84ed942ca5841bf9de155aa0f495b4d28d)
@@ -18,7 +18,8 @@
 from logging import Logger
 
 from leahi_dialin.common.constants import NO_RESET
-from leahi_dialin.common.fp_defs import FPPressureSensorNames
+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.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override
 from leahi_dialin.protocols.CAN import DenaliChannels
@@ -46,12 +47,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().HW_BETA_1_9:
+            self.fp_pressures[fp_enum_repository.FPTemperatureSensorNames.P46_PRES.name] = 0.0
 
         self.fp_pressure_timestamp = 0.0
 
@@ -65,16 +67,17 @@
         @param message:  published FP pressure sensor data message
         @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().HW_BETA_1_9:
+            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
 
@@ -116,7 +119,7 @@
         prs = float_to_bytearray(pressure)
         payload = rst + prs + sen
 
-        sensor_name = FPPressureSensorNames(sensor).name.split('_')[0]
+        sensor_name = fp_enum_repository.FPPressureSensorNames(sensor).name.split('_')[0]
         return cmd_generic_override(
             payload = payload,
             reset = reset,