Index: AlarmDefs.h =================================================================== diff -u -r65b8711ded4959c39b5f2e7b880febddc6c5f0cc -r32f44f7ef6ca1580a966d8b08366ce842117762b --- AlarmDefs.h (.../AlarmDefs.h) (revision 65b8711ded4959c39b5f2e7b880febddc6c5f0cc) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 32f44f7ef6ca1580a966d8b08366ce842117762b) @@ -249,7 +249,7 @@ ALARM_ID_HD_BLOOD_SITTING_WARNING = 211, ///< HD blood sitting too long warning (>4 min) ALARM_ID_HD_END_OF_TREATMENT_ALARM = 212, ///< HD end of treatment alarm (user not acting to end treatment) ALARM_ID_HD_PRIME_COMPLETED_MEDIUM = 213, ///< HD prime completed medium priority alarm - ALARM_ID_AVAILABLE_30 = 214, ///< Available for use + ALARM_ID_DG_CONCENTRATE_PUMPS_INVALID_CAL_RECORD = 214, ///< DG concentrate pumps invalid calibration record. ALARM_ID_AVAILABLE_31 = 215, ///< Available for use ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM = 216, ///< HD end treatment sub-mode timeout alarm ALARM_ID_AVAILABLE_32 = 217, ///< Available for use @@ -612,7 +612,7 @@ { ALARM_PRIORITY_HIGH, 150, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , ALARM_ID_HD_BLOOD_LEAK_DETECTED }, { ALARM_PRIORITY_HIGH, 200, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_VENOUS_PRESSURE_LOW }, { ALARM_PRIORITY_HIGH, 12, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_VENOUS_BUBBLE_DETECTED, }, - { ALARM_PRIORITY_MEDIUM, 301, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT, }, + { ALARM_PRIORITY_MEDIUM, 301, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT, }, { ALARM_PRIORITY_HIGH, 201, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_VENOUS_PRESSURE_HIGH }, { ALARM_PRIORITY_HIGH, 202, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_ARTERIAL_PRESSURE_LOW }, { ALARM_PRIORITY_HIGH, 203, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , ALARM_ID_HD_ARTERIAL_PRESSURE_HIGH }, @@ -700,7 +700,7 @@ { ALARM_PRIORITY_HIGH, 290, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_BLOOD_SITTING_WARNING }, { ALARM_PRIORITY_HIGH, 290, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_HD_END_OF_TREATMENT_ALARM }, { ALARM_PRIORITY_MEDIUM, 590, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_HD_PRIME_COMPLETED_MEDIUM }, - { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_30 }, + { ALARM_PRIORITY_HIGH, 2, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CONCENTRATE_PUMPS_INVALID_CAL_RECORD }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_31 }, { ALARM_PRIORITY_HIGH, 291, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_32 }, @@ -882,6 +882,7 @@ { 2, ALARM_ID_DG_TEMPERATURE_SENSORS_INVALID_CAL_RECORD }, { 2, ALARM_ID_DG_COND_SENSORS_INVALID_TEMP_COMP_CAL_RECORD }, { 2, ALARM_ID_DG_FILL_CONDUCTIVITIES_INVALID_CAL_RECORD }, + { 2, ALARM_ID_DG_CONCENTRATE_PUMPS_INVALID_CAL_RECORD }, { 10, ALARM_ID_HD_SOFTWARE_FAULT }, { 10, ALARM_ID_HD_BLOOD_PUMP_MC_CURRENT_CHECK }, { 10, ALARM_ID_HD_BLOOD_PUMP_OFF_CHECK }, @@ -1140,7 +1141,6 @@ { 999, ALARM_ID_AVAILABLE_15 }, { 999, ALARM_ID_AVAILABLE_20 }, { 999, ALARM_ID_AVAILABLE_21 }, - { 999, ALARM_ID_AVAILABLE_30 }, { 999, ALARM_ID_AVAILABLE_31 }, { 999, ALARM_ID_AVAILABLE_32 }, { 999, ALARM_ID_NO_ALARM }, @@ -1378,7 +1378,7 @@ { 211 , ALARM_ID_HD_BLOOD_SITTING_WARNING , "HD | Approaching MAX Blood Pump Stop Time | The blood has been stopped for nearly 5 minutes.\n- You must resume treatment before the blood pump stop time\ntimer expires.\n- If treatment is not resumed before the timer expires,\ntreatment will be terminated without rinseback. | Blood Stopped: Warning | Blood sitting too long warning (> 4 min) | During treatment stop sub-mode, if the blood is in the line for more than 4 minutes. | "}, { 212 , ALARM_ID_HD_END_OF_TREATMENT_ALARM , "HD | Approaching MAX Blood Pump Stop Time | The blood has been stopped for nearly 5 minutes.\n- You must Resume/OK treatment before the blood pump stop \ntime timer expires.\n- If treatment is not Resume/OK before the timer expires,\ntreatment will be terminated without rinseback. | Blood Stopped: Warning | Blood sitting too long warning (> 4 min) | During treatment end paused state, if the blood is in the line for more than 4 minutes. | "}, { 213 , ALARM_ID_HD_PRIME_COMPLETED_MEDIUM , "HD | Prime Complete - 30 MIN WARNING | The priming process completed 90 minutes ago. \n- Treatment must begin within 30 minutes or the\npre- treatment process will be terminated.\n- Press Resume/OK to continue. | Process: Pre- Tx Prime Complete | HD prime completed medium priority alarm | In Pre-Treatment Recirculation for 90 minutes (escalation of alarm 226) | "}, - { 214 , ALARM_ID_AVAILABLE_30 , " | | | | | | "}, + { 214 , ALARM_ID_DG_CONCENTRATE_PUMPS_INVALID_CAL_RECORD , "DG | 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. | DG POST: Conc Pump Cal | DG concentrate pump calibration record | If the non-volatile data is invalid raise the alarm. | "}, { 215 , ALARM_ID_AVAILABLE_31 , " | | | | | | "}, { 216 , ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM , "HD | Treatment Complete | Dialysis treatment is complete.\n- Press RINSEBACK to end treatment and rinseback. | Process: End of Dialysis Tx | HD end treatment sub-mode timeout alarm | If the treatment ended successfully. | "}, { 217 , ALARM_ID_AVAILABLE_32 , " | | | | | | "}, Index: Compatible.h =================================================================== diff -u -r65b8711ded4959c39b5f2e7b880febddc6c5f0cc -r32f44f7ef6ca1580a966d8b08366ce842117762b --- Compatible.h (.../Compatible.h) (revision 65b8711ded4959c39b5f2e7b880febddc6c5f0cc) +++ Compatible.h (.../Compatible.h) (revision 32f44f7ef6ca1580a966d8b08366ce842117762b) @@ -25,7 +25,7 @@ * @{ */ -#define SW_COMPATIBILITY_REV 15 ///< Compatibility revision for all system software stacks (HD and DG and UI). +#define SW_COMPATIBILITY_REV 16 ///< Compatibility revision for all system software stacks (HD and DG and UI). #define HD_FPGA_COMPATIBILITY_REV 1 ///< Compatibility revision for HD firmware with HD FPGA. #define DG_FPGA_COMPATIBILITY_REV 2 ///< Compatibility revision for DG firmware with DG FPGA.