Index: AlarmDefs.h =================================================================== diff -u -rabbec4e693b5958764e5a8f5931dedd0cb948782 -rbf0851779cc97c438c342f61b0f5238c9ecb6fea --- AlarmDefs.h (.../AlarmDefs.h) (revision abbec4e693b5958764e5a8f5931dedd0cb948782) +++ AlarmDefs.h (.../AlarmDefs.h) (revision bf0851779cc97c438c342f61b0f5238c9ecb6fea) @@ -351,8 +351,8 @@ ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW = 313, ///< DG cleaning mode inlet water temperature too low. ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH = 314, ///< DG cleaning mode inlet water pressure too high. ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW = 315, ///< DG cleaning mode inlet water pressure too low. - ALARM_ID_DG_ACID_CONCENTRATE_PUMP_PARK_FAULT = 316, ///< DG acid concentrate pump park fault. - ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT = 317, ///< DG bicarb concentrate pump part fault. + ALARM_ID_AVAILABLE_20 = 316, ///< Alarm available + ALARM_ID_AVAILABLE_21 = 317, ///< Alarm available. ALARM_ID_AVAILABLE_2 = 318, ///< Alarm available for use ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE = 319, ///< DG chemical disinfect flush flush sample. ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT = 320, ///< DG chemical disinfect flush sample timeout. @@ -806,8 +806,8 @@ { ALARM_PRIORITY_MEDIUM, 602, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW }, { ALARM_PRIORITY_MEDIUM, 605, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH }, { ALARM_PRIORITY_MEDIUM, 606, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACID_CONCENTRATE_PUMP_PARK_FAULT }, - { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT }, + { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_20 }, + { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_21 }, { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_2 }, { ALARM_PRIORITY_LOW, 752, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE }, { ALARM_PRIORITY_LOW, 752, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT }, @@ -984,8 +984,6 @@ { 110, ALARM_ID_DG_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE }, { 110, ALARM_ID_DG_TWO_WIRE_SENSORS_FPGA_FAULT }, { 110, ALARM_ID_HD_LOAD_CELL_PRIMARY_BACKUP_DRIFT_OUT_OF_RANGE }, - { 110, ALARM_ID_DG_ACID_CONCENTRATE_PUMP_PARK_FAULT }, - { 110, ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT }, { 110, ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY }, { 110, ALARM_ID_DG_FLOW_METER_CHECK_FAILURE }, { 110, ALARM_ID_DG_RO_REJECTION_RATIO_OUT_OF_RANGE }, @@ -1139,6 +1137,8 @@ { 999, ALARM_ID_AVAILABLE_10 }, { 999, ALARM_ID_AVAILABLE_13 }, { 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 }, @@ -1480,8 +1480,8 @@ { 313 , ALARM_ID_DG_CLEANING_MODE_INLET_WATER_TEMP_TOO_LOW , "DG | Disinfection: Water Temperature Low | Incoming water temperature is too low.\n- Disinfection has been terminated.\n- Check incoming water before initiating disinfection again. | Cleaning: Inlet Water Temp Low | DG cleaning mode inlet water temperature too low | If inlet water temperature is < 24 C. | "}, { 314 , ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH , "DG | Disinfection: Water Pressure High | Incoming water pressure is too high. \n- Disinfection has been terminated.\n- Check incoming water before initiating disinfection again. | Cleaning: Inlet Water Press High | DG cleaning mode inlet water pressure too high | If inlet water temperature is > 80 psig. | "}, { 315 , ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW , "DG | Disinfection: Water Pressure Low | Incoming water pressure is too low. \n- Disinfection has been terminated.\n- Check incoming water pressure\n before initiating disinfection again. | Cleaning: Inlet Water Press Low | DG cleaning mode inlet water pressure too low | If inlet water pressure is < 14 psig. | "}, - { 316 , ALARM_ID_DG_ACID_CONCENTRATE_PUMP_PARK_FAULT , "DG | 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. | DG Fault: Acid CP Pump Park | Acid concentrate pump did not park successfully | If the park took more than 1 second. | "}, - { 317 , ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT , "DG | 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. | DG Fault: Bicarb CP Pump Park | Bicarb concentrate pump did not park successfully | If the park took more than 1 second. | "}, + { 316 , ALARM_ID_AVAILABLE_20 , " | | | | | | "}, + { 317 , ALARM_ID_AVAILABLE_21 , " | | | | | | "}, { 318 , ALARM_ID_AVAILABLE_2 , " | | | | | | "}, { 319 , ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE , "DG | Residual Chemical Sampling | A water sample is needed to confirm the \nabsence of residual chemical following disinfection. \n- Test sample according to facility policy. \n- Confirm absence of residual chemical disinfectant. | Cleaning: Chem Residual Sampling | Collect sample to check the chemical disinfectant acid | Chemical disinfect flush sample alarm is prompted. | "}, { 320 , ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT , "DG | Chemical Residual Timeout | A chemical residual sample was not collected \n- within 30min of chemical flush.\n- To collect a sample for chemical residual,\nyou must repeat the chemical flush. | Cleaning: Chem Residual Timeout | The user did not proceed with collecting chemical disinfect flush sample for more than 30 minutes | Chemical disinfect flush sample was not collected form more than 30 minutes. | "}, Index: Compatible.h =================================================================== diff -u -ra2a775442dcc36ddfcae6e578c191f5a984f94bf -rbf0851779cc97c438c342f61b0f5238c9ecb6fea --- Compatible.h (.../Compatible.h) (revision a2a775442dcc36ddfcae6e578c191f5a984f94bf) +++ Compatible.h (.../Compatible.h) (revision bf0851779cc97c438c342f61b0f5238c9ecb6fea) @@ -25,7 +25,7 @@ * @{ */ -#define SW_COMPATIBILITY_REV 11 ///< Compatibility revision for all system software stacks (HD and DG and UI). +#define SW_COMPATIBILITY_REV 12 ///< 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.