Index: dialin/common/alarm_defs.py =================================================================== diff -u -rdf58df8b4e8b8d3f0b0764deda9f15050a071d78 -rafcc17e958cc581864479c86b344f2370d1c52fc --- dialin/common/alarm_defs.py (.../alarm_defs.py) (revision df58df8b4e8b8d3f0b0764deda9f15050a071d78) +++ dialin/common/alarm_defs.py (.../alarm_defs.py) (revision afcc17e958cc581864479c86b344f2370d1c52fc) @@ -8,9 +8,9 @@ # @file alarm_defs.py # # @author (last) Peter Lucia -# @date (last) 27-Apr-2021 +# @date (last) 13-May-2021 # @author (original) Peter Lucia -# @date (original) 27-Apr-2021 +# @date (original) 13-May-2021 # ############################################################################ from enum import unique @@ -23,7 +23,7 @@ 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_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 @@ -66,9 +66,10 @@ 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_AVAILABLE_1 = 46 + ALARM_ID_AVAILABLE_2 = 47 ALARM_ID_TEMPERATURE_SENSORS_FAULT = 48 - ALARM_ID_FPGA_COMM_TIMEOUT = 49 + 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 @@ -129,7 +130,7 @@ 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_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 @@ -147,7 +148,7 @@ 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_AVAILABLE_4 = 128 ALARM_ID_INSTALL_NEW_CARTRIDGE = 129 ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY = 130 ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE = 131 @@ -159,7 +160,7 @@ 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_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 @@ -213,3 +214,35 @@ 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_ARTERIAL_BUBBLE_DETECTED = 219 + ALARM_ID_HD_VENOUS_BUBBLE_DETECTED = 220 + ALARM_ID_HD_BP_FLOW_SLOW_READ_TIMEOUT_ERROR = 221 + ALARM_ID_HD_DP_FLOW_SLOW_READ_TIMEOUT_ERROR = 222 + ALARM_ID_HD_PUMP_DIRECTION_STATUS_ERROR = 223 + ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE = 224 + ALARM_ID_HD_BATTERY_COMM_FAULT = 225 Index: dialin/common/msg_ids.py =================================================================== diff -u -rdf58df8b4e8b8d3f0b0764deda9f15050a071d78 -rafcc17e958cc581864479c86b344f2370d1c52fc --- dialin/common/msg_ids.py (.../msg_ids.py) (revision df58df8b4e8b8d3f0b0764deda9f15050a071d78) +++ dialin/common/msg_ids.py (.../msg_ids.py) (revision afcc17e958cc581864479c86b344f2370d1c52fc) @@ -8,9 +8,9 @@ # @file msg_ids.py # # @author (last) Peter Lucia -# @date (last) 27-Apr-2021 +# @date (last) 13-May-2021 # @author (original) Peter Lucia -# @date (original) 27-Apr-2021 +# @date (original) 13-May-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 @@ -132,13 +140,16 @@ 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_CHEM_DISINFECT = 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_DG_VOLTAGES_DATA = 0X86 + MSG_ID_DG_CHEM_DISINFECT_DATA = 0X87 + MSG_ID_HD_BUBBLES_DATA = 0X93 + 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 @@ -225,10 +236,14 @@ 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_DG_VOLTAGES_DATA = 0X86 - MSG_ID_PRESSURE_OCCLUSION_DATA = 0X9 - MSG_ID_CAN_ERROR_COUNT = 0X999 - MSG_ID_RTC_EPOCH = 0XA + MSG_ID_HD_VALVES_CURRENT_OVERRIDE = 0X8057 + MSG_ID_HD_SYRINGE_PUMP_STATUS_OVERRIDE = 0X8059 + MSG_ID_HD_SYRINGE_PUMP_ENCODER_STATUS_OVERRIDE = 0X805A + MSG_ID_HD_SYRINGE_PUMP_ADC_DAC_STATUS_OVERRIDE = 0X805B + MSG_ID_HD_SYRINGE_PUMP_ADC_READ_COUNTER_OVERRIDE = 0X805C + MSG_ID_HD_BUBBLES_DATA_SEND_INTERVAL_OVERRIDE = 0X805D + MSG_ID_HD_BUBBLES_STATUS_OVERRIDE = 0X805E + MSG_ID_HD_BUBBLES_SELF_TEST_REQUEST = 0X8060 MSG_ID_DG_TESTER_LOGIN_REQUEST = 0XA000 MSG_ID_DG_ALARM_STATE_OVERRIDE = 0XA001 MSG_ID_DG_WATCHDOG_TASK_CHECKIN_OVERRIDE = 0XA002 @@ -260,7 +275,7 @@ 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___AVAILABLE_16 = 0XA021 MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0XA022 MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE = 0XA023 MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0XA024 @@ -292,11 +307,6 @@ 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_HD_DEBUG_EVENT = 0XFFF1 MSG_ID_DG_DEBUG_EVENT = 0XFFF2 MSG_ID_ACK_MESSAGE_THAT_REQUIRES_ACK = 0XFFFF Index: tools/build_common_defs.py =================================================================== diff -u -rf053467ac7cfb9fe349e394342d3a9253a377403 -rafcc17e958cc581864479c86b344f2370d1c52fc --- tools/build_common_defs.py (.../build_common_defs.py) (revision f053467ac7cfb9fe349e394342d3a9253a377403) +++ tools/build_common_defs.py (.../build_common_defs.py) (revision afcc17e958cc581864479c86b344f2370d1c52fc) @@ -71,7 +71,7 @@ print("Error reading in txt file: {0}".format(e)) return False - heapq.heapify(enums) + # TODO: match fw order current_time = datetime.now() code_header = \ @@ -103,8 +103,7 @@ # pop the enums from the min heap until its empty code = "" - while enums: - enum = heapq.heappop(enums) + for enum in enums: code += " {0} = {1}\n".format(enum[1], enum[0]) code_result += code