Index: AlarmDefs.h =================================================================== diff -u -r5eb23e90848977208b2826f2e137d90da51bac03 -r0d5d6320d896f3508a8c949e896dcfbfeb93ddb1 --- AlarmDefs.h (.../AlarmDefs.h) (revision 5eb23e90848977208b2826f2e137d90da51bac03) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 0d5d6320d896f3508a8c949e896dcfbfeb93ddb1) @@ -49,8 +49,8 @@ ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP = 11, ///< HD dialysate temperature below target temperature ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED = 12, ///< HD firmware image integrity POST test failed ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED = 13, ///< DG firmware image integrity POST test failed - ALARM_ID___AVAILABLE_1 = 14, ///< Not used - Available for use - ALARM_ID___AVAILABLE_2 = 15, ///< Not used - Available for use + ALARM_ID_DG_INVALID_USAGE_RECORD = 14, ///< DG invalid usage record CRC + ALARM_ID_HD_INVALID_USAGE_RECORD = 15, ///< HD invalid usage record CRC ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE = 16, ///< HD alarm audio failed POST ALARM_ID_HD_UI_POST_FAILED = 17, ///< HD UI POST failed ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD = 18, ///< DG load cells invalid calibration record @@ -138,9 +138,9 @@ 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_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANAGE = 102, ///< DG heat disinfect temperature gradient out of range - ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 103, ///< HD non-volatile calibration group invalid record CRC + ALARM_ID_HD_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 103, ///< HD invalid calibration CRC ALARM_ID_AIR_TRAP_ILLEGAL_LEVELS = 104, ///< Air trap level sensors reporting illegal combination of air/fluid - ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 105, ///< DG non-volatile system group invalid record CRC + ALARM_ID_DG_NVDATAMGMT_CAL_GROUP_RECORD_CRC_INVALID = 105, ///< DG invalid calibration CRC ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD = 106, ///< DG dialysate flow sensor invalid calibration record ALARM_ID_DG_RESTARTED_FAULT = 107, ///< HD reports DG restarted fault ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR = 108, ///< HD syringe pump ADC error @@ -455,16 +455,16 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, ALARM_ID_HD_RTC_BATTERY_LOW, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD___AVAILABLE_7, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD___AVAILABLE_7, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID___AVAILABLE_1, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID___AVAILABLE_2, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_USAGE_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_USAGE_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_POST_FAILED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, @@ -764,8 +764,8 @@ { 1, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP }, { 1, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED }, - { 1, ALARM_ID___AVAILABLE_1 }, - { 1, ALARM_ID___AVAILABLE_2 }, + { 1, ALARM_ID_DG_INVALID_USAGE_RECORD }, + { 1, ALARM_ID_HD_INVALID_USAGE_RECORD }, { 1, ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE }, { 1, ALARM_ID_HD_UI_POST_FAILED }, { 1, ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD },