Index: firmware/App/Services/AlarmMgmtSWFaults.h
===================================================================
diff -u -r7838caf7aff7f6a3d890d21c13a4a695782c97bd -r3c1ca4197b63f7988fe3bf58cf80299e4481416a
--- firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 7838caf7aff7f6a3d890d21c13a4a695782c97bd)
+++ firmware/App/Services/AlarmMgmtSWFaults.h	(.../AlarmMgmtSWFaults.h)	(revision 3c1ca4197b63f7988fe3bf58cf80299e4481416a)
@@ -63,11 +63,11 @@
     SW_FAULT_ID_PI_CTRL_INVALID_SIGNAL,
     SW_FAULT_ID_NVDATAMGMT_EXEC_INVALID_STATE,
     SW_FAULT_ID_NVDATAMGMT_INVALID_SELF_TEST_STATE,
-    SW_FAULT_ID_TEMPERATURE_SENSORS_EXEC_INVALID_STATE,                 // 35
+    SW_FAULT_ID_TEMPERATURE_SENSORS_INVALID_SELF_TEST_STATE,            // 35
+    SW_FAULT_ID_TEMPERATURE_SENSORS_EXEC_INVALID_STATE,
     SW_FAULT_ID_HEATERS_SELF_TEST_INVALID_STATE,
     SW_FAULT_ID_HEATERS_PRIMARY_HEATER_EXEC_INVALID_STATE,
-    SW_FAULT_ID_HEATERS_TRIMMER_HEATER_EXEC_INVALID_STATE,
-    SW_FAULT_ID_DG_PRESSURES_INVALID_SELF_TEST_STATE,
+    SW_FAULT_ID_HEATERS_TRIMMER_HEATER_EXEC_INVALID_STATE,
     SW_FAULT_ID_VALVES_INVALID_VALVE_STATE_NAME,                        // 40
     SW_FAULT_ID_VALVES_INVALID_VALVE_ID,
     SW_FAULT_ID_CAN_PARITY_ERROR,
@@ -89,10 +89,10 @@
     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_THERMISTORS_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_INVALID_THERMISTOR_SELECTED,
     SW_FAULT_ID_FAN_INVALID_EXEC_STATE,
-    SW_FAULT_ID_DG_CHEM_DISINFECT_INVALID_EXEC_STATE,
-    SW_FAULT_ID_DG_INVALID_SWITCH_ID,
+    SW_FAULT_ID_FAN_INVALID_SELF_TEST_STATE,
     SW_FAULT_ID_INVALID_FAN_SELECTED,                                   // 65
     SW_FAULT_ID_RO_PUMP_INVALID_EXEC_STATE,
     SW_FAULT_ID_RO_PUMP_INVALID_FLOW_RATE_SET,
@@ -107,7 +107,7 @@
     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_RECIRC_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_FILL_MODE_INVALID_EXEC_STATE,
     SW_FAULT_ID_SOLO_MODE_INVALID_EXEC_STATE,
@@ -124,6 +124,9 @@
     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_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,
     NUM_OF_SW_FAULT_IDS
 } SW_FAULT_ID_T;