Index: dialin/dg/dialysate_fill.py =================================================================== diff -u -r4d916d8daba73702a58aee58041a9c3cc089a48e -re5058835522499573ba251c093ae3c56deaf2149 --- dialin/dg/dialysate_fill.py (.../dialysate_fill.py) (revision 4d916d8daba73702a58aee58041a9c3cc089a48e) +++ dialin/dg/dialysate_fill.py (.../dialysate_fill.py) (revision e5058835522499573ba251c093ae3c56deaf2149) @@ -69,13 +69,13 @@ pctDiffConduct, used_acid, used_bicarb ] """ return [self.avg_acid, self.avg_bicarb, self.first_fill, - self.pctDiffConduct, self.used_acid, self.used_bicarb ] + self.pctDiffConduct, self.used_acid, self.used_bicarb] - @publish(["avg_acid", "avg_bicarb","first_fill", + @publish(["avg_acid", "avg_bicarb", "first_fill", "pctDiffConduct", "used_acid", "used_bicarb"]) def _handler_fill_mode_monitor_sync(self, message): """ - Handles published dialysate fill monitor' data messages. Dialysate fill data are captured + Handles published dialysate fill mode data' data messages. Dialysate fill data are captured for reference. @param message: published dialysate fill' data message Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r88b4967ce6b9ac816ac21b26326450de4b540887 -re5058835522499573ba251c093ae3c56deaf2149 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 88b4967ce6b9ac816ac21b26326450de4b540887) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision e5058835522499573ba251c093ae3c56deaf2149) @@ -25,9 +25,11 @@ from .constants import RESET, NO_RESET from .drain_pump import DGDrainPump from .fans import Fans +from .dialysate_fill import DialysateFill from .dialysate_flow_sensor import DialysateFlowSensor from .fluid_leak import DGFluidLeak from .flush import FlushMode +from .gen_idle import GenIdle from .hd_proxy import DGHDProxy from .heat_disinfect import HeatDisinfect from .heaters import Heaters @@ -161,11 +163,13 @@ self.chemical_disinfect = ChemicalDisinfect(self.can_interface, self.logger) self.concentrate_pumps = ConcentratePumps(self.can_interface, self.logger) self.conductivity_sensors = ConductivitySensors(self.can_interface, self.logger) + self.dialysate_fill = DialysateFill(self.can_interface, self.logger) self.dialysate_flow_sensor = DialysateFlowSensor(self.can_interface, self.logger) self.drain_pump = DGDrainPump(self.can_interface, self.logger) self.fans = Fans(self.can_interface, self.logger) self.fluid_leak = DGFluidLeak(self.can_interface, self.logger) self.flush = FlushMode(self.can_interface, self.logger) + self.gen_idle = GenIdle(self.can_interface, self.logger) self.hd_proxy = DGHDProxy(self.can_interface, self.logger) self.heat_disinfect = HeatDisinfect(self.can_interface, self.logger) self.heaters = Heaters(self.can_interface, self.logger) Index: dialin/dg/gen_idle.py =================================================================== diff -u --- dialin/dg/gen_idle.py (revision 0) +++ dialin/dg/gen_idle.py (revision e5058835522499573ba251c093ae3c56deaf2149) @@ -0,0 +1,108 @@ +########################################################################### +# +# Copyright (c) 2021-2022 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 ModeGenIdle.py +# +# @author (last) Sean Nash +# @date (last) 11-Nov-2021 +# @author (original) Hung Nguyen +# @date (original) 24-Mar-2022 +# +############################################################################ +import struct +from logging import Logger + +from .constants import RESET, NO_RESET +from ..common.msg_defs import MsgIds, MsgFieldPositions +from ..protocols.CAN import DenaliMessage, DenaliChannels +from ..utils.base import AbstractSubSystem, publish +from ..utils.checks import check_broadcast_interval_override_ms +from ..utils.conversions import integer_to_bytearray + + +class GenIdle(AbstractSubSystem): + """ + Dialysate Generation (DG) interface for bad fill sub-states related commands. + """ + + def __init__(self, can_interface, logger: Logger): + """ + Initialize CAN interface and logger + @param can_interface: Denali CAN Messenger object + @param: logger: (Logger) object + """ + + super().__init__() + + self.can_interface = can_interface + self.logger = logger + # The current bad fill sub-state + self.sub_state = 0 + + if self.can_interface is not None: + channel_id = DenaliChannels.dg_sync_broadcast_ch_id + msg_id = MsgIds.MSG_ID_DG_BAD_FILL_SUB_STATE.value + self.can_interface.register_receiving_publication_function(channel_id, msg_id, + self._handler_bad_fill_sub_state_sync) + + def get_sub_state(self): + """ + Gets current bad fill sub-state + + @param: sub state: (int) state index + @return: The current bad fill sub-state + """ + return self.sub_state + + @publish(['sub_state']) + def _handler_bad_fill_sub_state_sync(self, message): + """ + Handles published bad fill sub-states message. + + @param message: published bad fill sub-states message + @return: none + """ + state = struct.unpack('f', bytearray( + message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) + + self.sub_state = state[0] + + def cmd_bad_fill_substates_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: + """ + Constructs and sends the fill mode data broadcast interval override command + Constraints: + Must be logged into DG. + Given interval must be non-zero and a multiple of the DG 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_dg_ch_id, + message_id=MsgIds.MSG_ID_BAD_FILL_STATES_PUBLISH_INTERVAL_OVERRIDE.value, + payload=payload) + + self.logger.debug("override bad fill sub-states data broadcast interval") + + # 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 Fisheye: Tag e5058835522499573ba251c093ae3c56deaf2149 refers to a dead (removed) revision in file `dialin/dg/idle_badfill_substates.py'. Fisheye: No comparison available. Pass `N' to diff? Index: tests/test_conductivity.py =================================================================== diff -u -r6b85dbd8f5d6b077c0d2e3ed28337caa9be4f5f1 -re5058835522499573ba251c093ae3c56deaf2149 --- tests/test_conductivity.py (.../test_conductivity.py) (revision 6b85dbd8f5d6b077c0d2e3ed28337caa9be4f5f1) +++ tests/test_conductivity.py (.../test_conductivity.py) (revision e5058835522499573ba251c093ae3c56deaf2149) @@ -67,6 +67,7 @@ # DG Op modes dg_mode = dg.get_operation_mode() dg_sub_mode = dg.get_operation_sub_mode() + dg_sub_sub_mode = dg.gen_idle.get_sub_state() # flows fmp = dg.ro_pump.get_measured_flow_rate() @@ -92,6 +93,7 @@ # f'DG SubMode, {dg_sub_mode}, ' \ data_string = f'DG Mode, {dg_mode}, ' \ f'SubMode, {dg_sub_mode}, ' \ + f'SubSubMode, {dg_sub_sub_mode}, ' \ f'CPi, {cpi:.4f}, ' \ f'CPo, {cpo:.4f}, ' \ f'CD1, {cd1:.4f}, ' \