Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u -r79697500614904bafb56f3d33e368b954ba78f7d -ra291930ba38e329e2b373f6d2b2a7564a6b7a09a --- leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision 79697500614904bafb56f3d33e368b954ba78f7d) +++ leahi_dialin/fp/filtration_purification.py (.../filtration_purification.py) (revision a291930ba38e329e2b373f6d2b2a7564a6b7a09a) @@ -7,18 +7,18 @@ # # @file filtration_purification.py # -# @author (last) Dara Navaei -# @date (last) 26-Feb-2024 +# @author (last) Zoltan Miskolci +# @date (last) 09-Jan-2026 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # ############################################################################ + import struct from .modules.alarms import FPAlarms from .modules.boost_pump import FPBoostPump from .modules.conductivity_sensors import FPConductivitySensors -from .modules.constants import NO_RESET, RESET from .modules.events import FPEvents from .modules.flow_sensors import FPFlowSensors from .modules.levels import FPLevels @@ -32,13 +32,13 @@ from .proxies.dd_proxy import DDProxy -from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions +from ..common.constants import NO_RESET from ..common.fp_defs import FPOpModes +from ..common.msg_defs import MsgIds, MsgFieldPositions, MsgFieldPositionsFWVersions +from ..common.override_templates import cmd_generic_broadcast_interval_override, cmd_generic_override from ..protocols.CAN import DenaliMessage, DenaliCanMessenger, DenaliChannels from ..utils.base import AbstractSubSystem, publish, LogManager -from ..utils.checks import check_broadcast_interval_override_ms -from ..utils.conversions import integer_to_bytearray, unsigned_short_to_bytearray, bytearray_to_integer, \ - bytearray_to_byte +from ..utils.conversions import integer_to_bytearray, bytearray_to_byte class FP(AbstractSubSystem): @@ -66,7 +66,6 @@ @param can_interface: (str) CANBus interface name, e.g. "can0" @param log_level: (str) Logging level, defaults to None """ - super().__init__() self._log_manager = LogManager(log_level=log_level, log_filepath=self.__class__.__name__ + ".log") self.logger = self._log_manager.logger @@ -123,6 +122,7 @@ self.valves = FPValves(self.can_interface, self.logger) self.dd_proxy = DDProxy(self.can_interface, self.logger) + @publish(["msg_id_fp_debug_event", "fp_debug_events_timestamp","fp_debug_events"]) def _handler_fp_debug_event_sync(self, message, timestamp = 0.0): """ @@ -150,6 +150,7 @@ if self.fp_debug_event_index == self._FP_DEBUG_EVENT_LIST_COUNT: self.fp_debug_event_index = 0 + @publish(["fp_logged_in"]) def fp_set_logged_in_status(self, logged_in: bool = False): """ @@ -159,6 +160,7 @@ """ self.fp_logged_in = logged_in + @publish(["msg_id_fp_version_response", "fp_version, fp_fpga_version"]) def _handler_fp_version_response_sync(self,message, timestamp = 0.0): """ @@ -197,6 +199,7 @@ self.fp_version_response_timestamp = timestamp + @publish(["msg_id_fp_op_mode_data", "fp_op_mode_timestamp","fp_operation_mode", "fp_operation_sub_mode"]) def _handler_fp_op_mode_sync(self, message, timestamp = 0.0): """ @@ -215,6 +218,28 @@ self.fp_operation_sub_mode = smode[0] self.fp_op_mode_timestamp = timestamp + + def cmd_op_mode_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the measured op mode 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). + + @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 + """ + return cmd_generic_broadcast_interval_override( + ms = ms, + reset = reset, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = MsgIds.MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, + module_name = 'FP Operation Mode', + logger = self.logger, + can_interface = self.can_interface) + + def cmd_log_in_to_fp(self, resend: bool = False) -> int: """ Constructs and sends a login command via CAN bus. Login required before \n @@ -223,7 +248,6 @@ @param resend: (bool) if False (default), try to login once. Otherwise, tries to login indefinitely @return: 1 if logged in, 0 if log in failed """ - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, message_id=MsgIds.MSG_ID_FP_TESTER_LOGIN_REQUEST.value, payload=list(map(int, map(ord, self.FP_LOGIN_PASSWORD)))) @@ -246,6 +270,7 @@ self.logger.debug("Login Timeout!!!!") return False + def cmd_fp_set_operation_mode(self, new_mode: int = 0) -> int: """ Constructs and sends a set operation mode request command via CAN bus. @@ -257,31 +282,19 @@ @param new_mode: ID of operation mode to transition to @return: 1 if successful, zero otherwise - """ - payload = integer_to_bytearray(new_mode) + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = MsgIds.MSG_ID_FP_SET_OP_MODE_REQUEST, + entity_name = 'FP Operation Mode', + override_text = FPOpModes(new_mode).name, + logger = self.logger, + can_interface = self.can_interface) - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_SET_OP_MODE_REQUEST.value, - payload=payload) - self.logger.debug("Requesting FP mode change to " + str(new_mode)) - - # Send message - received_message = self.can_interface.send(message) - - if received_message is not None: - if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: - self.logger.debug("Success: Mode change accepted") - else: - self.logger.debug("Failure: Mode change rejected.") - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("FP mode change request Timeout!!!!") - return False - - def cmd_fp_software_reset_request(self) -> None: """ Constructs and sends an FP software reset request via CAN bus. @@ -290,60 +303,17 @@ @return: None """ + return cmd_generic_override( + payload = None, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = MsgIds.MSG_ID_FP_SOFTWARE_RESET_REQUEST, + entity_name = 'FP Software Reset', + override_text = '', + logger = self.logger, + can_interface = self.can_interface) - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_SOFTWARE_RESET_REQUEST.value) - self.logger.debug("requesting FP software reset") - - # Send message - self.can_interface.send(message, 0) - self.logger.debug("Sent request to FP to reset...") - self.fp_set_logged_in_status(False) - - def cmd_op_mode_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: - """ - Constructs and sends the measured op mode 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). - - @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 - """ - - if not check_broadcast_interval_override_ms(ms): - return False - - rst = integer_to_bytearray(reset) - mis = integer_to_bytearray(ms) - payload = rst + mis - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_OPERATION_MODE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("override op mode broadcast interval") - - # Send message - received_message = self.can_interface.send(message) - - # If there is content... - if received_message is not None: - # self.logger.debug(received_message) - if reset == RESET: - str_res = "reset back to normal: " - else: - str_res = str(ms) + " ms: " - self.logger.debug("operation mode 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.debug("Timeout!!!!") - return False - def cmd_fp_safety_shutdown_override(self, active: int, reset: int = NO_RESET) -> int: """ Constructs and sends an FP safety shutdown override command via CAN bus. @@ -353,28 +323,17 @@ @param active: int - True to activate safety shutdown, False to deactivate @param reset: integer - 1 to reset a previous override, 0 to override @return: 1 if successful, zero otherwise - """ - rst = integer_to_bytearray(reset) saf = integer_to_bytearray(active) payload = rst + saf - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, - message_id=MsgIds.MSG_ID_FP_SAFETY_SHUTDOWN_OVERRIDE_REQUEST.value, - payload=payload) - - self.logger.debug("overriding FP safety shutdown") - - # Send message - received_message = self.can_interface.send(message) - - if received_message is not None: - if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: - self.logger.debug("Safety shutdown signal overridden") - else: - self.logger.debug("Safety shutdown signal override failed.") - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False + return cmd_generic_override( + payload = payload, + reset = NO_RESET, + channel_id = DenaliChannels.dialin_to_fp_ch_id, + msg_id = MsgIds.MSG_ID_FP_SAFETY_SHUTDOWN_OVERRIDE_REQUEST, + entity_name = 'FP Safety Shutdown', + override_text = str(active), + logger = self.logger, + can_interface = self.can_interface)