Index: AlarmDefs.h =================================================================== diff -u -r8a40366d0904d5e0700485c02757708cf9f13e57 -r5912d2cd18e412e3e8a48013954c9bea2e0b5362 --- AlarmDefs.h (.../AlarmDefs.h) (revision 8a40366d0904d5e0700485c02757708cf9f13e57) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 5912d2cd18e412e3e8a48013954c9bea2e0b5362) @@ -339,6 +339,7 @@ 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_HD_SERVICE_TIME_INTERVAL_HAS_ELAPSED = 303, ///< HD service time interval has elapsed + ALARM_ID_HD_INVALID_USAGE_RECORD_CRC = 304, ///< HD invalid usage record NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -773,6 +774,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, 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_HD_SERVICE_TIME_INTERVAL_HAS_ELAPSED, 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_CRC, 0, ALARM_ID_NO_ALARM }, }; // Priority Rank Fault DFault Stops ClrIm NoClr NoRes NoRin NoEnd NoBRcr NoDRcr ClrOnly TxLog ID Escalate In Escalate To /// Table of alarms and their rank. @@ -819,6 +821,7 @@ { 1, ALARM_ID_HD_RTC_OR_TIMER_ACCURACY_FAILURE }, { 1, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD }, { 1, ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD }, + { 1, ALARM_ID_HD_INVALID_USAGE_RECORD_CRC }, { 3, ALARM_ID_HD_INVALID_SYSTEM_RECORD_CRC }, { 3, ALARM_ID_HD_INVALID_SERVICE_RECORD_CRC }, { 3, ALARM_ID_HD_SOFTWARE_FAULT }, Index: MsgDefs.h =================================================================== diff -u -r9fd561289142081f43c4ed8c73a5fd1e24340266 -r5912d2cd18e412e3e8a48013954c9bea2e0b5362 --- MsgDefs.h (.../MsgDefs.h) (revision 9fd561289142081f43c4ed8c73a5fd1e24340266) +++ MsgDefs.h (.../MsgDefs.h) (revision 5912d2cd18e412e3e8a48013954c9bea2e0b5362) @@ -168,7 +168,7 @@ MSG_ID_DG_SERIAL_NUMBER = 0x88, ///< DG serial number MSG_ID_UI_REQUEST_SERVICE_INFO = 0x89, ///< UI request for service schedule information MSG_ID_HD_SERVICE_SCHEDULE_DATA = 0x8A, ///< HD service schedule data - MSG_ID_HD_USAGE_DATA = 0x8B, ///< HD usage data TODO is this needed? + MSG_ID_HD_USAGE_DATA = 0x8B, ///< HD usage data MSG_ID_DG_SERVICE_SCHEDULE_DATA = 0x8C, ///< DG service schedule data MSG_ID_DG_USAGE_DATA = 0x8D, ///< DG usage data MSG_ID_HD_POST_SINGLE_TEST_RESULT = 0x8E, ///< HD POST single test result @@ -195,7 +195,7 @@ MSG_ID_HD_FANS_DATA = 0xA3, ///< HD fans data publish MSG_ID_HD_EVENT = 0xA4, ///< HD general event MSG_ID_DG_EVENT = 0xA5, ///< DG general event - MSG_ID_DG_DIALYSATE_FLOW_METER_DATA = 0xA6, // TODO remove when DEN-13460 merged ///< DG dialysate flow meter data (liter/minute) + MSG_ID____AVAILABLE_4 = 0xA6, ///< This message is available for use MSG_ID_DG_ALARM_INFO = 0xA7, ///< DG alarm information data publish MSG_ID_HD_RESERVOIRS_DATA = 0xA8, ///< HD reservoirs data publish MSG_ID_HD_REQUEST_DG_CONCENTRATE_MIXING_RATIOS = 0xA9, ///< HD request DG concentrate ratios