Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r911f6526ec3ba03ba0131681c7fb371c0abda6bb -r6fe29be25dab8101cbab8fc33b1c9eade067efa5
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 911f6526ec3ba03ba0131681c7fb371c0abda6bb)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 6fe29be25dab8101cbab8fc33b1c9eade067efa5)
@@ -52,17 +52,6 @@
     NUMBER_OF_ALARM_ACTIONS                                         ///< Number of alarm actions
 } ALARM_ACTION_T;
 
-/// Alarm data types list.
-typedef enum Alarm_Data_Types
-{
-    ALARM_DATA_TYPE_NONE = 0,                                       ///< No data given.
-    ALARM_DATA_TYPE_U32 = 1,                                        ///< Alarm data is unsigned 32-bit integer type.
-    ALARM_DATA_TYPE_S32 = 2,                                        ///< Alarm data is signed 32-bit integer type.
-    ALARM_DATA_TYPE_F32 = 3,                                        ///< Alarm data is 32-bit floating point type.
-    ALARM_DATA_TYPE_BOOL = 4,                                       ///< Alarm data is 32-bit boolean type.
-    NUM_OF_ALARM_DATA_TYPES                                         ///< Total number of alarm data types.
-} ALARM_DATA_TYPES_T;
-
 #pragma pack(push, 4)
 /// Record structure for detailing the properties of the current composite alarm status.
 typedef struct
@@ -81,7 +70,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;
@@ -196,7 +186,7 @@
     SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER,
     SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL,
     SW_FAULT_ID_MODE_TREATMENT_INVALID_ALARM_ACTION,
-    SW_FAULT_ID____AVAILABLE_1,
+    SW_FAULT_ID_MODE_PRE_TREATMENT_RESERVOIR_MGMT_INVALID_STATE,
     SW_FAULT_ID_DIALYSIS_INVALID_STATE,                                 // 55
     SW_FAULT_ID_DIALYSIS_INVALID_UF_STATE,
     SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
@@ -234,8 +224,34 @@
     SW_FAULT_ID_AIR_TRAP_INVALID_STATE,
     SW_FAULT_ID_AIR_TRAP_INVALID_LEVEL_SENSOR,                          // 90
     SW_FAULT_ID_DIALYSIS_INVALID_SALINE_BOLUS_STATE,
+    SW_FAULT_ID_MODE_PRE_TREATMENT_INVALID_STATE,
+    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,
+    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_INVALID_BLOOD_LEAK_STATE,                            // 110
+    SW_FAULT_ID_HD_SYRINGE_INVALID_BOLUS_CMD,
+    SW_FAULT_ID_HD_SYRINGE_INVALID_CONT_CMD,
+    SW_FAULT_ID_HD_SYRINGE_INVALID_VREF,
+    SW_FAULT_ID_HD_SYRINGE_INVALID_STATE,
+    SW_FAULT_ID_HD_INVALID_BUBBLE_STATE,                                // 115
+    SW_FAULT_ID_HD_INVALID_BUBBLE_ID,
+    SW_FAULT_ID_MODE_POST_TREATMENT_INVALID_STATE,
+    SW_FAULT_ID_POST_TREATMENT_RESERVOIR_MGMT_INVALID_STATE,
+    SW_FAULT_ID_FAN_INVALID_SELF_TEST_STATE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;
 
@@ -250,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 );