Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r5f1b50a1d9a7bd6ea17bb666e28ccfeafe56432c -r10f54e337a4dca3f8874f9557a8c6f933b469a9f
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 5f1b50a1d9a7bd6ea17bb666e28ccfeafe56432c)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 10f54e337a4dca3f8874f9557a8c6f933b469a9f)
@@ -7,8 +7,8 @@
 *
 * @file    AlarmMgmtSWFaults.h
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      03-May-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      30-Jun-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
@@ -137,7 +137,7 @@
     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_AVAILABLE_TO_USE = 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,
@@ -158,6 +158,16 @@
     SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED3 = 127,
     SW_FAULT_ID_DIALYSATE_MIX_EXEC_INVALID_STATE = 128,
     SW_FAULT_ID_MODE_UPDATE_INVALID_STATE = 129,
+    SW_FAULT_ID_SUBSTITUTION_PUMP_INVALID_ID = 130,
+    SW_FAULT_ID_SUBSTITUTION_PUMP_EXEC_INVALID_STATE = 131,
+    SW_FAULT_ID_DRY_BICART_DEPRESURIZE_INVALID_EXEC_STATE = 132,
+    SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER1 = 130,
+    SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER2 = 131,
+    SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER3 = 132,
+    SW_FAULT_ID_PID_CTRL_INVALID_CONTROLLER4 = 133,
+    SW_FAULT_ID_PID_CTRL_INVALID_SIGNAL = 134,
+    SW_FAULT_ID_SUBSTITUTION_PUMP_INVALID_ID = 135,
+    SW_FAULT_ID_SUBSTITUTION_PUMP_EXEC_INVALID_STATE = 136,
     NUM_OF_SW_FAULT_IDS
 } DD_SW_FAULT_ID_T;
 
@@ -290,6 +300,8 @@
     FP_FAULT_ID_FP_INVALID_PERMEATE_TANK_STATE = 123,
     FP_FAULT_ID_FP_INVALID_INLET_PRESSURE_CHECK_STATE = 124,
     FP_FAULT_ID_FP_INVALID_RECOVERY_VALVE_STATE = 125,
+    FP_FAULT_ID_INVALID_FLUID_PUMP_ID5 = 126,
+    FP_FAULT_ID_INVALID_FLUID_PUMP_ID6 = 127,
     NUM_OF_FP_FAULT_IDS
 } FP_SW_FAULT_ID_T;