Index: leahi_dialin/td/modules/pressure_sensors.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r7c8e829c563547ee50c517f1d6b84cb800b72027 --- leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/td/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 7c8e829c563547ee50c517f1d6b84cb800b72027) @@ -32,7 +32,7 @@ def __init__(self, can_interface, logger: Logger): """ - TDPressureOcclusion constructor + TDPressureSensors constructor """ super().__init__() @@ -44,7 +44,6 @@ 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: { @@ -58,6 +57,9 @@ TDPressureSensorAttributes.LONG_FILTERED_PRESSURE.name: 0.0, TDPressureSensorAttributes.PRES_LIMIT_MIN.name: 0, TDPressureSensorAttributes.PRES_LIMIT_MAX.name: 0 + }, + TDPressureSensorNames.H23_PRES.name: { + TDPressureSensorAttributes.PRES.name : 0.0 } } self.pressure_limits_state = 0 @@ -102,11 +104,13 @@ 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] @@ -120,6 +124,7 @@ self.tmp_pressure = tps[0] self.tmp_min_limit = tmin[0] self.tmp_max_limit = tmax[0] + self.td_pressure_sensors[TDPressureSensorNames.H23_PRES.name][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: