Index: AlarmDefs.h =================================================================== diff -u -rf606f965d8d2e93c0eede2243b0ff56993177408 -r4709c4af2b480b2e4d7e68dc30df1f509837849e --- AlarmDefs.h (.../AlarmDefs.h) (revision f606f965d8d2e93c0eede2243b0ff56993177408) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 4709c4af2b480b2e4d7e68dc30df1f509837849e) @@ -124,7 +124,7 @@ ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE = 93, ///< DD generate dialysate spent dialysate pressure out of range ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE = 94, ///< DD balance chamber state1 fill initiated and pressure drop is not in range ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE = 95, ///< DD balance chamber state2 fill initiated and pressure drop is not in range - ALARM_ID_AVAILABLE_96 = 96, ///< Available alarms + ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT = 96, ///< DD D74 bicarb conductivity sensor freshness/error timeout fault = 96, ///< Available alarms ALARM_ID_AVAILABLE_97 = 97, ///< Available alarms ALARM_ID_AVAILABLE_98 = 98, ///< Available alarms ALARM_ID_AVAILABLE_99 = 99, ///< Available alarms @@ -251,8 +251,7 @@ /**@}*/ -#ifdef __ALARM_MGMT_C__ - +#if defined(__ALARM_MGMT_C__) || defined(__ALARM_MGMT_DD_C__) || defined(__ALARM_MGMT_TD_C__) || defined(__ALARM_MGMT_RO_C__) /** * @addtogroup AlarmManagement * @{ @@ -288,7 +287,8 @@ ALARM_ID_T alarmID; ///< Alarm ID }; typedef struct AlarmsRankRecord ALARM_RANK_T; - +#endif +#ifdef __ALARM_MGMT_C__ /// Table of alarms and their static properties. const ALARM_T ALARM_TABLE[] = { // Priority Rank Fault DDFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID @@ -391,7 +391,7 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_96 }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_97 }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_98 }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_99 }, @@ -524,6 +524,7 @@ { 110, ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE }, { 110, ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE }, { 110, ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE }, + { 110, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT }, { 111, ALARM_ID_TD_DD_COMM_TIMEOUT }, { 111, ALARM_ID_TD_CAN_MESSAGE_NOT_ACKED_BY_DD }, { 111, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO }, @@ -542,7 +543,6 @@ { 700, ALARM_ID_TD_VENOUS_PRESSURE_SELF_TEST_FAILURE }, { 710, ALARM_ID_TD_PRE_TREATMENT_DRY_PRESSURE_TEST_FAILURE }, { 852, ALARM_ID_TD_AC_POWER_LOST }, - { 999, ALARM_ID_AVAILABLE_96 }, { 999, ALARM_ID_AVAILABLE_97 }, { 999, ALARM_ID_AVAILABLE_98 }, { 999, ALARM_ID_AVAILABLE_99 }, @@ -683,7 +683,7 @@ { 93 , ALARM_ID_DD_GEND_SPENT_DIAL_PRESS_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: Spent dial Press not in range | DD spent dialysate pressure is not in range | If the spent dialysate pressure (< 27 psig or > 31 psig) not in range. | "}, { 94 , ALARM_ID_DD_BC_STATE1_FILL_PRESSURE_DROP_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: BC Pressure not in range | DD balancing chamber state 1 fill initiated and pressure drop is not in range | If the fresh dialysate pressure (< 9 psig or > 13 psig) and spent dialysate pressure (< 9 psig or > 13 psig) not in range for balancing chamber state1 fill in progress. | "}, { 95 , ALARM_ID_DD_BC_STATE2_FILL_PRESSURE_DROP_OUT_OF_RANGE , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device. \n- Treatment must be terminated.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Fault: BC Pressure not in range | DD balancing chamber state 2 fill initiated and pressure drop is not in range | If the fresh dialysate pressure (< 9 psig or > 13 psig) and spent dialysate pressure (< 9 psig or > 13 psig) not in range for balancing chamber state2 fill in progress. | "}, - { 96 , ALARM_ID_AVAILABLE_96 , " | | | | | | "}, + { 96 , ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT , "DD | Service Required: Dialysate Device | A problem was detected with the dialysate device.\n- Locate the ID code found in the bottom left corner\nof the alarm screen.\n- Call service to report the issue and schedule a repair. | DD Conductivity Sensor Error | DD conductivity sensor (D74) located before balancing chamber reporting error or not being read successfully | Conductvity Sensor (D74) is reporting an error or FPGA is failing to read sensor. | "}, { 97 , ALARM_ID_AVAILABLE_97 , " | | | | | | "}, { 98 , ALARM_ID_AVAILABLE_98 , " | | | | | | "}, { 99 , ALARM_ID_AVAILABLE_99 , " | | | | | | "},