Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r046bc2b62cf942b7e846fa5bff698b94238edf24 -r3b84fc79b2fd6c7a447e54e4fe821447f613af59
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 046bc2b62cf942b7e846fa5bff698b94238edf24)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 3b84fc79b2fd6c7a447e54e4fe821447f613af59)
@@ -7,8 +7,8 @@
 *
 * @file    AlarmMgmtSWFaults.h
 *
-* @author  (last)      Raghu Kallala
-* @date    (last)      23-Feb-2026
+* @author  (last)      Jashwant Gantyada
+* @date    (last)      30-Jun-2026
 *
 * @author  (original)  Vinayakam Mani
 * @date    (original)  07-Aug-2024
@@ -120,7 +120,7 @@
     SW_FAULT_ID_TEMPERATURE_SENSORS_EXEC_INVALID_STATE = 89,
     SW_FAULT_ID_PI_CTRL_INVALID_CONTROLLER = 90,
     SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL = 91,
-    SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT = 92,
+    SW_FAULT_ID_AVAILABALE_1 = 92,
     SW_FAULT_ID_DIALYSATE_PUMP_INVALID_RPM_SELECTED = 93,
     SW_FAULT_ID_DIALYSATE_PUMP_EXEC_INVALID_STATE = 94,
     SW_FAULT_ID_DIALYSATE_PUMP_INVALID_PUMP_ID = 95,
@@ -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,
@@ -153,6 +153,22 @@
     SW_FAULT_ID_BICARB_CHAMBER_FILL_INVALID_EXEC_STATE = 122,
     SW_FAULT_ID_DRY_BICART_DRAIN_INVALID_EXEC_STATE = 123,
     SW_FAULT_ID_INVALID_RINSE_PUMP = 124,
+    SW_FAULT_ID_CONDUCTIVITY_SENSOR_CAL_CHECK = 125,
+    SW_FAULT_ID_PI_CTRL_INVALID_FEED_FORWARD_LIMIT = 126,
+    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_NVM_INVALID_EXEC_STATE = 133,
+    SW_FAULT_ID_NVM_INVALID_EXEC_SEND_STATE = 134,
+    SW_FAULT_ID_NVM_INVALID_SELF_TEST_STATE = 135,
+    SW_FAULT_ID_NVM_INVALID_USAGE_INFO_SELECTED = 136,
+    SW_FAULT_ID_NVM_WRITE_USAGE_INFO_FAILURE = 137,
+    SW_FAULT_ID_NVM_INVALID_RECORD_SELECTED = 138,
+    SW_FAULT_ID_NVM_OPS_TIMEOUT = 139,
+    SW_FAULT_ID_NVM_INVALID_OPS = 140,
     NUM_OF_SW_FAULT_IDS
 } DD_SW_FAULT_ID_T;