Index: leahi_dialin/__init__.py =================================================================== diff -u -r2138d06d100fdcf23f2e9069f35ee2fdee62008f -r0f08c28544b557b2bbd8c04b10cff284f41e4fb9 --- leahi_dialin/__init__.py (.../__init__.py) (revision 2138d06d100fdcf23f2e9069f35ee2fdee62008f) +++ leahi_dialin/__init__.py (.../__init__.py) (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -1,6 +1,6 @@ from .td import * from .dd import * -from .ro import * +from .fp import * from .ui import * from .utils import * Index: leahi_dialin/fp/__init__.py =================================================================== diff -u --- leahi_dialin/fp/__init__.py (revision 0) +++ leahi_dialin/fp/__init__.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1 @@ +from .filtration_purification import FP \ No newline at end of file Index: leahi_dialin/fp/filtration_purification.py =================================================================== diff -u --- leahi_dialin/fp/filtration_purification.py (revision 0) +++ leahi_dialin/fp/filtration_purification.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1,250 @@ +########################################################################### +# +# 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 filtration_purification.py +# +# @author (last) Dara Navaei +# @date (last) 26-Feb-2024 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 +# +############################################################################ +import struct + +from .modules.conductivity_sensors import FPConductivitySensors +from .modules.flow_sensors import FPFlowSensors +from .modules.boost_pump import FPPumps +from .modules.flow_sensors import FPFlowSensors +from .modules.levels import FPLevels +from .modules.pressure_sensors import FPPressureSensors +from .modules.valves import FPValves + + +from ..common.msg_defs import MsgIds, MsgFieldPositions +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 + + +class FP(AbstractSubSystem): + """ + Reverse Osmosis ( FP aka IOFP ) Dialin object API. + It provides the basic interface to communicate with the FP firmware. + """ + # FP debug event max count + _FP_DEBUG_EVENT_LIST_COUNT = 10 + _FP_DEBUG_EVENT_MSG_LEN_INDEX = 5 + + # FP login password + FP_LOGIN_PASSWORD = '123' + + # UI version message field positions + START_POS_MAJOR = DenaliMessage.PAYLOAD_START_INDEX + END_POS_MAJOR = START_POS_MAJOR + 1 + START_POS_MINOR = END_POS_MAJOR + END_POS_MINOR = START_POS_MINOR + 1 + START_POS_MICRO = END_POS_MINOR + END_POS_MICRO = START_POS_MICRO + 1 + START_POS_BUILD = END_POS_MICRO + END_POS_BUILD = START_POS_BUILD + 2 + START_POS_COMPATIBILITY_REV = END_POS_BUILD + END_POS_COMPATIBILITY_REV = START_POS_COMPATIBILITY_REV + 4 + + def __init__(self, can_interface="can0", log_level=None): + """ + FP object provides test/service commands for the FP sub-system. + + >> FP_object = FP('can0') + >> FP_object = FP(can_interface='can0', log_level="DEBUG") + + Possible log levels: + ["DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL", "CAN_ONLY", "PRINT_ONLY"] + + @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 + + # Create listener + self.can_interface = DenaliCanMessenger(can_interface=can_interface, + logger=self.logger) + self.can_interface.start() + self.callback_id = None + # register handler for FP operation mode broadcast messages + if self.can_interface is not None: + channel_id = DenaliChannels.fp_sync_broadcast_ch_id + msg_id = MsgIds.MSG_ID_RO_OP_MODE_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self._handler_fp_op_mode_sync) + + self.can_interface.register_receiving_publication_function(channel_id, + MsgIds.MSG_ID_RO_DEBUG_EVENT.value, + self._handler_fp_debug_event_sync) + + # create properties + self.fp_op_mode_timestamp = 0.0 + self.fp_debug_events_timestamp = 0.0 + self.ui_version_info_response_timestamp = 0.0 + + self.fp_operation_sub_mode = 0 + self.fp_logged_in = False + self.fp_set_logged_in_status(False) + self.ui_version = None + self.fp_debug_events = [''] * self._FP_DEBUG_EVENT_LIST_COUNT + self.fp_debug_event_index = 0 + self.fp_last_debug_event = '' + + # Create command groups + self.conductivity = FPConductivitySensors(self.can_interface, self.logger) + self.flows = FPFlowSensors(self.can_interface, self.logger) + self.pumps = FPPumps(self.can_interface, self.logger) + self.flows = FPFlowSensors(self.can_interface, self.logger) + self.levels = FPLevels(self.can_interface, self.logger) + self.pressures = FPPressureSensors(self.can_interface, self.logger) + self.valves = FPValves(self.can_interface, self.logger) + + @publish(["fp_debug_events_timestamp","fp_debug_events"]) + def _handler_fp_debug_event_sync(self, message, timestamp = 0.0): + + payload = message['message'] + message_length = payload[self._FP_DEBUG_EVENT_MSG_LEN_INDEX] + temp_message = '' + + index = MsgFieldPositions.START_POS_FIELD_1 + + for i in range(0, message_length): + # Loop through the length and get the + char, char_index = bytearray_to_byte(payload, index + i, False) + temp_message += chr(char) + + self.fp_debug_events_timestamp = timestamp + self.fp_debug_events.insert(self.fp_debug_event_index, temp_message) + self.fp_last_debug_event = temp_message + + self.fp_debug_event_index += 1 + 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): + """ + Callback for fp logged in status change. + @param logged_in boolean logged in status for FP + @return: none + """ + self.fp_logged_in = logged_in + + @publish(["fp_op_mode_timestamp","fp_operation_mode", "fp_operation_sub_mode"]) + def _handler_fp_op_mode_sync(self, message, timestamp = 0.0): + """ + Handles published FP operation mode messages. Current FP operation mode + is captured for reference. + + @param message: published FP operation mode broadcast message + @return: None + """ + mode = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + smode = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) + + self.fp_operation_mode = mode[0] + self.fp_operation_sub_mode = smode[0] + self.fp_op_mode_timestamp = timestamp + + def cmd_log_in_to_fp(self, resend: bool = False) -> int: + """ + Constructs and sends a login command via CAN bus. Login required before \n + other commands can be sent to the FP. + + @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_FIRST_RO_TESTER_MESSAGE.value, + payload=list(map(int, map(ord, self.FP_LOGIN_PASSWORD)))) + + self.logger.debug("Logging in...") + + # Send message + received_message = self.can_interface.send(message, resend=resend) + + if received_message is not None: + if received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] == 1: + self.logger.debug("Success: Logged In") + self.fp_set_logged_in_status(True) + #self._send_ro_checkin_message() # Timer starts interval first + #self.can_interface.transmit_interval_dictionary[self.callback_id].start() + else: + self.logger.debug("Failure: Log In Failed.") + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + 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. + Constraints: + Must be logged into FP. + Transition from current to requested op mode must be legal. + NOTE: for POST the FP device shall be in Standby Mode + + @param new_mode: ID of operation mode to transition to + + @return: 1 if successful, zero otherwise + + """ + + payload = integer_to_bytearray(new_mode) + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_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. + Constraints: + Must be logged into FP. + + @return: None + """ + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_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) + + Index: leahi_dialin/fp/modules/__init__.py =================================================================== diff -u --- leahi_dialin/fp/modules/__init__.py (revision 0) +++ leahi_dialin/fp/modules/__init__.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1 @@ \ No newline at end of file Index: leahi_dialin/fp/modules/boost_pump.py =================================================================== diff -u --- leahi_dialin/fp/modules/boost_pump.py (revision 0) +++ leahi_dialin/fp/modules/boost_pump.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1,256 @@ +########################################################################### +# +# 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 boost_pump.py +# +# @author (last) Micahel Garthwaite +# @date (last) 17-Aug-2023 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 +# +############################################################################ +import struct +from enum import unique +from logging import Logger + +from .constants import RESET, NO_RESET +from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +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 + +@unique +class FPPumpNames(DialinEnum): + P12_PUMP_RO = 0 + P40_PUMP_BOOSTER = 1 + + +class FPPumps(AbstractSubSystem): + """ + Dialin API sub-class for RO pump related commands. + """ + + def __init__(self, can_interface, logger: Logger): + """ + FPPumps constructor + """ + super().__init__() + self.can_interface = can_interface + self.logger = logger + + if self.can_interface is not None: + channel_id = DenaliChannels.fp_sync_broadcast_ch_id + msg_id = MsgIds.MSG_ID_RO_PUMP_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self._handler_boost_pump_sync) + self.ro_pump_timestamp = 0.0 + self.p12_ro_pump_state = 0 + self.p12_ro_pump_duty_cycle = 0.0 + self.p12_ro_pump_fb_duty_cycle = 0.0 + self.p12_ro_pump_speed = 0.0 + self.p40_boost_pump_state = 0 + self.p40_boost_pump_duty_cycle = 0.0 + self.p40_boost_pump_fb_duty_cycle = 0.0 + self.p40_boost_pump_speed = 0.0 + + + @publish(["ro_pump_timestamp", "p12_ro_pump_state", "p12_ro_pump_duty_cycle", "p12_ro_pump_fb_duty_cycle", + "p12_ro_pump_speed", "p40_boost_pump_state", "p40_boost_pump_duty_cycle", + "p40_boost_pump_fb_duty_cycle", "p40_boost_pump_speed"]) + def _handler_boost_pump_sync(self, message, timestamp=0.0): + """ + Handles published RO pump data messages. RO pump data is captured + for reference. + + @param message: published RO pump data message + @return: none + """ + + rps = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + rpdc = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) + rpfbdc = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) + rprpm = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) + bps = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + bpdc = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) + bpfbdc = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) + bprpm = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) + + self.ro_pump_timestamp = timestamp + self.p12_ro_pump_state = rps[0] + self.p12_ro_pump_duty_cycle = rpdc[0] + self.p12_ro_pump_fb_duty_cycle = rpfbdc[0] + self.p12_ro_pump_speed = rprpm[0] + self.p40_boost_pump_state = bps[0] + self.p40_boost_pump_duty_cycle = bpdc[0] + self.p40_boost_pump_fb_duty_cycle = bpfbdc[0] + self.p40_boost_pump_speed = bprpm[0] + + + + def cmd_boost_pump_set_speed_rate_override(self, pump: int, rpm: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the boost pump set point command + Constraints: + Must be logged into FP. + + @param rpm: integer - speed set point (in rpm) + @return: 1 if successful, zero otherwise + """ + rst = integer_to_bytearray(reset) + rpm = integer_to_bytearray(rpm) + pmp = integer_to_bytearray(pump) + payload = rst + rpm + pmp + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_BOOST_PUMP_SPEED_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override blood flow set point") + + # Send message + received_message = self.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(rpm) + + self.logger.debug("rpm overridden to " + str_res) + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") + return False + + def cmd_boost_pump_set_pwm_request(self, pump: int, pwm: int) -> int: + """ + Constructs and sends set pwm request for RO pumps \n + command. + Constraints: + Must be logged into FP. + + @param pwm: integer - counts to override the pwm ( 0 - 500 ) + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + + spd = integer_to_bytearray(pwm) + pmp = integer_to_bytearray(pump) + payload = pmp + spd + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_BOOST_PUMP_SET_PWM_REQUEST.value, + payload=payload) + + self.logger.debug("setting pump {} to pwm count {}".format(pump,pwm)) + + # Send message + received_message = self.can_interface.send(message) + + # If there is content... + if received_message is not None: + + self.logger.debug("pwm set to " + str(pwm)) + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") + return False + + def cmd_boost_pump_read_pwm_override(self, pump: int, pwm: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends the read pwm override for the RO pumps \n + command. + Constraints: + Must be logged into FP. + + @param pwm: float - pwm in percentage to override with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + + rst = integer_to_bytearray(reset) + rpwm = float_to_bytearray(pwm) + pmp = integer_to_bytearray(pump) + payload = rst + rpwm + pmp + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_BOOST_PUMP_READ_PWM_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override read pwm for pump".format(pump)) + + # Send message + received_message = self.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(rpwm) + + self.logger.debug("pwm overridden to " + str_res) + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") + return False + + def cmd_boost_pump_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the RO pump 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_RO_BOOST_PUMPS_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override FP pump 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(mis) + + self.logger.debug("broadcast overridden to " + str_res) + # response payload is OK or not OK + return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] + else: + self.logger.debug("Timeout!!!!") + return False \ No newline at end of file Index: leahi_dialin/fp/modules/conductivity_sensors.py =================================================================== diff -u --- leahi_dialin/fp/modules/conductivity_sensors.py (revision 0) +++ leahi_dialin/fp/modules/conductivity_sensors.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1,230 @@ +########################################################################### +# +# 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 conductivity_sensors.py +# +# @author (last) Dara Navaei +# @date (last) 15-May-2023 +# @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.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 + + +@unique +class FPConductivitySensorsEnum(DialinEnum): + P9_CPI = 0 # CPi (P9) conductivity sensor value + P18_CPO = 1 # CPo (P18) conductivity sensor value + +class FPConductivitySensors(AbstractSubSystem): + """ + Dialin API sub-class for conductivity sensors related commands. + """ + + def __init__(self, can_interface, logger: Logger): + """ + + @param can_interface: Denali Can Messenger object + """ + super().__init__() + + self.can_interface = can_interface + self.logger = logger + + if self.can_interface is not None: + channel_id = DenaliChannels.fp_sync_broadcast_ch_id + msg_id = MsgIds.MSG_ID_RO_CONDUCTIVITY_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self._handler_conductivity_sensors_sync) + + self.p9_cpi_conductivity = 0.0 + self.p18_cpo_conductivity = 0.0 + + self.fp_conductivity_timestamp = 0.0 + + @publish(["fp_conductivity_timestamp", + "p9_cpi_conductivity", "p18_cpo_conductivity"]) + def _handler_conductivity_sensors_sync(self, message, timestamp=0.0): + """ + Handles published FP conductivity sensor data messages. Conductivity sensor data are captured + for reference. + + @param message: published conductivity sensor data message + @return: None + """ + + self.p9_cpi_conductivity = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + self.p18_cpo_conductivity = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] + + self.fp_conductivity_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 + Constraints: + Must be logged into FP. + Given interval must be non-zero and a multiple of the RO 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 + + 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_RO_CONDUCTIVITY_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override FP conductivity sensor broadcast interval") + + # Send message + received_message = self.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: " + 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: + """ + Constructs and sends the FP conductivity value override command. + Constraints: + Must be logged into FP. + + @param sensor: unsigned int - sensor ID + @param conductivity: float - conductivity 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) + cond_byte_array = float_to_bytearray(conductivity) + sensor_byte_array = integer_to_bytearray(sensor) + payload = reset_byte_array + cond_byte_array + sensor_byte_array + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_OVERRIDE_REQUEST.value, + payload=payload) + + if reset == RESET: + str_res = "reset back to normal" + else: + str_res = str(conductivity) + " microsiemens/cm" + self.logger.debug("override FP conductivity sensor value for sensor " + str(sensor) + ": " + 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 + + 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 + + @param sensor: unsigned int - sensor ID + @param counter: counter - count 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) + read_byte_array = integer_to_bytearray(counter) + sensor_byte_array = integer_to_bytearray(sensor) + payload = reset_byte_array + read_byte_array + sensor_byte_array + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_READ_COUNT_OVERRIDE_REQUEST.value, + payload=payload) + + if reset == RESET: + 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) + + # 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 + + 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 + + @param sensor: unsigned int - sensor ID + @param counter: counter - count value to override error counter + @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) + error_byte_array = integer_to_bytearray(counter) + sensor_byte_array = integer_to_bytearray(sensor) + payload = reset_byte_array + error_byte_array + sensor_byte_array + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_CONDUCTIVITY_ERROR_COUNT_OVERRIDE_REQUEST.value, + payload=payload) + + if reset == RESET: + 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) + + # 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 \ No newline at end of file Index: leahi_dialin/fp/modules/constants.py =================================================================== diff -u --- leahi_dialin/fp/modules/constants.py (revision 0) +++ leahi_dialin/fp/modules/constants.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1,18 @@ +########################################################################### +# +# 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) Michael +# @date (last) 14-Nov-2024 +# @author (original) Michael +# @date (original) 14-Nov-2024 +# +############################################################################ + +RESET = 1 +NO_RESET = 0 Index: leahi_dialin/fp/modules/flow_sensors.py =================================================================== diff -u --- leahi_dialin/fp/modules/flow_sensors.py (revision 0) +++ leahi_dialin/fp/modules/flow_sensors.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1,175 @@ +########################################################################### +# +# 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 flow_sensors.py +# +# @author (last) Micahel Garthwaite +# @date (last) 17-Aug-2023 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 +# +############################################################################ +import struct +from enum import unique +from logging import Logger + +from .constants import RESET, NO_RESET +from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +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 + + +@unique +class FPFlowSensorNames(DialinEnum): + P7_FLOW_SENSOR_WATER_INLET = 0 # Water inlet flow sensor (FMS P7) + P16_FLOW_SENSOR_RO_OUTLET = 1 # RO outlet flow sensor (FMP P16) + + +class FPFlowSensors(AbstractSubSystem): + """ + + Dialin API sub-class for flow sensor related commands. + """ + + def __init__(self, can_interface, logger: Logger): + """ + + @param can_interface: Denali CAN Messenger object + """ + + super().__init__() + + self.can_interface = can_interface + self.logger = logger + + if self.can_interface is not None: + channel_id = DenaliChannels.fp_sync_broadcast_ch_id + msg_id = MsgIds.MSG_ID_RO_FLOW_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_flow_sensor_sync) + + + self.p7_flowFMS = 0.0 + self.p16_flowFMP = 0.0 + self.p7_tempFMS = 0.0 + self.p16_tempFMP = 0.0 + + self.fp_flow_timestamp = 0 + + @publish(["fp_levels_timestamp", + "p7_flowFMS", "p16_flowFMP", + "p7_tempFMS", "p16_tempFMP"]) + def _handler_flow_sensor_sync(self, message, timestamp=0.0): + """ + Handles published flow sensor message + + @param message: published flow sensor data message + @returns none + """ + self.p7_flowFMS = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + self.p16_flowFMP = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2]))[0] + self.p7_tempFMS = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3]))[0] + self.p16_tempFMP = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4]))[0] + + self.fp_flow_timestamp = timestamp + + def cmd_flow_sensor_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends an FP flow sensor broadcast interval override command message. + 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: (int) Publish time interval in ms + @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_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_FLOWS_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("Sending {} ms publish interval to the FP flow sensor 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 + + def cmd_flow_rate_override(self, flow_sensor: int, rate: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends flow rate override command. + Must be logged into FP. + + @param flow_sensor: integer - the sensor to override its value. + @param rate: integer - the rate value to override. + @param reset: integer - 1 to reset a previous override, 0 to override + @returns 1 if successful, zero otherwise + """ + reset_value = integer_to_bytearray(reset) + lvl = integer_to_bytearray(flow_sensor) + sts = float_to_bytearray(rate) + payload = reset_value + sts + lvl + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_FLOW_RATE_OVERRIDE_REQUEST.value, + payload=payload) + + # 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 + + def cmd_flow_temp_override(self, flow_sensor: int, temp: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends flow temp override command. + Must be logged into FP. + + @param flow_sensor: integer - the sensor to override its value + @param temp: float - the temperature value to override + @param reset: integer - 1 to reset a previous override, 0 to override + @returns 1 if successful, zero otherwise + """ + reset_value = integer_to_bytearray(reset) + lvl = integer_to_bytearray(flow_sensor) + sts = float_to_bytearray(temp) + payload = reset_value + sts + lvl + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_FLOW_TEMP_OVERRIDE_REQUEST.value, + payload=payload) + + # 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 \ No newline at end of file Index: leahi_dialin/fp/modules/levels.py =================================================================== diff -u --- leahi_dialin/fp/modules/levels.py (revision 0) +++ leahi_dialin/fp/modules/levels.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1,135 @@ +########################################################################### +# +# 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 levels.py +# +# @author (last) Michael Garthwaite +# @date (last) 28-Oct-2024 +# @author (original) Dara Navaei +# @date (original) 29-May-2020 +# +############################################################################ + +import struct +from enum import unique +from logging import Logger + +from .constants import NO_RESET +from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +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 + +@unique +class FPFloaterLevels(DialinEnum): + LEVEL_STATE_LOW = 0 + LEVEL_STATE_HIGH = 1 + LEVEL_STATE_MEDIUM = 2 + LEVEL_STATE_ILLEGAL = 3 + + +class FPLevels(AbstractSubSystem): + """ + + Dialin API sub-class for levels related commands. + """ + + def __init__(self, can_interface, logger: Logger): + """ + + @param can_interface: Denali CAN Messenger object + """ + + super().__init__() + + self.can_interface = can_interface + self.logger = logger + + if self.can_interface is not None: + channel_id = DenaliChannels.fp_sync_broadcast_ch_id + msg_id = MsgIds.MSG_ID_RO_LEVEL_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_levels_sync) + + self.p25_level = 0 + self.fp_levels_timestamp = 0 + + @publish(["fp_levels_timestamp", + "p25_level",]) + def _handler_levels_sync(self, message, timestamp=0.0): + """ + Handles published levels message + + @param message: published levels data message + @returns none + """ + self.p25_level = struct.unpack('i', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1]))[0] + + self.fp_levels_timestamp = timestamp + + def cmd_levels_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends an FP levels data broadcast interval override command message. + 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: (int) Publish time interval in ms + @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_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_LEVELS_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("Sending {} ms publish interval to the FP 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 + + def cmd_level_status_override(self, level_sensor: int, status: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends level status override command. + Must be logged into FP. + + @param level_sensor: integer - the level sensor to override its value + @param status: integer - the status value to override + @param reset: (int) 1 to reset a previous override, 0 to override + @returns 1 if successful, zero otherwise + """ + reset_value = integer_to_bytearray(reset) + lvl = integer_to_bytearray(level) + payload = reset_value + lvl + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_LEVELS_STATUS_OVERRIDE_REQUEST.value, + payload=payload) + + # 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 Index: leahi_dialin/fp/modules/pressure_sensors.py =================================================================== diff -u --- leahi_dialin/fp/modules/pressure_sensors.py (revision 0) +++ leahi_dialin/fp/modules/pressure_sensors.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1,220 @@ +########################################################################### +# +# 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 pressure_sensors.py +# +# @author (last) Vinayakam Mani +# @date (last) 02-May-2024 +# @author (original) Peter Lucia +# @date (original) 02-Apr-2020 +# +############################################################################ +import struct +from enum import unique +from logging import Logger + +from .constants import RESET, NO_RESET +from leahi_dialin.common.msg_defs import MsgIds, MsgFieldPositions +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 + + +@unique +class FPPressureSensorNames(DialinEnum): + M1_PRESSURE_SENSOR_WATER_INLET_PRE_REG = 0 + M3_PRESSURE_SENSOR_WATER_INLET_POST_REG = 1 + P8_PRESSURE_SENSOR_WATER_INLET_PRE_COND = 2 + P13_PRESSURE_SENSOR_PRE_RO_FILTER = 3 + P17_PRESSURE_SENSOR_POST_RO_FILTER = 4 + X1_PRESSURE_SENSOR_PRE_RO_PUMP = 5 + + +class FPPressureSensors(AbstractSubSystem): + """ + Dialin API sub-class for FP pressure sensor related commands. + """ + + def __init__(self, can_interface, logger: Logger): + """ + FPPressureSensors constructor + + """ + super().__init__() + self.can_interface = can_interface + self.logger = logger + + if self.can_interface is not None: + channel_id = DenaliChannels.fp_sync_broadcast_ch_id + msg_id = MsgIds.MSG_ID_RO_PRESSURES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self._handler_pressure_sync) + + self.fp_pressure_timestamp = 0.0 + self.m1_water_inlet_pre_reg_pressure = 0.0 + self.m3_water_inlet_post_reg_pressure = 0.0 + self.p8_water_inlet_pre_cond_pressure = 0.0 + self.p13_pre_ro_filter_pressure = 0.0 + self.p17_post_ro_filter_pressure = 0.0 + self.x1_pre_ro_pump_pressure = 0.0 + self.m1_water_inlet_pre_reg_temp = 0.0 + self.m3_water_inlet_post_reg_temp = 0.0 + self.p8_water_inlet_pre_cond_temp = 0.0 + self.p13_pre_ro_filter_temp = 0.0 + self.p17_post_ro_filter_temp = 0.0 + self.x1_pre_ro_pump_temp = 0.0 + + + @publish([ + "fp_pressure_timestamp", + "m1_water_inlet_pre_reg_pressure", + "m3_water_inlet_post_reg_pressure", + "p8_water_inlet_pre_cond_pressure", + "p13_pre_ro_filter_pressure", + "p17_post_ro_filter_pressure", + "x1_pre_ro_pump_pressure", + "m1_water_inlet_pre_reg_temp", + "m3_water_inlet_post_reg_temp", + "p8_water_inlet_pre_cond_temp", + "p13_pre_ro_filter_temp", + "p17_post_ro_filter_temp", + "x1_pre_ro_pump_temp" + ]) + def _handler_pressure_sync(self, message, timestamp=0.0): + """ + Handles published FP pressure sensor data messages. Pressure data are captured + for reference. + + @param message: published FP pressure sensor data message + @return: none + """ + + pre_reg_wi = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + post_reg_wi = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) + pre_cond_wi = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_3:MsgFieldPositions.END_POS_FIELD_3])) + pre_ro = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_4:MsgFieldPositions.END_POS_FIELD_4])) + post_ro = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_5:MsgFieldPositions.END_POS_FIELD_5])) + pre_pump = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_6:MsgFieldPositions.END_POS_FIELD_6])) + + pre_reg_wi_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7])) + post_reg_wi_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8])) + pre_cond_wi_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9])) + pre_ro_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10])) + post_ro_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_11:MsgFieldPositions.END_POS_FIELD_11])) + pre_pump_temp = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_12:MsgFieldPositions.END_POS_FIELD_12])) + + self.m1_water_inlet_pre_reg_pressure = pre_reg_wi[0] + self.m3_water_inlet_post_reg_pressure = post_reg_wi[0] + self.p8_water_inlet_pre_cond_pressure = pre_cond_wi[0] + self.p13_pre_ro_filter_pressure = pre_ro[0] + self.p17_post_ro_filter_pressure = post_ro[0] + self.x1_pre_ro_pump_pressure = pre_pump[0] + + self.m1_water_inlet_pre_reg_pressure = pre_reg_wi_temp[0] + self.m3_water_inlet_post_reg_pressure = post_reg_wi_temp[0] + self.p8_water_inlet_pre_cond_pressure = pre_cond_wi_temp[0] + self.p13_pre_ro_filter_pressure = pre_ro_temp[0] + self.p17_post_ro_filter_pressure = post_ro_temp[0] + self.x1_pre_ro_pump_temp = pre_pump_temp[0] + + self.fp_pressure_timestamp = timestamp + + def cmd_pressure_sensor_override(self, sensor: int, pressure: float, reset: int = NO_RESET) -> int: + """ + Constructs and sends a measured FP pressure override command message. + Constraints: + Must be logged into FP. + + @param sensor: int - switch between filtered override and raw override + @param pressure: float - measured pressure (in PSI) to override with + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + + rst = integer_to_bytearray(reset) + sen = integer_to_bytearray(sensor) + prs = float_to_bytearray(pressure) + payload = rst + prs + sen + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_PRESSURE_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override FP pressure sensor") + + # Send message + received_message = self.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(pressure) + " PSI. " + self.logger.debug("FP pressure 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_pressure_sensors_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the FP pressure data 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_RO_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override FP pressure 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("FP pressure 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 \ No newline at end of file Index: leahi_dialin/fp/modules/valves.py =================================================================== diff -u --- leahi_dialin/fp/modules/valves.py (revision 0) +++ leahi_dialin/fp/modules/valves.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1,294 @@ +########################################################################### +# +# 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 valves.py +# +# @author (last) Micahel Garthwaite +# @date (last) 17-Aug-2023 +# @author (original) Peman Montazemi +# @date (original) 19-May-2020 +# +############################################################################ + +import struct +from enum import unique +from logging import Logger +from collections import OrderedDict + +from .constants import NO_RESET +from leahi_dialin.common.msg_defs import MsgIds +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 + +# Valve states +ENERGIZED = True +DEENERGIZED = False + + +@unique +class FPValveStates(DialinEnum): + VALVE_STATE_CLOSED = 0 + VALVE_STATE_OPEN = 1 + + +@unique +class FPValveNames(DialinEnum): + M4_VWI = 0 # Valve (M4 VWi) + P39_VROD = 1 # Valve (P39 VROd) + P6_VFF = 2 # Valve (P6 VFF) + P11_VPI = 3 # Valve (P11 VPi) + P33_VCR = 4 # Valve (P33 VCr) + P34_VCB = 5 # Valve (P34 VCb) + P37_VCD = 6 # Valve (P37 VCd) + M7_VFB = 7 # Valve (M7 VFB) + P20_SPP = 8 # Valve (P20 SPP) + +class FPValves(AbstractSubSystem): + """ + Dialin API sub-class for FP valve related commands. + """ + + # Valves states publish message field positions + START_POS_VALVES_STATES = DenaliMessage.PAYLOAD_START_INDEX + END_POS_VALVES_STATES = START_POS_VALVES_STATES + 2 # Valves States come in as a U16 value (2 bytes) + + def __init__(self, can_interface, logger: Logger): + """ + + @param can_interface: Denali CAN Messenger object + """ + + super().__init__() + self.can_interface = can_interface + self.logger = logger + self.valves_sensed_states = OrderedDict() + self.fp_valves_states_timestamp = 0.0 + + if self.can_interface is not None: + channel_id = DenaliChannels.fp_sync_broadcast_ch_id + msg_id = MsgIds.MSG_ID_RO_VALVES_STATES_DATA.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, self._handler_valves_sync) + + self.valve_states_all = 0x0000 + self.m4_vwi_state= {"id": FPValveNames.M4_VWI.value, "state": DEENERGIZED} + self.p39_vrod_state = {"id": FPValveNames.P39_VFPD.value, "state": DEENERGIZED} + self.p6_vff_state = {"id": FPValveNames.P6_VFF.value, "state": DEENERGIZED} + self.p11_vpi_state = {"id": FPValveNames.P11_VPI.value, "state": DEENERGIZED} + self.p33_vcr_state = {"id": FPValveNames.P33_VCR.value, "state": DEENERGIZED} + self.p34_vcb_state = {"id": FPValveNames.P34_VCB.value, "state": DEENERGIZED} + self.p37_vcd_state = {"id": FPValveNames.P37_VCD.value, "state": DEENERGIZED} + self.m7_vfb_state = {"id": FPValveNames.M7_VFB.value, "state": DEENERGIZED} + self.p20_spp_state = {"id": FPValveNames.P20_SPP.value, "state": DEENERGIZED} + + # NOTE: The len function counts the enums with the same number only once. This is not the case in the DG valves + # class because each valve must have a unique ID. + self.valve_states_enum = [0 for _ in range(len(FPValveNames))] + + for valve in FPValveNames.__members__: + self.valves_sensed_states[valve] = '' + + def get_valve_states(self): + """ + Gets the valve states + + @return: All valve states + """ + return [ + self.m4_vwi_state.get("state"), + self.p39_vrod_state.get("state"), + self.p6_vff_state.get("state"), + self.p11_vpi_state.get("state"), + self.p33_vcr_state.get("state"), + self.p34_vcb_state.get("state"), + self.p37_vcd_state.get("state"), + self.m7_vfb_state.get("state"), + self.p20_spp_state.get("state") + ] + + @staticmethod + def sort_by_id(observation): + """ + Converts a published dictionary of valve state information to an ordered list + of tuples. + + @param observation: dictionary of the observed valve states + @return: a list of tuples of the valve states + """ + + result = [] + for key, value in observation.items(): + if isinstance(value, dict): + result.append((key, value.get("id", None), value.get("state", None))) + + result = sorted(result, key=lambda each: each[1]) + return result + + @staticmethod + def _binary_to_valve_state(binary) -> bool: + """ + @param binary: binary value + @return: 1 = energized, otherwise de-energized + """ + + if binary != 0: + return ENERGIZED + else: + return DEENERGIZED + + @publish([ + "fp_valves_states_timestamp", + "valve_states_all", + "m4_vwi_state", + "p39_vrod_state", + "p6_vff_state", + "p11_vpi_state", + "p33_vcr_state", + "p34_vcb_state", + "p37_vcd_state", + "m7_vfb_state", + "p20_spp_state", + "valve_states_enum" + ]) + def _handler_valves_sync(self, message, timestamp=0.0): + """ + Handles published FP valves states message. + + @param message: published FP valves states message + @return: none + """ + + vst = struct.unpack('H', bytearray(message['message'][self.START_POS_VALVES_STATES:self.END_POS_VALVES_STATES])) + self.valve_states_all = vst[0] + # Extract each valve state from U16 valves states using bit-masking + self.m4_vwi_state["state"] = self._binary_to_valve_state(vst[0] & 1) + self.p39_vrod_state["state"] = self._binary_to_valve_state(vst[0] & 2) + self.p6_vff_state["state"] = self._binary_to_valve_state(vst[0] & 4) + self.p11_vpi_state["state"] = self._binary_to_valve_state(vst[0] & 8) + self.p33_vcr_state["state"] = self._binary_to_valve_state(vst[0] & 16) + self.p34_vcb_state["state"] = self._binary_to_valve_state(vst[0] & 32) + self.p37_vcd_state["state"] = self._binary_to_valve_state(vst[0] & 64) + self.m7_vfb_state["state"] = self._binary_to_valve_state(vst[0] & 128) + self.p20_spp_state["state"] = self._binary_to_valve_state(vst[0] & 256) + + start = self.END_POS_VALVES_STATES + end = start + 1 + for valve_id in self.valves_sensed_states: + valve_state_number = struct.unpack('B', bytearray(message['message'][start:end]))[0] + self.valves_sensed_states[valve_id] = FPValveStates(valve_state_number).name + start = end + end += 1 + + self.fp_valves_states_timestamp = timestamp + + def cmd_valve_sensed_state_override(self, valve: int, state: bool, reset: int = NO_RESET) -> int: + """ + Constructs and sends the valve sensed state override command. + Constraints: + Must be logged into FP. + Given valve ID must be one of the valve IDs listed below. + + @param valve: unsigned int - valve ID + @param state: bool - valve state + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + + rst = integer_to_bytearray(reset) + ste = integer_to_bytearray(int(state)) + vlv = integer_to_bytearray(valve) + payload = rst + ste + vlv + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_VALVE_SENSED_STATE_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("Override valve sensed state") + + # 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.debug("Timeout!!!!") + return False + + def cmd_valve_override(self, valve: int, state: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the FP valve state override command. + Constraints: + Must be logged into FP. + Given valve ID must be one of the valve IDs listed below. + + @param valve: unsigned int - valve ID + @param state: int - valve state + @param reset: integer - 1 to reset a previous override, 0 to override + @return: 1 if successful, zero otherwise + """ + + rst = integer_to_bytearray(reset) + ste = integer_to_bytearray(int(state)) + vlv = integer_to_bytearray(valve) + payload = rst + ste + vlv + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_VALVE_CMD_STATE_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("Override valve state") + + # 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.debug("Timeout!!!!") + return False + + def cmd_valve_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the FP valve state 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: unsigned int - broadcast interval (in ms) + @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) + ivl = integer_to_bytearray(ms) + payload = rst + ivl + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_fp_ch_id, + message_id=MsgIds.MSG_ID_RO_VALVE_PUBLISH_INTERVAL_OVERRIDE_REQUEST.value, + payload=payload) + + self.logger.debug("override FP valves states publish interval") + + # 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 Index: leahi_dialin/protocols/CAN.py =================================================================== diff -u -r151f2ea1e956e89141f6eb66fb0b5f8aac74e6d7 -r0f08c28544b557b2bbd8c04b10cff284f41e4fb9 --- leahi_dialin/protocols/CAN.py (.../CAN.py) (revision 151f2ea1e956e89141f6eb66fb0b5f8aac74e6d7) +++ leahi_dialin/protocols/CAN.py (.../CAN.py) (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -262,26 +262,26 @@ channel_rx_tx_pairs = { DenaliChannels.td_alarm_broadcast_ch_id: None, DenaliChannels.dd_alarm_broadcast_ch_id: None, - DenaliChannels.ro_alarm_broadcast_ch_id: None, + DenaliChannels.fp_alarm_broadcast_ch_id: None, DenaliChannels.ui_alarm_broadcast_ch_id: None, DenaliChannels.td_to_dd_ch_id: None, DenaliChannels.dd_to_td_ch_id: None, DenaliChannels.td_to_ui_ch_id: None, DenaliChannels.td_sync_broadcast_ch_id: None, DenaliChannels.dd_sync_broadcast_ch_id: None, - DenaliChannels.ro_sync_broadcast_ch_id: None, + DenaliChannels.fp_sync_broadcast_ch_id: None, DenaliChannels.ui_to_td_ch_id: None, DenaliChannels.ui_sync_broadcast_ch_id: None, DenaliChannels.td_to_dialin_ch_id: DenaliChannels.dialin_to_td_ch_id, DenaliChannels.dd_to_dialin_ch_id: DenaliChannels.dialin_to_dd_ch_id, - DenaliChannels.ro_to_dialin_ch_id: DenaliChannels.dialin_to_ro_ch_id, + DenaliChannels.fp_to_dialin_ch_id: DenaliChannels.dialin_to_fp_ch_id, DenaliChannels.ui_to_dialin_ch_id: DenaliChannels.dialin_to_ui_ch_id } else: channel_rx_tx_pairs = { DenaliChannels.td_alarm_broadcast_ch_id: None, DenaliChannels.dd_alarm_broadcast_ch_id: None, - DenaliChannels.ro_alarm_broadcast_ch_id: None, + DenaliChannels.fp_alarm_broadcast_ch_id: None, DenaliChannels.ui_alarm_broadcast_ch_id: None, DenaliChannels.td_to_dd_ch_id: DenaliChannels.dialin_to_td_ch_id, DenaliChannels.dd_to_td_ch_id: DenaliChannels.dialin_to_dd_ch_id, @@ -384,24 +384,24 @@ td_alarm_broadcast_ch_id = 0x001 dd_alarm_broadcast_ch_id = 0x002 - ro_alarm_broadcast_ch_id = 0x004 + fp_alarm_broadcast_ch_id = 0x004 ui_alarm_broadcast_ch_id = 0x008 td_to_dd_ch_id = 0x010 dd_to_td_ch_id = 0x011 - dd_to_ro_ch_id = 0x020 - ro_to_dd_ch_id = 0x021 + dd_to_fp_ch_id = 0x020 + fp_to_dd_ch_id = 0x021 td_to_ui_ch_id = 0x040 ui_to_td_ch_id = 0x041 td_sync_broadcast_ch_id = 0x100 dd_sync_broadcast_ch_id = 0x101 - ro_sync_broadcast_ch_id = 0x102 + fp_sync_broadcast_ch_id = 0x102 ui_sync_broadcast_ch_id = 0x103 dialin_to_td_ch_id = 0x400 td_to_dialin_ch_id = 0x401 dialin_to_dd_ch_id = 0x402 dd_to_dialin_ch_id = 0x403 - dialin_to_ro_ch_id = 0x404 - ro_to_dialin_ch_id = 0x405 + dialin_to_fp_ch_id = 0x404 + fp_to_dialin_ch_id = 0x405 dialin_to_ui_ch_id = 0x406 ui_to_dialin_ch_id = 0x407 Fisheye: Tag 0f08c28544b557b2bbd8c04b10cff284f41e4fb9 refers to a dead (removed) revision in file `leahi_dialin/ro/__init__.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0f08c28544b557b2bbd8c04b10cff284f41e4fb9 refers to a dead (removed) revision in file `leahi_dialin/ro/modules/__init__.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0f08c28544b557b2bbd8c04b10cff284f41e4fb9 refers to a dead (removed) revision in file `leahi_dialin/ro/modules/boost_pump.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0f08c28544b557b2bbd8c04b10cff284f41e4fb9 refers to a dead (removed) revision in file `leahi_dialin/ro/modules/conductivity_sensors.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0f08c28544b557b2bbd8c04b10cff284f41e4fb9 refers to a dead (removed) revision in file `leahi_dialin/ro/modules/constants.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0f08c28544b557b2bbd8c04b10cff284f41e4fb9 refers to a dead (removed) revision in file `leahi_dialin/ro/modules/flow_sensors.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0f08c28544b557b2bbd8c04b10cff284f41e4fb9 refers to a dead (removed) revision in file `leahi_dialin/ro/modules/levels.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0f08c28544b557b2bbd8c04b10cff284f41e4fb9 refers to a dead (removed) revision in file `leahi_dialin/ro/modules/pressure_sensors.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0f08c28544b557b2bbd8c04b10cff284f41e4fb9 refers to a dead (removed) revision in file `leahi_dialin/ro/modules/valves.py'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0f08c28544b557b2bbd8c04b10cff284f41e4fb9 refers to a dead (removed) revision in file `leahi_dialin/ro/reverse_osmosis.py'. Fisheye: No comparison available. Pass `N' to diff? Index: tests/test_ro.py =================================================================== diff -u --- tests/test_ro.py (revision 0) +++ tests/test_ro.py (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -0,0 +1,107 @@ +########################################################################### +# +# 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 test_uf.py +# +# @author (last) Sean Nash +# @date (last) 24-Sep-2022 +# @author (original) Peter Lucia +# @date (original) 14-Jul-2020 +# +############################################################################ + +import sys +sys.path.append("..") +from time import sleep + +from leahi_dialin.fp.filtration_purification import RO +from leahi_dialin.fp.modules.boost_pump import ROPumpNames +from leahi_dialin.fp.modules.valves import ROValveNames +from leahi_dialin.fp.modules.valves import ROValveStates +from leahi_dialin.fp.modules.levels import ROFloaterLevels +from leahi_dialin.fp.modules.flow_sensors import ROFlowSensorNames + +if __name__ == "__main__": + # create a RO object called fp + ro = RO(log_level="DEBUG") + + # log in to RO as a tester + if ro.cmd_log_in_to_ro() == 0: + exit(1) + + ro.valves.cmd_valve_override(ROValveNames.VWI.value,ROValveStates.VALVE_STATE_OPEN.value) + ro.valves.cmd_valve_override(ROValveNames.VPI.value,ROValveStates.VALVE_STATE_OPEN.value) + ro.valves.cmd_valve_override(ROValveNames.VROD.value,ROValveStates.VALVE_STATE_OPEN.value) + ro.valves.cmd_valve_override(ROValveNames.VCR.value,ROValveStates.VALVE_STATE_OPEN.value) + ro.pumps.cmd_boost_pump_set_pwm_request(ROPumpNames.PUMP_RO.value,250) + + # fp.valves.cmd_valve_override(ROValveNames.VWI.value, ROValveStates.VALVE_STATE_CLOSED.value) + # fp.valves.cmd_valve_override(ROValveNames.VPI.value, ROValveStates.VALVE_STATE_CLOSED.value) + # fp.valves.cmd_valve_override(ROValveNames.VROD.value, ROValveStates.VALVE_STATE_CLOSED.value) + # fp.valves.cmd_valve_override(ROValveNames.VCR.value, ROValveStates.VALVE_STATE_CLOSED.value) + # fp.pumps.cmd_boost_pump_set_pwm_request(ROPumpNames.PUMP_RO.value,0) + + # sleep(15) + # fp.valves.cmd_valve_override(ROValveNames.VCR.value,ROValveStates.VALVE_STATE_CLOSED.value) + + # fp.pumps.cmd_boost_pump_set_pwm_request(ROPumpNames.PUMP_RO.value,100) + # sleep(15) + # fp.pumps.cmd_boost_pump_set_pwm_request(ROPumpNames.PUMP_RO.value,0) + + # fp.levels.cmd_level_state_override(ROFloaterLevels.LEVEL_STATE_HIGH.value) + # fp.flows.cmd_flow_rate_override(ROFlowSensorNames.FLOW_SENSOR_RO_OUTLET.value, 0.5) + + # create log file + with open("RO_test.log", "w") as f: + + # collect data and display/log it + while True: + sleep(1) + modes = "RO.m, " + '{:2d}'.format(ro.ro_operation_mode) + \ + ", RO.s, " + '{:2d}'.format(ro.ro_operation_sub_mode) + pumps = ", RO.st, " + '{:4d}'.format(ro.pumps.ro_pump_state) + \ + ", RO.dc, " + '{:9.2f}'.format(ro.pumps.ro_pump_duty_cycle) +\ + ", RO.sp, " + '{:9.2f}'.format(ro.pumps.ro_pump_speed) + press = ", PRi, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_water_inlet_pre_reg) + \ + ", PRo, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_water_inlet_post_reg) + \ + ", PC2o, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_water_inlet_pre_cond) + \ + ", PPo, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_pre_ro_filter) + \ + ", PMp, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_post_ro_filter) + \ + ", PPi, " + '{:9.2f}'.format(ro.pressures.pressure_sensor_pre_ro_pump) + valves = ", VWi, " + '{:4d}'.format(ro.valves.valve_state_VWI.get("state")) + \ + ", VFb, " + '{:4d}'.format(ro.valves.valve_state_VFB.get("state")) + \ + ", VFf, " + '{:4d}'.format(ro.valves.valve_state_VFF.get("state")) + \ + ", VPi, " + '{:4d}'.format(ro.valves.valve_state_VPI.get("state")) + \ + ", VCr, " + '{:4d}'.format(ro.valves.valve_state_VCR.get("state")) + \ + ", VCb, " + '{:4d}'.format(ro.valves.valve_state_VCB.get("state")) + \ + ", VCd, " + '{:4d}'.format(ro.valves.valve_state_VCD.get("state")) + \ + ", VROD, " + '{:4d}'.format(ro.valves.valve_state_VROD.get("state")) + level = ", LRO, " + '{:4d}'.format(ro.levels.floater) + flows = ", FMS, " + '{:9.2f}'.format(ro.flows.flowFMS) + \ + ", FMP, " + '{:9.2f}'.format(ro.flows.flowFMP) + # # alarms = ", AL.s, " + '{:1d}'.format(td.alarms.get_current_alarms_state()) + \ + # ", AL.t, " + '{:4d}'.format(td.alarms.alarm_top) + + # log data + f.write(modes) + f.write(pumps) + f.write(press) + f.write(valves) + f.write(level) + f.write(flows) + # f.write(alarms) + f.write("\n") + + # print to console + print(" Modes: "+modes) + print(" Pumps: "+pumps) + print(" Pressures: "+press) + print(" Valves: "+valves) + print(" Level: "+level) + print(" Flows: "+flows) + # print(" Alarms: "+alarms) + Index: tests/test_uf.py =================================================================== diff -u -rb93016ee67204223658152cb2952e8ab16af1b94 -r0f08c28544b557b2bbd8c04b10cff284f41e4fb9 --- tests/test_uf.py (.../test_uf.py) (revision b93016ee67204223658152cb2952e8ab16af1b94) +++ tests/test_uf.py (.../test_uf.py) (revision 0f08c28544b557b2bbd8c04b10cff284f41e4fb9) @@ -22,11 +22,19 @@ from dialin.dg.temperatures import DGTemperaturesNames from time import sleep +from leahi_dialin.td.treatment_delivery import TD +#from leahi_dialin.dd.dialysate_delivery import DD +#from leahi_dialin.fp.reverse_osmosis import RO + +from leahi_dialin.td.modules.valves import ValvesEnum + if __name__ == "__main__": - # create an HD object called hd - hd = HD(log_level="DEBUG") - # create a DG object called dg - dg = DG(log_level="DEBUG") + # create an TD object called td + td = TD(log_level="DEBUG") + # create a DD object called dd +# dd = DD(log_level="DEBUG") + # create a RO object called fp +# fp = RO(log_level="DEBUG") sleep(2) # hd.ui.cmd_ui_start_treatment_request() @@ -35,7 +43,7 @@ # log in to HD and DG as tester # if hd.cmd_log_in_to_hd() == 0: # exit(1) -# if dg.cmd_log_in_to_dg() == 0: +# if fp.cmd_log_in_to_ro() == 0: # exit(1) # sleep(1) @@ -48,75 +56,27 @@ # collect UF related data from HD and DG while True: sleep(1) - modes = "HD.m, " + '{:2d}'.format(hd.hd_operation_mode) + \ - ", HD.s, " + '{:2d}'.format(hd.hd_operation_sub_mode) + \ - ", DG.m, " + '{:2d}'.format(dg.dg_operation_mode) + \ - ", DG.s, " + '{:2d}'.format(dg.dg_operation_sub_mode) - loadCells = ", A1, " + '{:8.1f}'.format(dg.load_cells.load_cell_A1) + \ - ", B1, " + '{:8.1f}'.format(dg.load_cells.load_cell_B1) + \ - ", A2, " + '{:8.1f}'.format(dg.load_cells.load_cell_A2) + \ - ", B2, " + '{:8.1f}'.format(dg.load_cells.load_cell_B2) - ultraFilt = ", RfUF, " + '{:9.2f}'.format(hd.dialysate_outlet_flow.reference_dialysate_outlet_uf_volume) + \ - ", MsUF, " + '{:9.2f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_uf_volume) + \ - ", Act.Res, " + '{:1d}'.format(dg.reservoirs.active_reservoir) - valves = ", DGVlvs, " + '{:4X}'.format(dg.valves.valve_states_all) + \ - ", VBA, " + hd.valves.valves_status[ValvesEnum.VBA.name]["PosID"] + \ - ", VBV, " + hd.valves.valves_status[ValvesEnum.VBV.name]["PosID"] + \ - ", VDi, " + hd.valves.valves_status[ValvesEnum.VDI.name]["PosID"] + \ - ", VDo, " + hd.valves.valves_status[ValvesEnum.VDO.name]["PosID"] + \ - ", VBT, " + '{:1d}'.format(hd.valves.hd_air_trap_status) - air = ", ADV, " + '{:1d}'.format(hd.air_bubbles.air_bubbles_status[0]) + \ - ", ULBl, " + '{:1d}'.format(hd.air_trap.lower_level) + \ - ", ULBu, " + '{:1d}'.format(hd.air_trap.upper_level) - pumpSetPts = ", BP.s, " + '{:4d}'.format(hd.bloodflow.target_blood_flow_rate) + \ - ", DPi.s, " + '{:4d}'.format(hd.dialysate_inlet_flow.target_dialysate_inlet_flow_rate) + \ - ", ROP.s, " + '{:9.2f}'.format(dg.ro_pump.target_pressure_psi) + \ - ", DRP.s, " + '{:9.2f}'.format(dg.drain_pump.target_drain_pump_rpm) - pumpMeasSpds = ", BP.m, " + '{:7.1f}'.format(hd.bloodflow.measured_blood_pump_speed) + \ - ", BP.m2, " + '{:7.1f}'.format(hd.bloodflow.get_measured_blood_pump_motor_controller_speed()) + \ - ", BP.r, " + '{:6.1f}'.format(hd.bloodflow.measured_blood_pump_rotor_speed) + \ - ", BP.f, " + '{:7.1f}'.format(hd.bloodflow.measured_blood_flow_rate) + \ - ", DPi.m, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_speed) + \ - ", DPi.m2, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.get_measured_dialysate_inlet_pump_motor_controller_speed()) + \ - ", DPi.r, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_pump_rotor_speed) + \ - ", DPi.f, " + '{:7.1f}'.format(hd.dialysate_inlet_flow.measured_dialysate_inlet_flow_rate) + \ - ", DPo.m, " + '{:7.1f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_speed) + \ - ", DPo.m2, " + '{:7.1f}'.format(hd.dialysate_outlet_flow.get_measured_dialysate_outlet_pump_motor_controller_speed()) + \ - ", DPo.r, " + '{:6.1f}'.format(hd.dialysate_outlet_flow.measured_dialysate_outlet_pump_rotor_speed) + \ - ", FMD.f, " + '{:7.4f}'.format(dg.dialysate_flow_sensor.get_flow_rate()) + \ - ", ROP.f, " + '{:9.3f}'.format(dg.ro_pump.measured_flow_rate_lpm) - pumpPWMs = ", BP.w, "+'{:6.1f}'.format(hd.bloodflow.pwm_duty_cycle_pct) + \ - ", DPi.w, " + '{:6.1f}'.format(hd.dialysate_inlet_flow.pwm_duty_cycle_pct) + \ - ", DPo.w, " + '{:6.1f}'.format(hd.dialysate_outlet_flow.pwm_duty_cycle_pct) + \ - ", ROP.w, " + '{:6.1f}'.format(dg.ro_pump.pwm_duty_cycle_pct) + \ - ", DRP.w, " + '{:4d}'.format(dg.drain_pump.dac_value) - dgPress = ", PPi, " + '{:9.2f}'.format(dg.pressures.ro_pump_inlet_pressure) + \ - ", PPo, " + '{:9.2f}'.format(dg.pressures.ro_pump_outlet_pressure) + \ - ", PRd, " + '{:9.2f}'.format(dg.pressures.drain_pump_inlet_pressure) + \ - ", PDr, " + '{:9.2f}'.format(dg.pressures.drain_pump_outlet_pressure) - hdPress = ", PBA, " + '{:9.2f}'.format(hd.pressure_occlusion.arterial_pressure) + \ - ", PBV, " + '{:9.2f}'.format(hd.pressure_occlusion.venous_pressure) + \ - ", OB, " + '{:7d}'.format(hd.pressure_occlusion.blood_pump_occlusion) - Temps = ", TPi, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.INLET_PRIMARY_HEATER.name]) + \ - ", TPo, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_PRIMARY_HEATER.name]) + \ - ", TRo, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.INLET_DIALYSATE.name]) + \ - ", TDi, " + '{:9.2f}'.format(dg.temperatures.temperatures[DGTemperaturesNames.OUTLET_DIALYSATE_REDUNDANT.name]) + "," - alarms = ", AL.s, " + '{:1d}'.format(hd.alarms.get_current_alarms_state()) + \ - ", AL.t, " + '{:4d}'.format(hd.alarms.alarm_top) - accels = ", AC.x, " + '{:9.4f}'.format(hd.accel.get_accel_vector().x) + \ - ", AC.y, " + '{:9.4f}'.format(hd.accel.get_accel_vector().y) + \ - ", AC.z, " + '{:9.4f}'.format(hd.accel.get_accel_vector().z) + \ - ", ACm.x, " + '{:9.4f}'.format(hd.accel.get_accel_max_vector().x) + \ - ", ACm.y, " + '{:9.4f}'.format(hd.accel.get_accel_max_vector().y) + \ - ", ACm.z, " + '{:9.4f}'.format(hd.accel.get_accel_max_vector().z) + \ - ", ACt.x, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().x) + \ - ", ACt.y, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().y) + \ - ", ACt.z, " + '{:9.4f}'.format(hd.accel.get_accel_tilts().z) - htrs = (', Pri_main_DC, {:5.3f}, Pri_small_DC, {:5.3f}, Trimmer_DC, {:5.3f}, ' - 'Primary_target_temp, {:5.3f}, Trimmer_target_temp, {:5.3f}, '. - format(dg.heaters.main_primary_heater_duty_cycle, dg.heaters.small_primary_heater_duty_cycle, - dg.heaters.trimmer_heater_duty_cycle, - dg.heaters.primary_heaters_target_temperature, dg.heaters.trimmer_heater_target_temperature)) + modes = "TD.m, " + '{:2d}'.format(td.td_operation_mode) + \ + ", TD.s, " + '{:2d}'.format(td.td_operation_sub_mode) + # ", DD.m, " + '{:2d}'.format(dd.dd_operation_mode) + \ + # ", DD.s, " + '{:2d}'.format(dd.dd_operation_sub_mode) + pumpSetPts = ", BP.sf, " + '{:4d}'.format(td.blood_flow.set_blood_flow_rate) + \ + ", BP.ss, " + '{:9.2f}'.format(td.blood_flow.set_rpm) + # ", ROP.s, " + '{:9.2f}'.format(fp.ro_pump.TBD) + pumpMeasSpds = ", BP.m, " + '{:7.1f}'.format(td.blood_flow.measured_blood_pump_speed) + # ", BP.r, " + '{:6.1f}'.format(td.blood_flow.measured_blood_pump_rotor_speed) + \ + # ", BP.f, " + '{:7.1f}'.format(td.blood_flow.measured_blood_flow_rate) + press = ", PBA, " + '{:9.2f}'.format(td.pressure_sensors.arterial_pressure) + \ + ", PBV, " + '{:9.2f}'.format(td.pressure_sensors.venous_pressure) + # valves = ", VBA, " + td.valves.valves_status[ValvesEnum.VBA.name]["PosID"] + \ + # ", VBV, " + td.valves.valves_status[ValvesEnum.VBV.name]["PosID"] + # air = ", ADV, " + '{:1d}'.format(td.bubbles.air_bubbles_status) + \ + # ", ULBl, " + '{:1d}'.format(td.air_trap.lower_level) + \ + # ", ULBu, " + '{:1d}'.format(td.air_trap.upper_level) + \ + # ", AP, " + '{:1d}'.format(td.air_pump.air_pump_state) + \ + # ", VBT, " + '{:1d}'.format(td.air_trap.valve_state) + # alarms = ", AL.s, " + '{:1d}'.format(td.alarms.get_current_alarms_state()) + \ + # ", AL.t, " + '{:4d}'.format(td.alarms.alarm_top) # log data f.write(modes)