Index: AlarmDefs.h =================================================================== diff -u -rdfd5570b73325edc2487d9cf54a42306363545ae -r2f9aacdc29711409fba96c2b5eaccbcbeaaeb71a --- AlarmDefs.h (.../AlarmDefs.h) (revision dfd5570b73325edc2487d9cf54a42306363545ae) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 2f9aacdc29711409fba96c2b5eaccbcbeaaeb71a) @@ -49,6 +49,9 @@ ALARM_ID_DD_COMM_TOO_MANY_BAD_CRCS = 18, ///< DD too many bad communications CRC ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO = 19, ///< DD didn't get ACK on message to RO that required acknowledgment ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD = 20, ///< DD didn't get ACK on message to TD that required acknowledgment + ALARM_ID_DD_FPGA_POST_TEST_FAILED = 21, ///< DD FPGA POST failure + ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE = 22, ///< DD processor clock speed checks against FPGA clock failure + ALARM_ID_DD_FPGA_COMM_TIMEOUT = 23, ///< DG FPGA communication down for too long NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -202,6 +205,9 @@ { ALARM_PRIORITY_HIGH, 10, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DD_COMM_TOO_MANY_BAD_CRCS }, { ALARM_PRIORITY_HIGH, 111, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO }, { ALARM_PRIORITY_HIGH, 111, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_FPGA_POST_TEST_FAILED }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DD_FPGA_COMM_TIMEOUT }, }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET NoBRcr NoDRcr ClrOnly TxLog ID /// Table of alarms and their rank. @@ -223,6 +229,9 @@ { 110, ALARM_ID_DD_WATCHDOG_EXPIRED }, { 110, ALARM_ID_DD_SOFTWARE_FAULT }, { 110, ALARM_ID_RO_SOFTWARE_FAULT }, + { 110, ALARM_ID_DD_FPGA_POST_TEST_FAILED }, + { 110, ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE }, + { 110, ALARM_ID_DD_FPGA_COMM_TIMEOUT }, { 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 }, @@ -271,6 +280,9 @@ { 18 , ALARM_ID_DD_COMM_TOO_MANY_BAD_CRCS , "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: CAN CRC Com | Too many bad CRCs detected on received system messages | If too many bad messages CRCs are received within a set period of time | "}, { 19 , ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_RO , "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. | Loss of RO Comm (RO ACK) | DD to RO comm error | DD message to RO that requires acknowledge was not acknowledged within a certain time. | "}, { 20 , ALARM_ID_DD_CAN_MESSAGE_NOT_ACKED_BY_TD , "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. | Loss of TD Comm (TD ACK) | DD to TD comm error | DD message to TD that requires acknowledge was not acknowledged within a certain time. | "}, + { 21 , ALARM_ID_DD_FPGA_POST_TEST_FAILED , "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 POST: FPGA Compatibility | DD FPGA POST failure | Minimum DD FPGA major and minor revision are not equal to the FPGA major and minor revision in FPGA header | "}, + { 22 , ALARM_ID_DD_FPGA_CLOCK_SPEED_CHECK_FAILURE , "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: Proc- FPGA Clock | FPGA clock speed failure | If the FPGA clock speed is relatively close to the processor clock for a certain period of time. | "}, + { 23 , ALARM_ID_DD_FPGA_COMM_TIMEOUT , "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: FPGA Com | DD FPGA communication down for too long | If retries for commands exceeds limit or FPGA reports comm error. | "}, // Num Alarm ID Device Display Title Instructions Alarm List Title Description Trigger Condition }; Index: DDDefs.h =================================================================== diff -u -r90a88be33ec7a2bb9d251562348fe85df884c5a0 -r2f9aacdc29711409fba96c2b5eaccbcbeaaeb71a --- DDDefs.h (.../DDDefs.h) (revision 90a88be33ec7a2bb9d251562348fe85df884c5a0) +++ DDDefs.h (.../DDDefs.h) (revision 2f9aacdc29711409fba96c2b5eaccbcbeaaeb71a) @@ -49,7 +49,7 @@ */ /// Enumeration of init & POST mode states. -enum DG_POST_States +enum DD_POST_States { DG_POST_STATE_START = 0, ///< Start initialize & POST mode state DG_POST_STATE_FW_COMPATIBILITY, ///< Run firmware compatibility test state @@ -75,7 +75,7 @@ DG_POST_STATE_FAILED, ///< POST failed state NUM_OF_DG_POST_STATES ///< Number of initialize & POST mode states }; -typedef enum DG_POST_States DG_POST_STATE_T; ///< Type for DG POST states enumeration +typedef enum DD_POST_States DD_POST_STATE_T; ///< Type for DG POST states enumeration /**@}*/ @@ -520,12 +520,12 @@ */ /// Enumeration of service mode states. -enum DG_Service_States +enum DD_Service_States { - DG_SERVICE_STATE_START = 0, ///< Start service mode state - NUM_OF_DG_SERVICE_STATES ///< Number of service mode states + DD_SERVICE_STATE_START = 0, ///< Start service mode state + NUM_OF_DD_SERVICE_STATES ///< Number of service mode states }; -typedef enum DG_Service_States DG_SERVICE_STATE_T; ///< Type for DG service states enumeration +typedef enum DD_Service_States DD_SERVICE_STATE_T; ///< Type for DD service states enumeration /**@}*/