Index: leahi_dialin/dd/modules/levels.py =================================================================== diff -u -r56cd024ca23456ab0ae5f6acd30cb4cde02beb4a -rd2697fb12fc381fed6e7fb0820ec6486513243f6 --- leahi_dialin/dd/modules/levels.py (.../levels.py) (revision 56cd024ca23456ab0ae5f6acd30cb4cde02beb4a) +++ leahi_dialin/dd/modules/levels.py (.../levels.py) (revision d2697fb12fc381fed6e7fb0820ec6486513243f6) @@ -15,16 +15,16 @@ ############################################################################ 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.dd_defs import DDConductivitySensorsEnum, DDLevelSensorEnum +from leahi_dialin.common.override_templates import cmd_generic_broadcast_interval_override +from leahi_dialin.dd.modules.conductivity_sensors import DDConductivitySensors 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): @@ -86,29 +86,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 +122,13 @@ else: self.logger.debug("Timeout!!!!") return False + + def get_level_sensor_values(self): + """ + Docstring for get_level_sensor_values + """ + + D64_sensor_value = self.dd_level_sensors[DDLevelSensorEnum.D63_LEVEL.name] + D98_sensor_value = DDConductivitySensors(self.can_interface, self.logger).dd_conductivity[DDConductivitySensorsEnum.D98_COND.name] + + return { 'D64': D64_sensor_value, 'D98': D98_sensor_value }