Index: AlarmDefs.h =================================================================== diff -u -r9b230faa04fe57ff323a26500bc9ccbba9561668 -rc19c06d1b5f4aa16ea13837e7177cceb83a14aee --- AlarmDefs.h (.../AlarmDefs.h) (revision 9b230faa04fe57ff323a26500bc9ccbba9561668) +++ AlarmDefs.h (.../AlarmDefs.h) (revision c19c06d1b5f4aa16ea13837e7177cceb83a14aee) @@ -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, 500, 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 }, @@ -1068,6 +1068,7 @@ { 441, ALARM_ID_DG_EXCESSIVE_TILT }, { 442, ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_1_ALARM }, { 442, ALARM_ID_HD_LOAD_CELL_ACCELERATION_RES_2_ALARM }, + { 500, ALARM_ID_DG_TURN_OFF_INLET_WATER_VALVES }, { 590, ALARM_ID_HD_PRIME_COMPLETED_MEDIUM }, { 600, ALARM_ID_DG_HEAT_DISINFECT_TEMP_GRAD_OUT_OF_RANGE }, { 600, ALARM_ID_DG_CHEM_DISINFECT_TARGET_COND_OUT_OF_RANGE }, @@ -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 }, }; @@ -1211,7 +1211,7 @@ { 44 , ALARM_ID_HD_UI_COMM_TIMEOUT , "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: UI Comm | User interface communication timeout | If the sub-system communication timeout has occurred. UI is 5 seconds. DG is 2 seconds. | "}, { 45 , ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS , "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: CAN CRC Com | Too many bad CRCs detected on received system messages | If too many bad messages CRCs are received within a set period of time | "}, { 46 , ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI , "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: CAN ACK UI Com | System message that required acknowledgment was not acknowledged | If no retries left in the pending acknowlegement list. | "}, - { 47 , ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED , "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: RO Pump High | DG RO pump out of upper range | If the RO pump > 95% PWM for 12 secs. | "}, + { 47 , ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED , "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: RO Pump High | DG RO pump out of upper range | If the RO pump > 95% PWM for 30 secs. | "}, { 48 , ALARM_ID_HD_UF_VOLUME_ACCURACY_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: UF Rate Tare Err | Ultrafiltration volume accuracy error during treatment | If the UF volume (refUFvolume - measureVolume) > 100.0 mL. | "}, { 49 , ALARM_ID_HD_FPGA_COMM_TIMEOUT , "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: FPGA Com | HD FPGA communication down for too long | If there are more than 3 comm errors in a 1 min period. | "}, { 50 , ALARM_ID_DG_VALVE_CONTROL_FAILURE , "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: Valve Control | DG FPGA not accepting commanded valve states | If the read back FPGA valve states does not match the commanded valve states for a certain amount of time. | "}, @@ -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. | 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: Compatible.h =================================================================== diff -u -r7eda2e3915a73edb13480a8197e5dd7d5c912b22 -rc19c06d1b5f4aa16ea13837e7177cceb83a14aee --- Compatible.h (.../Compatible.h) (revision 7eda2e3915a73edb13480a8197e5dd7d5c912b22) +++ Compatible.h (.../Compatible.h) (revision c19c06d1b5f4aa16ea13837e7177cceb83a14aee) @@ -25,7 +25,7 @@ * @{ */ -#define SW_COMPATIBILITY_REV 13 ///< Compatibility revision for all system software stacks (HD and DG and UI). +#define SW_COMPATIBILITY_REV 14 ///< 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. Index: DGDefs.h =================================================================== diff -u -r5053d55ab7ee8e1bd58210b1ffde98955d169c8a -rc19c06d1b5f4aa16ea13837e7177cceb83a14aee --- DGDefs.h (.../DGDefs.h) (revision 5053d55ab7ee8e1bd58210b1ffde98955d169c8a) +++ DGDefs.h (.../DGDefs.h) (revision c19c06d1b5f4aa16ea13837e7177cceb83a14aee) @@ -215,10 +215,12 @@ enum DG_Disinfect_States { DG_DISINFECT_FLUSH_STATE = 0, ///< DG disinfect flush - DG_DISINFECT_HEAT_STATE, ///< DG disinfect heat + DG_DISINFECT_HEAT_STATE_ACTIVE_COOL, ///< DG disinfect heat with active cool DG_DISINFECT_CHEM_STATE, ///< DG disinfect chemical DG_DISINFECT_CHEM_FLUSH_STATE, ///< DG disinfect chemical flush DG_DISINFECT_RO_PERMEATE_SAMPLE_STATE, ///< DG disinfect RO permeate sample + DG_DISINFECT_HEAT_STATE_PASSIVE_COOL, ///< DG disinfect heat with passive cool + DG_DISINFECT_ACTIVE_COOL, ///< DG disinfect active cool DG_DISINFECT_NOT_RUNNING_STATE, ///< DG disinfect not running NUM_OF_DG_DISINFECT_STATES ///< Number of DG disinfect states }; @@ -543,30 +545,32 @@ /// Enumeration of available DG commands. enum DG_Command { - DG_CMD_NONE = 0, ///< Not a command - DG_CMD_SWITCH_RESERVOIR = 1, ///< Command to request DG switch reservoirs - DG_CMD_START_DRAIN = 2, ///< Command to request DG to start drain - DG_CMD_STOP_DRAIN = 3, ///< Command to request DG to stop drain - DG_CMD_START_FILL = 4, ///< Command to request DG to start fill - DG_CMD_STOP_FILL = 5, ///< Command to request DG to stop fill - DG_CMD_START_TRIMMER_HEATER = 6, ///< Command to request DG to start trimmer heater - DG_CMD_STOP_TRIMMER_HEATER = 7, ///< Command to request DG to stop trimmer heater - DG_CMD_VALVE_SETTING = 8, ///< Command to request DG to change valve settings - DG_CMD_SAMPLE_WATER = 9, ///< Command to request DG to sample water - DG_CMD_START_FLUSH = 10, ///< Command to request DG to start flush - DG_CMD_STOP_FLUSH = 11, ///< Command to request DG to stop flush - DG_CMD_START_HEAT_DISINFECT = 12, ///< Command to request DG to start heat disinfect - DG_CMD_STOP_HEAT_DISINFECT = 13, ///< Command to request DG to stop heat disinfect - DG_CMD_START_CHEM_DISINFECT = 14, ///< Command to request DG to start chemical disinfect - DG_CMD_STOP_CHEM_DISINFECT = 15, ///< Command to request DG to stop chemical disinfect - DG_CMD_REQUEST_CONC_MIXING_RATIOS = 16, ///< Command to request DG to send the concentrate pumps mixing ratios - DG_CMD_START_CHEM_DISINFECT_FLUSH = 17, ///< Command to request DG to start chemical disinfect - DG_CMD_STOP_CHEM_DISINFECT_FLUSH = 18, ///< Command to request DG to stop chemical disinfect - DG_CMD_START_RO_PERMEATE_SAMPLE = 19, ///< Command to request DG to start RO permeate sample mode - DG_CMD_STOP_RO_PERMEATE_SAMPLE = 20, ///< Command to request DG to stop RO permeate sample mode - DG_CMD_STOP_ACTIVE_COOL = 21, ///< Command to request DG to stop active cool mode - DG_CMD_PARK_CONCENTRATE_PUMPS = 22, ///< Command to request DG to park concentrate pumps - NUM_OF_DG_COMMANDS ///< Number of DG commands + DG_CMD_NONE = 0, ///< Not a command + DG_CMD_SWITCH_RESERVOIR = 1, ///< Command to request DG switch reservoirs + DG_CMD_START_DRAIN = 2, ///< Command to request DG to start drain + DG_CMD_STOP_DRAIN = 3, ///< Command to request DG to stop drain + DG_CMD_START_FILL = 4, ///< Command to request DG to start fill + DG_CMD_STOP_FILL = 5, ///< Command to request DG to stop fill + DG_CMD_START_TRIMMER_HEATER = 6, ///< Command to request DG to start trimmer heater + DG_CMD_STOP_TRIMMER_HEATER = 7, ///< Command to request DG to stop trimmer heater + DG_CMD_VALVE_SETTING = 8, ///< Command to request DG to change valve settings + DG_CMD_SAMPLE_WATER = 9, ///< Command to request DG to sample water + DG_CMD_START_FLUSH = 10, ///< Command to request DG to start flush + DG_CMD_STOP_FLUSH = 11, ///< Command to request DG to stop flush + DG_CMD_START_HEAT_DISINFECT_ACTIVE_COOL = 12, ///< Command to request DG to start heat disinfect with active cool + DG_CMD_STOP_HEAT_DISINFECT = 13, ///< Command to request DG to stop heat disinfect + DG_CMD_START_CHEM_DISINFECT = 14, ///< Command to request DG to start chemical disinfect + DG_CMD_STOP_CHEM_DISINFECT = 15, ///< Command to request DG to stop chemical disinfect + DG_CMD_REQUEST_CONC_MIXING_RATIOS = 16, ///< Command to request DG to send the concentrate pumps mixing ratios + DG_CMD_START_CHEM_DISINFECT_FLUSH = 17, ///< Command to request DG to start chemical disinfect + DG_CMD_STOP_CHEM_DISINFECT_FLUSH = 18, ///< Command to request DG to stop chemical disinfect + DG_CMD_START_RO_PERMEATE_SAMPLE = 19, ///< Command to request DG to start RO permeate sample mode + DG_CMD_STOP_RO_PERMEATE_SAMPLE = 20, ///< Command to request DG to stop RO permeate sample mode + DG_CMD_STOP_ACTIVE_COOL = 21, ///< Command to request DG to stop active cool mode + DG_CMD_PARK_CONCENTRATE_PUMPS = 22, ///< Command to request DG to park concentrate pumps + DG_CMD_START_HEAT_DISINFECT_PASSIVE_COOL = 23, ///< Command to request DG to start heat disinfect with passive cool + DG_CMD_START_ACTIVE_COOL = 24, ///< Command to request DG to start heat disinfect active cool + NUM_OF_DG_COMMANDS ///< Number of DG commands }; typedef enum DG_Command DG_COMMAND_T; ///< Type for DG commands enumeration @@ -671,6 +675,7 @@ DG_EVENT_BICARB_CHECK_RESULT, ///< DG bicarb check result DG_EVENT_ACID_CHECK_RESULT, ///< DG acid check result DG_EVENT_COND1_VS_COND2_DIFF_RESULT, ///< DG CD1 (acid) vs. CD2 (bicarb) different result + DG_EVENT_PASSIVE_COOL_HEAT_DISINFECT_STATUS, ///< DG passive cool heat disinfect status NUM_OF_DG_EVENT_IDS ///< Total number of DG events }; typedef enum DG_Event_List DG_EVENT_ID_T; ///< Type for DG event list enumeration Index: MsgDefs.h =================================================================== diff -u -r7eda2e3915a73edb13480a8197e5dd7d5c912b22 -rc19c06d1b5f4aa16ea13837e7177cceb83a14aee --- MsgDefs.h (.../MsgDefs.h) (revision 7eda2e3915a73edb13480a8197e5dd7d5c912b22) +++ MsgDefs.h (.../MsgDefs.h) (revision c19c06d1b5f4aa16ea13837e7177cceb83a14aee) @@ -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_PASSIVE_COOL_HEAT_DISINFECT = 0xCC, ///< DG start stop passive cool 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