Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r88696f3c6a5d82503064a73433d39fa000728d93 -r6dcc3d91f1f6095d6d3a722c2e3c2074d69be2a5
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 88696f3c6a5d82503064a73433d39fa000728d93)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 6dcc3d91f1f6095d6d3a722c2e3c2074d69be2a5)
@@ -74,15 +74,17 @@
     BOOL                alarmsToEscalate;                           ///< Are any active alarms due to escalate (should UI show count down timer?)
     U32                 alarmsEscalatesIn;                          ///< Time until alarm will escalate (seconds)
     ALARM_ID_T          alarmTop;                                   ///< ID of current top alarm that will drive lamp/audio and UI should be displaying right now
-    BOOL                topAlarmConditionnDetected;                 ///< Condition for top alarm is still being detected
+    BOOL                topAlarmConditionDetected;                  ///< Condition for top alarm is still being detected
     BOOL                systemFault;                                ///< A system fault is active?
     BOOL                stop;                                       ///< We should be in controlled stop right now
     BOOL                noClear;                                    ///< No recovery will be possible
     BOOL                noResume;                                   ///< Treatment may not be resumed at this time
     BOOL                noRinseback;                                ///< Rinseback may not be initiated at this time
     BOOL                noEndTreatment;                             ///< Ending the treatment is not an option at this time
-    BOOL                noNewTreatment;                             ///< No new treatments may be started even if current treatment is ended
+    BOOL                noNewTreatment;                             ///< No new treatments may be started even if current treatment is ended
+    BOOL                noDialRecirc;                               ///< No dialysate re-circulation allowed at this time
     BOOL                usrACKRequired;                             ///< The user must acknowledge top alarm
+    BOOL                noMinimize;                                 ///< Prevent user from minimizing the alarm window
     BOOL                lampOn;                                     ///< The alarm lamp is on
 } COMP_ALARM_STATUS_T;
 
@@ -238,8 +240,24 @@
     SW_FAULT_ID_MODE_PRE_TREATMENT_PRIME_INVALID_STATE,
     SW_FAULT_ID_SYSTEM_COMM_INVALID_FRAME_SIZE,
     SW_FAULT_ID_SYSTEM_CMMM_CAN_TRANSMIT_REJECTED,                      // 95
+    SW_FAULT_ID_BLOOD_PRIME_INVALID_STATE,
+    SW_FAULT_ID_RINSEBACK_INVALID_STATE,
+    SW_FAULT_ID_TREATMENT_END_INVALID_STATE,
+    SW_FAULT_ID_TREATMENT_RECIRC_INVALID_STATE,
+    SW_FAULT_ID_TREATMENT_STOP_INVALID_STATE,                           // 100
     SW_FAULT_ID_MODE_PRIME_INVALID_ALARM_ACTION,
+    SW_FAULT_ID_INVALID_NVDATAMGMT_EXEC_CAL_STATE,
     SW_FAULT_ID_HD_INVALID_NO_CARTRIDGE_SELF_TEST_STATE,
+    SW_FAULT_ID_HD_INVALID_DRY_SELF_TEST_STATE,
+    SW_FAULT_ID_HD_INVALID_WET_SELF_TEST_STATE,                         // 105
+    SW_FAULT_ID_HD_INVALID_PRE_TREATMENT_RECIRC_STATE,
+    SW_FAULT_ID_HD_INVALID_COMMAND_RESPONSE_ID,
+    SW_FAULT_ID_HD_INVALID_RESERVOIR_ID,
+    SW_FAULT_ID_HD_INVALID_VALVE_SETTING_ID,
+    SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD,                           // 110
+    SW_FAULT_ID_HD_SYRINGE_INVALID_CONT_CMD,
+    SW_FAULT_ID_HD_SYRINGE_INVALID_VREF,
+    SW_FAULT_ID_HD_SYRINGE_INVALID_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
@@ -254,9 +272,12 @@
 void clearAlarm( ALARM_ID_T alarm );
 void clearAlarmCondition( ALARM_ID_T alarm );
 void setAlarmUserActionEnabled( ALARM_USER_ACTION_T action, BOOL enabled );
-void signalAlarmSilence( U32 cmd );
+void signalAlarmSilence( ALARM_SILENCE_CMD_T cmd );
 void signalAlarmUserActionInitiated( ALARM_USER_ACTION_T action );
 BOOL isAlarmActive( ALARM_ID_T alarm );
+BOOL isAnyAlarmActive( void );
+BOOL isDialysateRecircBlocked( void );
+BOOL doesAlarmStatusIndicateStop( void );
 ALARM_PRIORITY_T getCurrentAlarmStatePriority( void );
 BOOL isAlarmRecoverable( ALARM_ID_T alarm );
 void setAlarmAudioVolume( U32 volumeLevel );