Index: dialin/common/__init__.py =================================================================== diff -u -r77f757df822e74058abe3e146f6a8d4c3678e049 -raf21ad6b590a05515b33e573d1c9236f21cafa3e --- dialin/common/__init__.py (.../__init__.py) (revision 77f757df822e74058abe3e146f6a8d4c3678e049) +++ dialin/common/__init__.py (.../__init__.py) (revision af21ad6b590a05515b33e573d1c9236f21cafa3e) @@ -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 -raf21ad6b590a05515b33e573d1c9236f21cafa3e --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 46a620c6eec5d04cdbada3afd520f95d0c157c65) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision af21ad6b590a05515b33e573d1c9236f21cafa3e) @@ -1,34 +1,198 @@ ########################################################################### # -# 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) 14-Apr-2021 # @author (original) Peter Lucia -# @date (original) 07-Aug-2020 +# @date (original) 14-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_TEMPERATRUE_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_DETECTOR_FAULT = 175 + ALARM_ID_DG_LOAD_CELLS_INVALID_CALIBRATION = 176 Index: dialin/common/msg_ids.py =================================================================== diff -u -rf053467ac7cfb9fe349e394342d3a9253a377403 -raf21ad6b590a05515b33e573d1c9236f21cafa3e --- dialin/common/msg_ids.py (.../msg_ids.py) (revision f053467ac7cfb9fe349e394342d3a9253a377403) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision af21ad6b590a05515b33e573d1c9236f21cafa3e) @@ -8,9 +8,9 @@ # @file msg_ids.py # # @author (last) Peter Lucia -# @date (last) 06-Apr-2021 +# @date (last) 14-Apr-2021 # @author (original) Peter Lucia -# @date (original) 06-Apr-2021 +# @date (original) 14-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_STATUS = 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,9 @@ 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_HD_BLOOD_LEAK_STATE = 0X78 + MSG_ID_DG_START_STOP_FLUSH = 0X79 + MSG_ID_DG_FLUSH_DATA = 0X7A MSG_ID_DIALYSATE_FLOW_DATA = 0X8 MSG_ID_TESTER_LOGIN_REQUEST = 0X8000 MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0X8001 @@ -209,8 +212,10 @@ 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_STATUS_SEND_INTERVAL_OVERRIDE = 0X804C + MSG_ID_HD_BLOOD_LEAK_STATUS_DETECTOR_OVERRIDE = 0X804D + MSG_ID_HD_BLOOD_LEAK_STATE_SEND_INTERVAL_OVERRIDE = 0X804E + MSG_ID_HD_BLOOD_LEAK_STATE_DETECTOR_OVERRIDE = 0X804F MSG_ID_PRESSURE_OCCLUSION_DATA = 0X9 MSG_ID_CAN_ERROR_COUNT = 0X999 MSG_ID_RTC_EPOCH = 0XA @@ -240,10 +245,10 @@ MSG_ID_DG_ACCEL_SEND_INTERVAL_OVERRIDE = 0XA019 MSG_ID___AVAILABLE_11 = 0XA01A 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 +280,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/hd/air_trap.py =================================================================== diff -u -r3b8ec241845f0bfbeebc3f6e14160b9e7148fc3b -raf21ad6b590a05515b33e573d1c9236f21cafa3e --- dialin/hd/air_trap.py (.../air_trap.py) (revision 3b8ec241845f0bfbeebc3f6e14160b9e7148fc3b) +++ dialin/hd/air_trap.py (.../air_trap.py) (revision af21ad6b590a05515b33e573d1c9236f21cafa3e) @@ -121,7 +121,7 @@ payload = rst + det + idx message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_DG_AIR_TRAP_LEVEL_SENSOR_OVERRIDE.value, + message_id=MsgIds.MSG_ID_HD_AIR_TRAP_LEVEL_SENSOR_OVERRIDE.value, payload=payload) self.logger.debug("override air trap level sensor detection value for sensor " + str(sensor)) @@ -154,7 +154,7 @@ payload = rst + mis message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_DG_AIR_TRAP_DATA_BROADCAST_INTERVAL_OVERRIDE.value, + message_id=MsgIds.MSG_ID_HD_AIR_TRAP_SEND_INTERVAL_OVERRIDE.value, payload=payload) self.logger.debug("override HD air trap data broadcast interval") Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -r211f04b9e9ff6558bc34f99ee805e18ad9c30579 -raf21ad6b590a05515b33e573d1c9236f21cafa3e --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision 211f04b9e9ff6558bc34f99ee805e18ad9c30579) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision af21ad6b590a05515b33e573d1c9236f21cafa3e) @@ -174,8 +174,9 @@ """ 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.") # Send message @@ -191,38 +192,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. Index: dialin/hd/treatment.py =================================================================== diff -u -r02eff24a2b116fe3d71d8275eeb78f419302efd6 -raf21ad6b590a05515b33e573d1c9236f21cafa3e --- dialin/hd/treatment.py (.../treatment.py) (revision 02eff24a2b116fe3d71d8275eeb78f419302efd6) +++ dialin/hd/treatment.py (.../treatment.py) (revision af21ad6b590a05515b33e573d1c9236f21cafa3e) @@ -67,8 +67,6 @@ UF_START_STATE = 0 # Start state of the ultrafiltration state machine UF_PAUSED_STATE = 1 # Paused state of the ultrafiltration state machine UF_RUNNING_STATE = 2 # Running state of the ultrafiltration state machine - UF_OFF_STATE = 3 # Completed/off state of the ultrafiltration state machine - UF_COMPLETED_STATE = 4 # Completed state of ultrafiltration state machine # Saline bolus states SALINE_BOLUS_STATE_IDLE = 0 # No saline bolus delivery is in progress Index: dialin/hd/ui_proxy.py =================================================================== diff -u -rf053467ac7cfb9fe349e394342d3a9253a377403 -raf21ad6b590a05515b33e573d1c9236f21cafa3e --- dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision f053467ac7cfb9fe349e394342d3a9253a377403) +++ dialin/hd/ui_proxy.py (.../ui_proxy.py) (revision af21ad6b590a05515b33e573d1c9236f21cafa3e) @@ -1383,7 +1383,7 @@ cmd = integer_to_bytearray(cmnd) payload = cmd message = DenaliMessage.build_message(channel_id=DenaliChannels.dialin_to_hd_ch_id, - message_id=MsgIds.MSG_ID_UI_START_TREATMENT_REQUEST.value, + message_id=MsgIds.MSG_ID_UI_INITIATE_TREATMENT_REQUEST.value, payload=payload) self.logger.debug("Sending start treatment command request.") @@ -1784,3 +1784,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/hd/valves.py =================================================================== diff -u -rb24ebf6f50d919d88ff58f10b010cfdfcff8b2a9 -raf21ad6b590a05515b33e573d1c9236f21cafa3e --- dialin/hd/valves.py (.../valves.py) (revision b24ebf6f50d919d88ff58f10b010cfdfcff8b2a9) +++ dialin/hd/valves.py (.../valves.py) (revision af21ad6b590a05515b33e573d1c9236f21cafa3e) @@ -122,21 +122,21 @@ self.hd_air_trap_status = 0 - def get_valves_status(self): - """ - Returns the valve status dictionary - @return: (dict) the valve statuses - """ - return self.valves_status - - def get_hd_air_trap_status(self): """ Returns the hd air trap status @return: (str) the HD air trap status """ return self.hd_air_trap_status + def get_hd_valves_status(self): + """ + Gets the hd valves status + + @return: (dict) the hd valves status + """ + return self.valves_status + def cmd_hd_valves_broadcast_interval_override(self, ms, reset=NO_RESET): """ Constructs and sends broadcast time interval Index: dialin/ui/hd_simulator.py =================================================================== diff -u -rf053467ac7cfb9fe349e394342d3a9253a377403 -raf21ad6b590a05515b33e573d1c9236f21cafa3e --- dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision f053467ac7cfb9fe349e394342d3a9253a377403) +++ dialin/ui/hd_simulator.py (.../hd_simulator.py) (revision af21ad6b590a05515b33e573d1c9236f21cafa3e) @@ -24,7 +24,7 @@ from ..common import TreatmentParameterRejections, GuiActionType, EResponse, TXStates from .hd_simulator_alarms import HDAlarmsSimulator from ..common.msg_defs import RequestRejectReasons, MsgIds, MsgFieldPositions -from ..common.hd_defs import HDDefs +from ..common.hd_defs import HDOpModes from ..protocols.CAN import (DenaliMessage, DenaliCanMessenger, DenaliChannels) @@ -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, @@ -288,13 +288,13 @@ if request == 0: self.logger.debug("Selecting treatment parameters") - self.cmd_send_hd_operation_mode(HDDefs.MODE_PRET.value) + self.cmd_send_hd_operation_mode(HDOpModes.MODE_PRET.value) elif request == 1: self.logger.debug("Canceling treatment") - self.cmd_send_hd_operation_mode(HDDefs.MODE_STAN.value) + self.cmd_send_hd_operation_mode(HDOpModes.MODE_STAN.value) elif request == 2: self.logger.debug("Starting treatment") - self.cmd_send_hd_operation_mode(HDDefs.MODE_TREA.value) + self.cmd_send_hd_operation_mode(HDOpModes.MODE_TREA.value) self.cmd_send_start_treatment_response(YES, 0) @@ -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_HD_INITIATE_TREATMENT_RESPONSE.value, payload=payload) self.can_interface.send(message, 0)