Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -rafe332fec54d9d0432dfc0d54aef1debaa92b066 -rd0d72ba74208cb43073ec38c7bbfebb2d32dcc66 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision afe332fec54d9d0432dfc0d54aef1debaa92b066) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision d0d72ba74208cb43073ec38c7bbfebb2d32dcc66) @@ -45,10 +45,10 @@ self._handler_pressure_sync) self.td_pressure_timestamp = 0.0 - self.arterial_pressure = 0.0 - self.venous_pressure = 0.0 - self.arterial_long_filtered_pressure = 0.0 - self.venous_long_filtered_pressure = 0.0 + self.h2_arterial_pressure = 0.0 + self.h14_venous_pressure = 0.0 + self.h2_arterial_long_filtered_pressure = 0.0 + self.h14_venous_long_filtered_pressure = 0.0 self.pressure_limits_state = 0 self.arterial_pressure_limit_min = 0 self.arterial_pressure_limit_max = 0 @@ -57,15 +57,15 @@ @publish([ "td_pressure_timestamp", - "arterial_pressure", - "venous_pressure", + "h2_arterial_pressure", + "h14_venous_pressure", "pressure_limits_state", "arterial_pressure_limit_min", "arterial_pressure_limit_max", "venous_pressure_limit_min", "venous_pressure_limit_max", - "arterial_long_filtered_pressure", - "venous_long_filtered_pressure", + "h2_arterial_long_filtered_pressure", + "h14_venous_long_filtered_pressure", ]) def _handler_pressure_sync(self, message, timestamp=0.0): """ @@ -95,15 +95,15 @@ lfv = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) - self.arterial_pressure = art[0] - self.venous_pressure = ven[0] + self.h2_arterial_pressure = art[0] + self.h14_venous_pressure = ven[0] self.pressure_limits_state = pls[0] self.arterial_pressure_limit_min = apl[0] self.arterial_pressure_limit_max = apu[0] self.venous_pressure_limit_min = vpl[0] self.venous_pressure_limit_max = vpu[0] - self.arterial_long_filtered_pressure = lfa[0] - self.venous_long_filtered_pressure = lfv[0] + self.h2_arterial_long_filtered_pressure = lfa[0] + self.h14_venous_long_filtered_pressure = lfv[0] self.td_pressure_timestamp = timestamp def cmd_pressure_sensor_override(self, pressure: float, sensor: int, reset: int = NO_RESET) -> int: