Index: AlarmDefs.h
===================================================================
diff -u -rdadabf0328d16a7109af21d6744160f7cf21e43a -r756b67730cf654e5ed0fd17964f6b23f57177401
--- AlarmDefs.h	(.../AlarmDefs.h)	(revision dadabf0328d16a7109af21d6744160f7cf21e43a)
+++ AlarmDefs.h	(.../AlarmDefs.h)	(revision 756b67730cf654e5ed0fd17964f6b23f57177401)
@@ -162,6 +162,10 @@
     ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK = 124,               ///< HD in treatment stopped sub-mode after rinseback completed (no escalation)
     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_INSTALL_NEW_CARTRIDGE = 129,                           ///< HD needs new cartridge to be installed
+    ALARM_ID_CARTRIDGE_INSTALLED_IMPROPERLY = 130,                  ///< HD cartridge installed improperly alarm
     NUM_OF_ALARM_IDS                                                ///< Total number of alarms
 };
 typedef enum Alarm_List ALARM_ID_T;                                 ///< Type for alarm list enumeration
@@ -388,6 +392,10 @@
     { ALARM_PRIORITY_LOW,     31,   0,              ALARM_ID_NO_ALARM,                            FALSE, TRUE , TRUE , FALSE, FALSE, FALSE, FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_STOPPED_AFTER_RINSEBACK
     { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,                            FALSE, TRUE , TRUE,  FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM
     { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,                            FALSE, TRUE , TRUE,  FALSE, TRUE , TRUE , FALSE, FALSE, FALSE }, // ALARM_ID_TREATMENT_RECIRC_TIMEOUT_ALARM
+    { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,                            FALSE, TRUE , FALSE, FALSE, TRUE , TRUE , TRUE , FALSE, FALSE }, // ALARM_ID_CARTRIDGE_DOOR_OPENED
+    { ALARM_PRIORITY_HIGH,     4,   0,              ALARM_ID_NO_ALARM,                            TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , TRUE , FALSE }, // ALARM_ID_PRETREATMENT_SELF_TEST_FAILURE
+    { 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
     // Priority              Rank  Escalate In      Escalate To                                   Fault  Stops  ClrIm  NoClr  NoRes  NoRin  NoEnd  NoNew  UsrAck
 };
 
Index: HDDefs.h
===================================================================
diff -u -r9faa9e59fb2c1813df6a2fc9debd8d6bf3de1545 -r756b67730cf654e5ed0fd17964f6b23f57177401
--- HDDefs.h	(.../HDDefs.h)	(revision 9faa9e59fb2c1813df6a2fc9debd8d6bf3de1545)
+++ HDDefs.h	(.../HDDefs.h)	(revision 756b67730cf654e5ed0fd17964f6b23f57177401)
@@ -128,6 +128,7 @@
 {
     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-run state
@@ -160,6 +161,7 @@
     HD_PRIME_DIALYSATE_BYPASS_STATE,                                        ///< Dialysate bypass fluid path state
     HD_PRIME_WET_SELF_TESTS_STATE,                                          ///< Perform wet self-tests after priming complete
     HD_PRIME_PAUSE,                                                         ///< Prime pause state, waits to be resumed
+    HD_PRIME_COMPLETE,                                                      ///< Prime complete state
     NUM_OF_HD_PRIME_STATES                                                  ///< Number of prime sub-mode states
 };
 typedef enum HD_Pre_Treatment_Prime_States HD_PRE_TREATMENT_PRIME_STATE_T;  ///< Type for HD pre-treatment prime sub-mode states enumeration