Index: AlarmDefs.h =================================================================== diff -u -r9b230faa04fe57ff323a26500bc9ccbba9561668 -r81ceae0e4d2c112902748fa454ca8761493188af --- AlarmDefs.h (.../AlarmDefs.h) (revision 9b230faa04fe57ff323a26500bc9ccbba9561668) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 81ceae0e4d2c112902748fa454ca8761493188af) @@ -341,7 +341,7 @@ ALARM_ID_DG_DRAIN_PUMP_DIRECTION_FPGA_FAULT = 303, ///< DG drain pump direction FPGA fault ALARM_ID_HD_INVALID_USAGE_RECORD_CRC = 304, ///< HD invalid usage record ALARM_ID_HD_CPU_RAM_ERROR = 305, ///< HD processor RAM error - ALARM_ID_AVAILABLE_50 = 306, ///< Alarm ID available + ALARM_ID_DG_TURN_OFF_INLET_WATER_VALVES = 306, ///< DG turn off inlet water valves ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT = 307, ///< HD AC power lost second alarm ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR = 308, ///< DG CPi conductivity sensor invalid character received ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR = 309, ///< DG CPo conductivity sensor invalid character received @@ -796,7 +796,7 @@ { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_DRAIN_PUMP_DIRECTION_FPGA_FAULT }, { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_INVALID_USAGE_RECORD_CRC }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CPU_RAM_ERROR }, - { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_50 }, + { ALARM_PRIORITY_MEDIUM, 839, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_DG_TURN_OFF_INLET_WATER_VALVES }, { ALARM_PRIORITY_HIGH, 100, FALSE, FALSE, TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR }, @@ -1117,6 +1117,7 @@ { 751, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_REMOVE_ACID }, { 752, ALARM_ID_DG_CHEM_DISINFECT_FLUSH_FLUSH_SAMPLE }, { 753, ALARM_ID_DG_RO_PERMEATE_SAMPLE_REMOVE_DIA_CAP }, + { 839, ALARM_ID_DG_TURN_OFF_INLET_WATER_VALVES }, { 840, ALARM_ID_HD_DISINFECT_FLUSH }, { 841, ALARM_ID_HD_DISINFECT_HEAT }, { 842, ALARM_ID_HD_DISINFECT_CHEM }, @@ -1142,7 +1143,6 @@ { 999, ALARM_ID_AVAILABLE_30 }, { 999, ALARM_ID_AVAILABLE_31 }, { 999, ALARM_ID_AVAILABLE_32 }, - { 999, ALARM_ID_AVAILABLE_50 }, { 999, ALARM_ID_NO_ALARM }, }; @@ -1470,7 +1470,7 @@ { 303 , ALARM_ID_DG_DRAIN_PUMP_DIRECTION_FPGA_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: DRP Hall Commutation | DG drain pump direction FPGA fault | If the FPGA indicates an error for a certain period of time. | "}, { 304 , ALARM_ID_HD_INVALID_USAGE_RECORD_CRC , "HD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | HD POST: Usage Rec NVRAM CRC | HD invalid usage reocord | If the CRC of the HD usage record does not match the calculated CRC. | "}, { 305 , ALARM_ID_HD_CPU_RAM_ERROR , "HD | Service Required: Hemodialysis Device | A problem was detected with the hemodialysis 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. | HD Fault: Processor RAM error | HD_CPU RAM error | If the RAM status indicates any of the following: Double bit error, Address decode failure, Address decode logic element failure, Read address parity failure, Write address parity failure. | "}, - { 306 , ALARM_ID_AVAILABLE_50 , " | | | | | | "}, + { 306 , ALARM_ID_DG_TURN_OFF_INLET_WATER_VALVES , "DG | Turn Off Inlet Water Valves | Heat disinfection is in progress.\n- Turn off inlet water valves. \n | Cleaning: Turn Off Inlet Water Valves | Selection of nocturnal heat disinfect | If the user has selected the nocturnal heat disinfect, the DG Software prompts the user to turn off the inlet water valves once the reservoirs are filled. | "}, { 307 , ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT , "HD | Power Loss | Treatment must be terminated due to a power loss.\n- Follow clinic instructions on when to initiate manual rinseback.\n- Check all electrical connections.\n- If power returns within 5 minutes of outage, \n- rinseback will be allowed. | Blood Stop: Loss of AC Power | HD AC power lost alarm | The HD Software shall trigger an alarm if an AC power loss is detected while the HD system is in pre-treatment, treatment, or post-treatment mode. | "}, { 308 , ALARM_ID_DG_CPI_COND_SENSOR_INVALID_CHAR , "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: CPi Comm | DG CPi conductivity sensor transmits invalid characters | If the CPi conductivity sensor transmits invalid characters for a certain period of time. | "}, { 309 , ALARM_ID_DG_CPO_COND_SENSOR_INVALID_CHAR , "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: CPo Comm | DG CPo conductivity sensor transmits invalid characters | If the CPo conductivity sensor transmits invalid characters for a certain period of time. | "}, Index: DGDefs.h =================================================================== diff -u -r5053d55ab7ee8e1bd58210b1ffde98955d169c8a -r81ceae0e4d2c112902748fa454ca8761493188af --- DGDefs.h (.../DGDefs.h) (revision 5053d55ab7ee8e1bd58210b1ffde98955d169c8a) +++ DGDefs.h (.../DGDefs.h) (revision 81ceae0e4d2c112902748fa454ca8761493188af) @@ -303,6 +303,10 @@ DG_HEAT_DISINFECT_STATE_FILL_R2_WITH_HOT_WATER, ///< Heat disinfect, fill R2 with hot water state DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1, ///< Heat disinfect, disinfect R2 to R1 state DG_HEAT_DISINFECT_STATE_COOL_DOWN_HEATERS, ///< Heat disinfect, cool down heaters state + DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_IDLE, ///< Heat disinfect, nocturnal cool idle state + DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_CHECK_WATER_TEMP, ///< Heat disinfect, nocturnal cool check water temperature state + DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_DRAIN_R1, ///< Heat disinfect, nocturnal cool drain R1 state + DG_HEAT_DISINFECT_STATE_NOCTURNAL_COOL_DRAIN_R2, ///< Heat disinfect, nocturnal cool drain R2 state DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R1, ///< Heat disinfect, mix drain R1 state DG_HEAT_DISINFECT_STATE_MIX_DRAIN_R2, ///< Heat disinfect, mix drain R2 state DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH, ///< Heat disinfect, cancel mode basic path state @@ -343,6 +347,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 noctHeatDisinfectStatus; ///< Nocturnal heat disinfect status } MODE_HEAT_DISINFECT_DATA_T; #endif Index: MsgDefs.h =================================================================== diff -u -r7eda2e3915a73edb13480a8197e5dd7d5c912b22 -r81ceae0e4d2c112902748fa454ca8761493188af --- MsgDefs.h (.../MsgDefs.h) (revision 7eda2e3915a73edb13480a8197e5dd7d5c912b22) +++ MsgDefs.h (.../MsgDefs.h) (revision 81ceae0e4d2c112902748fa454ca8761493188af) @@ -233,6 +233,7 @@ MSG_ID_DG_START_STOP_RO_PERMEATE_SAMPLE_MODE_CMD_REQUEST = 0xC9, ///< DG start/stop RO permeate sample mode command request MSG_ID_DG_RO_PERMEATE_SAMPLE_DATA = 0xCA, ///< DG RO permeate sample mode data broadcast MSG_ID_HD_SEND_RO_PERMEATE_SAMPLE_DISPENSE_REQUEST_TO_DG = 0xCB, ///< HD send RO permeate sample dispense request to DG + MSG_ID_DG_START_STOP_NOCTURNAL_HEAT_DISINFECT = 0xCC, ///< DG start stop nocturnal heat disinfect MSG_ID_DG_SEND_RO_PERMEATE_SAMPLE_DISPENSE_READY_TO_HD = 0xCD, ///< DG send RO permeate sample dispense ready to HD MSG_ID_DG_DRAIN_MODE_DATA = 0xCE, ///< DG drain mode data broadcast message MSG_ID_UI_INSTITUTIONAL_RECORD_REQUEST = 0xCF, ///< UI request institutional record request