Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r5aa0b08cb09b06af807687fe03db5137e388da82 -r5b7121b237be1970c0a040809503ff5786e6da0d
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 5aa0b08cb09b06af807687fe03db5137e388da82)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 5b7121b237be1970c0a040809503ff5786e6da0d)
@@ -14,20 +14,20 @@
 * @date    (original)  30-Jul-2024
 *
 ***************************************************************************/
-
-#ifndef __ALARM_MGMT_SW_FAULTS_H__
-#define __ALARM_MGMT_SW_FAULTS_H__
-
-/**
- *  @addtogroup AlarmManagement
- *  @{
- */
-
-// ********** public definitions **********
-
-/// Listing of specific software faults for logging purposes.
-typedef enum
-{
+
+#ifndef __ALARM_MGMT_SW_FAULTS_H__
+#define __ALARM_MGMT_SW_FAULTS_H__
+
+/**
+ *  @addtogroup AlarmManagement
+ *  @{
+ */
+
+// ********** public definitions **********
+
+/// Listing of specific software faults for logging purposes.
+typedef enum
+{
     SW_FAULT_ID_NONE = 0,
     SW_FAULT_ID_INT_ADC_DATA_OVERRUN = 1,
     SW_FAULT_ID_INT_ADC_INVALID_CHANNEL_REQUESTED = 2,
@@ -132,14 +132,25 @@
     SW_FAULT_ID_INVALID_TD_OPERATING_MODE = 101,
     SW_FAULT_ID_GEND_MODE_INVALID_EXEC_STATE = 102,
     SW_FAULT_ID_GEND_MODE_INVALID_EXEC_STATE1 = 103,
-    SW_FAULT_ID_INVALID_RO_OPERATING_MODE = 104,
+    SW_FAULT_ID_INVALID_FP_OPERATING_MODE = 104,
+    SW_FAULT_ID_PRE_GEND_MODE_INVALID_EXEC_STATE = 105,
+    SW_FAULT_ID_POST_GEND_MODE_INVALID_EXEC_STATE = 106,
+    SW_FAULT_ID_PRE_GEND_WET_SELF_TEST_INVALID_EXEC_STATE = 107,
+    SW_FAULT_ID_PRE_GEND_WET_SELF_TEST_INVALID_EXEC_STATE1 = 108,
+    SW_FAULT_ID_UF_INVALID_EXEC_STATE = 109,
+    SW_FAULT_ID_SPENT_CHAMBER_FILL_INVALID_EXEC_STATE = 110,
+    SW_FAULT_ID_TD_INVALID_BLOOD_LEAK_STATE = 111,
+    SW_FAULT_ID_BLOOD_LEAK_EMBEDDED_MODE_INVALID_STATE = 112,
+    SW_FAULT_ID_BLOOD_LEAK_ENQUEUE_FAILURE = 113,
+    SW_FAULT_ID_BLOOD_LEAK_INVALID_EMB_MODE_CMD_SELECTED = 114,
 #ifdef __PUMPTEST__
-    SW_FAULT_ID_PISTON_PUMP_EXEC_INVALID_STATE = 105,
-    SW_FAULT_ID_PISTON_PUMP_INVALID_PUMP_ID = 106,
+    // Assigning high value to separate from actual fault id from test fault ids.
+    SW_FAULT_ID_PISTON_PUMP_EXEC_INVALID_STATE = 9000,
+    SW_FAULT_ID_PISTON_PUMP_INVALID_PUMP_ID = 9001,
 #endif
-    NUM_OF_SW_FAULT_IDS
-} SW_FAULT_ID_T;
-
+    NUM_OF_SW_FAULT_IDS
+} SW_FAULT_ID_T;
+
 /**@}*/
 
-#endif
+#endif