Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r56cd024ca23456ab0ae5f6acd30cb4cde02beb4a -r7546656fb0fdcdbf3db79c69a891ed3b085f95e4 --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 56cd024ca23456ab0ae5f6acd30cb4cde02beb4a) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 7546656fb0fdcdbf3db79c69a891ed3b085f95e4) @@ -15,16 +15,15 @@ ############################################################################ import struct -from enum import unique from logging import Logger -from .constants import NO_RESET +from leahi_dialin.common.constants import NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions from leahi_dialin.common.dd_defs import DDLevelSensorEnum +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.conversions import integer_to_bytearray, float_to_bytearray +from leahi_dialin.utils.base import AbstractSubSystem, publish +from leahi_dialin.utils.conversions import integer_to_bytearray class DDLevels(AbstractSubSystem): @@ -52,7 +51,8 @@ self.dd_level_sensors = { DDLevelSensorEnum.D6_LEVEL.name: 0, DDLevelSensorEnum.D63_LEVEL.name: 0, - DDLevelSensorEnum.D46_LEVEL.name: 0 + DDLevelSensorEnum.D46_LEVEL.name: 0, + DDLevelSensorEnum.D98_LEVEL.name: 0 } self.dd_levels_timestamp = 0 @@ -72,6 +72,8 @@ message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] self.dd_level_sensors[DDLevelSensorEnum.D46_LEVEL.name] = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + self.dd_level_sensors[DDLevelSensorEnum.D98_LEVEL.name] = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] self.dd_levels_timestamp = timestamp @@ -86,29 +88,15 @@ @param reset: (int) 1 to reset a previous override, 0 to override @returns 1 if successful, zero otherwise """ - if not check_broadcast_interval_override_ms(ms): - return False - - reset_value = integer_to_bytearray(reset) - interval_value = integer_to_bytearray(ms) - payload = reset_value + interval_value - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dd_ch_id, - message_id=MsgIds.MSG_ID_DD_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("Sending {} ms publish interval to the Levels module".format(ms)) - # Send message - received_message = self.can_interface.send(message) - - # If there is content in message - if received_message is not None: - # Response payload is OK or not - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - 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_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'DD level sensors', + logger = self.logger, + can_interface = self.can_interface) + def cmd_level_status_override(self, level_sensor: int, status: int, reset: int = NO_RESET) -> int: """ Constructs and sends level status cycle override command @@ -136,3 +124,12 @@ else: self.logger.debug("Timeout!!!!") return False + + def get_chamber_f_sensor_values(self): + """ + Gets the level sensor values for chamber F. + + @returns (dict) Returns all sensor values from Chamber F + """ + + return { 'D64': self.dd_level_sensors[DDLevelSensorEnum.D63_LEVEL.name], 'D98': self.dd_level_sensors[DDLevelSensorEnum.D98_LEVEL.name] }