Index: AlarmDefs.h =================================================================== diff -u -r4b96e472cdb29d52ba9ffc4fd5ad1ce535f20803 -rad5247f9ac263850c86ca43edd7fa462816a3e91 --- AlarmDefs.h (.../AlarmDefs.h) (revision 4b96e472cdb29d52ba9ffc4fd5ad1ce535f20803) +++ AlarmDefs.h (.../AlarmDefs.h) (revision ad5247f9ac263850c86ca43edd7fa462816a3e91) @@ -201,6 +201,15 @@ ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE = 163, ///< DG temperature sensors difference out of range ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT = 164, ///< DG heat disinfect inlet pressure and temperature sensors out of range ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT = 165, ///< DG heat disinfect inlet conductivity and temperature out of range + ALARM_ID_DG_BAD_INLET_WATER_QUALITY = 166, ///< Inlet water quality is bad (temperature, conductivity, pressure) + ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE = 167, ///< HD blood pump occlusion self-test failure alarm + ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE = 168, ///< HD dialysate inlet pump occlusion self-test failure alarm + ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE = 169, ///< HD dialysate outlet pump occlusion self-test failure alarm + ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE = 170, ///< HD arterial pressure self-test failure alarm + ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE = 171, ///< HD venous pressure self-test failure alarm + ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE = 172, ///< HD blood flow meter status check self-test failure alarm + ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE = 173, ///< HD dialysate flow meter status check self-test failure alarm + ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE = 174, ///< HD blood leak detector self-test failure alarm NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -369,10 +378,10 @@ { ALARM_PRIORITY_MEDIUM, 21, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_INLET_WATER_HIGH_CONDUCTIVITY { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_SOFTWARE_FAULT { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_CONDUCTIVITY_SENSOR_FAULT - { ALARM_PRIORITY_HIGH, 20, ALM_ESC_5_MIN, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_INLET_WATER_LOW_TEMPERATURE - { ALARM_PRIORITY_HIGH, 19, ALM_ESC_5_MIN, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_INLET_WATER_HIGH_TEMPERATURE + { ALARM_PRIORITY_HIGH, 20, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_INLET_WATER_LOW_TEMPERATURE + { ALARM_PRIORITY_HIGH, 19, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_INLET_WATER_HIGH_TEMPERATURE { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRESSURE_SENSOR_FAULT - { ALARM_PRIORITY_HIGH, 23, ALM_ESC_5_MIN, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_INLET_WATER_LOW_PRESSURE + { ALARM_PRIORITY_HIGH, 23, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_INLET_WATER_LOW_PRESSURE { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_CRITICAL_DATA_ERROR { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_ACCELEROMETER_SELF_TEST_FAILURE { ALARM_PRIORITY_HIGH, 1, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_ACCELEROMETER_SELF_TEST_FAILURE @@ -471,6 +480,16 @@ { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_TEMP_SENSORS_DIFF_OUT_OF_RANGE { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_HEAT_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT + { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_DG_HEAT_DISINFECT_INLET_COND_AND_TEMP_OUT + { ALARM_PRIORITY_HIGH, 36, 0, ALARM_ID_NO_ALARM, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DG_BAD_INLET_WATER_QUALITY + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_BP_OCCLUSION_SELF_TEST_FAILURE + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_DIP_OCCLUSION_SELF_TEST_FAILURE + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_DOP_OCCLUSION_SELF_TEST_FAILURE + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_ARTERIAL_PRESSURE_SELF_TEST_FAILURE + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_VENOUS_PRESSURE_SELF_TEST_FAILURE + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_HD_BLOOD_LEAK_SELF_TEST_FAILURE // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck }; Index: HDDefs.h =================================================================== diff -u -rd28027b83afa69852315c2c91383e3978fe11a63 -rad5247f9ac263850c86ca43edd7fa462816a3e91 --- HDDefs.h (.../HDDefs.h) (revision d28027b83afa69852315c2c91383e3978fe11a63) +++ HDDefs.h (.../HDDefs.h) (revision ad5247f9ac263850c86ca43edd7fa462816a3e91) @@ -206,7 +206,7 @@ NO_CART_SELF_TESTS_PUMPS_STATE, ///< No cartridge self-test for blood pump, dialysate in pump, dialysate out pump state NO_CART_SELF_TESTS_LEAK_DETECTORS_STATE, ///< No cartridge leak detectors self-test state NO_CART_SELF_TESTS_BOARD_TEMPERATURE_STATE, ///< No cartridge board temperature self-test state - NO_CART_SELF_TESTS_DOOR_SWITCH_STATE, ///< No cartridge door switch self-test state + NO_CART_SELF_TESTS_START_HOMING_STATE, ///< No cartridge start home valves and pumps state NO_CART_SELF_TESTS_HOME_VALVES_AND_PUMPS_STATE, ///< No cartridge home valves and pumps self-test state NO_CART_SELF_TESTS_HOME_IDLE_STATE, ///< Wait for valves and pumps finish homing state NO_CART_SELF_TESTS_STOPPED_STATE, ///< No cart self-test stopped state @@ -221,8 +221,7 @@ { DRY_SELF_TESTS_START_STATE = 0, ///< Dry self-tests starting state DRY_SELF_TESTS_WAIT_FOR_DOOR_CLOSE_STATE, ///< Wait for door to close before executing self-tests - DRY_SELF_TESTS_BUBBLE_DETECTOR_STATE, ///< Bubble detectors dry self-test state - DRY_SELF_TESTS_AIR_TRAP_STATE, ///< Air trap fill level ultrasonic sensor dry self-test state + DRY_SELF_TESTS_USED_CARTRIDGE_CHECK_STATE, ///< Bubble detectors dry self-test state DRY_SELF_TESTS_OCCLUSION_SENSORS_STATE, ///< Occlusion sensors dry self-test state DRY_SELF_TESTS_PRESSURE_SENSORS_SETUP_STATE, ///< Pressure sensors dry self-test setup valves and pump state DRY_SELF_TESTS_PRESSURE_SENSORS_STATE, ///< Pressure sensors verify pressure readings state