Index: leahi_dialin/dd/modules/pressure_sensors.py =================================================================== diff -u -r35e8d930cb1a45457de87d93728fe60c7cb10ab5 -rd2697fb12fc381fed6e7fb0820ec6486513243f6 --- leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision 35e8d930cb1a45457de87d93728fe60c7cb10ab5) +++ leahi_dialin/dd/modules/pressure_sensors.py (.../pressure_sensors.py) (revision d2697fb12fc381fed6e7fb0820ec6486513243f6) @@ -13,16 +13,16 @@ # @date (original) 14-Apr-2020 # ############################################################################ + import struct -from enum import unique from logging import Logger -from .constants import NO_RESET, RESET +from leahi_dialin.common.constants import NO_RESET, RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.dd_defs import DDPressureNames +from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override from leahi_dialin.protocols.CAN import DenaliMessage, DenaliChannels -from leahi_dialin.utils.base import AbstractSubSystem, publish, DialinEnum -from leahi_dialin.utils.checks import check_broadcast_interval_override_ms +from leahi_dialin.utils.base import AbstractSubSystem, publish from leahi_dialin.utils.conversions import integer_to_bytearray, float_to_bytearray @@ -53,7 +53,8 @@ DDPressureNames.D66_PRES.name: 0.0, DDPressureNames.D51_PRES.name: 0.0, DDPressureNames.D18_PRES.name: 0.0, - DDPressureNames.D41_PRES.name: 0.0 + DDPressureNames.D41_PRES.name: 0.0, + DDPressureNames.D87_PRES.name: 0.0 } self.dd_pressures_timestamp = 0 @@ -77,6 +78,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.dd_pressures[DDPressureNames.D41_PRES.name] = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + self.dd_pressures[DDPressureNames.D87_PRES.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6]))[0] self.dd_pressures_timestamp = timestamp @@ -93,30 +96,15 @@ """ - if not check_broadcast_interval_override_ms(ms): - return False + cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = DenaliChannels.dialin_to_dd_ch_id, + msg_id = MsgIds.MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'DD pressure sensors', + logger = self.logger, + can_interface = self.can_interface) - rst = integer_to_bytearray(reset) - ivl = integer_to_bytearray(ms) - payload = rst + ivl - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_PRESSURE_SENSOR_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override pressure data broadcast interval") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - def cmd_pressure_readings_override(self, sensor: int, pressure: float, reset: int = NO_RESET) -> int: """ Constructs and sends the pressure readings override command.