Index: dialin/common/__init__.py =================================================================== diff -u -r77f757df822e74058abe3e146f6a8d4c3678e049 -rbe97d97e1ddd765351cdc51cb75aee9e7e63ba58 --- dialin/common/__init__.py (.../__init__.py) (revision 77f757df822e74058abe3e146f6a8d4c3678e049) +++ dialin/common/__init__.py (.../__init__.py) (revision be97d97e1ddd765351cdc51cb75aee9e7e63ba58) @@ -1,11 +1,6 @@ -from .alarm_defs import AlarmList, AlarmPriorities -from .msg_defs import MsgIds -from .prs_defs import Ranges -from .hd_defs import (PreTreatmentSubModes, - PreTreatmentSampleWaterStates, - PreTreatmentConsumableSelfTestStates, - PreTreatmentRecircStates, - PreTreatmentNoCartSelfTestStates, - PreTreatmentDrySelfTestStates, - PreTreatmentPrimeStates, - PostTreatmentStates) +from .alarm_defs import * +from .alarm_priorities import * +from .msg_defs import * +from .prs_defs import * +from .hd_defs import * +from .ui_defs import * Index: dialin/common/alarm_defs.py =================================================================== diff -u -r46a620c6eec5d04cdbada3afd520f95d0c157c65 -rbe97d97e1ddd765351cdc51cb75aee9e7e63ba58 --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 46a620c6eec5d04cdbada3afd520f95d0c157c65) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision be97d97e1ddd765351cdc51cb75aee9e7e63ba58) @@ -1,34 +1,205 @@ ########################################################################### # -# Copyright (c) 2019-2020 Diality Inc. - All Rights Reserved. +# Copyright (c) 2019-2021 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 alarm_defs.py # -# @author (last) Sean Nash -# @date (last) 03-Nov-2020 +# @author (last) Peter Lucia +# @date (last) 20-Apr-2021 # @author (original) Peter Lucia -# @date (original) 07-Aug-2020 +# @date (original) 20-Apr-2021 # ############################################################################ -import os from enum import unique -from ..utils.base import AlarmEnum, DialinEnum +from ..utils.base import AlarmEnum -enum_list = {} -with open(os.path.join(os.path.dirname(__file__), 'AlarmIds.txt'), 'r') as file_obj: - for line in file_obj: - split_str = line.split('=') - enum_list[split_str[0].strip()] = int(split_str[1].strip()) -AlarmList = AlarmEnum('AlarmList', enum_list) - +# Branch: staging @unique -class AlarmPriorities(DialinEnum): - ALARM_PRIORITY_NONE = 0 # Indicates not an alarm or no alarms active at this time - ALARM_PRIORITY_LOW = 1 # Low priority alarm - ALARM_PRIORITY_MEDIUM = 2 # Medium priority alarm - ALARM_PRIORITY_HIGH = 3 # High priority alarm - NUM_OF_ALARM_PRIORITIES = 4 # Total number of alarm priorities +class AlarmList(AlarmEnum): + ALARM_ID_NO_ALARM = 0 + ALARM_ID_HD_SOFTWARE_FAULT = 1 + ALARM_ID_STUCK_BUTTON_TEST_FAILED = 2 + ALARM_ID_FPGA_POST_TEST_FAILED = 3 + ALARM_ID_WATCHDOG_POST_TEST_FAILED = 4 + ALARM_ID_UI_COMM_POST_FAILED = 5 + ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK = 6 + ALARM_ID_BLOOD_PUMP_OFF_CHECK = 7 + ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK = 8 + ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_CHECK = 9 + ALARM_ID_DIAL_IN_PUMP_MC_CURRENT_CHECK = 10 + ALARM_ID_DIAL_IN_PUMP_OFF_CHECK = 11 + ALARM_ID_DIAL_IN_PUMP_MC_DIRECTION_CHECK = 12 + ALARM_ID_DIAL_IN_PUMP_ROTOR_SPEED_CHECK = 13 + ALARM_ID_DIAL_OUT_PUMP_MC_CURRENT_CHECK = 14 + ALARM_ID_DIAL_OUT_PUMP_OFF_CHECK = 15 + ALARM_ID_DIAL_OUT_PUMP_MC_DIRECTION_CHECK = 16 + ALARM_ID_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK = 17 + ALARM_ID_WATCHDOG_EXPIRED = 18 + ALARM_ID_RTC_COMM_ERROR = 19 + ALARM_ID_RTC_CONFIG_ERROR = 20 + ALARM_ID_DG_COMM_TIMEOUT = 21 + ALARM_ID_UI_COMM_TIMEOUT = 22 + ALARM_ID_COMM_TOO_MANY_BAD_CRCS = 23 + ALARM_ID_TREATMENT_STOPPED_BY_USER = 24 + ALARM_ID_BLOOD_SITTING_WARNING = 25 + ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RESUME = 26 + ALARM_ID_BLOOD_SITTING_TOO_LONG_NO_RINSEBACK = 27 + ALARM_ID_CAN_MESSAGE_NOT_ACKED = 28 + ALARM_ID_OCCLUSION_BLOOD_PUMP = 29 + ALARM_ID_OCCLUSION_DIAL_IN_PUMP = 30 + ALARM_ID_OCCLUSION_DIAL_OUT_PUMP = 31 + ALARM_ID_ARTERIAL_PRESSURE_LOW = 32 + ALARM_ID_ARTERIAL_PRESSURE_HIGH = 33 + ALARM_ID_VENOUS_PRESSURE_LOW = 34 + ALARM_ID_VENOUS_PRESSURE_HIGH = 35 + ALARM_ID_UF_RATE_TOO_HIGH_ERROR = 36 + ALARM_ID_UF_VOLUME_ACCURACY_ERROR = 37 + ALARM_ID_RTC_BATTERY_LOW = 38 + ALARM_ID_RTC_OR_TIMER_ACCURACY_FAILURE = 39 + ALARM_ID_RTC_RAM_OPS_ERROR = 40 + ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 41 + ALARM_ID_NVDATA_MFG_RECORD_CRC_ERROR = 42 + ALARM_ID_NVDATA_SRVC_RECORD_CRC_ERROR = 43 + ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = 44 + ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 45 + ALARM_ID_RO_PUMP_OUT_PRESSURE_OUT_OF_RANGE = 47 + ALARM_ID_TEMPERATURE_SENSORS_FAULT = 48 + ALARM_ID_FPGA_COMM_TIMEOUT = 49 + ALARM_ID_HD_COMM_TIMEOUT = 50 + ALARM_ID_VALVE_CONTROL_FAILURE = 51 + ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 52 + ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 53 + ALARM_ID_HD_PRIME_PURGE_AIR_TIME_OUT = 54 + ALARM_ID_BLOOD_PUMP_MOTOR_SPEED_CHECK = 55 + ALARM_ID_DIAL_IN_PUMP_MOTOR_SPEED_CHECK = 56 + ALARM_ID_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK = 57 + ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 58 + ALARM_ID_INLET_WATER_LOW_CONDUCTIVITY = 59 + ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY = 60 + ALARM_ID_DG_SOFTWARE_FAULT = 61 + ALARM_ID_CONDUCTIVITY_SENSOR_FAULT = 62 + ALARM_ID_INLET_WATER_LOW_TEMPERATURE = 63 + ALARM_ID_INLET_WATER_HIGH_TEMPERATURE = 64 + ALARM_ID_PRESSURE_SENSOR_FAULT = 65 + ALARM_ID_INLET_WATER_LOW_PRESSURE = 66 + ALARM_ID_HD_CRITICAL_DATA_ERROR = 67 + ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE = 68 + ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE = 69 + ALARM_ID_HD_EXCESSIVE_TILT = 70 + ALARM_ID_DG_EXCESSIVE_TILT = 71 + ALARM_ID_HD_SHOCK = 72 + ALARM_ID_DG_SHOCK = 73 + ALARM_ID_HD_ACCELEROMETER_FAILURE = 74 + ALARM_ID_DG_ACCELEROMETER_FAILURE = 75 + ALARM_ID_DG_CRITICAL_DATA_ERROR = 76 + ALARM_ID_RO_REJECTION_RATIO_OUT_OF_RANGE = 77 + ALARM_ID_INLET_WATER_PRESSURE_FAULT = 78 + ALARM_ID_HD_VALVE_HOMING_FAILED = 79 + ALARM_ID_HD_VALVE_TRANSITION_TIMEOUT = 80 + ALARM_ID_HD_VALVE_NOT_FUNCTIONAL = 81 + ALARM_ID_HD_VALVE_CURRENT_OUT_OF_RANGE = 82 + ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE = 83 + ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS = 84 + ALARM_ID_AIR_TRAP_FILL_DURING_PRIME = 85 + ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT = 86 + ALARM_ID_BLOOD_FLOW_SIGNAL_STRENGTH_TOO_LOW = 87 + ALARM_ID_DIALYSATE_FLOW_SIGNAL_STRENGTH_TOO_LOW = 88 + ALARM_ID_EMPTY_SALINE_BAG = 89 + ALARM_ID_SALINE_BOLUS_VOLUME_CHECK_FAILURE = 90 + ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 91 + ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 92 + ALARM_ID_UV_REACTOR_NOT_HEALTHY = 93 + ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE = 94 + ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 95 + ALARM_ID_RO_PUMP_FLOW_RATE_OUT_OF_RANGE = 96 + ALARM_ID_DG_THERMISTORS_TEMPERATURE_OUT_OF_RANGE = 97 + ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE = 98 + ALARM_ID_DG_DIALYSATE_FILL_OUT_OF_TIME = 99 + ALARM_ID_CP1_SPEED_CONTROL_ERROR = 100 + ALARM_ID_CP2_SPEED_CONTROL_ERROR = 101 + ALARM_ID_FLOW_RATE_OUT_OF_UPPER_RANGE = 102 + ALARM_ID_RO_PUMP_PRESSURE_OUT_OF_RANGE = 103 + ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE = 104 + ALARM_ID_DG_HEATERS_NEGATIVE_COLD_JUNCTION_TEMPERATURE = 105 + ALARM_ID_DG_HEATERS_FAULT = 106 + ALARM_ID_END_OF_TREATMENT_WARNING = 107 + ALARM_ID_END_OF_TREATMENT_ALARM = 108 + ALARM_ID_END_OF_TREATMENT_HIGH = 109 + ALARM_ID_DG_HEAT_DISINFECT_CYCLE_FAILED = 110 + ALARM_ID_RO_PUMP_RAMP_UP_TO_FLOW_TIMEOUT = 111 + ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE = 112 + ALARM_ID_DRAIN_PUMP_OFF_FAULT = 113 + ALARM_ID_RO_PUMP_OFF_FAULT = 114 + ALARM_ID_PRIME_DIALYSATE_DIALYZER_TIME_OUT = 115 + ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT = 116 + ALARM_ID_PRIME_COMPLETED_LOW_PRIORITY = 117 + ALARM_ID_PRIME_COMPLETED_MEDIUM_PRIORITY = 118 + ALARM_ID_PRIME_COMPLETED_HIGH_PRIORITY = 119 + ALARM_ID_PRIME_OUT_OF_TIME = 120 + ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 121 + ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM = 122 + ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM = 123 + ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK = 124 + ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM = 125 + ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM = 126 + ALARM_ID_CARTRIDGE_DOOR_OPENED = 127 + ALARM_ID_PRE_TREATMENT_NO_CART_SELF_TEST_FAILURE = 128 + ALARM_ID_INSTALL_NEW_CARTRIDGE = 129 + ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY = 130 + ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE = 131 + ALARM_ID_NO_CARTRIDGE_LOADED = 132 + ALARM_ID_END_TREATMENT_TIMEOUT_ALARM = 133 + ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE = 134 + ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH = 135 + ALARM_ID_DIALYSATE_TEMPERATURE_TOO_LOW = 136 + ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE = 137 + ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE = 138 + ALARM_ID_DG_FLOW_METER_CHECK_FAILURE = 139 + ALARM_ID_DG_RO_PUMP_TOO_MANY_RAMP_UP_RETRY = 140 + ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID = 141 + ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_CRC_INVALID = 142 + ALARM_ID_NVDATAMGMT_INDIVIDUAL_RECORD_TIME_INVALID = 143 + ALARM_ID_HD_AC_POWER_LOST = 144 + ALARM_ID_DG_RESTARTED_FAULT = 145 + ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE = 146 + ALARM_ID_HD_FLUID_LEAK_DETECTED = 147 + ALARM_ID_DG_FLUID_LEAK_DETECTED = 148 + ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR = 149 + ALARM_ID_HD_SYRINGE_DETECTED = 150 + ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR = 151 + ALARM_ID_HD_SYRINGE_PUMP_SPEED_ERROR = 152 + ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_EMPTY = 153 + ALARM_ID_HD_SYRINGE_PUMP_OCCLUSION = 154 + ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED = 155 + ALARM_ID_HD_SYRINGE_PUMP_NOT_STOPPED_ERROR = 156 + ALARM_ID_HD_BLOOD_LEAK_DETECTED = 157 + ALARM_ID_CARTRIDGE_REMOVAL_FAILURE = 158 + ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT = 159 + ALARM_ID_DG_RESERVOIR_FILL_TIMEOUT = 160 + ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT = 161 + ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT = 162 + ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE = 163 + ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 164 + ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT = 165 + ALARM_ID_DG_BAD_INLET_WATER_QUALITY = 166 + ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE = 167 + ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE = 168 + ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE = 169 + ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE = 170 + ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE = 171 + ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE = 172 + ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE = 173 + ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE = 174 + ALARM_ID_HD_BLOOD_LEAK_FAULT = 175 + ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION = 176 + ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE = 177 + ALARM_ID_DG_PRIMARY_HEATERS_INTERNAL_TEMP_OUT_OF_RANGE = 178 + ALARM_ID_DG_TRIMMER_HEATER_INTERNAL_TEMP_OUT_OF_RANGE = 179 + ALARM_ID_DG_HEATERS_ON_WITH_NO_FLOW_TIMEOUT = 180 + ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT = 181 + ALARM_ID_DIALYSATE_TEMPERATURE_HIGH = 182 + ALARM_ID_DIALYSATE_TEMPERATURE_LOW = 183 Index: dialin/common/msg_ids.py =================================================================== diff -u -rf053467ac7cfb9fe349e394342d3a9253a377403 -rbe97d97e1ddd765351cdc51cb75aee9e7e63ba58 --- dialin/common/msg_ids.py (.../msg_ids.py) (revision f053467ac7cfb9fe349e394342d3a9253a377403) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision be97d97e1ddd765351cdc51cb75aee9e7e63ba58) @@ -8,9 +8,9 @@ # @file msg_ids.py # # @author (last) Peter Lucia -# @date (last) 06-Apr-2021 +# @date (last) 20-Apr-2021 # @author (original) Peter Lucia -# @date (original) 06-Apr-2021 +# @date (original) 20-Apr-2021 # ############################################################################ from enum import unique @@ -119,7 +119,7 @@ MSG_ID_HD_SYRINGE_PUMP_DATA = 0X69 MSG_ID_HD_FLUID_LEAK_STATE = 0X6A MSG_ID_DG_FLUID_LEAK_STATE = 0X6B - MSG_ID_HD_BLOOD_LEAK_STATE = 0X6C + MSG_ID_HD_BLOOD_LEAK_DATA = 0X6C MSG_ID_UI_HD_SET_RTC_REQUEST = 0X6D MSG_ID_HD_UI_SET_RTC_RESPONSE = 0X6E MSG_ID_UI_DG_SET_RTC_REQUEST = 0X6F @@ -132,6 +132,12 @@ MSG_ID_UI_TREATMENT_LOG_DATA_REQUEST = 0X75 MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE = 0X76 MSG_ID_HD_POST_TREATMENT_STATE = 0X77 + MSG_ID___AVAILABLE_16 = 0X78 + MSG_ID_DG_START_STOP_FLUSH = 0X79 + MSG_ID_DG_FLUSH_DATA = 0X7A + MSG_ID_HD_VOLTAGES_DATA = 0X7B + MSG_ID_HD_ALARM_AUDIO_VOLUME_SET_RESPONSE = 0X7C + MSG_ID_HD_ALARM_INFORMATION = 0X7D MSG_ID_DIALYSATE_FLOW_DATA = 0X8 MSG_ID_TESTER_LOGIN_REQUEST = 0X8000 MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0X8001 @@ -209,8 +215,16 @@ MSG_ID_HD_SYRINGE_PUMP_MEASURED_HOME_OVERRIDE = 0X8049 MSG_ID_HD_SYRINGE_PUMP_MEASURED_POSITION_OVERRIDE = 0X804A MSG_ID_HD_SYRINGE_PUMP_MEASURED_VOLUME_OVERRIDE = 0X804B - MSG_ID_HD_BLOOD_LEAK_SEND_INTERVAL_OVERRIDE = 0X804C - MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE = 0X804D + MSG_ID_HD_BLOOD_LEAK_DATA_SEND_INTERVAL_OVERRIDE = 0X804C + MSG_ID_HD_BLOOD_LEAK_STATUS_OVERRIDE = 0X804D + MSG_ID_HD_BLOOD_LEAK_ZERO_REQUEST = 0X804E + MSG_ID_HD_MONITORED_VOLTAGES_SEND_INTERVAL_OVERRIDE = 0X8050 + MSG_ID_HD_MONITORED_VOLTAGES_OVERRIDE = 0X8051 + MSG_ID_HD_ALARM_INFO_SEND_INTERVAL_OVERRIDE = 0X8052 + MSG_ID_HD_ALARM_AUDIO_VOLUME_LEVEL_OVERRIDE = 0X8053 + MSG_ID_HD_ALARM_AUDIO_CURRENT_HG_OVERRIDE = 0X8054 + MSG_ID_HD_ALARM_AUDIO_CURRENT_LG_OVERRIDE = 0X8055 + MSG_ID_HD_ALARM_BACKUP_AUDIO_CURRENT_OVERRIDE = 0X8056 MSG_ID_PRESSURE_OCCLUSION_DATA = 0X9 MSG_ID_CAN_ERROR_COUNT = 0X999 MSG_ID_RTC_EPOCH = 0XA @@ -239,11 +253,12 @@ MSG_ID_DG_ACCEL_MAX_OVERRIDE = 0XA018 MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0XA019 MSG_ID___AVAILABLE_11 = 0XA01A + MSG_ID___AVAILABLE_17 = 0XA01B MSG_ID_DRAIN_PUMP_SET_DELTA_PRESSURE_OVERRIDE = 0XA01C - MSG_ID_HEAT_DISINFECT_RECIRC_PATH_DURATION_MINS = 0XA01D - MSG_ID_HEAT_DISINFECT_R1_TO_R2_DURATION_MINS = 0XA01E - MSG_ID_HEAT_DISINFECT_R2_TO_R1_DURATION_MINS = 0XA01F - MSG_ID_HEAT_DISINFECT_NO_OF_CYCLES_TO_RUN = 0XA020 + MSG_ID___AVAILABLE_12 = 0XA01D + MSG_ID___AVAILABLE_13 = 0XA01E + MSG_ID___AVAILABLE_14 = 0XA01F + MSG_ID___AVAILABLE_15 = 0XA020 MSG_ID_HEAT_DISINFECT_PUBLISH_INTERVAL_OVERRIDE = 0XA021 MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0XA022 MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE = 0XA023 @@ -275,6 +290,7 @@ MSG_ID_DG_SEND_SCHEDULED_RUNS_RECORD = 0XA03E MSG_ID_DG_FLUID_LEAK_SEND_INTERVAL_OVERRIDE = 0XA03F MSG_ID_DG_FLUID_LEAK_STATE_DETECTOR_OVERRIDE = 0XA040 + MSG_ID_DG_FLUSH_PUBLISH_INTERVAL_OVERRIDE = 0XA041 MSG_ID_DIALYSATE_OUT_FLOW_DATA = 0XB MSG_ID_LOAD_CELL_READINGS = 0XC MSG_ID_TREATMENT_TIME = 0XD Index: dialin/dg/dialysate_generator.py =================================================================== diff -u -r6ee95f85e0504b8c7214258074e3022b50c982bd -rbe97d97e1ddd765351cdc51cb75aee9e7e63ba58 --- dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision 6ee95f85e0504b8c7214258074e3022b50c982bd) +++ dialin/dg/dialysate_generator.py (.../dialysate_generator.py) (revision be97d97e1ddd765351cdc51cb75aee9e7e63ba58) @@ -326,10 +326,7 @@ Constraints: Must be logged into DG. - \returns response message if received, False if no response received - - @return: 1 if successful, zero otherwise - + @return: None """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_dg_ch_id, Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r6ee95f85e0504b8c7214258074e3022b50c982bd -rbe97d97e1ddd765351cdc51cb75aee9e7e63ba58 --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 6ee95f85e0504b8c7214258074e3022b50c982bd) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision be97d97e1ddd765351cdc51cb75aee9e7e63ba58) @@ -174,7 +174,7 @@ """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_REQUEST_CALIBRATION_DATA.value) + message_id=MsgIds.MSG_ID_HD_GET_CALIBRATION_RECORD.value) self.logger.debug("requesting HD calibration data.") @@ -191,38 +191,6 @@ self.logger.debug("Timeout!!!!") return False - def cmd_hd_erase_calibration_data(self): - """ - Constructs and sends an erase HD calibration data request command via CAN bus. - Constraints: - Must be logged into HD. - - \returns response message if received, False if no response received - - @return: 1 if successful, zero otherwise - - """ - key = integer_to_bytearray(-758926171) # 0xD2C3B4A5 - - message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_HD_ERASE_CALIBRATION_DATA.value, - payload=key) - - self.logger.debug("requesting HD calibration data be erased.") - - # 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("HD calibration data erasure request accepted.") - else: - self.logger.debug("HD calibration data erasure request failed.") - return received_message['message'][DenaliMessage.PAYLOAD_START_INDEX] - else: - self.logger.debug("Timeout!!!!") - return False - def cmd_hd_set_operation_mode(self, newMode=0): """ Constructs and sends a set operation mode request command via CAN bus. @@ -312,10 +280,7 @@ Constraints: Must be logged into HD. - \returns response message if received, False if no response received - - @return: 1 if successful, zero otherwise - + @return: None """ message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, Index: dialin/hd/syringe_pump.py =================================================================== diff -u -r04d9678a26c46fe1567d9e8eecd80414a94ee4bc -rbe97d97e1ddd765351cdc51cb75aee9e7e63ba58 --- dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision 04d9678a26c46fe1567d9e8eecd80414a94ee4bc) +++ dialin/hd/syringe_pump.py (.../syringe_pump.py) (revision be97d97e1ddd765351cdc51cb75aee9e7e63ba58) @@ -144,6 +144,14 @@ """ return self.syringe_pump_force_v + def get_syringe_pump_safety_volume(self): + """ + Gets the current syringe pump safety volume reading + + @return: latest published safety volume calculated by HD firmware + """ + return self.syringe_pump_safety_volume_ml + @_publish(["syringe_pump_state", "syringe_pump_set_rate_ml_hr", "syringe_pump_meas_rate_ml_hr","syringe_pump_position", "syringe_pump_volume_ml","syringe_pump_home_v", Index: dialin/hd/ui_proxy.py =================================================================== diff -u -rf053467ac7cfb9fe349e394342d3a9253a377403 -rbe97d97e1ddd765351cdc51cb75aee9e7e63ba58 --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision f053467ac7cfb9fe349e394342d3a9253a377403) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision be97d97e1ddd765351cdc51cb75aee9e7e63ba58) @@ -262,6 +262,14 @@ """ return self.fpga_version + def get_reject_reasons(self): + """ + Gets all possible reject reasons + + @return: OrderedDict(), {"": ... } + """ + return self.reject_reasons + def get_treatment_parameters(self): """ Gets the array of treatment parameters set by user or Dialin @@ -270,6 +278,23 @@ """ return self.treatment_parameters + def get_treatment_parameters_reject_reasons(self): + """ + Gets the array of reject reasons for treatment parameters by HD firmware + + @return: the array of reject reasons + """ + return self.treatment_parameters_reject_reasons + + def get_treatment_parameters_valid(self): + """ + Gets the T/F flag for whether treatment parameters + are considered valid by HD. + + @return: True if treatment parameters are valid, False if not + """ + return self.treatment_parameters_valid + def get_min_treatment_duration_min(self): """ Gets the min treatment duration @@ -334,14 +359,6 @@ """ return self.duration_change_reject_reason - def get_reject_reasons(self): - """ - Gets all possible reject reasons - - @return: OrderedDict(), {"": ... } - """ - return self.reject_reasons - def get_duration_change_time_min(self): """ Gets the duration change time @@ -444,177 +461,6 @@ """ return self.target_dialysate_flow_rate - def get_treatment_parameters_valid(self): - """ - Gets the T/F flag for whether treatment parameters - are considered valid by HD. - - @return: True if treatment parameters are valid, False if not - """ - return self.treatment_parameters_valid - - def get_treatment_parameters_reject_reasons(self): - """ - Gets the reject reason codes for the treatment parameters - sent to the HD for validation. - - @return: The array of reject reason codes for all treatment parameters - """ - return self.treatment_parameters_reject_reasons - - def get_blood_flow_rate_reject_reason(self): - """ - Gets the reject reason code for the blood flow rate - treatment parameter. - - @return: The reject reason code for the blood flow rate - """ - return self.blood_flow_rate_reject_reason - - def get_dialysate_flow_rate_reject_reason(self): - """ - Gets the reject reason code for the dialysate flow rate - treatment parameter. - - @return: The reject reason code for the dialysate flow rate - """ - return self.dialysate_flow_rate_reject_reason - - def get_treatment_duration_reject_reason(self): - """ - Gets the reject reason code for the treatment duration - treatment parameter. - - @return: The reject reason code for the treatment duration - """ - return self.treatment_duration_reject_reason - - def get_heparin_pre_stop_time_reject_reason(self): - """ - Gets the reject reason code for the Heparin pre-stop - time treatment parameter. - - @return: The reject reason code for the Heparin pre-stop time - """ - return self.heparin_pre_stop_time_reject_reason - - def get_saline_bolus_volume_reject_reason(self): - """ - Gets the reject reason code for the saline bolus volume - treatment parameter. - - @return: The reject reason code for the saline bolus volume - """ - return self.saline_bolus_volume_reject_reason - - def get_acid_concentrate_reject_reason(self): - """ - Gets the reject reason code for the acid concentrate - treatment parameter. - - @return: The reject reason code for the acid concentrate - """ - return self.acid_concentrate_reject_reason - - def get_bicarb_concentrate_reject_reason(self): - """ - Gets the reject reason code for the bicarbonate - concentrate treatment parameter. - - @return: The reject reason code for the bicarbonate concentrate - """ - return self.bicarb_concentrate_reject_reason - - def get_dialyzer_type_reject_reason(self): - """ - Gets the reject reason code for the dialyzer type treatment - parameter. - - @return: The reject reason code for the dialyzer type - """ - return self.dialyzer_type_reject_reason - - def get_blood_pressure_meas_interval_reject_reason(self): - """ - Gets the reject reason code for the BP measurement interval - treatment parameter. - - @return: The reject reason code for the BP measurement interval - """ - return self.blood_pressure_meas_interval_reject_reason - - def get_rinseback_flow_rate_reject_reason(self): - """ - Gets the reject reason code for the rinseback flow rate - treatment parameter. - - @return: The reject reason code for the rinseback flow rate - """ - return self.rinseback_flow_rate_reject_reason - - def get_arterial_pressure_low_alarm_limit_reject_reason(self): - """ - Gets the reject reason code for the arterial pressure low alarm - limit treatment parameter. - - @return: The reject reason code for the arterial pressure low alarm limit - """ - return self.arterial_pressure_low_alarm_limit_reject_reason - - def get_arterial_pressure_high_alarm_limit_reject_reason(self): - """ - Gets the reject reason code for the arterial pressure high alarm - limit treatment parameter. - - @return: The reject reason code for the arterial pressure high alarm limit - """ - return self.arterial_pressure_high_alarm_limit_reject_reason - - def get_venous_pressure_low_alarm_limit_reject_reason(self): - """ - Gets the reject reason code for the venous pressure low alarm - limit treatment parameter. - - @return: The reject reason code for the venous pressure low alarm limit - """ - return self.venous_pressure_low_alarm_limit_reject_reason - - def get_venous_pressure_high_alarm_limit_reject_reason(self): - """ - Gets the reject reason code for the venous pressure high alarm - limit treatment parameter. - - @return: The reject reason code for the venous pressure high alarm limit - """ - return self.venous_pressure_high_alarm_limit_reject_reason - - def get_heparin_dispense_rate_reject_reason(self): - """ - Gets the reject reason code for the Heparin dispense rate - treatment parameter. - - @return: The reject reason code for the Heparin dispense rate - """ - return self.heparin_dispense_rate_reject_reason - - def get_heparin_bolus_volume_reject_reason(self): - """ - Gets the reject reason code for the Heparin bolus volume - treatment parameter. - - @return: The reject reason code for the Heparin bolus volume - """ - return self.heparin_bolus_volume_reject_reason - - def get_dialysate_temperature_reject_reason(self): - """ - Gets the reject reason code for the dialysate temperature - treatment parameter. - - @return: The reject reason code for dialysate temperature - """ - return self.dialysate_temperature_reject_reason - def get_saline_bolus_reject_reason(self): """ Gets the reject reason code for the saline bolus request @@ -857,23 +703,23 @@ self.treatment_parameters_valid = True else: self.treatment_parameters_valid = False - self.blood_flow_rate_reject_reason = bld[0] - self.dialysate_flow_rate_reject_reason = dia[0] - self.treatment_duration_reject_reason = dur[0] - self.heparin_pre_stop_time_reject_reason = sto[0] - self.saline_bolus_volume_reject_reason = sal[0] - self.acid_concentrate_reject_reason = acd[0] - self.bicarb_concentrate_reject_reason = bic[0] - self.dialyzer_type_reject_reason = dlz[0] - self.blood_pressure_meas_interval_reject_reason = bpi[0] - self.rinseback_flow_rate_reject_reason = rbf[0] - self.arterial_pressure_low_alarm_limit_reject_reason = apl[0] - self.arterial_pressure_high_alarm_limit_reject_reason = aph[0] - self.venous_pressure_low_alarm_limit_reject_reason = vpl[0] - self.venous_pressure_high_alarm_limit_reject_reason = vph[0] - self.heparin_dispense_rate_reject_reason = hdr[0] - self.heparin_bolus_volume_reject_reason = hbv[0] - self.dialysate_temperature_reject_reason = tmp[0] + 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_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] = apl[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_ARTERIAL_PRESSURE_LOW_LIMIT_MMHG.value] = aph[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_HIGH_LIMIT_MMHG.value] = vpl[0] + self.treatment_parameters_reject_reasons[self.TreatmentParameters.TREATMENT_PARAM_VENOUS_PRESSURE_LOW_LIMIT_MMHG.value] = vph[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] @_publish([ "min_treatment_duration_min", @@ -1784,3 +1630,29 @@ self.logger.debug("Sending user continue to treatment request to HD.") self.can_interface.send(message, 0) + def cmd_ui_start_treatment_request(self): + """ + Constructs and sends a ui start treatment request message + + @return: none + """ + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=MsgIds.MSG_ID_UI_START_TREATMENT_REQUEST.value) + + self.logger.debug("Sending user start treatment request to HD.") + self.can_interface.send(message, 0) + + def cmd_ui_disposable_removal_confirm(self): + """ + Constructs and sends a ui disposable removal confirm message + + @return: none + """ + + message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, + message_id=MsgIds.MSG_ID_UI_DISPOSABLE_REMOVAL_CONFIRM.value) + + self.logger.debug("Sending user disposable removal confirm msg to HD.") + self.can_interface.send(message, 0) + Index: dialin/ui/hd_simulator.py =================================================================== diff -u -r045eb4c25850caf5b77a3fabcb0e6eefa7407380 -rbe97d97e1ddd765351cdc51cb75aee9e7e63ba58 --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision 045eb4c25850caf5b77a3fabcb0e6eefa7407380) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision be97d97e1ddd765351cdc51cb75aee9e7e63ba58) @@ -60,7 +60,7 @@ if self.can_interface is not None: channel_id = DenaliChannels.ui_to_hd_ch_id self.can_interface.register_receiving_publication_function(channel_id, - MsgIds.MSG_ID_UI_START_TREATMENT_REQUEST.value, + MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value, self._handler_ui_start_treatment) self.can_interface.register_receiving_publication_function(channel_id, MsgIds.MSG_ID_UI_SET_UF_VOLUME_PARAMETER.value, @@ -311,7 +311,7 @@ payload += integer_to_bytearray(reason) message = DenaliMessage.build_message(channel_id=DenaliChannels.hd_to_ui_ch_id, - message_id=MsgIds.MSG_ID_HD_START_TREATMENT_RESPONSE.value, + message_id=MsgIds.MSG_ID_UI_INITIATE_TREATMENT_RESPONSE.value, payload=payload) self.can_interface.send(message, 0)