Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r7ce778dc51b7dba5a7a7ca14244ed7eea7bf029d --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 7ce778dc51b7dba5a7a7ca14244ed7eea7bf029d) @@ -7,22 +7,21 @@ # # @file conductivity_sensors.py # -# @author (last) Dara Navaei -# @date (last) 15-May-2023 +# @author (last) Zoltan Miskolci +# @date (last) 04-Dec-2025 # @author (original) Quang Nguyen # @date (original) 20-Jul-2020 # ############################################################################ import struct from logging import Logger -from enum import unique from .constants import RESET, NO_RESET from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions -from leahi_dialin.common.fp_defs import FPConductivitySensorsEnum +from leahi_dialin.common.fp_defs import FPConductivitySensorsEnum, FPRORejectionRatioEnum +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 @@ -47,12 +46,22 @@ self.can_interface.register_receiving_publication_function(channel_id, self.msg_id_fp_conductivity_data, self._handler_conductivity_sensors_sync) self.fp_conductivity_timestamp = 0.0 + self.ro_rejection_ratio_timestamp = 0.0 self.fp_conductivity = { FPConductivitySensorsEnum.P9_COND.name: 0.0, FPConductivitySensorsEnum.P18_COND.name: 0.0 } + self.ro_rejection_ratio = { + FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO.name: 0.0, + FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO_TANK_FILL.name: 0.0, + FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO.name: 0.0, + FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO_TANK_FILL.name: 0.0, + FPRORejectionRatioEnum.GEN_PERMEATE_STATE.name: 0 + } + + @publish(["msg_id_fp_conductivity_data", "fp_conductivity", "fp_conductivity_timestamp"]) def _handler_conductivity_sensors_sync(self, message, timestamp=0.0): """ @@ -82,35 +91,37 @@ @return: 1 if successful, zero otherwise """ - if not check_broadcast_interval_override_ms(ms): - return False + cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = MsgIds.MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'FP conductivity sensor', + logger = self.logger, + can_interface = self.can_interface) - reset_byte_array = integer_to_bytearray(reset) - ms_byte_array = integer_to_bytearray(ms) - payload = reset_byte_array + ms_byte_array - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) + def cmd_ro_rejection_ratio_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the FP RO Rejection Ratio broadcast interval override command + Constraints: + Must be logged into FP. + Given interval must be non-zero and a multiple of the FP general task interval (50 ms). - self.logger.debug("override FP conductivity sensor broadcast interval") + @param ms: integer - interval (in ms) to override with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ - # Send message - received_message = self.can_interface.send(message) + cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = MsgIds.MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'FP RO Rejection Ratio', + logger = self.logger, + can_interface = self.can_interface) - # If there is content... - if received_message is not None: - if reset == RESET: - str_res = "reset back to normal: " - else: - str_res = str(ms) + " ms: " - self.logger.debug("FP Conductivity sensor data broadcast interval overridden to " + str_res + - str(received_message['message'][DenaliMessage.PAYLOAD_START_INDEX])) - # response payload is OK or not OK - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.error("Timeout!!!!") - return False def cmd_conductivity_sensor_readings_override(self, sensor: int, conductivity: float, reset: int = NO_RESET) -> int: """ @@ -151,6 +162,7 @@ self.logger.error("Timeout!!!!") return False + def cmd_conductivity_sensor_read_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the FP conductivity sensor read override command @@ -175,7 +187,7 @@ str_res = "reset back to normal" else: str_res = str(counter) - self.logger.debug("override FP conductivity sensor value for sensor " + str(sensor) + ": " + str_res) + self.logger.debug("override FP conductivity sensor read counter value for sensor " + str(sensor) + ": " + str_res) # Send message received_message = self.can_interface.send(message) @@ -212,7 +224,7 @@ str_res = "reset back to normal" else: str_res = str(counter) - self.logger.debug("override FP conductivity sensor value for sensor " + str(sensor) + ": " + str_res) + self.logger.debug("override FP conductivity sensor error counter value for sensor " + str(sensor) + ": " + str_res) # Send message received_message = self.can_interface.send(message) @@ -223,4 +235,40 @@ return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] else: self.logger.error("Timeout!!!!") - return False \ No newline at end of file + return False + + + def cmd_ro_rejection_ratio_override(self, value: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends the FP RO Rejection Ratio override command + + @param value: float - value to override sensor with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + + """ + + reset_byte_array = integer_to_bytearray(reset) + value_byte_array = float_to_bytearray(value) + payload = reset_byte_array + value_byte_array + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST.value, + payload=payload) + + if reset == RESET: + str_res = "reset back to normal" + else: + str_res = str(value) + self.logger.debug("override FP RO Rejection ratio value: " + str_res) + + # 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.error("Timeout!!!!") + return False