Index: AlarmDefs.h =================================================================== diff -u -re0ee25076bdf5ba7adbd4ada17689aa3595de2fe -r70ec00e730a4e995fbd6e4f84ecbdc90d4edfd96 --- AlarmDefs.h (.../AlarmDefs.h) (revision e0ee25076bdf5ba7adbd4ada17689aa3595de2fe) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 70ec00e730a4e995fbd6e4f84ecbdc90d4edfd96) @@ -103,8 +103,8 @@ ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 65, ///< HD requests DG command with invalid parameter fault ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID = 66, ///< DG non-volatile calibration group invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE = 67, ///< HD blood pump occlusion self-test failure alarm - ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE = 68, ///< HD dialysate inlet pump occlusion self-test failure alarm - ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE = 69, ///< HD dialysate outlet pump occlusion self-test failure alarm + ALARM_ID____AVAILABLE_5 = 68, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_6 = 69, ///< This alarm ID is available for use ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE = 70, ///< HD arterial pressure self-test failure alarm ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE = 71, ///< HD venous pressure self-test failure alarm ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE = 72, ///< HD blood flow meter status check self-test failure alarm @@ -122,11 +122,11 @@ ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR = 84, ///< HD venous pressure sensor not being read ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE = 85, ///< HD venous pressure sensor temperature out of range error ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR = 86, ///< HD BP occlusion sensor not being read - ALARM_ID_HD_DPI_OCCLUSON_READ_TIMEOUT_ERROR = 87, ///< HD DPi occlusion sensor not being read - ALARM_ID_HD_DPO_OCCLUSION_READ_TIMEOUT_ERROR = 88, ///< HD DPo occlusion sensor not being read + ALARM_ID____AVAILABLE_10 = 87, ///< HD DPi occlusion sensor not being read + ALARM_ID____AVAILABLE_11 = 88, ///< HD DPo occlusion sensor not being read ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR = 89, ///< HD BP occlusion sensor error - ALARM_ID_HD_DPI_OCCLUSION_SENSOR_ERROR = 90, ///< HD DPi occlusion sensor error - ALARM_ID_HD_DPO_OCCLUSION_SENSOR_ERROR = 91, ///< HD DPo occlusion sensor error + ALARM_ID____AVAILABLE_12 = 90, ///< HD DPi occlusion sensor error + ALARM_ID____AVAILABLE_13 = 91, ///< HD DPo occlusion sensor error ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR = 92, ///< HD blood flow sensor not being read ALARM_ID_HD_BP_FLOW_SENSOR_ERROR = 93, ///< HD blood flow sensor error ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR = 94, ///< HD dialysate flow sensor not being read @@ -178,8 +178,8 @@ ALARM_ID_DG_COMM_TIMEOUT = 140, ///< Dialysate generator communication timeout ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT = 141, ///< Air trap fill timeout during treatment ALARM_ID_OCCLUSION_BLOOD_PUMP = 142, ///< Blood pump occlusion detected - ALARM_ID_OCCLUSION_DIAL_IN_PUMP = 143, ///< Dialysate inlet pump occlusion detected - ALARM_ID_OCCLUSION_DIAL_OUT_PUMP = 144, ///< Dialysate outlet pump occlusion detected + ALARM_ID____AVAILABLE_8 = 143, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_9 = 144, ///< This alarm ID is available for use ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE = 145, ///< Concentrate conductivity after adding acid out of range alarm ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE = 146, ///< Dialysate conductivity out of range ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT = 147, ///< DG dialysate generation conductivity fault alarm @@ -272,8 +272,8 @@ ALARM_ID_RTC_RAM_OPS_ERROR = 234, ///< RTC (i.e read time) or RAM operations failure (read or write) ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK = 235, ///< HD in treatment stopped sub-mode after rinseback completed (no escalation) ALARM_ID_INSTALL_NEW_CARTRIDGE = 236, ///< HD needs new cartridge to be installed - ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY = 237, ///< HD cartridge installed improperly alarm - ALARM_ID_NO_CARTRIDGE_LOADED = 238, ///< HD no cartridge loaded alarm + ALARM_ID____AVAILABLE_7 = 237, ///< This alarm ID is available for use + ALARM_ID_NO_CARTRIDGE_LOADED = 238, ///< HD no cartridge loaded or installed improperly alarm ALARM_ID_CARTRIDGE_REMOVAL_FAILURE = 239, ///< HD fail to remove cartridge alarm ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE = 240, ///< Bicarb conductivity out of range during bicarb pump check alarm ALARM_ID_DG_RESERVOIR_DRAIN_TIMEOUT = 241, ///< DG reservoir drain time out @@ -295,35 +295,35 @@ ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT = 257, ///< DG FPGA power out timeout ALARM_ID_HD_FPGA_POWER_OUT_TIMEOUT = 258, ///< HD FPGA power out timeout ALARM_ID_HD_TEMPERATURES_OUT_OF_RANGE = 259, ///< HD temperatures out of range - ALARM_ID_UI_POST_FAILURE_SHASUM = 260, ///< UI POST Application Integrity (Sha256Sum) failure. - ALARM_ID_UI_POST_FAILURE_CANBUS = 261, ///< UI POST CANBus failure. - ALARM_ID_UI_POST_FAILURE_DISPLAY = 262, ///< UI POST Display failure. - ALARM_ID_UI_POST_FAILURE_TOUCH = 263, ///< UI POST Touch failure. - ALARM_ID_UI_POST_FAILURE_SDCARD = 264, ///< UI POST SD-Card failure. - ALARM_ID_UI_POST_FAILURE_RTC = 265, ///< UI POST RTC failure. - ALARM_ID_UI_POST_FAILURE_WIFI = 266, ///< UI POST WiFi failure. - ALARM_ID_UI_POST_FAILURE_BLUETOOTH = 267, ///< UI POST Bluetooth failure. - ALARM_ID_UI_POST_FAILURE_ETHERNET = 268, ///< UI POST Ethernet failure. - ALARM_ID_UI_POST_FAILURE_SOUND = 269, ///< UI POST Sound failure. + ALARM_ID_UI_POST_FAILURE_SHASUM = 260, ///< UI POST Application Integrity (Sha256Sum) failure + ALARM_ID_UI_POST_FAILURE_CANBUS = 261, ///< UI POST CANBus failure + ALARM_ID_UI_POST_FAILURE_DISPLAY = 262, ///< UI POST Display failure + ALARM_ID_UI_POST_FAILURE_TOUCH = 263, ///< UI POST Touch failure + ALARM_ID_UI_POST_FAILURE_SDCARD = 264, ///< UI POST SD-Card failure + ALARM_ID_UI_POST_FAILURE_RTC = 265, ///< UI POST RTC failure + ALARM_ID_UI_POST_FAILURE_WIFI = 266, ///< UI POST WiFi failure + ALARM_ID_UI_POST_FAILURE_BLUETOOTH = 267, ///< UI POST Bluetooth failure + ALARM_ID_UI_POST_FAILURE_ETHERNET = 268, ///< UI POST Ethernet failure + ALARM_ID_UI_POST_FAILURE_SOUND = 269, ///< UI POST Sound failure ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED = 270, ///< HD Watchdog POST failure ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED = 271, ///< HD Watchdog POST failure ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE = 272, ///< HD Fan RPM out of range - ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE = 273, ///< HD measured blood pump flow rate is out of range. - ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE = 274, ///< HD measured dialysate inlet pump flow rate is out of range. - ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE = 275, ///< HD arterial pressure sensor is reading out of range. - ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE = 276, ///< HD venous pressure sensor is reading out of range. - ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE = 277, ///< HD BP occlusion sensor is reading out of range. - ALARM_ID_HD_DPI_OCCLUSION_OUT_OF_RANGE = 278, ///< HD DPi occlusion sensor is reading out of range. - ALARM_ID_HD_DPO_OCCLUSION_OUT_OF_RANGE = 279, ///< HD DPo occlusion sensor is reading out of range. - ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR = 280, ///< HD arterial pressure sensor read timeout error. + ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE = 273, ///< HD measured blood pump flow rate is out of range + ALARM_ID_HD_DIAL_IN_FLOW_OUT_OF_RANGE = 274, ///< HD measured dialysate inlet pump flow rate is out of range + ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE = 275, ///< HD arterial pressure sensor is reading out of range + ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE = 276, ///< HD venous pressure sensor is reading out of range + ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE = 277, ///< HD BP occlusion sensor is reading out of range + ALARM_ID____AVAILABLE_3 = 278, ///< This alarm ID is available for use + ALARM_ID____AVAILABLE_4 = 279, ///< This alarm ID is available for use + ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR = 280, ///< HD arterial pressure sensor read timeout error ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME = 281, ///< Acid concentration bottle low volume alarm ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME = 282, ///< Bicarbonate concentration bottle low volume alarm ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE = 283, ///< DG load cells weight out of range - ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE = 284, ///< DG load cells primary/back up drift out of range. - ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING = 285, ///< HD treatment recirculate timeout warning. - ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING = 286, ///< HD treatment rinseback complete timeout warning. - ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 287, ///< HD processor clock speed checks against FPGA clock failure. - ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT = 288, ///< DG trimmer heater on with flow timeout. + ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE = 284, ///< DG load cells primary/back up drift out of range + ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING = 285, ///< HD treatment recirculate timeout warning + ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING = 286, ///< HD treatment rinseback complete timeout warning + ALARM_ID_HD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 287, ///< HD processor clock speed checks against FPGA clock failure + ALARM_ID_DG_TRIMMER_HEATER_ON_WITH_NO_FLOW_TIMEOUT = 288, ///< DG trimmer heater on with flow timeout NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -512,8 +512,8 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_5, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_6, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, @@ -532,11 +532,11 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DPI_OCCLUSON_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DPO_OCCLUSION_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_10, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_11, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DPI_OCCLUSION_SENSOR_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DPO_OCCLUSION_SENSOR_ERROR, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_12, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_13, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_FLOW_SENSOR_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, @@ -590,8 +590,8 @@ { ALARM_PRIORITY_HIGH, 19, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_DG_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 20, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 21, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_OCCLUSION_BLOOD_PUMP, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 21, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE, ALARM_ID_OCCLUSION_DIAL_IN_PUMP, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 21, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE, ALARM_ID_OCCLUSION_DIAL_OUT_PUMP, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 21, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE, ALARM_ID____AVAILABLE_8, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 21, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE, ALARM_ID____AVAILABLE_9, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 22, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 23, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 24, FALSE, FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, TRUE, ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT, 0, ALARM_ID_NO_ALARM }, @@ -688,7 +688,7 @@ { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_RTC_RAM_OPS_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_INSTALL_NEW_CARTRIDGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID____AVAILABLE_7, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_NO_CARTRIDGE_LOADED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, @@ -731,8 +731,8 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck TxLog ID Escalate In Escalate To { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DPI_OCCLUSION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DPO_OCCLUSION_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_3, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID____AVAILABLE_4, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_ACID_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_BICARB_BOTTLE_LOW_VOLUME, 0, ALARM_ID_NO_ALARM }, @@ -827,8 +827,8 @@ { 3, ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT }, { 3, ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID }, { 3, ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE }, - { 3, ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE }, - { 3, ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE }, + { 3, ALARM_ID____AVAILABLE_5 }, + { 3, ALARM_ID____AVAILABLE_6 }, { 3, ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE }, { 3, ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE }, { 3, ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE }, @@ -846,11 +846,11 @@ { 3, ALARM_ID_HD_VENOUS_PRESSURE_READ_TIMEOUT_ERROR }, { 3, ALARM_ID_HD_VENOUS_PRESSURE_SENSOR_TEMP_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BP_OCCLUSION_READ_TIMEOUT_ERROR }, - { 3, ALARM_ID_HD_DPI_OCCLUSON_READ_TIMEOUT_ERROR }, - { 3, ALARM_ID_HD_DPO_OCCLUSION_READ_TIMEOUT_ERROR }, + { 3, ALARM_ID____AVAILABLE_10 }, + { 3, ALARM_ID____AVAILABLE_11 }, { 3, ALARM_ID_HD_BP_OCCLUSION_SENSOR_ERROR }, - { 3, ALARM_ID_HD_DPI_OCCLUSION_SENSOR_ERROR }, - { 3, ALARM_ID_HD_DPO_OCCLUSION_SENSOR_ERROR }, + { 3, ALARM_ID____AVAILABLE_12 }, + { 3, ALARM_ID____AVAILABLE_13 }, { 3, ALARM_ID_HD_BP_FLOW_READ_TIMEOUT_ERROR }, { 3, ALARM_ID_HD_BP_FLOW_SENSOR_ERROR }, { 3, ALARM_ID_HD_DP_FLOW_READ_TIMEOUT_ERROR }, @@ -893,8 +893,8 @@ { 3, ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE }, { 3, ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE }, { 3, ALARM_ID_HD_BP_OCCLUSION_OUT_OF_RANGE }, - { 3, ALARM_ID_HD_DPI_OCCLUSION_OUT_OF_RANGE }, - { 3, ALARM_ID_HD_DPO_OCCLUSION_OUT_OF_RANGE }, + { 3, ALARM_ID____AVAILABLE_3 }, + { 3, ALARM_ID____AVAILABLE_4 }, { 3, ALARM_ID_HD_ARTERIAL_PRESSURE_READ_TIMEOUT_ERROR }, { 3, ALARM_ID_DG_LOAD_CELL_WEIGHT_OUT_OF_RANGE }, { 3, ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE }, @@ -920,8 +920,8 @@ { 19, ALARM_ID_DG_COMM_TIMEOUT }, { 20, ALARM_ID_AIR_TRAP_FILL_DURING_TREATMENT }, { 21, ALARM_ID_OCCLUSION_BLOOD_PUMP }, - { 21, ALARM_ID_OCCLUSION_DIAL_IN_PUMP }, - { 21, ALARM_ID_OCCLUSION_DIAL_OUT_PUMP }, + { 21, ALARM_ID____AVAILABLE_8 }, + { 21, ALARM_ID____AVAILABLE_9 }, { 22, ALARM_ID_ACID_CONDUCTIVITY_OUT_OF_RANGE }, { 23, ALARM_ID_DIALYSATE_CONDUCTIVITY_OUT_OF_RANGE }, { 24, ALARM_ID_DIALYSATE_CONDUCTIVITY_FAULT }, @@ -1019,7 +1019,7 @@ { 999, ALARM_ID_RTC_RAM_OPS_ERROR }, { 999, ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK }, { 999, ALARM_ID_INSTALL_NEW_CARTRIDGE }, - { 999, ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY }, + { 999, ALARM_ID____AVAILABLE_7 }, { 999, ALARM_ID_NO_CARTRIDGE_LOADED }, { 999, ALARM_ID_CARTRIDGE_REMOVAL_FAILURE }, { 999, ALARM_ID_BICARB_CONDUCTIVITY_OUT_OF_RANGE }, Index: MsgDefs.h =================================================================== diff -u -r5dedbee6f1a9796a274d53890243eb6e956ea165 -r70ec00e730a4e995fbd6e4f84ecbdc90d4edfd96 --- MsgDefs.h (.../MsgDefs.h) (revision 5dedbee6f1a9796a274d53890243eb6e956ea165) +++ MsgDefs.h (.../MsgDefs.h) (revision 70ec00e730a4e995fbd6e4f84ecbdc90d4edfd96) @@ -228,8 +228,8 @@ MSG_ID_PRESSURE_ARTERIAL_OVERRIDE = 0x8017, ///< Arterial pressure measured override request MSG_ID_PRESSURE_VENOUS_OVERRIDE = 0x8018, ///< Venous pressure measured override request MSG_ID_OCCLUSION_BLOOD_PUMP_OVERRIDE = 0x8019, ///< Blood pump occlusion pressure measured override request - MSG_ID_OCCLUSION_DIAL_IN_PUMP_OVERRIDE = 0x801A, ///< Dialysate inlet pump occlusion pressure measured override request - MSG_ID_OCCLUSION_DIAL_OUT_PUMP_OVERRIDE = 0x801B, ///< Dialysate outlet pump occlusion pressure measured override request + MSG_ID___AVAILABLE_1 = 0x801A, ///< This msg ID is available for use + MSG_ID___AVAILABLE_2 = 0x801B, ///< This msg ID is available for use MSG_ID_PRES_OCCL_SEND_INTERVAL_OVERRIDE = 0x801C, ///< Pressure and occlusion broadcast interval override request MSG_ID_SET_RTC_DATE_TIME = 0x801D, ///< RTC set date/time request MSG_ID_DIAL_OUT_FLOW_SEND_INTERVAL_OVERRIDE = 0x801E, ///< Dialysate outlet flow broadcast interval override request @@ -354,7 +354,7 @@ MSG_ID_DG_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0xA01E, ///< DG switches data publish interval override MSG_ID_DG_OP_MODE_PUBLISH_INTERVAL_OVERRIDE = 0xA01F, ///< DG operation mode publish interval override MSG_ID_DG_BLOCK_MESSAGE_TRANSMISSION = 0xA020, ///< HD prevent transmission of given message(s) - MSG_ID___AVAILABLE_16 = 0xA021, ///< This msg ID is available for use + MSG_ID___AVAILABLE_3 = 0xA021, ///< This msg ID is available for use MSG_ID_DG_SOFTWARE_RESET_REQUEST = 0xA022, ///< DG reset request MSG_ID_DG_CONCENTRATE_PUMP_MEASURED_SPEED_OVERRIDE = 0xA023, ///< DG concentrate pump measured speed override request MSG_ID_CONCENTRATE_PUMP_TARGET_SPEED_OVERRIDE = 0xA024, ///< Concentrate pumps' target speed override request