Index: AlarmDefs.h =================================================================== diff -u -r3379ea368a12543304f2d9c7491d2e0aa19c5f66 -raea82c6f5fc6cfcb9bf73054752f5c6ee3f7e6cb --- AlarmDefs.h (.../AlarmDefs.h) (revision 3379ea368a12543304f2d9c7491d2e0aa19c5f66) +++ AlarmDefs.h (.../AlarmDefs.h) (revision aea82c6f5fc6cfcb9bf73054752f5c6ee3f7e6cb) @@ -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_NVDATAMGMT_GROUP_RECORD_CRC_INVALID = 66, ///< DG non-volatile calibration group invalid record CRC TODO remove this alarm when merging DEN-9480 into staging + 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 @@ -141,7 +141,7 @@ 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_CAL_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 TODO remove this alarm after DEN-9480 fwcommon was merged into staging 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 @@ -190,9 +190,9 @@ ALARM_ID_INLET_WATER_LOW_PRESSURE = 152, ///< Inlet water pressure too low ALARM_ID_PRIME_COMPLETED_HIGH = 153, ///< HD prime completed high priority alarm ALARM_ID_NVDATA_EEPROM_OPS_FAILURE = 154, ///< EEPROM operations (read, write, erase) failure - ALARM_ID_DG_NVDATAMGMT_SERVICE_RECORD_CRC_ERROR = 155, ///< DG non-volatile service invalid record CRC + ALARM_ID_DG_NVDATAMGMT_SERVICE_RECORD_CRC_ERROR = 155, ///< DG non-volatile service invalid record CRC TODO remove this alarm after DEN-9480 fwcommon was merged into staging ALARM_ID_NVDATA_HW_USAGE_DATA_CRC_ERROR = 156, ///< HW usage data (treatment time in HD and total consumed water in DG) failure - ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = 157, ///< Calibration record CRC failure + ALARM_ID_NVDATA_CAL_RECORD_CRC_ERROR = 157, ///< Calibration record CRC failure TODO remove this alarm after DEN-9480 fwcommon was merged into staging ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 158, ///< Blood pump failed flow vs. motor speed check. Mismatch with flow rate and rate implied by motor speed ALARM_ID_DIAL_IN_PUMP_FLOW_VS_MOTOR_SPEED_CHECK = 159, ///< Dialysate inlet pump failed flow vs. motor speed check. Mismatch with flow rate and rate implied by motor speed ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH = 160, ///< Blood pump rotor speed too high @@ -286,10 +286,10 @@ ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT = 248, ///< DG chemical disinfect could not reach to target temperature ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 249, ///< DG chemical disinfect inlet pressure and temperature sensors out of range ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT = 250, ///< DG chemical disinfect inlet conductivity and temperature out of range - ALARM_ID_HD_INVALID_SYSTEM_RECORD = 251, ///< HD invalid system record - ALARM_ID_HD_INVALID_SERVICE_RECORD = 252, ///< HD invalid service record - ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC = 253, ///< DG invalid system record - ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC = 254, ///< DG invalid service record + ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC = 251, ///< HD invalid system record + ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC = 252, ///< HD invalid service record + ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC = 253, ///< DG invalid system record + ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC = 254, ///< DG invalid service record ALARM_ID_HD_UI_COMPATIBILITY_ERROR = 255, ///< HD and UI software builds are not compatible ALARM_ID_HD_DG_COMPATIBILITY_ERROR = 256, ///< HD and DG software builds are not compatible ALARM_ID_DG_FPGA_POWER_OUT_TIMEOUT = 257, ///< DG FPGA power out timeout @@ -319,7 +319,7 @@ 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_SCHEDULED_RUNS_GROUP_RECORD_CRC_INVALID = 284, ///< DG scheduled runs group invalid record CRC. + ALARM_ID_DG_SCHEDULED_RUNS_GROUP_RECORD_CRC_INVALID = 284, ///< DG scheduled runs group invalid record CRC. TODO remove this alarm after DEN-9480 fwcommon was merged into staging NUM_OF_ALARM_IDS ///< Total number of alarms }; @@ -690,8 +690,8 @@ { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_INLET_COND_AND_TEMP_OUT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_HD_INVALID_SYSTEM_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_INVALID_SERVICE_RECORD, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE, FALSE, ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_COMPATIBILITY_ERROR, 0, ALARM_ID_NO_ALARM }, @@ -758,8 +758,6 @@ { 1, ALARM_ID_HD_BLOOD_FLOW_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CAL_RECORD }, { 1, ALARM_ID_HD_HEPARIN_FORCE_SENSOR_INVALID_CAL_RECORD }, - { 1, ALARM_ID_HD_INVALID_SYSTEM_RECORD }, - { 1, ALARM_ID_HD_INVALID_SERVICE_RECORD }, { 1, ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED }, { 1, ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED }, { 1, ALARM_ID_UI_POST_FAILURE_FILESYSTEM }, @@ -769,6 +767,8 @@ { 1, ALARM_ID_UI_POST_FAILURE_SDCARD }, { 1, ALARM_ID_UI_POST_FAILURE_RTC }, { 1, ALARM_ID_UI_POST_FAILURE_WIFI }, + { 3, ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC }, + { 3, ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC }, { 3, ALARM_ID_DG_INVALID_SYSTEM_RECORD_CRC }, { 3, ALARM_ID_DG_INVALID_SERVICE_RECORD_CRC }, { 3, ALARM_ID_HD_SOFTWARE_FAULT },