Index: dialin/common/hd_defs.py =================================================================== diff -u -ra06d8e6591bba30488c521dd0be24fa0c14c2e75 -r06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821 --- dialin/common/hd_defs.py (.../hd_defs.py) (revision a06d8e6591bba30488c521dd0be24fa0c14c2e75) +++ dialin/common/hd_defs.py (.../hd_defs.py) (revision 06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821) @@ -346,8 +346,10 @@ @unique class TreatmentStopStates(DialinEnum): TREATMENT_STOP_RECIRC_STATE = 0 - TREATMENT_STOP_NO_RECIRC_STATE = 1 - NUM_OF_TREATMENT_STOP_STATES = 2 + TREATMENT_STOP_RECIRC_DIALYSATE_ONLY_STATE = 1 + TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE = 2 + TREATMENT_STOP_NO_RECIRC_STATE = 3 + NUM_OF_TREATMENT_STOP_STATES = 4 @unique @@ -411,3 +413,26 @@ SALINE_BOLUS_STATE_IN_PROGRESS = 2 SALINE_BOLUS_STATE_MAX_DELIVERED = 3 NUM_OF_SALINE_BOLUS_STATES = 4 + +@unique +class TreatmentParameters(DialinEnum): + TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN = 0 + TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN = 1 + TREATMENT_PARAM_TREATMENT_DURATION_MIN = 2 + TREATMENT_PARAM_HEPARIN_PRESTOP_MIN = 3 + TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML = 4 + TREATMENT_PARAM_ACID_CONCENTRATE = 5 + TREATMENT_PARAM_BICARB_CONCENTRATE = 6 + TREATMENT_PARAM_DIALYZER_TYPE = 7 + TREATMENT_PARAM_HEPARIN_TYPE = 8 + TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN = 9 + TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN = 10 + TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG = 11 + TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG = 12 + TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG = 13 + TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG = 14 + TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR = 15 + TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML = 16 + TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C = 17 + TREATMENT_PARAM_UF_VOLUME_L = 18 + NUM_OF_TREATMENT_PARAMS = 19 Index: dialin/hd/alarms.py =================================================================== diff -u -rfe64b46371ec7a8d6709c6f23fd0db81f0dc138c -r06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821 --- dialin/hd/alarms.py (.../alarms.py) (revision fe64b46371ec7a8d6709c6f23fd0db81f0dc138c) +++ dialin/hd/alarms.py (.../alarms.py) (revision 06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821) @@ -120,19 +120,9 @@ @return: (str) the current alarms state in text form. """ - result = "" - if self.alarms_priority_state == self.HD_ALARM_STATE_NONE: - result = "None" - elif self.alarms_priority_state == self.HD_ALARM_STATE_LOW: - result = "Low" - elif self.alarms_priority_state == self.HD_ALARM_STATE_MEDIUM: - result = "Medium" - elif self.alarms_priority_state == self.HD_ALARM_STATE_HIGH: - result = "High" + return self.alarms_state - return result - - def get_all_alarm_states(self): + def get_alarm_states(self): """ Gets all states for all alarms Index: dialin/hd/pretreatment.py =================================================================== diff -u -r688054e96377ce0b2ec5386d7a34b0e1b8a387b3 -r06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821 --- dialin/hd/pretreatment.py (.../pretreatment.py) (revision 688054e96377ce0b2ec5386d7a34b0e1b8a387b3) +++ dialin/hd/pretreatment.py (.../pretreatment.py) (revision 06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821) @@ -242,38 +242,30 @@ self.pre_treatment_wet_self_test_state = struct.unpack('i', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))[0] - self.pre_treatment_submode = 'Unknown SubMode' if PreTreatmentSubModes.has_value(pt_submode): - self.pre_treatment_submode = PreTreatmentSubModes(pt_submode).name + self.pre_treatment_submode = PreTreatmentSubModes(pt_submode).value - self.pre_treatment_sample_water_state = 'Unknown State' if PreTreatmentSampleWaterStates.has_value(pt_sw_state): - self.pre_treatment_sample_water_state = PreTreatmentSampleWaterStates(pt_sw_state).name + self.pre_treatment_sample_water_state = PreTreatmentSampleWaterStates(pt_sw_state).value - self.pre_treatment_consumable_self_test_state = 'Unknown State' if PreTreatmentConsumableSelfTestStates.has_value(pt_consumable_st_state): self.pre_treatment_consumable_self_test_state = PreTreatmentConsumableSelfTestStates( - pt_consumable_st_state).name + pt_consumable_st_state).value - self.pre_treatment_no_cart_self_test_state = 'Unknown State' if PreTreatmentNoCartSelfTestStates.has_value(pt_no_cart_st_state): - self.pre_treatment_no_cart_self_test_state = PreTreatmentNoCartSelfTestStates(pt_no_cart_st_state).name + self.pre_treatment_no_cart_self_test_state = PreTreatmentNoCartSelfTestStates(pt_no_cart_st_state).value - self.pre_treatment_dry_self_test_state = 'Unknown State' - if PreTreatmentDrySelfTestsStates.has_value(pt_dry_st_state): - self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestsStates(pt_dry_st_state).name + if PreTreatmentDrySelfTestStates.has_value(pt_dry_st_state): + self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestStates(pt_dry_st_state).value - self.pre_treatment_dry_self_test_state = 'Unknown State' - if PreTreatmentDrySelfTestsStates.has_value(pt_dry_st_state): - self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestsStates(pt_dry_st_state).name + if PreTreatmentDrySelfTestStates.has_value(pt_dry_st_state): + self.pre_treatment_dry_self_test_state = PreTreatmentDrySelfTestStates(pt_dry_st_state).value - self.pre_treatment_prime_state = 'Unknown State' if PreTreatmentPrimeStates.has_value(pt_prime_state): - self.pre_treatment_prime_state = PreTreatmentPrimeStates(pt_prime_state).name + self.pre_treatment_prime_state = PreTreatmentPrimeStates(pt_prime_state).value - self.pre_treatment_recirc_state = 'Unknown State' if PreTreatmentRecircStates.has_value(pt_recirc_state): - self.pre_treatment_recirc_state = PreTreatmentRecircStates(pt_recirc_state).name + self.pre_treatment_recirc_state = PreTreatmentRecircStates(pt_recirc_state).value @publish([ "no_cart_self_test_timeout", Index: dialin/hd/treatment.py =================================================================== diff -u -r2fd9d80d245316a7db05b45f4b6a9c58a56d7c6a -r06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821 --- dialin/hd/treatment.py (.../treatment.py) (revision 2fd9d80d245316a7db05b45f4b6a9c58a56d7c6a) +++ dialin/hd/treatment.py (.../treatment.py) (revision 06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821) @@ -149,7 +149,7 @@ self.recirc_countdown_secs = 0 # treatment stop status self.treatment_stop_timeout_secs = 0 - self.treatment_stop_timeout_coundown_secs = 0 + self.treatment_stop_timeout_countdown_secs = 0 self.current_treatment_param_dict = {} self.current_blood_flow = 0 @@ -414,6 +414,23 @@ """ return self.recirc_countdown_secs + def get_treatment_stop_timeout(self) -> int: + """ + Returns treatment stop timeout (in seconds) + + @return: The treatment stop timeout + """ + return self.treatment_stop_timeout_secs + + def get_treatment_stop_timeout_countdown(self) -> int: + """ + Returns treatment stop timeout countdown (in seconds) + + @return: The treatment stop timeout countdown + """ + return self.treatment_stop_timeout_countdown_secs + + def get_current_treatment_parameters(self) -> dict: """ Returns current treatment parameters in a dictionary @@ -623,7 +640,7 @@ self.recirc_timeout_secs = tmo[0] self.recirc_countdown_secs = cdn[0] - @publish(["treatment_stop_timeout_secs", "treatment_stop_timeout_coundown_secs"]) + @publish(["treatment_stop_timeout_secs", "treatment_stop_timeout_countdown_secs"]) def _handler_treatment_stop_timer_data_sync(self, message) -> None: """ Handles published treatment stop progress data messages. @@ -638,7 +655,7 @@ message['message'][MsgFieldPositions.START_POS_FIELD_2:MsgFieldPositions.END_POS_FIELD_2])) self.treatment_stop_timeout_secs = tmo[0] - self.treatment_stop_timeout_coundown_secs = cnd[0] + self.treatment_stop_timeout_countdown_secs = cnd[0] @publish(["accepted", "current_blood_flow", "current_dialysate_flow", "current_treatment_duration", "current_heparin_pre_stop", "current_saline_bolus_volume", @@ -980,11 +997,12 @@ Constructs and sends the set dialyzer type parameter command. Constraints: Must be logged into HD. - Dialyzer ID must be positive integer and should be between 0 and 3 (see below) - DIALYZER_TYPE_NIPRO_ELISIO_H_17 = 0 - DIALYZER_TYPE_NIPRO_ELISIO_H_19 = 1 - DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F160NRE = 2 - DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F180NRE = 3 + Dialyzer ID must be positive integer and should be between 0 and 4 (see below) + DIALYZER_TYPE_BBRAUN_PRO_13H = 0 + DIALYZER_TYPE_BBRAUN_PRO_16H = 1 + DIALYZER_TYPE_BBRAUN_PRO_19H = 2 + DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F160NRE = 3 + DIALYZER_TYPE_FRESENIUS_OPTIFLUX_F180NRE = 4 @param dialyzer: integer - set dialyzer type @return: 1 if successful, zero otherwise Index: dialin/hd/ui_proxy.py =================================================================== diff -u -re193e10da7d6c16158592c1aae7ebe1221dd0cde -r06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision e193e10da7d6c16158592c1aae7ebe1221dd0cde) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision 06c15853c3ffd7dae9b0e7fe889fcc23ccb5b821) @@ -13,14 +13,15 @@ # @date (original) 15-Apr-2020 # ############################################################################ -import enum import struct from collections import OrderedDict from logging import Logger from ..common.msg_defs import MsgIds, RequestRejectReasons, MsgFieldPositions +from ..common.hd_defs import TreatmentParameters from ..protocols.CAN import DenaliMessage, DenaliChannels -from ..utils.base import AbstractSubSystem, publish +from ..utils.base import AbstractSubSystem, publish, DialinEnum +from enum import unique from ..utils.conversions import integer_to_bytearray, float_to_bytearray @@ -65,47 +66,18 @@ START_POS_FPGA_LAB = END_POS_FPGA_MINOR END_POS_FPGA_LAB = START_POS_FPGA_LAB + 1 - class TreatmentParameters(enum.Enum): + @unique + class AlarmUserOptions(DialinEnum): - TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN = 0 - TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN = 1 - TREATMENT_PARAM_TREATMENT_DURATION_MIN = 2 - TREATMENT_PARAM_HEPARIN_PRESTOP_MIN = 3 - TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML = 4 - TREATMENT_PARAM_ACID_CONCENTRATE = 5 - TREATMENT_PARAM_BICARB_CONCENTRATE = 6 - TREATMENT_PARAM_DIALYZER_TYPE = 7 - TREATMENT_PARAM_HEPARIN_TYPE = 8 - TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN = 9 - TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN = 10 - TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG = 11 - TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG = 12 - TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG = 13 - TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG = 14 - TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR = 15 - TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML = 16 - TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C = 17 - TREATMENT_PARAM_UF_VOLUME_L = 18 - NUM_OF_TREATMENT_PARAMS = 19 - - @classmethod - def has_value(cls, value): - return value in cls._value2member_map_ - - class AlarmUserOptions(enum.Enum): - ALARM_USER_ACTION_RESUME = 0 ALARM_USER_ACTION_RINSEBACK = 1 ALARM_USER_ACTION_END_TREATMENT = 2 ALARM_USER_ACTION_ACK = 3 NUMBER_OF_ALARM_USER_ACTIONS = 4 - @classmethod - def has_value(cls, value): - return value in cls._value2member_map_ + @unique + class RinsebackUserActions(DialinEnum): - class RinsebackUserActions(enum.Enum): - REQUESTED_USER_ACTION_RINSEBACK_CONFIRM_START = 0 REQUESTED_USER_ACTION_RINSEBACK_INCREASE_RATE = 1 REQUESTED_USER_ACTION_RINSEBACK_DECREASE_RATE = 2 @@ -118,30 +90,20 @@ REQUESTED_USER_ACTION_RINSEBACK_BACK_TO_TREATMENT = 9 NUM_OF_REQUESTED_RINSEBACK_USER_ACTIONS = 10 - @classmethod - def has_value(cls, value): - return value in cls._value2member_map_ + @unique + class RecircUserActions(DialinEnum): - class RecircUserActions(enum.Enum): - REQUESTED_USER_ACTION_TX_RECIRC_RECONNECT = 0 REQUESTED_USER_ACTION_TX_RECIRC_CONFIRM_RECONNECT = 1 REQUESTED_USER_ACTION_TX_RECIRC_RESUME_RC = 2 REQUESTED_USER_ACTION_TX_RECIRC_END_TREATMENT = 3 NUM_OF_REQUESTED_TX_RECIRC_USER_ACTIONS = 4 - @classmethod - def has_value(cls, value): - return value in cls._value2member_map_ - - class TreatmentEndUserActions(enum.Enum): - + @unique + class TreatmentEndUserActions(DialinEnum): REQUESTED_USER_ACTION_TX_END_RINSEBACK_START = 0 NUM_OF_REQUESTED_TX_END_USER_ACTIONS = 1 - @classmethod - def has_value(cls, value): - return value in cls._value2member_map_ def __init__(self, can_interface, logger: Logger): """ @@ -588,24 +550,24 @@ tmp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_18:MsgFieldPositions.END_POS_FIELD_18])) - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value] = dur[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value] = sto[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value] = sal[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value] = acd[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value] = bic[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value] = dlz[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_TYPE.value] = hpr[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value] = bpi[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value] = rbf[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value] = apl[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value] = aph[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value] = vpl[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value] = vph[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value] = hdr[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value] = hbv[0] - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value] = tmp[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value] = dur[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value] = sto[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value] = sal[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value] = acd[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value] = bic[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value] = dlz[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_TYPE.value] = hpr[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value] = bpi[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value] = rbf[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value] = apl[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value] = aph[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value] = vpl[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value] = vph[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value] = hdr[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value] = hbv[0] + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value] = tmp[0] @publish([ "treatment_parameters" @@ -621,7 +583,7 @@ """ tmp = struct.unpack('f', bytearray( message['message'][MsgFieldPositions.START_POS_FIELD_1:MsgFieldPositions.END_POS_FIELD_1])) - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_UF_VOLUME_L.value] = tmp[0] / 1000.0 + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_UF_VOLUME_L.value] = tmp[0] / 1000.0 @publish([ "treatment_parameters_valid", @@ -697,24 +659,24 @@ self.treatment_parameters_valid = True else: self.treatment_parameters_valid = False - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value] = dur[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value] = sto[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value] = sal[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value] = acd[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value] = bic[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value] = dlz[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_TYPE.value] = hpr[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value] = bpi[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value] = rbf[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value] = aph[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value] = apl[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value] = vph[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value] = vpl[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value] = hdr[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value] = hbv[0] - self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value] = tmp[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value] = dur[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value] = sto[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value] = sal[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value] = acd[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value] = bic[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value] = dlz[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_HEPARIN_TYPE.value] = hpr[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value] = bpi[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value] = rbf[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value] = aph[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value] = apl[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value] = vph[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value] = vpl[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value] = hdr[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value] = hbv[0] + self.treatment_parameters_reject_reasons[TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value] = tmp[0] @publish([ "min_treatment_duration_min", @@ -1232,16 +1194,16 @@ @return: None """ - if self.TreatmentParameters.has_value(param_idx): - self.treatment_parameters[self.TreatmentParameters(param_idx)] = value + if TreatmentParameters.has_value(param_idx): + self.treatment_parameters[param_idx] = value idx = integer_to_bytearray(param_idx) - if param_idx == self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value: + if param_idx == TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value: val = float_to_bytearray(value) - elif param_idx == self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value: + elif param_idx == TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value: val = float_to_bytearray(value) - elif param_idx == self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value: + elif param_idx == TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value: val = float_to_bytearray(value) - elif param_idx == self.TreatmentParameters.TREATMENT_PARAM_UF_VOLUME_L.value: + elif param_idx == TreatmentParameters.TREATMENT_PARAM_UF_VOLUME_L.value: val = float_to_bytearray(value) else: val = integer_to_bytearray(value) @@ -1264,7 +1226,7 @@ acid: int = 0, bicarb: int = 0, dialyzer: int = 0, - heparin: int = 0, + hep_type: int = 0, dia_temp: float = 37.0, art_low: int = -300, art_high: int = 0, @@ -1287,7 +1249,7 @@ @param acid: (int) acid concentrate type @param bicarb: (int) bicarbonate concentrate type @param dialyzer: (int) dialyzer type - @param heparin: (int) heparin type + @param hep_type: (int) heparin type @param dia_temp: (float) dialysate temperature (in deg C) @param art_low: (int) arterial pressure low alarm limit (in mmHg) @param art_high: (int) arterial pressure high alarm limit (in mmHg) @@ -1298,24 +1260,24 @@ @return: None """ - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld_flow - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia_flow - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value] = duration - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value] = hep_stop - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value] = sal_bol - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value] = acid - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value] = bicarb - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value] = dialyzer - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_TYPE.value] = heparin - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value] = bp_intvl - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value] = rb_flow - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value] = art_low - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value] = art_high - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value] = ven_low - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value] = ven_high - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value] = hep_rate - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value] = hep_bol - self.treatment_parameters[self.TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value] = dia_temp + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BLOOD_FLOW_RATE_ML_MIN.value] = bld_flow + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYSATE_FLOW_RATE_ML_MIN.value] = dia_flow + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_TREATMENT_DURATION_MIN.value] = duration + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_PRESTOP_MIN.value] = hep_stop + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_SALINE_BOLUS_VOLUME_ML.value] = sal_bol + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ACID_CONCENTRATE.value] = acid + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BICARB_CONCENTRATE.value] = bicarb + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYZER_TYPE.value] = dialyzer + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_TYPE.value] = hep_type + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_BLOOD_PRESSURE_MEAS_INTERVAL_MIN.value] = bp_intvl + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_RINSEBACK_FLOW_RATE_ML_MIN.value] = rb_flow + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value] = art_low + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_HIGH_LIMIT_MMHG.value] = art_high + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value] = ven_low + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value] = ven_high + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_DISPENSE_RATE_ML_HR.value] = hep_rate + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME_ML.value] = hep_bol + self.treatment_parameters[TreatmentParameters.TREATMENT_PARAM_DIALYSATE_TEMPERATURE_C.value] = dia_temp bld = integer_to_bytearray(bld_flow) dia = integer_to_bytearray(dia_flow) @@ -1325,7 +1287,7 @@ acc = integer_to_bytearray(acid) bic = integer_to_bytearray(bicarb) dzr = integer_to_bytearray(dialyzer) - hpr = integer_to_bytearray(heparin) + hpr = integer_to_bytearray(hep_type) bpi = integer_to_bytearray(bp_intvl) rbf = integer_to_bytearray(rb_flow) apl = integer_to_bytearray(art_low)