Index: AlarmDefs.h =================================================================== diff -u -r3b5a32bace3e00f68953cd665db9bb6dd653abec -r634393e80aa39b1552715b348fc68b6b38a5d529 --- AlarmDefs.h (.../AlarmDefs.h) (revision 3b5a32bace3e00f68953cd665db9bb6dd653abec) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 634393e80aa39b1552715b348fc68b6b38a5d529) @@ -308,7 +308,7 @@ ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED = 270, ///< HD POST Safety Shutdown failure ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED = 271, ///< DG POST Safety Shutdown failure ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE = 272, ///< HD Fan RPM out of range - ALARM_ID_AVAILABLE_10 = 273, ///< Available for use + ALARM_ID_AVAILABLE_30 = 273, ///< Alarm available. ALARM_ID_DG_INACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE = 274, ///< DG inactive reservoir weight out of range ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE = 275, ///< HD arterial pressure sensor is reading out of range ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE = 276, ///< HD venous pressure sensor is reading out of range @@ -351,7 +351,7 @@ 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_AVAILABLE_20 = 316, ///< Alarm available + 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. @@ -514,29 +514,29 @@ { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_PUMP_OFF_CHECK }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_PUMP_MC_DIRECTION_CHECK }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_PUMP_ROTOR_SPEED_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MC_CURRENT_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MC_CURRENT_CHECK }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_OFF_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MC_DIRECTION_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_ROTOR_SPEED_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MC_CURRENT_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MC_DIRECTION_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_ROTOR_SPEED_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MC_CURRENT_CHECK }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_OFF_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MC_DIRECTION_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MC_DIRECTION_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_MAIN_PRIMARY_HEATER_FPGA_FAULT }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UI_COMM_TIMEOUT }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_FPGA_COMM_TIMEOUT }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_VALVE_CONTROL_FAILURE }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_BLOOD_PUMP_MOTOR_SPEED_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MOTOR_SPEED_CHECK }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_IN_PUMP_MOTOR_SPEED_CHECK }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_CRITICAL_DATA_ERROR }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_CRITICAL_DATA_ERROR }, - { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETER_FAILURE }, + { ALARM_PRIORITY_HIGH, 110, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ACCELEROMETER_FAILURE }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_ACCELEROMETER_FAILURE }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VALVE_HOMING_FAILED }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_VALVE_TRANSITION_TIMEOUT }, @@ -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, TRUE , TRUE , FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT, }, + { ALARM_PRIORITY_MEDIUM, 698, 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 }, @@ -630,7 +630,7 @@ { ALARM_PRIORITY_MEDIUM, 603, FALSE, FALSE, TRUE , TRUE , FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_HIGH }, { ALARM_PRIORITY_MEDIUM, 410, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , ALARM_ID_DG_ACID_CONDUCTIVITY_OUT_OF_RANGE }, { ALARM_PRIORITY_HIGH, 2, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_RTC_OR_TIMER_ACCURACY_FAILURE }, - { ALARM_PRIORITY_MEDIUM, 421, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT }, + { ALARM_PRIORITY_MEDIUM, 699, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT }, { ALARM_PRIORITY_MEDIUM, 601, 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_HIGH }, { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_WATCHDOG_EXPIRED }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID @@ -761,7 +761,7 @@ { ALARM_PRIORITY_HIGH, 1, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED }, { ALARM_PRIORITY_HIGH, 2, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED }, { ALARM_PRIORITY_LOW, 850, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE }, - { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_10 }, + { ALARM_PRIORITY_LOW, 999, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_AVAILABLE_30 }, { ALARM_PRIORITY_HIGH, 110, FALSE, TRUE , TRUE , TRUE , FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE, FALSE, ALARM_ID_DG_INACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, // Priority Rank Fault DGFault Stops ClrIm NoClr NoRes NoRin NoEnd BlkRB BlkET BTSRB BTSET NoBRcr NoDRcr ClrOnly TxLog ID { ALARM_PRIORITY_HIGH, 10, TRUE , FALSE, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, TRUE , TRUE , FALSE, FALSE, ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE }, @@ -888,25 +888,15 @@ { 10, ALARM_ID_HD_BLOOD_PUMP_OFF_CHECK }, { 10, ALARM_ID_HD_BLOOD_PUMP_MC_DIRECTION_CHECK }, { 10, ALARM_ID_HD_BLOOD_PUMP_ROTOR_SPEED_CHECK }, - { 10, ALARM_ID_HD_DIAL_IN_PUMP_MC_CURRENT_CHECK }, { 10, ALARM_ID_HD_DIAL_IN_PUMP_OFF_CHECK }, - { 10, ALARM_ID_HD_DIAL_IN_PUMP_MC_DIRECTION_CHECK }, - { 10, ALARM_ID_HD_DIAL_IN_PUMP_ROTOR_SPEED_CHECK }, { 10, ALARM_ID_HD_OCCLUSION_SENSOR_FPGA_FAULT }, - { 10, ALARM_ID_HD_DIAL_OUT_PUMP_MC_CURRENT_CHECK }, { 10, ALARM_ID_HD_DIAL_OUT_PUMP_OFF_CHECK }, - { 10, ALARM_ID_HD_DIAL_OUT_PUMP_MC_DIRECTION_CHECK }, - { 10, ALARM_ID_HD_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, { 10, ALARM_ID_HD_UI_COMM_TIMEOUT }, { 10, ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS }, { 10, ALARM_ID_HD_CAN_MESSAGE_NOT_ACKED_BY_UI }, - { 10, ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR }, { 10, ALARM_ID_HD_FPGA_COMM_TIMEOUT }, { 10, ALARM_ID_HD_BLOOD_PUMP_MOTOR_SPEED_CHECK }, - { 10, ALARM_ID_HD_DIAL_IN_PUMP_MOTOR_SPEED_CHECK }, - { 10, ALARM_ID_HD_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK }, { 10, ALARM_ID_HD_CRITICAL_DATA_ERROR }, - { 10, ALARM_ID_HD_ACCELEROMETER_FAILURE }, { 10, ALARM_ID_HD_VALVE_HOMING_FAILED }, { 10, ALARM_ID_HD_VALVE_TRANSITION_TIMEOUT }, { 10, ALARM_ID_HD_VALVE_NOT_FUNCTIONAL }, @@ -1015,6 +1005,16 @@ { 110, ALARM_ID_TEST_ALARM_NO_DIAL_RECIRC_CLR_TOP_ONLY }, { 110, ALARM_ID_DG_MAX_RO_PUMP_PWM_EXCEEDED }, { 110, ALARM_ID_DG_INACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, + { 110, ALARM_ID_HD_DIAL_IN_PUMP_MC_CURRENT_CHECK }, + { 110, ALARM_ID_HD_DIAL_IN_PUMP_ROTOR_SPEED_CHECK }, + { 110, ALARM_ID_HD_DIAL_OUT_PUMP_ROTOR_SPEED_CHECK }, + { 110, ALARM_ID_HD_DIAL_IN_PUMP_MC_DIRECTION_CHECK }, + { 110, ALARM_ID_HD_DIAL_OUT_PUMP_MC_CURRENT_CHECK }, + { 110, ALARM_ID_HD_DIAL_OUT_PUMP_MC_DIRECTION_CHECK }, + { 110, ALARM_ID_HD_UF_VOLUME_ACCURACY_ERROR }, + { 110, ALARM_ID_HD_DIAL_IN_PUMP_MOTOR_SPEED_CHECK }, + { 110, ALARM_ID_HD_DIAL_OUT_PUMP_MOTOR_SPEED_CHECK }, + { 110, ALARM_ID_HD_ACCELEROMETER_FAILURE }, { 111, ALARM_ID_HD_DG_COMM_TIMEOUT }, { 111, ALARM_ID_HD_NEW_RESERVOIRS_DATA_MESSAGE_NOT_RECEIVE }, { 111, ALARM_ID_HD_DG_NEW_OPERATION_MODE_MESSAGE_NOT_RECEIVE }, @@ -1046,7 +1046,6 @@ { 291, ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM }, { 292, ALARM_ID_HD_PRIME_COMPLETED_HIGH }, { 300, ALARM_ID_HD_TREATMENT_STOPPED_BY_USER }, - { 301, ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT }, { 400, ALARM_ID_HD_DIAL_IN_FLOW_CHECK_FAILURE }, { 401, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_SAFETY_TEMP }, { 401, ALARM_ID_HD_DIALYSATE_TEMP_ABOVE_TARGET_TEMP }, @@ -1058,7 +1057,6 @@ { 420, ALARM_ID_DG_FILL_CONDUCTIVITY_OUT_OF_RANGE }, { 421, ALARM_ID_HD_ACTIVE_RESERVOIR_RECIRCULATION_OUT_OF_RANGE }, { 421, ALARM_ID_HD_ACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE }, - { 421, ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT }, { 430, ALARM_ID_DG_INLET_WATER_PRESSURE_IN_HIGH_RANGE }, { 431, ALARM_ID_DG_INLET_WATER_PRESSURE_IN_LOW_RANGE }, { 432, ALARM_ID_DG_INLET_WATER_TEMPERATURE_IN_HIGH_RANGE }, @@ -1092,6 +1090,8 @@ { 604, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_COND_TOO_LOW }, { 605, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_HIGH }, { 606, ALARM_ID_DG_CLEANING_MODE_INLET_WATER_PRESSURE_TOO_LOW }, + { 698, ALARM_ID_HD_BLOOD_LEAK_RECOVERING_PLEASE_WAIT }, + { 699, ALARM_ID_DG_CREATING_DIALYSATE_PLEASE_WAIT }, { 700, ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE }, { 700, ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE }, { 700, ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE }, @@ -1136,11 +1136,11 @@ { 999, ALARM_ID_HD_UI_POST_FAILURE_DISPLAY }, { 999, ALARM_ID_AVAILABLE_2 }, { 999, ALARM_ID_AVAILABLE_7 }, - { 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 }, { 999, ALARM_ID_NO_ALARM }, @@ -1437,7 +1437,7 @@ { 270 , ALARM_ID_HD_SAFETY_SHUTDOWN_POST_TEST_FAILED , "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: Proc Safestate | HD POST Safety Shutdown failure | If the 24 volts power source is greater than 5.0 volts during safety shutdown self test state. If the 24 volts power source is less than 22.6 volts during safety shutdown self test recover state. | "}, { 271 , ALARM_ID_DG_SAFETY_SHUTDOWN_POST_TEST_FAILED , "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: Proc Safestate | DG POST Safety Shutdown failure | If the 24 volts power source is greater than 5.0 volts during safety shutdown self test state. If the 24 volts power source is less than 22.6 volts during safety shutdown self test recover state. | "}, { 272 , ALARM_ID_HD_FAN_RPM_OUT_OF_RANGE , "HD | Service Required: Hemodialysis Device | A non- critical problem was detected with the hemodialysis\n device.\n- Call service to report the issue and schedule a repair. | HD Alarm (Low): Fan Speed | HD Fan RPM out of range | If the fan RPM is out of Min/Max range. | "}, - { 273 , ALARM_ID_AVAILABLE_10 , " | | | | | | "}, + { 273 , ALARM_ID_AVAILABLE_30 , " | | | | | | "}, { 274 , ALARM_ID_DG_INACTIVE_RESERVOIR_WEIGHT_OUT_OF_RANGE , "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: Reservoir Fault | DG idle reservoir weight out of range | If the reservoir weight > 200.0 of the target mL. | "}, { 275 , ALARM_ID_HD_ARTERIAL_PRESSURE_OUT_OF_RANGE , "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: Arterial Press Range | HD arterial pressure sensor is reading out of range | If the arterial pressure > 2000.0 mmHg or < -1500.0 mmHg. | "}, { 276 , ALARM_ID_HD_VENOUS_PRESSURE_OUT_OF_RANGE , "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: Venous Press Range | HD venous pressure sensor is reading out of range | If the venous pressure > 2000.0 mmHg or < -1500.0 mmHg. | "}, Index: Compatible.h =================================================================== diff -u -r3b5a32bace3e00f68953cd665db9bb6dd653abec -r634393e80aa39b1552715b348fc68b6b38a5d529 --- Compatible.h (.../Compatible.h) (revision 3b5a32bace3e00f68953cd665db9bb6dd653abec) +++ Compatible.h (.../Compatible.h) (revision 634393e80aa39b1552715b348fc68b6b38a5d529) @@ -25,7 +25,7 @@ * @{ */ -#define SW_COMPATIBILITY_REV 16 ///< Compatibility revision for all system software stacks (HD and DG and UI). +#define SW_COMPATIBILITY_REV 17 ///< 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: HDDefs.h =================================================================== diff -u -r8fc441b150d7a6aedf415c329ada5c29da99bf27 -r634393e80aa39b1552715b348fc68b6b38a5d529 --- HDDefs.h (.../HDDefs.h) (revision 8fc441b150d7a6aedf415c329ada5c29da99bf27) +++ HDDefs.h (.../HDDefs.h) (revision 634393e80aa39b1552715b348fc68b6b38a5d529) @@ -435,7 +435,6 @@ SALINE_BOLUS_STATE_IDLE = 0, ///< No saline bolus delivery is in progress SALINE_BOLUS_STATE_WAIT_FOR_PUMPS_STOP, ///< Wait for pumps to stop before starting bolus SALINE_BOLUS_STATE_IN_PROGRESS, ///< A saline bolus delivery is in progress - SALINE_BOLUS_STATE_MAX_DELIVERED, ///< Maximum saline bolus volume reached - no more saline bolus deliveries allowed NUM_OF_SALINE_BOLUS_STATES ///< Number of saline bolus states }; typedef enum Saline_Bolus_States SALINE_BOLUS_STATE_T; ///< Type for saline bolus state enumeration @@ -512,6 +511,7 @@ TREATMENT_STOP_RECIRC_BLOOD_ONLY_STATE, ///< Re-circulate Blood only state of the treatment re-circulate sub-mode state machine TREATMENT_STOP_NO_RECIRC_STATE, ///< No re-circulation state of the treatment stop sub-mode state machine TREATMENT_STOP_RECOVER_BLOOD_DETECT_STATE, ///< Treatment stop recover blood detect state + TREATMENT_STOP_DELIVER_SALINE_BOLUS_STATE, ///< Treatment stop deliver saline bolus state NUM_OF_TREATMENT_STOP_STATES ///< Number of treatment stop sub-mode states }; /// Type for treatment stop states enumeration. @@ -780,6 +780,8 @@ HD_EVENT_PARTIAL_OCCLUSION_BASELINE, ///< HD event partial occlusion baseline event HD_EVENT_BLOOD_LEAK_ZEROING_REQUEST, ///< HD event blood leak zeroing request. HD_EVENT_BLOOD_LEAK_ZEROING_REQUIRED, ///< HD event blood leak zeroing required. + HD_EVENT_UF_RATE_TX_DUR, ///< HD event UF rate changes in treatment duration. + HD_EVENT_UF_RATE_TIME_TX_DUR, ///< HD event UF rate time difference in treatment duration. NUM_OF_EVENT_IDS ///< Total number of HD events }; typedef enum HD_Event_List HD_EVENT_ID_T; ///< Type for HD event list enumeration @@ -815,6 +817,7 @@ GENERIC_CONFIRM_ID_DISINFECT_STOP_ACTIVE_COOL, ///< Active cool stop user confirmation GENERIC_CONFIRM_ID_DISINFECT_STOP_RO_PERMEATE_SAMPLE, ///< RO permeate sample stop user confirmation GENERIC_CONFIRM_ID_RO_PERMEATE_SAMPLE_STOP_OR_DISPENSE, ///< RO permeate sample stop or dispense + GENERIC_CONFIRM_ID_UF_RATE_CHANGE_IN_TX_DURATION_CHANGE, ///< Ultrafiltration rate change in treatment duration change NUM_OF_GENERIC_CONFIRM_IDS, ///< Total number of generic confirm IDs }; typedef enum Generic_Confirm_Id GENERIC_CONFIRM_ID_T; ///< Type for generic confirm enumeration Index: MsgDefs.h =================================================================== diff -u -r8fc441b150d7a6aedf415c329ada5c29da99bf27 -r634393e80aa39b1552715b348fc68b6b38a5d529 --- MsgDefs.h (.../MsgDefs.h) (revision 8fc441b150d7a6aedf415c329ada5c29da99bf27) +++ MsgDefs.h (.../MsgDefs.h) (revision 634393e80aa39b1552715b348fc68b6b38a5d529) @@ -563,14 +563,14 @@ REQUEST_REJECT_REASON_PARAM_OUT_OF_RANGE = 17, ///< A treatment parameter is out of range REQUEST_REJECT_REASON_HEPARIN_PRESTOP_EXCEEDS_DURATION = 18, ///< The Heparin pre-stop setting is greater than the treatment duration REQUEST_REJECT_REASON_DG_FILTER_FLUSH_HAS_BEEN_EXPIRED = 19, ///< DG filter flush time has been expired - REQUEST_REJECT_REASON_AVAILABLE_2 = 20, ///< Not used - REQUEST_REJECT_REASON_SALINE_MAX_VOLUME_REACHED = 21, ///< Saline bolus volume maximum has been reached - no more saline allowed + REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_ALLOWED = 20, ///< Saline bolus is not allowed (due to blood and dialysate recirculation blockage) + REQUEST_REJECT_REASON_AVAILABLE_3 = 21, ///< Not used REQUEST_REJECT_REASON_SALINE_BOLUS_NOT_IN_PROGRESS = 22, ///< A saline bolus is not in progress REQUEST_REJECT_REASON_ACTION_DISABLED_IN_CURRENT_STATE = 23, ///< Requested user action is disabled in current state REQUEST_REJECT_REASON_ALARM_IS_ACTIVE = 24, ///< Requested user action not allowed while alarm is active REQUEST_REJECT_REASON_INVALID_COMMAND = 25, ///< Requested user action invalid REQUEST_REJECT_REASON_TREATMENT_IS_COMPLETED = 26, ///< The treatment has been completed - REQUEST_REJECT_REASON_ADDL_RINSEBACK_MAX_VOLUME_REACHED = 27, ///< Rinseback additional volume maximum has been reached - no more additional rinsebacks allowed + REQUEST_REJECT_REASON_AVAILABLE_4 = 27, ///< Not used REQUEST_REJECT_REASON_DIALYZER_NOT_INVERTED = 28, ///< Dialyzer not inverted yet REQUEST_REJECT_REASON_NO_PATIENT_CONNECTION_CONFIRM = 29, ///< The user has not confirmed patient connection REQUEST_REJECT_REASON_HEPARIN_PAUSE_INVALID_IN_THIS_STATE = 30, ///< Heparin cannot be paused if not currently deliverying Heparin