Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r8e2cfecc47bb3912078b29513f1717c1567f0071 -rd6c75118f4e5792b40b744a0b29e44c78368a469
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 8e2cfecc47bb3912078b29513f1717c1567f0071)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision d6c75118f4e5792b40b744a0b29e44c78368a469)
@@ -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,7 +239,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,
+    SW_FAULT_ID_HD_SYRINGE_INVALID_CONT_CMD,                            // 110
+    SW_FAULT_ID_HD_SYRINGE_INVALID_VREF,
+    SW_FAULT_ID_HD_SYRINGE_INVALID_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
@@ -253,9 +271,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 );