Index: AlarmDefs.h =================================================================== diff -u -re3d6e7e6f3c00be6febfa96ebb5bd53cc6ff3822 -rc6f30b81cb2c01234c5870d38824c9af14eda04b --- AlarmDefs.h (.../AlarmDefs.h) (revision e3d6e7e6f3c00be6febfa96ebb5bd53cc6ff3822) +++ AlarmDefs.h (.../AlarmDefs.h) (revision c6f30b81cb2c01234c5870d38824c9af14eda04b) @@ -53,7 +53,7 @@ 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 + ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_DG = 18, ///< HD didn't get ACK on message to DG that required acknowledgment ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP = 19, ///< HD dialysate temperature above target temperature. ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD = 20, ///< DG conductivity sensors invalid calibration record ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD = 21, ///< DG drain line volume invalid calibration record @@ -81,7 +81,7 @@ ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT = 43, ///< DG main primary heater FPGA fault ALARM_ID_UI_COMM_TIMEOUT = 44, ///< User interface communication timeout ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS = 45, ///< HD too many bad communications CRC - ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED = 46, ///< HD System message that required acknowledgment was not acknowledged + ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_UI = 46, ///< HD didn't get ACK on message to UI that required acknowledgment ALARM_ID_UF_RATE_TOO_HIGH_ERROR = 47, ///< Ultrafiltration rate is too high error during treatment ALARM_ID_UF_VOLUME_ACCURACY_ERROR = 48, ///< Ultrafiltration volume accuracy error during treatment ALARM_ID_HD_FPGA_COMM_TIMEOUT = 49, ///< HD FPGA communication down for too long @@ -494,7 +494,7 @@ { 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_CAN_MESSAGE_NOT_ACKED_DG, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP, ALM_ESC_10_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 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 }, @@ -524,7 +524,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UI_COMM_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_COMM_TOO_MANY_BAD_CRCS, 0, ALARM_ID_NO_ALARM },//add DG version // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To - { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED, 0, ALARM_ID_NO_ALARM },//add DG version + { ALARM_PRIORITY_HIGH, 3, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_UI, 0, ALARM_ID_NO_ALARM },//add DG version { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UF_RATE_TOO_HIGH_ERROR, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_UF_VOLUME_ACCURACY_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_FPGA_COMM_TIMEOUT, 0, ALARM_ID_NO_ALARM }, @@ -830,7 +830,7 @@ { 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 }, + { 1, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_DG }, { 1, ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD }, { 1, ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD }, { 1, ALARM_ID_DG_RESERVOIRS_INVALID_CAL_RECORD }, @@ -877,7 +877,7 @@ { 3, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT }, { 3, ALARM_ID_UI_COMM_TIMEOUT }, { 3, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS }, - { 3, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED }, + { 3, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_UI }, { 3, ALARM_ID_UF_RATE_TOO_HIGH_ERROR }, { 3, ALARM_ID_UF_VOLUME_ACCURACY_ERROR }, { 3, ALARM_ID_HD_FPGA_COMM_TIMEOUT }, @@ -1174,7 +1174,7 @@ { 15 , ALARM_ID_HD_INVALID_USAGE_RECORD , "HD | Self Test Error | Call service to schedule a repair. | HD non-volatile usage information group invalid record CRC | If the HD usage information record's CRC does not match the calculated CRC in POST. | "}, { 16 , ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE , "HD | Self Test Error | Call service to schedule a repair. | HD alarm audio failed POST | If alarm audio current is NOT sufficiently high for at more than 1 second indicating alarm tone is being output | "}, { 17 , ALARM_ID_HD_UI_POST_FAILED , "HD | Self Test Error | Call service to schedule a repair. | HD UI POST failed | If User Interface has not sent POST results within 2 seconds. | "}, - { 18 , ALARM_ID_DG_PRESSURE_SENSORS_INVALID_CAL_RECORD , "DG | Calibration Error | Call service to schedule a repair. | DG pressure sensors non-volatile calibration record invalid CRC | If the calibration record's CRC does not match the calculated CRC in POST. | "}, + { 18 , ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_DG , "HD | Communication Error | Call service to schedule a repair. | HD did not get ACK on message to DG that required acknowledgement | If no retries left in the pending acknowlegement. | "}, { 19 , ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP , "HD | Dialysate Temperature Error | Call service to schedule a repair. | Dialysate temperature is above the target temperature | If the dialysate temperature is above the target temperature for a certain period of time. | "}, { 20 , ALARM_ID_DG_COND_SENSORS_INVALID_CAL_RECORD , "DG | Calibration Error | Call service to schedule a repair. | DG conductivity sensors invalid calibration record | If the calibration data that was received from NVDataMgmt is NOT legitimate | "}, { 21 , ALARM_ID_DG_DRAIN_LINE_VOLUME_INVALID_CAL_RECORD , "DG | Calibration Error | Call service to schedule a repair. | DG drain line volume invalid calibration record | If the calibration data that was received from NVDataMgmt is NOT legitimate | "}, @@ -1202,7 +1202,7 @@ { 43 , ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT , "DG | FPGA Error | Call service to schedule a repair. | Main primary heater FPGA fault | If the main primary heater's voltage FPGA does not report fresh data or it reports and error for a certain period of time. | "}, { 44 , ALARM_ID_UI_COMM_TIMEOUT , "HD | Machine Error | Call service to schedule a repair. | User interface communication timeout | If the sub-system communication timeout has occurred. UI is 5 seconds. DG is 2 seconds. | "}, { 45 , ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS , "HD | Machine Error | Call service to schedule a repair. | Too many bad CRCs detected on received system messages | If too many bad messages CRCs are received within a set period of time | "}, - { 46 , ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED , "HD | Machine Error | Call service to schedule a repair. | System message that required acknowledgment was not acknowledged | If no retries left in the pending acknowlegement list. | "}, + { 46 , ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_UI , "HD | Machine Error | Call service to schedule a repair. | HD did not get ACK on message to UI that required acknowledgment | If no retries left in the pending acknowlegement. | "}, { 47 , ALARM_ID_UF_RATE_TOO_HIGH_ERROR , "HD | Ultrafiltration Error | Call service to schedule a repair. | Ultrafiltration rate is too high error during treatment | If the UF rate > 2750.0 mL per hour. | "}, { 48 , ALARM_ID_UF_VOLUME_ACCURACY_ERROR , "HD | Ultrafiltration Error | Call service to schedule a repair. | Ultrafiltration volume accuracy error during treatment | If the UF volume (refUFvolume - measureVolume) > 250.0 mL. | "}, { 49 , ALARM_ID_HD_FPGA_COMM_TIMEOUT , "HD | Machine Error | Call service to schedule a repair. | HD FPGA communication down for too long | If retries for commands > 5 counts. | "},