Index: AlarmDefs.h =================================================================== diff -u -rcf7073516598a5c31e58e9562b52979f194352f9 -r64bee740c6be8dcda470e5d7a6327d108c7742ea --- AlarmDefs.h (.../AlarmDefs.h) (revision cf7073516598a5c31e58e9562b52979f194352f9) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 64bee740c6be8dcda470e5d7a6327d108c7742ea) @@ -50,7 +50,7 @@ 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_CRC = 14, ///< DG invalid usage record CRC - ALARM_ID_HD_INVALID_USAGE_RECORD = 15, ///< HD invalid usage record CRC + ALARM_ID_AVAILABLE_60 = 15, ///< alarm ID available 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_HD_CAN_MESSAGE_NOT_ACKED_DG = 18, ///< HD didn't get ACK on message to DG that required acknowledgment @@ -491,7 +491,7 @@ { 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_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, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_60, 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_HD_CAN_MESSAGE_NOT_ACKED_DG, 0, ALARM_ID_NO_ALARM }, @@ -827,7 +827,7 @@ { 1, ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED }, { 1, ALARM_ID_DG_INVALID_USAGE_RECORD_CRC }, - { 1, ALARM_ID_HD_INVALID_USAGE_RECORD }, + { 1, ALARM_ID_AVAILABLE_60 }, { 1, ALARM_ID_HD_ALARM_AUDIO_SELF_TEST_FAILURE }, { 1, ALARM_ID_HD_UI_POST_FAILED }, { 1, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_DG }, @@ -1171,7 +1171,7 @@ { 12 , ALARM_ID_HD_INTEGRITY_POST_TEST_FAILED , "HD | Self Test Error | Call service to schedule a repair. | HD firmware image integrity POST test failed | If the calculated CRC of the HD image does not match the expected CRC. | "}, { 13 , ALARM_ID_DG_INTEGRITY_POST_TEST_FAILED , "DG | Self Test Error | Call service to schedule a repair. | DG firmware image integrity POST test failed | If the calculated CRC of the DG firmware image does not matched the expected CRC | "}, { 14 , ALARM_ID_DG_INVALID_USAGE_RECORD_CRC , "DG | Self Test Error | Call service to schedule a repair. | DG non-volatile usage information group invalid record CRC | If the DG usage information record's CRC does not match the calculated CRC in POST. | "}, - { 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. | "}, + { 15 , ALARM_ID_AVAILABLE_60 , "N/A | Not Used | N/A. | 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_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. | "}, Index: HDDefs.h =================================================================== diff -u -r4d9b18196318f64f83b9849bc288c6b80b3d6ba1 -r64bee740c6be8dcda470e5d7a6327d108c7742ea --- HDDefs.h (.../HDDefs.h) (revision 4d9b18196318f64f83b9849bc288c6b80b3d6ba1) +++ HDDefs.h (.../HDDefs.h) (revision 64bee740c6be8dcda470e5d7a6327d108c7742ea) @@ -674,8 +674,8 @@ enum Acid_Concentrates { ACID_CONC_TYPE_FRESENIUS_08_1251_1 = 0, ///< Fresensius Naturalyte Acid Concentrate 08-1251-1 - ACID_CONC_TYPE_FRESENIUS_08_2251_0, ///< Fresensius Naturalyte Acid Concentrate 08-1251-1 - ACID_CONC_TYPE_FRESENIUS_08_3251_9, ///< Fresensius Naturalyte Acid Concentrate 08-1251-1 + ACID_CONC_TYPE_FRESENIUS_08_2251_0, ///< Fresensius Naturalyte Acid Concentrate 08-2251-0 + ACID_CONC_TYPE_FRESENIUS_08_3251_9, ///< Fresensius Naturalyte Acid Concentrate 08-3251-9 NUM_OF_ACID_CONC_TYPES ///< Number of acid concentrates }; typedef enum Acid_Concentrates ACID_CONCENTRATE_TYPE_T; ///< Type for acid concentrates enumeration