Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u -re7d16bd6881619e5fc2a0bc1a7fd578a9978498e -r00412d78bda4176d5c45a3778cb90ad907928965 --- leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision e7d16bd6881619e5fc2a0bc1a7fd578a9978498e) +++ leahi_dialin/fp/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 00412d78bda4176d5c45a3778cb90ad907928965) @@ -42,25 +42,21 @@ if self.can_interface is not None: channel_id = DenaliChannels.fp_sync_broadcast_ch_id - msg_id = MsgIds.MSG_ID_FP_PRESSURES_DATA.value - self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self.msg_id_fp_pressures_data = MsgIds.MSG_ID_FP_PRESSURES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_pressures_data, self._handler_pressure_sync) self.fp_pressures = { FPPressureSensorNames.M1_PRES.name: 0.0, 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.X1_PRES.name: 0.0, - FPPressureSensorNames.X2_PRES.name: 0.0, - FPPressureSensorNames.X3_PRES.name: 0.0, - FPPressureSensorNames.X4_PRES.name: 0.0 + FPPressureSensorNames.P17_PRES.name: 0.0 } self.fp_pressure_timestamp = 0.0 - @publish(["fp_pressure_timestamp", "fp_pressures"]) + @publish(["msg_id_fp_pressures_data", "fp_pressures", "fp_pressure_timestamp"]) def _handler_pressure_sync(self, message, timestamp=0.0): """ Handles published FP pressure sensor data messages. Pressure data are captured @@ -80,14 +76,6 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.fp_pressures[FPPressureSensorNames.P17_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] - self.fp_pressures[FPPressureSensorNames.X1_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] - self.fp_pressures[FPPressureSensorNames.X2_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))[0] - self.fp_pressures[FPPressureSensorNames.X3_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))[0] - self.fp_pressures[FPPressureSensorNames.X4_PRES.name] = struct.unpack('f', bytearray( - message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))[0] self.fp_pressure_timestamp = timestamp