Index: FPDefs.h
===================================================================
diff -u -rfb0e774b659626e194ca88d22920d03819da59da -r193dbb4390b5cd6ab3adf0a9bd2f6e74c3a4b32c
--- FPDefs.h	(.../FPDefs.h)	(revision fb0e774b659626e194ca88d22920d03819da59da)
+++ FPDefs.h	(.../FPDefs.h)	(revision 193dbb4390b5cd6ab3adf0a9bd2f6e74c3a4b32c)
@@ -18,8 +18,8 @@
     FP_MODE_STAN,                                           ///< Standby mode
     FP_MODE_PGEN,                                           ///< Pre Generate Permeate mode ( RO Featured )
     FP_MODE_GENP,                                           ///< Generate Permeate mode ( RO Featured )
-    FP_MODE_DPGW,                                           ///< Defeatured Pre-Generate Permeate mode
-    FP_MODE_DEGW,                                           ///< Defeatured Generate Permeate mode
+    FP_MODE_DPGP,                                           ///< Defeatured Pre-Generate Permeate mode
+    FP_MODE_DEGP,                                           ///< Defeatured Generate Permeate mode
     FP_MODE_NLEG,                                           ///< Not legal - an illegal mode transition occurred
     NUM_OF_FP_MODES                                         ///< Number of FP operation modes
 };
@@ -226,10 +226,29 @@
     FP_EVENT_PRE_GEN_CHANGE,                                            ///< FP pre gen state change
     FP_EVENT_PRE_GEN_DEF_CHANGE,                                        ///< FP defeatured pre gen state change
     FP_EVENT_GENP_DEF_CHANGE,                                           ///< FP defeatured pre gen state change
+    FP_EVENT_FAULT_ALARM_TRIGGER,                                       ///< FP event for alarms that would trigger
     NUM_OF_FP_EVENT_IDS                                                 ///< Total number of FP events
 };
 typedef enum FP_Event_List FP_EVENT_ID_T;                               ///< Type for FP event list enumeration
 
+/// Enumeration of valves.
+typedef enum FP_Valves
+{
+    M4_VALV = 0,                                  ///< Valve (M4)
+    FP_FIRST_VALVE = M4_VALV,                     ///< First valve
+    P39_VALV,                                     ///< Valve (P39)
+    P6_VALV,                                      ///< Valve (P6)
+    P11_VALV,                                     ///< Valve (P11)
+    P33_VALV,                                     ///< Valve (P33)
+    P34_VALV,                                     ///< Valve (P34)
+    P37_VALV,                                     ///< Valve (P37)
+    M7_VALV,                                      ///< Valve (M7)
+    P20_VALV,                                     ///< Valve (P20)
+    P43_VALV,                                     ///< Valve (P43)
+    FP_NUM_OF_VALVES                              ///< Number of valves
+} FP_VALVES_T;
+
+
 /**@}*/
 
 /**