Index: dialin/common/msg_ids.py =================================================================== diff -u -r197d6e71147426b2c0a7e37bbaf7469a96a75e95 -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 197d6e71147426b2c0a7e37bbaf7469a96a75e95) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309) @@ -320,6 +320,7 @@ MSG_ID_HD_HEPRIN_BOLUS_TARGET_RATE_OVERRIDE = 0x807A MSG_ID_HD_REQ_CURRENT_TREATMENT_PARAMETERS = 0x807B MSG_ID_HD_RES_CURRENT_TREATMENT_PARAMETERS = 0x807C + MSG_ID_HD_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0x807D MSG_ID_DG_TESTER_LOGIN_REQUEST = 0xA000 MSG_ID_DG_ALARM_STATE_OVERRIDE = 0xA001 @@ -396,7 +397,8 @@ MSG_ID_DG_SET_SW_CONFIG_RECORD = 0xA04B MSG_ID_DG_SEND_SW_CONFIG_RECORD = 0xA04C MSG_ID_DG_FANS_DUTY_CYCLE_OVERRIDE = 0xA04D - MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE = 0xA04E + MSG_ID_DG_SET_FANS_RPM_ALARM_START_TIME_OFFSET = 0xA04E + MSG_ID_DG_HD_COMMUNICATION_STATUS_OVERRIDE = 0xA04F MSG_ID_HD_DEBUG_EVENT = 0xFFF1 MSG_ID_DG_DEBUG_EVENT = 0xFFF2 Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -rb8e4caa6515a773d560de2a2663541db67286f80 -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision b8e4caa6515a773d560de2a2663541db67286f80) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309) @@ -8,7 +8,7 @@ # @file dialysate_generator.py # # @author (last) Dara Navaei -# @date (last) 02-Dec-2021 +# @date (last) 01-Mar-2022 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/dg/ro_pump.py =================================================================== diff -u -r4a976b41da5547b1d1f420396efd32428314b411 -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 --- dialin/dg/ro_pump.py (.../ro_pump.py) (revision 4a976b41da5547b1d1f420396efd32428314b411) +++ dialin/dg/ro_pump.py (.../ro_pump.py) (revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309) @@ -8,7 +8,7 @@ # @file ro_pump.py # # @author (last) Dara Navaei -# @date (last) 19-Nov-2021 +# @date (last) 23-Feb-2022 # @author (original) Sean # @date (original) 14-Apr-2020 # Index: dialin/dg/temperatures.py =================================================================== diff -u -re1c57630f2c197d49209edc02a179ae77f7a12f4 -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 --- dialin/dg/temperatures.py (.../temperatures.py) (revision e1c57630f2c197d49209edc02a179ae77f7a12f4) +++ dialin/dg/temperatures.py (.../temperatures.py) (revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309) @@ -8,7 +8,7 @@ # @file temperatures.py # # @author (last) Dara Navaei -# @date (last) 10-Dec-2021 +# @date (last) 02-Mar-2022 # @author (original) Dara Navaei # @date (original) 01-Dec-2021 # Index: dialin/hd/fans.py =================================================================== diff -u -r023588def838cbb91576d0e1e150e60cff100500 -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 --- dialin/hd/fans.py (.../fans.py) (revision 023588def838cbb91576d0e1e150e60cff100500) +++ dialin/hd/fans.py (.../fans.py) (revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309) @@ -8,7 +8,7 @@ # @file fans.py # # @author (last) Dara Navaei -# @date (last) 05-Jan-2022 +# @date (last) 01-Mar-2022 # @author (original) Dara Navaei # @date (original) 04-Aug-2021 # @@ -140,6 +140,37 @@ self.logger.debug("Timeout!!!!") return False + def cmd_fans_rpm_alarm_start_time_offset(self, time: int) -> int: + """ + Constructs and sends the HD fan RPM alarm start time offset command + Constraints: + Must be logged into HD. + + @param time: (int) time offset in seconds + @return: 1 if successful, zero otherwise + """ + payload = integer_to_bytearray(time) + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=MsgIds.MSG_ID_HD_SET_FANS_RPM_ALARM_START_TIME_OFFSET.value, + payload=payload) + + self.logger.debug("Override fan RPM alarm start time offset") + + # Send message + received_message = self.can_interface.send(message) + + # If there is no content... + if received_message is not None: + + self.logger.debug("RPM alarm start time offset set to: " + + 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_fans_data_broadcast_interval_override(self, ms: int, reset: int = NO_RESET) -> int: """ Constructs and sends the fans data publish interval. @@ -184,40 +215,6 @@ self.logger.debug("Timeout!!!!") return False - def cmd_fans_rpm_alarm_start_time_offset_override(self, seconds: int, reset: int = NO_RESET) -> int: - """ - Constructs and sends the HD fan RPM alarm start time override command - Constraints: - Must be logged into HD. - - @param seconds: (int) seconds that the fan alarm start time must be overridden to - @param reset: (int) 1 to reset a previous override, 0 to override - @return: 1 if successful, zero otherwise - """ - reset_value = integer_to_bytearray(reset) - s = integer_to_bytearray(seconds) - payload = reset_value + s - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE.value, - payload=payload) - - self.logger.debug("Override fan RPM alarm start time") - - # Send message - received_message = self.can_interface.send(message) - - # If there is no content... - if received_message is not None: - - self.logger.debug("Set RPM alarm start time to: " + - 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_fans_duty_cycle_override(self, duty_cycle: float, reset: int = NO_RESET) -> int: """ Constructs and sends the HD fans duty cycle override command Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -re1c57630f2c197d49209edc02a179ae77f7a12f4 -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision e1c57630f2c197d49209edc02a179ae77f7a12f4) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309) @@ -7,8 +7,8 @@ # # @file hemodialysis_device.py # -# @author (last) Micahel Garthwaite -# @date (last) 22-Feb-2022 +# @author (last) Dara Navaei +# @date (last) 01-Mar-2022 # @author (original) Peter Lucia # @date (original) 02-Apr-2020 # Index: dialin/hd/treatment.py =================================================================== diff -u -r88b4967ce6b9ac816ac21b26326450de4b540887 -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 --- dialin/hd/treatment.py (.../treatment.py) (revision 88b4967ce6b9ac816ac21b26326450de4b540887) +++ dialin/hd/treatment.py (.../treatment.py) (revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309) @@ -705,8 +705,8 @@ self.current_arterial_high = arthigh[0] self.current_venous_low = venouslow[0] self.current_venous_high = venoushigh[0] - self.current_heparin_bolus = hepdispense[0] - self.current_heparin_dispense = hepbolus[0] + self.current_heparin_bolus = hepbolus[0] + self.current_heparin_dispense = hepdispense[0] self.current_dialysate_temp = dialtemp[0] self.current_uf_volume = ufvol[0] Index: dialin/version.py =================================================================== diff -u -rde182c178484211749c94484b2fbe84d6451fe3a -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 --- dialin/version.py (.../version.py) (revision de182c178484211749c94484b2fbe84d6451fe3a) +++ dialin/version.py (.../version.py) (revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309) @@ -8,8 +8,8 @@ # @file version.py # -# @author (last) Peter Lucia -# @date (last) 25-Jun-2021 +# @author (last) Dara Navaei +# @date (last) 18-Jan-2022 # @author (original) Peter Lucia # @date (original) 18-Jun-2020 # Index: tests/dg_nvm_scripts.py =================================================================== diff -u -r49b0a39cd2cb1868c7953a9379f331daaf22fdbf -rdc34d36bd96f68c2ec1976cd505f97d5d3ff2309 --- tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision 49b0a39cd2cb1868c7953a9379f331daaf22fdbf) +++ tests/dg_nvm_scripts.py (.../dg_nvm_scripts.py) (revision dc34d36bd96f68c2ec1976cd505f97d5d3ff2309) @@ -1,3 +1,18 @@ +########################################################################### +# +# Copyright (c) 2022-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 dg_nvm_scripts.py +# +# @author (last) Dara Navaei +# @date (last) 17-Feb-2022 +# @author (original) Dara Navaei +# @date (original) 10-Feb-2022 +# +############################################################################ from dialin import DG if __name__ == "__main__":