Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -rd741f651b63edc7695b2be2178c9e5c44aaed1f3 -rafb05eebd86337012af4f6a9d21cb9a1e7f5f16a
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision d741f651b63edc7695b2be2178c9e5c44aaed1f3)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision afb05eebd86337012af4f6a9d21cb9a1e7f5f16a)
@@ -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,
@@ -95,9 +95,57 @@
     SW_FAULT_ID_INVALID_ALARM_ID_REFERENCED3 = 64,
     SW_FAULT_ID_CAN_IN_INVALID_BUFFER = 65,
     SW_FAULT_ID_CAN_OUT_INVALID_BUFFER = 66,
-    NUM_OF_SW_FAULT_IDS
-} SW_FAULT_ID_T;
-
+    SW_FAULT_ID_PRESSURE_INVALID_EXEC_STATE = 67,
+    SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR1 = 68,
+    SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR2 = 69,
+    SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR3 = 70,
+    SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR4 = 71,
+    SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR5 = 72,
+    SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR6 = 73,
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID = 74,
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID1 = 75,
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID2 = 76,
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID3 = 77,
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID4 = 78,
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID5 = 79,
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID6 = 80,
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID7 = 81,
+    SW_FAULT_ID_CONDUCTIVITY_WR_INVALID_EXEC_STATE = 82,
+    SW_FAULT_ID_CONDUCTIVITY_RD_INVALID_EXEC_STATE = 83,
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID8 = 84,
+    SW_FAULT_ID_CONCENTRATE_PUMP_EXEC_INVALID_STATE = 85,
+    SW_FAULT_ID_CONCENTRATE_PUMP_INVALID_PUMP_ID = 86,
+    SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED1 = 87,
+    SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED2 = 88,
+    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_DIALYSATE_PUMP_INVALID_RPM_SELECTED = 93,
+    SW_FAULT_ID_DIALYSATE_PUMP_EXEC_INVALID_STATE = 94,
+    SW_FAULT_ID_DIALYSATE_PUMP_INVALID_PUMP_ID = 95,
+    SW_FAULT_ID_HEATERS_INVALID_HEATER_ID_SELECTED = 96,
+    SW_FAULT_ID_HEATERS_INVALID_EXEC_STATE = 97,
+    SW_FAULT_ID_INVALID_LEVEL_SELECTED = 98,
+    SW_FAULT_ID_DD_INVALID_LEVEL_ID = 99,
+    SW_FAULT_ID_BAL_CHAMBER_INVALID_EXEC_STATE = 100,
+    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_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,
+#ifdef __PUMPTEST__
+    // 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;
+
 /**@}*/
 
-#endif
+#endif