Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r3325bb3ddb5961167139a9db37b7098083b7b83d -rffdb4e555df649ae73c30005e19b90c17c8aad2e
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 3325bb3ddb5961167139a9db37b7098083b7b83d)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision ffdb4e555df649ae73c30005e19b90c17c8aad2e)
@@ -1,14 +1,14 @@
 /**************************************************************************
 *
-* Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved.
+* Copyright (c) 2021-2025 Diality Inc. - All Rights Reserved.
 *
 * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN
 * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER.
 *
 * @file    AlarmMgmtSWFaults.h
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      24-Apr-2023
+* @date    (last)      20-May-2025
 *
 * @author  (original)  Quang Nguyen
 * @date    (original)  20-May-2021
@@ -88,50 +88,50 @@
     SW_FAULT_ID_SERVICE_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT,
     SW_FAULT_ID_UV_REACTORS_INVALID_EXEC_STATE,
-    SW_FAULT_ID_UV_REACTORS_INVALID_SELF_TEST_STATE,
-    SW_FAULT_ID_THERMISTORS_INVALID_EXEC_STATE,                         // 60
+    SW_FAULT_ID_UV_REACTORS_INVALID_SELF_TEST_STATE,                    // 60
+    SW_FAULT_ID_THERMISTORS_INVALID_EXEC_STATE,
     SW_FAULT_ID_THERMISTORS_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_INVALID_THERMISTOR_SELECTED,
     SW_FAULT_ID_FAN_INVALID_EXEC_STATE,
-    SW_FAULT_ID_FAN_INVALID_SELF_TEST_STATE,
-    SW_FAULT_ID_INVALID_FAN_SELECTED,                                   // 65
+    SW_FAULT_ID_FAN_INVALID_SELF_TEST_STATE,                            // 65
+    SW_FAULT_ID_INVALID_FAN_SELECTED,
     SW_FAULT_ID_RO_PUMP_INVALID_EXEC_STATE,
     SW_FAULT_ID_RO_PUMP_INVALID_FLOW_RATE_SET,
     SW_FAULT_ID_DRAIN_PUMP_INVALID_EXEC_STATE,
-    SW_FAULT_ID_UV_REACTORS_INVALID_REACTOR_SELECTD,
-    SW_FAULT_ID_RO_PUMP_INVALID_PRESSURE_SELECTED,                      // 70
+    SW_FAULT_ID_UV_REACTORS_INVALID_REACTOR_SELECTD,                    // 70
+    SW_FAULT_ID_RO_PUMP_INVALID_PRESSURE_SELECTED,
     SW_FAULT_ID_DRAIN_PUMP_TARGET_FLOW_LPM_SELECTED,
     SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED,
     SW_FAULT_ID_DRAIN_PUMP_INVALID_RPM_SELECTED,
-    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID,
-    SW_FAULT_ID_DG_FLUSH_INVALID_EXEC_STATE,                            // 75
+    SW_FAULT_ID_ALARM_MGMT_INVALID_ALARM_ID,                            // 75
+    SW_FAULT_ID_DG_FLUSH_INVALID_EXEC_STATE,
     SW_FAULT_ID_HEAT_DISINFECT_INVALID_EXEC_STATE,
     SW_FAULT_ID_INVALID_DG_RESERVOIR_SELECTED,
     SW_FAULT_ID_STANDBY_MODE_INVALID_EXEC_STATE,
-    SW_FAULT_ID_GEN_IDLE_MODE_INVALID_EXEC_STATE,
-    SW_FAULT_ID_DRAIN_MODE_INVALID_EXEC_STATE,                          // 80
+    SW_FAULT_ID_GEN_IDLE_MODE_INVALID_EXEC_STATE,                       // 80
+    SW_FAULT_ID_DRAIN_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_FILL_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_SOLO_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_PRESSURE_INVALID_EXEC_STATE,
-    SW_FAULT_ID_INVALID_NVDATAMGMT_EXEC_CAL_STATE,
-    SW_FAULT_ID_INVALID_VALVE_ID,                                       // 85
+    SW_FAULT_ID_INVALID_NVDATAMGMT_EXEC_CAL_STATE,                      // 85
+    SW_FAULT_ID_INVALID_VALVE_ID,
     SW_FAULT_ID_INVALID_INT_ADC_CHANNEL_NUMBER,
     SW_FAULT_ID_INVALID_RTI_NOTIFICATION,
     SW_FAULT_ID_CAN_TX_FAULT,
-    SW_FAULT_ID_INVALID_CAN_MESSAGE_SIZE,
-    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID,                         // 90
+    SW_FAULT_ID_INVALID_CAN_MESSAGE_SIZE,                               // 90
+    SW_FAULT_ID_INVALID_CONDUCTIVITY_SENSOR_ID,
     SW_FAULT_ID_INVALID_PRESSURE_SENSOR_SELECTED,
     SW_FAULT_ID_INVALID_TASK,
     SW_FAULT_ID_INVALID_VOLTAGE_MONITOR_STATE,
-    SW_FAULT_ID_INVALID_MONITORED_VOLTAGE_ID,
-    SW_FAULT_ID_INVALID_LOAD_CELL_ID,                                   // 95
+    SW_FAULT_ID_INVALID_MONITORED_VOLTAGE_ID,                           // 95
+    SW_FAULT_ID_INVALID_LOAD_CELL_ID,
     SW_FAULT_ID_DG_CHEM_DISINFECT_INVALID_EXEC_STATE,
     SW_FAULT_ID_DG_INVALID_SWITCH_ID,
     SW_FAULT_ID_DG_PRESSURES_INVALID_SELF_TEST_STATE,
-    SW_FAULT_ID_SAFETY_SHUTDOWN_INVALID_SELF_TEST_STATE,
-    SW_FAULT_ID_PHANTOM_INTERRUPT,                                      // 100
+    SW_FAULT_ID_SAFETY_SHUTDOWN_INVALID_SELF_TEST_STATE,                // 100
+    SW_FAULT_ID_PHANTOM_INTERRUPT,
     SW_FAULT_ID_ILLEGAL_MEM_ACCESS,
-    SW_FAULT_ID_INVALID_CHEMICAL_BOTTLE_SELECTED,
+    SW_FAULT_ID_INVALID_AVAILABLE_1,
     SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED,
     SW_FAULT_ID_INVALID_FLOW_SENSOR_SELECTED,                           // 105
     SW_FAULT_ID_INVALID_SERVICE_STATE_SELECTED,
@@ -149,6 +149,9 @@
     SW_FAULT_ID_PI_CTRL_INVALID_STEP_LIMIT,
     SW_FAULT_ID_DG_INVALID_RO_PUMP_DUTY_CYCLE_SELECTED,
     SW_FAULT_ID_DG_INVALID_TEST_CONFIG_SELECTED,                        // 120
+    SW_FAULT_ID_DG_INVALID_COND_SNSNR_CAL_TABLE_SELECTED,
+    SW_FAULT_ID_DG_RO_PERMEATE_SAMPLE_INVALID_EXEC_STATE,
+    SW_FAULT_ID_DG_RO_PERMEATE_SAMPLE_INVALID_MESSAGE,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;