Index: AlarmDefs.h =================================================================== diff -u -rdb65d65709c7c0d8c82e32c3a01d25f5b8db22b6 -rd8aa1fb47fd006b74113018a6b90b5c041996a1c --- AlarmDefs.h (.../AlarmDefs.h) (revision db65d65709c7c0d8c82e32c3a01d25f5b8db22b6) +++ AlarmDefs.h (.../AlarmDefs.h) (revision d8aa1fb47fd006b74113018a6b90b5c041996a1c) @@ -49,7 +49,7 @@ ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP = 11, ///< HD dialysate temperature below target temperature ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED = 12, ///< HD firmware image integrity POST test failed ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED = 13, ///< DG firmware image integrity POST test failed - ALARM_ID_DG_INVALID_USAGE_RECORD = 14, ///< DG invalid usage record CRC + ALARM_ID_DG_INVALID_USAGE_RECORD_CRC = 14, ///< DG invalid usage record CRC 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 @@ -334,6 +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_DG_DISINFECT_HAS_BEEN_EXPIRED = 299, ///< DG disinfect has been expired + ALARM_ID_DG_SERIVCE_TIME_INTERVAL_HAS_ELAPSED = 300, ///< DG service time interval has elapsed NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -467,7 +469,7 @@ { ALARM_PRIORITY_HIGH, 799, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIALYSATE_TEMP_BELOW_TARGET_TEMP, ALM_ESC_10_MIN, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INTEGRITY_POST_TEST_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_INTEGRITY_POST_TEST_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_INVALID_USAGE_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_INVALID_USAGE_RECORD_CRC, 0, ALARM_ID_NO_ALARM }, { 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 }, @@ -763,6 +765,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_DG_DISINFECT_HAS_BEEN_EXPIRED, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_MEDIUM, 899, FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_SERIVCE_TIME_INTERVAL_HAS_ELAPSED, 0, ALARM_ID_NO_ALARM }, }; // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To /// Table of alarms and their rank. @@ -778,7 +782,7 @@ { 1, ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE }, { 1, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED }, - { 1, ALARM_ID_DG_INVALID_USAGE_RECORD }, + { 1, ALARM_ID_DG_INVALID_USAGE_RECORD_CRC }, { 1, ALARM_ID_HD_INVALID_USAGE_RECORD }, { 1, ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE }, { 1, ALARM_ID_HD_UI_POST_FAILED }, @@ -1035,6 +1039,8 @@ { 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_DG_DISINFECT_HAS_BEEN_EXPIRED }, + { 899, ALARM_ID_DG_SERIVCE_TIME_INTERVAL_HAS_ELAPSED }, { 900, ALARM_ID_EMPTY_SALINE_BAG }, { 901, ALARM_ID_DIALYSATE_TEMPERATURE_HIGH }, { 902, ALARM_ID_DIALYSATE_TEMPERATURE_LOW }, Index: MsgDefs.h =================================================================== diff -u -rd2b33b8d231f0c8439db5973bc67238f8dde79bf -rd8aa1fb47fd006b74113018a6b90b5c041996a1c --- MsgDefs.h (.../MsgDefs.h) (revision d2b33b8d231f0c8439db5973bc67238f8dde79bf) +++ MsgDefs.h (.../MsgDefs.h) (revision d8aa1fb47fd006b74113018a6b90b5c041996a1c) @@ -212,6 +212,7 @@ MSG_ID_DG_RESPONSE_SERVICE_MODE_REQUEST = 0xB4, ///< DG response to HD request to go to service mode MSG_ID_HD_REQUEST_DG_ALARMS = 0xB5, ///< HD request for DG to re-send trigger messages for each active alarm MSG_ID_HD_REQUEST_DG_SERVICE_MODE = 0xB6, ///< HD request for DG to to go to service mode + MSG_ID_DG_RTC_EPOCH = 0xB7, ///< DG RTC epoch broadcast message #ifdef EMC_TEST_BUILD MSG_ID_CAN_ERROR_COUNT = 0x999, // test code in support of EMC testing @@ -315,7 +316,7 @@ MSG_ID_HD_BUBBLE_STATUS_OVERRIDE = 0x805E, ///< HD air bubble detector status override request MSG_ID_HD_BLOOD_PRIME_VOLUME_OVERRIDE = 0x805F, ///< HD blood prime volume override request MSG_ID_HD_BUBBLE_SELF_TEST_REQUEST = 0x8060, ///< HD air bubble detector self-test request - MSG_ID_HD_FAN_RPM_ALARM_START_TIME_OFFSET_OVERRIDE = 0x8061, ///< HD fan RPM alarm start time override request TODO remove once DEN-12224 merged into staging + MSG_ID____AVAILABLE_2 = 0x8061, ///< Unused - this message ID is available for use MSG_ID_HD_SWITCHES_STATUS_OVERRIDE = 0x8062, ///< HD switches status override request MSG_ID_HD_SWITCHES_PUBLISH_INTERVAL_OVERRIDE = 0x8063, ///< HD switches data publish override request MSG_ID_HD_BATTERY_REMAINING_PERCENT_OVERRIDE = 0x8064, ///< HD battery remaining percent override request