Index: AlarmDefs.h =================================================================== diff -u -rb4ab0178aed479be4d8f2eea4cd807d3808b8a8f -ra6cb0bf3379278338730790fd6f95b2cfb3df501 --- AlarmDefs.h (.../AlarmDefs.h) (revision b4ab0178aed479be4d8f2eea4cd807d3808b8a8f) +++ AlarmDefs.h (.../AlarmDefs.h) (revision a6cb0bf3379278338730790fd6f95b2cfb3df501) @@ -334,8 +334,8 @@ ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT = 296, ///< DG TDi sensors FPGA fault ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT = 297, ///< DG TRo sensors FPGA fault ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT = 298, ///< DG baro sensor FPGA fault - ALARM_ID__AVAILABLE_2 = 299, ///< Alarm ID available for use - ALARM_ID__AVAILABLE_3 = 300, ///< Alarm ID available for use + ALARM_ID_DG_INVALID_SERIAL_NUMBER = 299, ///< DG invalid serial number + ALARM_ID_HD_INVALID_SERIAL_NUMBER = 300, ///< HD invalid serial number ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE = 301, ///< DG primary heater power voltage out of range ALARM_ID_DG_CPU_RAM_ERROR = 302, ///< DG processor RAM error ALARM_ID__AVAILABLE_4 = 303, ///< Alarm ID available for use @@ -687,7 +687,7 @@ { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_DETECTED, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH , 799, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SYRINGE_PUMP_SYRINGE_REMOVED, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH , 3, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_THD_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH , 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_THD_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 900, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_EMPTY_SALINE_BAG, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 901, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID__AVAILABLE_9, ALM_ESC_5_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { ALARM_PRIORITY_LOW, 902, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , ALARM_ID__AVAILABLE_10, ALM_ESC_5_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, @@ -701,7 +701,7 @@ { ALARM_PRIORITY_LOW, 909, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRIME_DIALYSATE_BYPASS_TIME_OUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 910, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 799, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_PRE_TREATMENT_WET_LC_TEST_FAILURE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_BAROMETRIC_SENSOR_COEFFS_BAD_CRC, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE, TRUE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_BAROMETRIC_SENSOR_COEFFS_BAD_CRC, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , 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, TRUE , TRUE , 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 , TRUE , TRUE , FALSE, FALSE, ALARM_ID_INSTALL_NEW_CARTRIDGE, 0, ALARM_ID_NO_ALARM }, @@ -769,8 +769,8 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TDI_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_2, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_3, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_SERIAL_NUMBER, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_SERIAL_NUMBER, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 999, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPU_RAM_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID__AVAILABLE_4, 0, ALARM_ID_NO_ALARM }, @@ -987,6 +987,8 @@ { 3, ALARM_ID_DG_TRO_SENSORS_FPGA_FAULT }, { 3, ALARM_ID_DG_BARO_SENSOR_FPGA_FAULT }, { 3, ALARM_ID_DG_PRIMARY_HEATER_POWER_VOLTAGE_OUT_OF_RANGE }, + { 3, ALARM_ID_DG_INVALID_SERIAL_NUMBER }, + { 3, ALARM_ID_HD_INVALID_SERIAL_NUMBER }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -1049,8 +1051,6 @@ { 899, ALARM_ID_HD_TREATMENT_RECIRC_TIMEOUT_WARNING }, { 899, ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING }, { 899, ALARM_ID_HD_DISINFECT_CHEM_INSTRUCTION1 }, - { 899, ALARM_ID__AVAILABLE_2 }, - { 899, ALARM_ID__AVAILABLE_3 }, { 899, ALARM_ID__AVAILABLE_4 }, { 900, ALARM_ID_EMPTY_SALINE_BAG }, { 901, ALARM_ID__AVAILABLE_9 },