Index: AlarmDefs.h =================================================================== diff -u -r9187537d9eb1bd8ee9bf5a5de89384daada1fe60 -re6ae882b6248a172511a6ef0e8404bddec825f30 --- AlarmDefs.h (.../AlarmDefs.h) (revision 9187537d9eb1bd8ee9bf5a5de89384daada1fe60) +++ AlarmDefs.h (.../AlarmDefs.h) (revision e6ae882b6248a172511a6ef0e8404bddec825f30) @@ -219,7 +219,7 @@ ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE = 181, ///< DG load cells weight out of range for tare ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD = 182, ///< DG load cells invalid calibration ALARM_ID_DG_INVALID_LOAD_CELL_VALUE = 183, ///< DG invalid load cell value - ALARM_ID_UV_REACTOR_NOT_HEALTHY = 184, ///< Inlet or Outlet UV reactor not healthy + ALARM_ID_DG_INLET_UV_REACTOR_NOT_HEALTHY = 184, ///< DG inlet UV reactor not healthy ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE = 185, ///< DG fan RPM out of range ALARM_ID_DG_CONCENTRATE_PUMP_FAULT = 186, ///< DG concentrate pump fault ALARM_ID_CP1_SPEED_CONTROL_ERROR = 187, ///< DG concentrate pump CP1 speed control error @@ -356,6 +356,7 @@ ALARM_ID_HD_AIR_PUMP_TIMEOUT = 318, ///< HD Air Pump timeout alarm 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. + ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY = 321, ///< DG outlet UV reactor not healthy NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -666,7 +667,7 @@ { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 1, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INVALID_LOAD_CELL_VALUE, 0, ALARM_ID_NO_ALARM }, - { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_UV_REACTOR_NOT_HEALTHY, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INLET_UV_REACTOR_NOT_HEALTHY, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_LOW, 999, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CONCENTRATE_PUMP_FAULT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, ALARM_ID_CP1_SPEED_CONTROL_ERROR, 0, ALARM_ID_NO_ALARM }, @@ -807,6 +808,7 @@ { ALARM_PRIORITY_HIGH, 3, TRUE, FALSE, TRUE , TRUE , TRUE, TRUE , TRUE, TRUE, TRUE, TRUE , FALSE, FALSE, ALARM_ID_HD_AIR_PUMP_TIMEOUT, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_MEDIUM, 799, FALSE, FALSE, FALSE, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE, 0, ALARM_ID_NO_ALARM }, { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT, 0, ALARM_ID_NO_ALARM }, + { ALARM_PRIORITY_HIGH, 3, FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY, 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. @@ -980,7 +982,7 @@ { 3, ALARM_ID_FLOW_RATE_OUT_OF_LOWER_RANGE }, { 3, ALARM_ID_DRAIN_PUMP_RPM_OUT_OF_RANGE }, { 3, ALARM_ID_DRAIN_PUMP_OFF_FAULT }, - { 3, ALARM_ID_UV_REACTOR_NOT_HEALTHY }, + { 3, ALARM_ID_DG_INLET_UV_REACTOR_NOT_HEALTHY }, { 3, ALARM_ID_DG_CD1_CD2_SENSORS_FPGA_FAULT }, { 3, ALARM_ID_DG_CPI_CPO_SENSORS_FPGA_FAULT }, { 3, ALARM_ID_DG_RO_FLOW_RATE_OUT_OF_MAX_RANGE }, @@ -1038,6 +1040,7 @@ { 3, ALARM_ID_DG_BICARB_CONCENTRATE_PUMP_PARK_FAULT }, { 3, ALARM_ID_HD_AIR_PUMP_TIMEOUT }, { 3, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_SAMPLE_TIMEOUT }, + { 3, ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY }, { 4, ALARM_ID_END_OF_TREATMENT_HIGH }, { 5, ALARM_ID_TREATMENT_STOPPED_NO_RINSEBACK }, { 6, ALARM_ID_HD_BLOOD_LEAK_DETECTED }, @@ -1338,7 +1341,7 @@ { 181 , ALARM_ID_DG_LOAD_CELLS_TARE_WEIGHT_OUT_OF_RANGE , "DG | Ultrafiltration Measurement Error | Call service to schedule a repair. | DG load cells weight out of range for tare | If the load cell weight is out of range for tare. | "}, { 182 , ALARM_ID_DG_LOAD_CELLS_INVALID_CAL_RECORD , "DG | Ultrafiltration Measurement Error | Call service to schedule a repair. | DG load cells invalid calibration | If the CRC of load cells calibration data does not match the calculated CRC. | "}, { 183 , ALARM_ID_DG_INVALID_LOAD_CELL_VALUE , "DG | Heat Disinfection Error | Call service to schedule a repair. | DG invalid load cell value | If the half full reservoir is filled prior to filling the reservoir that is supposed to overflow to the half full reservoir. | "}, - { 184 , ALARM_ID_UV_REACTOR_NOT_HEALTHY , "DG | UV Reactor Error | Call service to schedule a repair. | Inlet or Outlet UV reactor not healthy | If the inlet or outlet reactor are not healthy. | "}, + { 184 , ALARM_ID_DG_INLET_UV_REACTOR_NOT_HEALTHY , "DG | UV Reactor Error | Call service to schedule a repair. | Inlet UV reactor not healthy | If the inlet reactor are not healthy. | "}, { 185 , ALARM_ID_DG_FAN_RPM_OUT_OF_RANGE , "DG | Fan Error | Fan failure.\n- Check that the fans inlets are not blocked or obstructed. | DG fan RPM out of range | If the fan RPM is out of Min/Max range. | "}, { 186 , ALARM_ID_DG_CONCENTRATE_PUMP_FAULT , "DG | Dialysate Concentrate Pump Error | Call service to schedule a repair. | DG concentrate pump fault | If the concentrate pumps fault is reported by the FPGA. | "}, { 187 , ALARM_ID_CP1_SPEED_CONTROL_ERROR , "DG | Dialysate Concentrate Pump Error | Call service to schedule a repair. | DG concentrate pump CP1 speed control error | If the concentrate pump CP1 speed > 0.02 tolerance for a certain period of time. | "}, @@ -1478,6 +1481,7 @@ { 318 , ALARM_ID_HD_AIR_PUMP_TIMEOUT , "HD | Air Pump Operation Timeout | Call service to schedule a repair. | HD Air Pump operation timeout | If air pump has been turned on for greater than 10s. | "}, { 319 , ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE , "DG | Chemical Disinfect Flush | Collect Flush Sample. | 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 Disinfect Flush | Call service to schedule a repair. | 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. | "}, + { 321 , ALARM_ID_DG_OUTLET_UV_REACTOR_NOT_HEALTHY , "DG | UV Reactor Error | Call service to schedule a repair. | Outlet UV reactor not healthy | If the outlet reactor are not healthy. | "}, // Num Alarm ID Device Display Title Instructions Description Trigger Condition }; #endif Index: DGDefs.h =================================================================== diff -u -rbf0f2f02dfbf5af94b5676b7b553897d43e998f5 -re6ae882b6248a172511a6ef0e8404bddec825f30 --- DGDefs.h (.../DGDefs.h) (revision bf0f2f02dfbf5af94b5676b7b553897d43e998f5) +++ DGDefs.h (.../DGDefs.h) (revision e6ae882b6248a172511a6ef0e8404bddec825f30) @@ -339,6 +339,7 @@ F32 R1FillLevel; ///< Reservoir 1 level upon starting the heat disinfect. F32 R2FillLevel; ///< Reservoir 2 level upon starting the heat disinfect. U32 heatDisinfectUIState; ///< Heat disinfect UI state. + U32 nelsonSupportMode; ///< Nelson support mode. } MODE_HEAT_DISINFECT_DATA_T; #endif @@ -415,6 +416,7 @@ F32 R1FillLevel; ///< Reservoir 1 level upon starting the chemical disinfect. F32 R2FillLevel; ///< Reservoir 2 level upon starting the chemical disinfect. U32 chemDisinfectUIState; ///< Chemical disinfect UI state. + U32 nelsonSupportMode; ///< Nelson support mode. } MODE_CHEMICAL_DISINFECT_DATA_T; #endif