Index: AlarmDefs.h =================================================================== diff -u -rda53e8b28010432fdcd7cb791cabeb4821868c58 -re983150a21b67d33a47fad96b022d96b1779756b --- AlarmDefs.h (.../AlarmDefs.h) (revision da53e8b28010432fdcd7cb791cabeb4821868c58) +++ AlarmDefs.h (.../AlarmDefs.h) (revision e983150a21b67d33a47fad96b022d96b1779756b) @@ -101,7 +101,7 @@ ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT = 63, ///< FPGA reports failure reading arterial pressure sensor ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT = 64, ///< FPGA reports failure reading venous pressure sensor ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT = 65, ///< HD requests DG command with invalid parameter fault - ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 66, ///< DG non-volatile calibration group invalid record CRC + ALARM_ID_NVDATAMGMT_GROUP_RECORD_CRC_INVALID = 66, ///< DG non-volatile calibration group invalid record CRC 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 @@ -138,10 +138,10 @@ ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT = 100, ///< HD no cartridge self-test timeout ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT = 101, ///< HD dry self-test timeout ALARM_ID_RTC_COMM_ERROR = 102, ///< Real-time clock communication error - ALARM_ID_DG_NVDATAMGMT_MFG_RECORD_CRC_INVALID = 103, ///< DG non-volatile manufacturing invalid record CRC + ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 103, ///< HD non-volatile calibration group invalid record CRC ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS = 104, ///< Air trap level sensors reporting illegal combination of air/fluid ALARM_ID_DG_NVDATAMGMT_SYSTEM_GROUP_RECORD_CRC_INVALID = 105, ///< DG non-volatile system group invalid record CRC - ALARM_ID_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID = 106, ///< DG non-volatile service group invalid record CRC + ALARM_ID_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID = 106, ///< DG non-volatile service group invalid record CRC ALARM_ID_DG_RESTARTED_FAULT = 107, ///< HD reports DG restarted fault ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR = 108, ///< HD syringe pump ADC error ALARM_ID_HD_SYRINGE_PUMP_VOLUME_ERROR = 109, ///< HD syringe pump volume check error @@ -505,7 +505,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT, 0, ALARM_ID_NO_ALARM }, { 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_DG_NVDATAMGMT_CAL_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_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 }, @@ -542,7 +542,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_RTC_COMM_ERROR, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE , FALSE, FALSE, ALARM_ID_DG_NVDATAMGMT_MFG_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_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE, ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_NVDATAMGMT_SYSTEM_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_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID, 0, ALARM_ID_NO_ALARM }, @@ -807,7 +807,7 @@ { 3, ALARM_ID_ARTERIAL_PRESSURE_SENSOR_FAULT }, { 3, ALARM_ID_VENOUS_PRESSURE_SENSOR_FAULT }, { 3, ALARM_ID_DG_COMMAND_INVALID_PARAMETER_FAULT }, - { 3, ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID }, + { 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 }, @@ -844,7 +844,7 @@ { 3, ALARM_ID_HD_NO_CART_SELF_TEST_TIMEOUT }, { 3, ALARM_ID_HD_DRY_SELF_TEST_TIMEOUT }, { 3, ALARM_ID_RTC_COMM_ERROR }, - { 3, ALARM_ID_DG_NVDATAMGMT_MFG_RECORD_CRC_INVALID }, + { 3, ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID }, { 3, ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS }, { 3, ALARM_ID_DG_NVDATAMGMT_SYSTEM_GROUP_RECORD_CRC_INVALID }, { 3, ALARM_ID_DG_NVDATAMGMT_SERVICE_GROUP_RECORD_CRC_INVALID },