Index: dialin/common/alarm_defs.py =================================================================== diff -u -r1fd5bc0ed97d0d90223fa78ec195dd7636712c5b -ra89c772d75b8c0a755f91dcb69bebaa20daef2ea --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision 1fd5bc0ed97d0d90223fa78ec195dd7636712c5b) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision a89c772d75b8c0a755f91dcb69bebaa20daef2ea) @@ -8,9 +8,9 @@ # @file alarm_defs.py # # @author (last) Peter Lucia -# @date (last) 11-May-2021 +# @date (last) 09-Jun-2021 # @author (original) Peter Lucia -# @date (original) 11-May-2021 +# @date (original) 09-Jun-2021 # ############################################################################ from enum import unique @@ -21,223 +21,3 @@ @unique class AlarmList(AlarmEnum): ALARM_ID_NO_ALARM = 0 - ALARM_ID_HD_SOFTWARE_FAULT = 1 - ALARM_ID_STUCK_BUTTON_TEST_FAILED = 2 - ALARM_ID_HD_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_AVAILABLE_1 = 46 - ALARM_ID_AVAILABLE_2 = 47 - ALARM_ID_TEMPERATURE_SENSORS_FAULT = 48 - ALARM_ID_HD_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_AVAILABLE_3 = 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_AVAILABLE_4 = 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_AVAILABLE_5 = 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 - ALARM_ID_DG_VOLTAGE_OUT_OF_RANGE = 184 - ALARM_ID_DG_DRAIN_CIRCULATION_LINE_TIMEOUT = 185 - ALARM_ID_DG_INVALID_LOAD_CELL_VALUE = 186 - ALARM_ID_HD_SYRINGE_PUMP_ENCODER_DIRECTION_ERROR = 187 - ALARM_ID_HD_SYRINGE_PUMP_CONTROLLER_DIRECTION_ERROR = 188 - ALARM_ID_HD_SYRINGE_PUMP_FAULT = 189 - ALARM_ID_HD_SYRINGE_PUMP_OVER_TRAVEL_ERROR = 190 - ALARM_ID_HD_SYRINGE_PUMP_NOT_ENOUGH_HEPARIN_ALARM = 191 - ALARM_ID_HD_SYRINGE_PUMP_DAC_WRITE_ERROR = 192 - ALARM_ID_HD_SYRINGE_PUMP_RUNNING_WHILE_BP_OFF_ERROR = 193 - ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 194 - ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT = 195 - ALARM_ID_DG_FPGA_COMM_TIMEOUT = 196 - ALARM_ID_DG_LOAD_CELL_ADC_ERROR = 197 - ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR = 198 - ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE = 199 - ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR = 200 - ALARM_ID_HD_DPI_OCCLUSON_READ_TIMEOUT_ERROR = 201 - ALARM_ID_HD_DPO_OCCLUSION_READ_TIMEOUT_ERROR = 202 - ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR = 203 - ALARM_ID_HD_DPI_OCCLUSION_SENSOR_ERROR = 204 - ALARM_ID_HD_DPO_OCCLUSION_SENSOR_ERROR = 205 - ALARM_ID_DG_CONCENTRATE_PUMP_FAULT = 206 - ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR = 207 - ALARM_ID_HD_BP_FLOW_SENSOR_ERROR = 208 - ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR = 209 - ALARM_ID_HD_DP_FLOW_SENSOR_ERROR = 210 - ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT = 211 - ALARM_ID_DG_FPGA_POST_TEST_FAILED = 212 - ALARM_ID_HD_ARTERIAL_BUBBLE_SELF_TEST_FAILURE = 213 - ALARM_ID_HD_ARTERIAL_BUBBLE_DETECTOR_FAULT = 214 - ALARM_ID_DG_HEATERS_SELF_TEST_FAILURE = 215 - ALARM_ID_HD_VENOUS_BUBBLE_SELF_TEST_FAILURE = 216 - ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_TREATMENT_FAULT = 217 - ALARM_ID_HD_VENOUS_BUBBLE_DETECTOR_RINSEBACK_FAULT = 218 - ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR = 219 - ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR = 220 Index: dialin/common/msg_ids.py =================================================================== diff -u -r7d1ec34cc1dafe7dea3703080e546fc47cf190f2 -ra89c772d75b8c0a755f91dcb69bebaa20daef2ea --- dialin/common/msg_ids.py (.../msg_ids.py) (revision 7d1ec34cc1dafe7dea3703080e546fc47cf190f2) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision a89c772d75b8c0a755f91dcb69bebaa20daef2ea) @@ -8,9 +8,9 @@ # @file msg_ids.py # # @author (last) Peter Lucia -# @date (last) 11-May-2021 +# @date (last) 09-Jun-2021 # @author (original) Peter Lucia -# @date (original) 11-May-2021 +# @date (original) 09-Jun-2021 # ############################################################################ from enum import unique @@ -22,6 +22,20 @@ class MsgIds(DialinEnum): MSG_ID_UNUSED = 0X0 MSG_ID_OFF_BUTTON_PRESS = 0X1 + MSG_ID_ALARM_STATUS = 0X2 + MSG_ID_ALARM_TRIGGERED = 0X3 + MSG_ID_ALARM_CLEARED = 0X4 + MSG_ID_BLOOD_FLOW_DATA = 0X5 + MSG_ID_DG_CHECK_IN = 0X6 + MSG_ID_UI_CHECK_IN = 0X7 + MSG_ID_DIALYSATE_FLOW_DATA = 0X8 + MSG_ID_PRESSURE_OCCLUSION_DATA = 0X9 + MSG_ID_RTC_EPOCH = 0XA + MSG_ID_DIALYSATE_OUT_FLOW_DATA = 0XB + MSG_ID_LOAD_CELL_READINGS = 0XC + MSG_ID_TREATMENT_TIME = 0XD + MSG_ID_POWER_OFF_WARNING = 0XE + MSG_ID_TREATMENT_STATE = 0XF MSG_ID_USER_UF_PAUSE_RESUME_REQUEST = 0X10 MSG_ID_USER_UF_SETTINGS_CHANGE_REQUEST = 0X11 MSG_ID_USER_SALINE_BOLUS_REQUEST = 0X12 @@ -38,7 +52,6 @@ MSG_ID_HD_VERSION = 0X1D MSG_ID_DG_VERSION = 0X1E MSG_ID_RO_PUMP_DATA = 0X1F - MSG_ID_ALARM_STATUS = 0X2 MSG_ID_DG_PRESSURES_DATA = 0X20 MSG_ID_DG_SWITCH_RESERVOIR_CMD = 0X21 MSG_ID_DG_FILL_CMD = 0X22 @@ -55,7 +68,6 @@ MSG_ID_DG_TEMPERATURE_DATA = 0X2D MSG_ID_USER_UF_SETTINGS_CHANGE_CONFIRMATION_RESPONSE = 0X2E MSG_ID_SALINE_BOLUS_DATA = 0X2F - MSG_ID_ALARM_TRIGGERED = 0X3 MSG_ID_DG_START_STOP_HEAT_DISINFECT = 0X30 MSG_ID_DG_CONDUCTIVITY_DATA = 0X31 MSG_ID_USER_REQUEST_ALARM_SILENCE = 0X32 @@ -72,7 +84,6 @@ MSG_ID_HD_START_PRIME_RESPONSE = 0X3D MSG_ID_HD_AIR_TRAP_DATA = 0X3E MSG_ID_ALARM_CONDITION_CLEARED = 0X3F - MSG_ID_ALARM_CLEARED = 0X4 MSG_ID_UI_ALARM_USER_ACTION = 0X40 MSG_ID_USER_UF_PAUSE_RESUME_RESPONSE = 0X41 MSG_ID_DG_CONCENTRATE_PUMP_DATA = 0X42 @@ -89,7 +100,6 @@ MSG_ID_HD_HEPARIN_DATA_BROADCAST = 0X4D MSG_ID_UI_SET_ALARM_AUDIO_VOLUME_LEVEL_CMD = 0X4E MSG_ID_UI_SET_UF_VOLUME_PARAMETER = 0X4F - MSG_ID_BLOOD_FLOW_DATA = 0X5 MSG_ID_HD_SET_UF_VOLUME_PARAMETER_RESPONSE = 0X50 MSG_ID_DG_COMMAND_RESPONSE = 0X51 MSG_ID_UI_RINSEBACK_CMD = 0X52 @@ -106,7 +116,6 @@ MSG_ID_UI_SAMPLE_WATER_CMD = 0X5D MSG_ID_HD_SAMPLE_WATER_CMD_RESPONSE = 0X5E MSG_ID_UI_SAMPLE_WATER_RESULT = 0X5F - MSG_ID_DG_CHECK_IN = 0X6 MSG_ID_DG_FILTER_FLUSH_PROGRESS = 0X60 MSG_ID_HD_NO_CART_SELF_TEST_PROGRESS = 0X61 MSG_ID_UI_INSTALLATION_CONFIRM = 0X62 @@ -123,7 +132,6 @@ MSG_ID_UI_HD_SET_RTC_REQUEST = 0X6D MSG_ID_HD_UI_SET_RTC_RESPONSE = 0X6E MSG_ID_UI_DG_SET_RTC_REQUEST = 0X6F - MSG_ID_UI_CHECK_IN = 0X7 MSG_ID_DG_UI_SET_RTC_RESPONSE = 0X70 MSG_ID_UI_START_TREATMENT_REQUEST = 0X71 MSG_ID_HD_START_TREATMENT_RESPONSE = 0X72 @@ -138,7 +146,38 @@ 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_HD_STANDBY_STATE = 0X7E + MSG_ID_UI_DISINFECT_REQUEST = 0X7F + MSG_ID_HD_DISINFECT_RESPONSE = 0X80 + MSG_ID_UI_CHEM_DISINFECT_CONFIRM = 0X81 + MSG_ID_HD_CHEM_DISINFECT_CONFIRM_RESPONSE = 0X82 + MSG_ID_DG_FLUSH_TIME_DATA = 0X83 + MSG_ID_DG_HEAT_DISINFECT_TIME_DATA = 0X84 + MSG_ID_DG_CHEM_DISINFECT_TIME_DATA = 0X85 + MSG_ID_DG_VOLTAGES_DATA = 0X86 + MSG_ID_DG_CHEM_DISINFECT_DATA = 0X87 + MSG_ID_DG_SERIAL_NUMBER = 0X88 + MSG_ID_UI_REQUEST_SYSTEM_USAGE_INFO = 0X89 + MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0X8A + MSG_ID_HD_USAGE_DATA = 0X8B + MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0X8C + MSG_ID_DG_USAGE_DATA = 0X8D + MSG_ID_HD_POST_SINGLE_TEST_RESULT = 0X8E + MSG_ID_HD_POST_FINAL_TEST_RESULT = 0X8F + MSG_ID_DG_POST_SINGLE_TEST_RESULT = 0X90 + MSG_ID_DG_POST_FINAL_TEST_RESULT = 0X91 + MSG_ID_UI_POST_FINAL_TEST_RESULT = 0X92 + MSG_ID_HD_BUBBLES_DATA = 0X93 + MSG_ID_HD_TREATMENT_LOG_PERIODIC_DATA = 0X94 + MSG_ID_HD_TREATMENT_LOG_ALARM_EVENT = 0X95 + MSG_ID_HD_TREATMENT_LOG_EVENT = 0X96 + MSG_ID_UI_ACTIVE_ALARMS_LIST_REQUEST = 0X97 + MSG_ID_HD_ACTIVE_ALARMS_LIST_REQUEST_RESPONSE = 0X98 + MSG_ID_HD_SERIAL_NUMBER = 0X99 + MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_REQUEST = 0X9A + MSG_ID_HD_SET_STANDBY_DISINFECT_SUB_MODE_RESPONSE = 0X9B + MSG_ID_HD_DISINFECTS_UI_STATE_READINGS = 0X9C + MSG_ID_CAN_ERROR_COUNT = 0X999 MSG_ID_TESTER_LOGIN_REQUEST = 0X8000 MSG_ID_DIAL_OUT_FLOW_SET_PT_OVERRIDE = 0X8001 MSG_ID_OFF_BUTTON_STATE_OVERRIDE = 0X8002 @@ -233,12 +272,6 @@ MSG_ID_HD_BUBBLES_DATA_SEND_INTERVAL_OVERRIDE = 0X805D MSG_ID_HD_BUBBLE_STATUS_OVERRIDE = 0X805E MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST = 0X8060 - MSG_ID_DG_VOLTAGES_DATA = 0X86 - MSG_ID_DG_CHEM_DISINFECT_DATA = 0X87 - MSG_ID_PRESSURE_OCCLUSION_DATA = 0X9 - MSG_ID_HD_BUBBLES_DATA = 0X93 - MSG_ID_CAN_ERROR_COUNT = 0X999 - MSG_ID_RTC_EPOCH = 0XA MSG_ID_DG_TESTER_LOGIN_REQUEST = 0XA000 MSG_ID_DG_ALARM_STATE_OVERRIDE = 0XA001 MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE = 0XA002 @@ -302,11 +335,7 @@ 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 - MSG_ID_POWER_OFF_WARNING = 0XE - MSG_ID_TREATMENT_STATE = 0XF + MSG_ID_FILTER_FLUSH_TIME_PERIOD_OVERRIDE = 0XA042 MSG_ID_HD_DEBUG_EVENT = 0XFFF1 MSG_ID_DG_DEBUG_EVENT = 0XFFF2 MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0XFFFF Index: dialin/hd/hemodialysis_device.py =================================================================== diff -u -rab9f086590a97f92856343bba1263dafa39a566f -ra89c772d75b8c0a755f91dcb69bebaa20daef2ea --- dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision ab9f086590a97f92856343bba1263dafa39a566f) +++ dialin/hd/hemodialysis_device.py (.../hemodialysis_device.py) (revision a89c772d75b8c0a755f91dcb69bebaa20daef2ea) @@ -138,7 +138,7 @@ self.hd_operation_mode = mode[0] self.hd_operation_sub_mode = smode[0] - def cmd_log_in_to_hd(self, resend: bool = False): + def cmd_log_in_to_hd(self, resend: bool = False) -> int: """ Constructs and sends a login command via CAN bus. Login required before \n other commands can be sent to the HD. @@ -166,7 +166,7 @@ self.logger.debug("Login Timeout!!!!") return False - def cmd_hd_request_calibration_data(self): + def cmd_hd_request_calibration_data(self) -> int: """ Constructs and sends an HD calibration data request command via CAN bus. Constraints: @@ -195,7 +195,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_hd_set_operation_mode(self, newMode=0): + def cmd_hd_set_operation_mode(self, newMode: int = 0) -> int: """ Constructs and sends a set operation mode request command via CAN bus. Constraints: @@ -237,7 +237,7 @@ self.logger.debug("HD mode change request Timeout!!!!") return False - def cmd_hd_safety_shutdown_override(self, active=True, reset=NO_RESET): + def cmd_hd_safety_shutdown_override(self, active: bool = True, reset: int = NO_RESET) -> int: """ Constructs and sends an HD safety shutdown override command via CAN bus. Constraints: @@ -278,7 +278,7 @@ self.logger.debug("Timeout!!!!") return False - def cmd_hd_software_reset_request(self): + def cmd_hd_software_reset_request(self) -> None: """ Constructs and sends an HD software reset request via CAN bus. Constraints: