Index: AlarmDefs.h =================================================================== diff -u -rcf1fed41c558443039d166b55c9e912df4209d9c -r6ce9e738cffe377505cfcf1c126db62f9b2f4445 --- AlarmDefs.h (.../AlarmDefs.h) (revision cf1fed41c558443039d166b55c9e912df4209d9c) +++ AlarmDefs.h (.../AlarmDefs.h) (revision 6ce9e738cffe377505cfcf1c126db62f9b2f4445) @@ -167,6 +167,7 @@ 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 + ALARM_ID_NO_CARTRIDGE_LOADED = 132, ///< HD no cartridge loaded alarm NUM_OF_ALARM_IDS ///< Total number of alarms }; typedef enum Alarm_List ALARM_ID_T; ///< Type for alarm list enumeration @@ -398,6 +399,7 @@ { ALARM_PRIORITY_LOW, 4, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE }, // ALARM_ID_INSTALL_NEW_CARTRIDGE { ALARM_PRIORITY_LOW, 4, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE }, // ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY { ALARM_PRIORITY_MEDIUM, 3, ALM_ESC_4_MIN, ALARM_ID_BLOOD_SITTING_WARNING, FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE + { ALARM_PRIORITY_LOW, 4, 0, ALARM_ID_NO_ALARM, FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE }, // ALARM_ID_NO_CARTRIDGE_LOADED // Priority Rank Escalate In Escalate To Fault Stops ClrIm NoClr NoRes NoRin NoEnd NoNew UsrAck }; Index: HDDefs.h =================================================================== diff -u -re685556de06610793c3f4ab94bd1f52135f07fd2 -r6ce9e738cffe377505cfcf1c126db62f9b2f4445 --- HDDefs.h (.../HDDefs.h) (revision e685556de06610793c3f4ab94bd1f52135f07fd2) +++ HDDefs.h (.../HDDefs.h) (revision 6ce9e738cffe377505cfcf1c126db62f9b2f4445) @@ -131,8 +131,8 @@ 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-run state - HD_PRE_TREATMENT_PRIME_STATE, ///< Prime both blood and dialysate circuits 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