Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -rbc8403b288e167f51c9e991c2a07bb455c77c19a -r27f3db92495948d4c1192421c1b0c20338c4a034
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision bc8403b288e167f51c9e991c2a07bb455c77c19a)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
@@ -81,7 +81,8 @@
     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                lampOn;                                     ///< The alarm lamp is on
 } COMP_ALARM_STATUS_T;
@@ -238,11 +239,17 @@
     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_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,
-    SW_FAULT_ID_HD_INVALID_PRE_TREATMENT_RECIRC_STATE,
-    SW_FAULT_ID_HD_INVALID_COMMAND_RESPONSE_ID,                         // 100
+    SW_FAULT_ID_HD_INVALID_PRE_TREATMENT_RECIRC_STATE,                  // 105
+    SW_FAULT_ID_HD_INVALID_COMMAND_RESPONSE_ID,
     SW_FAULT_ID_HD_INVALID_RESERVOIR_ID,
     SW_FAULT_ID_HD_INVALID_VALVE_SETTING_ID,
     NUM_OF_SW_FAULT_IDS
@@ -259,9 +266,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 );