Index: leahi_dialin/common/constants.py =================================================================== diff -u --- leahi_dialin/common/constants.py (revision 0) +++ leahi_dialin/common/constants.py (revision 6f8c46ea15d5b4b663a5d8cb1999fda895ede551) @@ -0,0 +1,27 @@ +########################################################################### +# +# Copyright (c) 2020-2024 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN +# WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file constants.py +# +# @author (last) Zoltan Miskolci +# @date (last) 03-Dec-2025 +# @author (original) Michael +# @date (original) 14-Nov-2024 +# +############################################################################ + +RESET = 1 +NO_RESET = 0 + +ACCEPTED = 1 +REJECTED = 0 + +BUTTON_PRESSED = 1 +BUTTON_RELEASED = 0 + +PUMP_CONTROL_MODE_CLOSED_LOOP = 0 +PUMP_CONTROL_MODE_OPEN_LOOP = 1 Index: leahi_dialin/common/fp_defs.py =================================================================== diff -u -r5d5363c270d5bc6c45f9d3cc4f0b141c90ef5cbb -r6f8c46ea15d5b4b663a5d8cb1999fda895ede551 --- leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 5d5363c270d5bc6c45f9d3cc4f0b141c90ef5cbb) +++ leahi_dialin/common/fp_defs.py (.../fp_defs.py) (revision 6f8c46ea15d5b4b663a5d8cb1999fda895ede551) @@ -7,8 +7,8 @@ # # @file fp_defs.py # -# @author (last) Dara Navaei -# @date (last) 08-Feb-2024 +# @author (last) Zoltan Miskolci +# @date (last) 03-Dec-2025 # @author (original) Peter Lucia # @date (original) 22-Jun-2021 # @@ -127,6 +127,15 @@ NUM_OF_FP_CONDUCTIVITY = 2 # Number of Conductivity sensors @unique +class FPRORejectionRatioEnum(DialinEnum): + RAW_RO_REJECTION_RATIO = 0 # Raw RO Rejection Ratio value + RAW_RO_REJECTION_RATIO_TANK_FILL = 1 # Raw RO Rejection Ratio Tank Fill value + AVG_RO_REJECTION_RATIO = 2 # Average RO Rejection Ratio value + AVG_RO_REJECTION_RATIO_TANK_FILL = 3 # Average RO Rejection Ratio Tank Fill value + GEN_PERMEATE_STATE = 4 # Generate Permeate State value + NUM_OF_FP_CONDUCTIVITY = 5 # Number of RO Rejection Ratio items + +@unique class FPFlowSensorNames(DialinEnum): P7_FLOW = 0 # Water inlet flow sensor (FMS P7) P16_FLOW = 1 # RO outlet flow sensor (FMP P16) Index: leahi_dialin/common/msg_ids.py =================================================================== diff -u -r30b5a848a9dac0d1f3696ad7edbd6b607a117c09 -r6f8c46ea15d5b4b663a5d8cb1999fda895ede551 --- leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 30b5a848a9dac0d1f3696ad7edbd6b607a117c09) +++ leahi_dialin/common/msg_ids.py (.../msg_ids.py) (revision 6f8c46ea15d5b4b663a5d8cb1999fda895ede551) @@ -7,8 +7,8 @@ # # @file msg_ids.py # -# @author (last) Dara Navaei -# @date (last) 10-May-2024 +# @author (last) Zoltan Miskolci +# @date (last) 03-Dec-2025 # @author (original) Peter Lucia # @date (original) 06-Apr-2021 # @@ -125,6 +125,13 @@ MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0x67 MSG_ID_DD_VOLTAGES_DATA = 0x68 MSG_ID_DD_RINSE_PUMP_DATA = 0x69 + MSG_ID_TD_TREATMENT_LOG_ALARM_EVENT = 0x6A + MSG_ID_TD_TREATMENT_LOG_EVENT = 0x6B + MSG_ID_TD_DATE_AND_TIME_REQUEST = 0x6C + MSG_ID_TD_DATE_AND_TIME_RESPONSE = 0x6D + MSG_ID_DD_DATE_AND_TIME_REQUEST = 0x6E + MSG_ID_DD_DATE_AND_TIME_RESPONSE = 0x6F + MSG_ID_FP_RO_REJECTION_RATIO_DATA = 0x71 MSG_ID_TD_TESTER_LOGIN_REQUEST = 0x8000 MSG_ID_TD_SOFTWARE_RESET_REQUEST = 0x8001 @@ -329,6 +336,13 @@ MSG_ID_FP_SET_TEST_CONFIGURATION = 0xB02D MSG_ID_FP_GET_TEST_CONFIGURATION = 0XB02E MSG_ID_FP_RESET_ALL_TEST_CONFIGURATIONS = 0XB02F + MSG_ID_FP_INLET_PRES_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB030 + MSG_ID_FP_INLET_PRES_CHECK_TIME_OVERRIDE_REQUEST = 0xB031 + MSG_ID_FP_FILTERED_COND_SENSOR_READINGS_OVERRIDE_REQUEST = 0xB032 + MSG_ID_FP_FILTERED_COND_SENSOR_TEMPERATURE_OVERRIDE_REQUEST = 0xB032 + MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST = 0xB033 + MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST = 0xB034 + MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST = 0xB035 MSG_ID_TD_DEBUG_EVENT = 0xFFF1 MSG_ID_DD_DEBUG_EVENT = 0xFFF2 Index: leahi_dialin/common/override_templates.py =================================================================== diff -u --- leahi_dialin/common/override_templates.py (revision 0) +++ leahi_dialin/common/override_templates.py (revision 6f8c46ea15d5b4b663a5d8cb1999fda895ede551) @@ -0,0 +1,81 @@ +########################################################################### +# +# Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. +# +# THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM IN PART OR IN +# WHOLE WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. +# +# @file override_templates.py +# +# @author (last) Zoltan Miskolci +# @date (last) 03-Dec-2025 +# @author (original) Zoltan Miskolci +# @date (original) 03-Dec-2025 +# +############################################################################ + +# Module imports +from logging import Logger + +# Project imports +from .constants import RESET, NO_RESET +from .msg_defs import MsgIds +from ..protocols.CAN import DenaliMessage, DenaliChannels +from ..utils.base import DialinEnum +from ..utils.checks import check_broadcast_interval_override_ms +from ..utils.conversions import integer_to_bytearray, float_to_bytearray + + +@staticmethod +def cmd_generic_broadcast_interval_override(ms: int, + reset: int, + msg_id: MsgIds, + channel_id: DenaliChannels, + module_name: str, + logger: Logger, + can_interface) -> int: + """ + Constructs and sends broadcast interval override command + Constraints: + Must be logged into the corresponding Module. + Given interval must be non-zero and a multiple of the general task interval (50 ms). + + @param ms: integer - interval (in ms) to override with + @param reset: integer - 1 to reset a previous override, 0 to override + @param msg_id: MsgIds - The override's msg id + @param channel_id: DenaliChannels - The override's channel id + @param module_name: str - The module's name to put into the debug prints + @param logger: str - The logger for printing debug and error messages + @param can_interface: The can_interface + @return: 1 if successful, zero otherwise + """ + + if not check_broadcast_interval_override_ms(ms): + return False + + 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=channel_id, + message_id=msg_id.value, + payload=payload) + + logger.debug(f"override {module_name} broadcast interval") + + # Send message + received_message = can_interface.send(message) + + # 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: " + logger.debug(f"{module_name} 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: + logger.error("Timeout!!!!") + return False Index: leahi_dialin/dd/modules/voltages.py =================================================================== diff -u -r144020fa422bc5d0db1bd62647c29022a887206e -r6f8c46ea15d5b4b663a5d8cb1999fda895ede551 --- leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 144020fa422bc5d0db1bd62647c29022a887206e) +++ leahi_dialin/dd/modules/voltages.py (.../voltages.py) (revision 6f8c46ea15d5b4b663a5d8cb1999fda895ede551) @@ -48,7 +48,7 @@ self.dd_voltages_timestamp = 0.0 - @publish(["dd_voltages_timestamp","monitored_voltages"]) + @publish(["msg_id_dd_voltages_data","dd_voltages_timestamp","monitored_voltages"]) def _handler_monitored_voltages_sync(self, message, timestamp=0.0): """ Handles published DD monitored voltages data messages. Voltage data are captured Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u -rec8a2600b9e8cf6fe7e02c200a1c24221ca86863 -r6f8c46ea15d5b4b663a5d8cb1999fda895ede551 --- leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision ec8a2600b9e8cf6fe7e02c200a1c24221ca86863) +++ leahi_dialin/fp/modules/conductivity_sensors.py (.../conductivity_sensors.py) (revision 6f8c46ea15d5b4b663a5d8cb1999fda895ede551) @@ -15,14 +15,13 @@ ############################################################################ 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,19 +46,29 @@ 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): """ - Handles published FP conductivity sensor data messages. Conductivity sensor data are captured + Handles published FP conductivity sensor data messages. Conductivity sensor data are captured for reference. - @param message: published conductivity sensor data message + @param message: Published conductivity sensor data message @return: None """ @@ -70,6 +79,31 @@ self.fp_conductivity_timestamp = timestamp + + @publish(["msg_id_ro_rejection_ratio_data", "ro_rejection_ratio", "ro_rejection_ratio_timestamp"]) + def _handler_ro_rejection_ratio_sync(self, message, timestamp=0.0): + """ + Handles published FP RO Rejection Ratio data messages. RO Rejection Ratio data are captured + for reference. + + @param message: Published RO Rejection Ratio data message + @return: None + """ + + self.ro_rejection_ratio[FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + self.ro_rejection_ratio[FPRORejectionRatioEnum.RAW_RO_REJECTION_RATIO_TANK_FILL.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] + self.ro_rejection_ratio[FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + self.ro_rejection_ratio[FPRORejectionRatioEnum.AVG_RO_REJECTION_RATIO_TANK_FILL.name] = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + self.ro_rejection_ratio[FPRORejectionRatioEnum.GEN_PERMEATE_STATE.name] = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5]))[0] + + self.ro_rejection_ratio_timestamp = timestamp + + def cmd_conductivity_sensor_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the FP conductivity sensor data broadcast interval override command @@ -82,35 +116,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 +187,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 +212,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) @@ -188,6 +225,7 @@ self.logger.error("Timeout!!!!") return False + def cmd_conductivity_sensor_error_counter_override(self, sensor: int, counter: int, reset: int = NO_RESET) -> int: """ Constructs and sends the FP conductivity error counter override command @@ -212,7 +250,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 +261,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 Index: leahi_dialin/version.py =================================================================== diff -u -rf8c8af8419655d29685451540605d90509c461fa -r6f8c46ea15d5b4b663a5d8cb1999fda895ede551 --- leahi_dialin/version.py (.../version.py) (revision f8c8af8419655d29685451540605d90509c461fa) +++ leahi_dialin/version.py (.../version.py) (revision 6f8c46ea15d5b4b663a5d8cb1999fda895ede551) @@ -81,4 +81,4 @@ if __name__ == '__main__': - print(VERSION) \ No newline at end of file + print(DEV_VERSION) \ No newline at end of file