Index: AlarmDefs.h =================================================================== diff -u -rbb1462551a612dc09ec6806d8f42cd16c45b8af0 -rccacdf3e6320c16ef97d11ba388f842beabe4548 --- AlarmDefs.h (.../AlarmDefs.h) (revision bb1462551a612dc09ec6806d8f42cd16c45b8af0) +++ AlarmDefs.h (.../AlarmDefs.h) (revision ccacdf3e6320c16ef97d11ba388f842beabe4548) @@ -163,7 +163,7 @@ ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM = 125, ///< HD in treatment rinseback operation timeout ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM = 126, ///< HD in treatment re-circ sub-mode for too long ALARM_ID_CARTRIDGE_DOOR_OPENED = 127, ///< HD cartridge door opened alarm - ALARM_ID_PRE_TREATMENT_SELF_TEST_FAILURE = 128, ///< HD pre-treatment mode self-tests failure + ALARM_ID_PRE_TREATMENT_NO_CART_SELF_TEST_FAILURE = 128, ///< HD pre-treatment mode no cartridge self-tests failure ALARM_ID_INSTALL_NEW_CARTRIDGE = 129, ///< HD needs new cartridge to be installed ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY = 130, ///< HD cartridge installed improperly alarm ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE = 131, ///< HD rinseback volume check failure @@ -172,6 +172,8 @@ ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE = 134, ///< HD blood prime volume check failure ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH = 135, ///< HD dialysate temperature too high alarm ALARM_ID_DIALYSATE_TEMPERATRUE_TOO_LOW = 136, ///< HD dialysate temperature too low alarm + ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE = 137, ///< HD pre-treatment mode dry self-tests failure + ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE = 138, ///< HD pre-treatment mode wet self-tests failure NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -405,7 +407,7 @@ { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , TRUE, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM { ALARM_PRIORITY_HIGH, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_DOOR_OPENED - { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRETREATMENT_SELF_TEST_FAILURE + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRE_TREATMENT_NO_CART_SELF_TEST_FAILURE { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_INSTALL_NEW_CARTRIDGE { ALARM_PRIORITY_LOW, 999, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY { ALARM_PRIORITY_MEDIUM, 999, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE @@ -414,6 +416,8 @@ { ALARM_PRIORITY_MEDIUM, 999, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_BLOOD_PRIME_VOLUME_CHECK_FAILURE { ALARM_PRIORITY_HIGH, 28, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, TRUE , FALSE }, // ALARM_ID_DIALYSATE_TEMPERATURE_TOO_HIGH { ALARM_PRIORITY_HIGH, 29, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_DIALYSATE_TEMPERATRUE_TOO_LOW + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRE_TREATMENT_DRY_SELF_TEST_FAILURE + { ALARM_PRIORITY_HIGH, 3, 0, ALARM_ID_NO_ALARM, TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRE_TREATMENT_WET_SELF_TEST_FAILURE // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew NoRcr UsrAck }; Index: HDDefs.h =================================================================== diff -u -r3e84b0d1a8625232a2b129ab704f423589981dfd -rccacdf3e6320c16ef97d11ba388f842beabe4548 --- HDDefs.h (.../HDDefs.h) (revision 3e84b0d1a8625232a2b129ab704f423589981dfd) +++ HDDefs.h (.../HDDefs.h) (revision ccacdf3e6320c16ef97d11ba388f842beabe4548) @@ -128,15 +128,12 @@ { HD_PRE_TREATMENT_START_STATE = 0, ///< Start pre-treatment mode state HD_PRE_TREATMENT_WATER_SAMPLE_STATE, ///< Water sample state - HD_PRE_TREATMENT_HOME_SETUP_STATE, ///< Home setup state waits for user to close door HD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE, ///< Self tests with no cartridge state HD_PRE_TREATMENT_CART_INSTALL_STATE, ///< Consumable and cartridge installation state HD_PRE_TREATMENT_SELF_TEST_DRY_STATE, ///< Self tests dry state HD_PRE_TREATMENT_PRIME_STATE, ///< Prime blood and dialysate circuits and run wet self-tests state - HD_PRE_TREATMENT_RECIRCULATE_START_STATE, ///< Re-circulate starting state, change valves and heater settings HD_PRE_TREATMENT_RECIRCULATE_STATE, ///< Re-circulate blood and dialysate circuits state HD_PRE_TREATMENT_PATIENT_CONNECTION_STATE, ///< Patient connection state - HD_PRE_TREATMENT_PAUSE_STATE, ///< Pre-treatment pause state NUM_OF_HD_PRE_TREATMENT_STATES ///< Number of pre-treatment mode states }; typedef enum HD_Pre_Treatment_Mode_States HD_PRE_TREATMENT_MODE_STATE_T; ///< Type for HD pre-treatment mode states enumeration @@ -152,6 +149,7 @@ enum HD_Pre_Treatment_Prime_States { HD_PRIME_START_STATE = 0, ///< Prime start state + HD_PRIME_WAIT_FOR_USER_START_STATE, ///< Wait for user to start prime state HD_PRIME_SALINE_SETUP_STATE, ///< Saline setup state HD_PRIME_SALINE_PURGE_AIR_STATE, ///< Saline purge air state HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE, ///< Circulate blood circuit state