Index: leahi_dialin/td/modules/pressure_sensors.py
===================================================================
diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -rd27c40205e18118f4689f62463a266da1f91dba6
--- leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863)
+++ leahi_dialin/td/modules/pressure_sensors.py	(.../pressure_sensors.py)	(revision d27c40205e18118f4689f62463a266da1f91dba6)
@@ -18,7 +18,7 @@
 
 from .constants import RESET, NO_RESET
 from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions
-from leahi_dialin.common.td_defs import TDPressureSensorNames, TDPressureSensorAttributes
+from leahi_dialin.common.td_defs import td_enum_repository
 from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels
 from leahi_dialin.utils.base import AbstractSubSystem, publish
 from leahi_dialin.utils.checks import check_broadcast_interval_override_ms
@@ -32,7 +32,7 @@
 
     def __init__(self, can_interface, logger: Logger):
         """
-        TDPressureOcclusion constructor
+        TDPressureSensors constructor
 
         """
         super().__init__()
@@ -44,20 +44,22 @@
             self.msg_id_td_pressure_data = MsgIds.MSG_ID_TD_PRESSURE_DATA.value
             self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_td_pressure_data,
                                                                        self._handler_pressure_sync)
-
         self.td_pressure_timestamp = 0.0
         self.td_pressure_sensors = {
-            TDPressureSensorNames.H2_PRES.name: {
-                TDPressureSensorAttributes.PRES.name: 0.0,
-                TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0,
-                TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0,
-                TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 0
+            td_enum_repository.TDPressureSensorNames.H2_PRES.name: {
+                td_enum_repository.TDPressureSensorAttributes.PRES.name: 0.0,
+                td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0,
+                td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0,
+                td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 0
             },
-            TDPressureSensorNames.H14_PRES.name: {
-                TDPressureSensorAttributes.PRES.name: 0.0,
-                TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0,
-                TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0,
-                TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 0
+            td_enum_repository.TDPressureSensorNames.H14_PRES.name: {
+                td_enum_repository.TDPressureSensorAttributes.PRES.name: 0.0,
+                td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0,
+                td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0,
+                td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 0
+            },
+            td_enum_repository.TDPressureSensorNames.H23_PRES.name: {
+                td_enum_repository.TDPressureSensorAttributes.PRES.name : 0.0
             }
         }
         self.pressure_limits_state = 0
@@ -102,24 +104,27 @@
         lfv = struct.unpack('f', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))
         tps = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))
+            message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))
         tmin = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))
+            message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11]))
         tmax = struct.unpack('f', bytearray(
-            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))
+            message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12]))
+        baro = struct.unpack('f', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_13:MsgFieldPositions.END_POS_FIELD_13]))
 
-        self.td_pressure_sensors[TDPressureSensorNames.H2_PRES.name][TDPressureSensorAttributes.PRES.name] = art[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H14_PRES.name][TDPressureSensorAttributes.PRES.name] = ven[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name] = art[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name] = ven[0]
         self.pressure_limits_state = pls[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H2_PRES.name][TDPressureSensorAttributes.PRES_LIMIT_MIN.name] = apl[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H2_PRES.name][TDPressureSensorAttributes.PRES_LIMIT_MAX.name] = apu[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H14_PRES.name][TDPressureSensorAttributes.PRES_LIMIT_MIN.name] = vpl[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H14_PRES.name][TDPressureSensorAttributes.PRES_LIMIT_MAX.name] = vpu[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H2_PRES.name][TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name] = lfa[0]
-        self.td_pressure_sensors[TDPressureSensorNames.H14_PRES.name][TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name] = lfv[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name] = apl[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name] = apu[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MIN.name] = vpl[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES_LIMIT_MAX.name] = vpu[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H2_PRES.name][td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name] = lfa[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H14_PRES.name][td_enum_repository.TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name] = lfv[0]
         self.tmp_pressure = tps[0]
         self.tmp_min_limit = tmin[0]
         self.tmp_max_limit = tmax[0]
+        self.td_pressure_sensors[td_enum_repository.TDPressureSensorNames.H23_PRES.name][td_enum_repository.TDPressureSensorAttributes.PRES.name] = baro[0]
         self.td_pressure_timestamp = timestamp
 
     def cmd_pressure_sensor_override(self, sensor: int, pressure: float,  reset: int = NO_RESET) -> int:
@@ -186,7 +191,7 @@
                                               message_id=MsgIds.MSG_ID_TD_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value,
                                               payload=payload)
 
-        self.logger.debug("override blood flow broadcast interval")
+        self.logger.debug("override pressure sensors broadcast interval")
 
         # Send message
         received_message = self.can_interface.send(message)
@@ -198,7 +203,7 @@
                 str_res = "reset back to normal: "
             else:
                 str_res = str(ms) + " ms: "
-            self.logger.debug("Blood flow broadcast interval overridden to " + str_res +
+            self.logger.debug("Pressure sensors broadcast interval overridden to " + str_res +
                               str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]))
             # response payload is OK or not OK
             return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX]