Index: leahi_dialin/fp/modules/pressure_sensors.py
===================================================================
diff -u -r80f84ad5638667894e9df2161b9c5d9b8f27ed9b -r6e95e1705ce73dd7f159564b2ac3fde75f29b215
--- leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 80f84ad5638667894e9df2161b9c5d9b8f27ed9b)
+++ leahi_dialin/fp/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision 6e95e1705ce73dd7f159564b2ac3fde75f29b215)
@@ -36,7 +36,6 @@
     X2_PRES = 6
     X3_PRES = 7
     X4_PRES = 8
-    X5_PRES = 9
 
 
 class FPPressureSensors(AbstractSubSystem):
@@ -55,7 +54,7 @@
 
         if self.can_interface is not None:
             channel_id = DenaliChannels.fp_sync_broadcast_ch_id
-            msg_id = MsgIds.MSG_ID_RO_PRESSURES_DATA.value
+            msg_id = MsgIds.MSG_ID_FP_PRESSURES_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, msg_id,
                                                                        self._handler_pressure_sync)
 
@@ -69,23 +68,9 @@
         self.x2_pres = 0.0
         self.x3_pres = 0.0
         self.x4_pres = 0.0
-        self.x5_pres = 0.0
-        self.m1_pres_temp = 0.0
-        self.m3_pres_temp = 0.0
-        self.p8_pres_temp = 0.0
-        self.p13_pres_temp = 0.0
-        self.p17_pres_temp = 0.0
-        self.x1_pres_temp = 0.0
-        self.x2_pres_temp = 0.0
-        self.x3_pres_temp = 0.0
-        self.x4_pres_temp = 0.0
-        self.x5_pres_temp = 0.0
-
     @publish([
         "fp_pressure_timestamp", "m1_pres", "m3_pres", "p8_pres", "p13_pres", "p17_pres",
-        "x1_pres", "x2_pres", "x3_pres", "x4_pres", "x5_pres",
-        "m1_pres_temp", "m3_pres_temp", "p8_pres_temp", "p13_pres_temp", "p17_pres_temp",
-        "x1_pres_temp", "x2_pres_temp", "x3_pres_temp", "x4_pres_temp", "x5_pres_temp",
+        "x1_pres", "x2_pres", "x3_pres", "x4_pres",
     ])
     def _handler_pressure_sync(self, message, timestamp=0.0):
         """
@@ -114,30 +99,7 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0]
         self.x4_pres = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0]
-        self.x5_pres = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0]
 
-        self.m1_pres_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))[0]
-        self.m3_pres_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))[0]
-        self.p8_pres_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))[0]
-        self.p13_pres_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_14:MsgFieldPositions.END_POS_FIELD_14]))[0]
-        self.p17_pres_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_15:MsgFieldPositions.END_POS_FIELD_15]))[0]
-        self.x1_pres_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_16:MsgFieldPositions.END_POS_FIELD_16]))[0]
-        self.x2_pres_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_17:MsgFieldPositions.END_POS_FIELD_17]))[0]
-        self.x3_pres_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18]))[0]
-        self.x4_pres_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_19:MsgFieldPositions.END_POS_FIELD_19]))[0]
-        self.x5_pres_temp = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_20:MsgFieldPositions.END_POS_FIELD_20]))[0]
-
         self.fp_pressure_timestamp = timestamp
 
     def cmd_pressure_sensor_override(self, sensor: int, pressure: float,  reset: int = NO_RESET) -> int:
@@ -158,7 +120,7 @@
         payload = rst + prs + sen
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_PRESSURE_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("override FP pressure sensor")
@@ -200,7 +162,7 @@
         payload = rst + mis
 
         message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id,
-                                              message_id=MsgIds.MSG_ID_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
+                                              message_id=MsgIds.MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
         self.logger.debug("override FP pressure broadcast interval")