Index: leahi_dialin/common/fp_defs.py
===================================================================
diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -rbac0a2d09d57dc27cfa2f2a596d57fdcbed392ee
--- leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision 52aa7af16b98730ba59fc2577dbe8f73b5959775)
+++ leahi_dialin/common/fp_defs.py	(.../fp_defs.py)	(revision bac0a2d09d57dc27cfa2f2a596d57fdcbed392ee)
@@ -24,10 +24,16 @@
     MODE_STAN = 3                                           # Standby mode
     MODE_PRE_GENP = 4                                       # Pre Generate Permeate Mode
     MODE_GENP = 5                                           # Generate Permeate Mode
-    MODE_NLEG = 6                                           # Not legal - an illegal mode transition occurred
-    NUM_OF_FP_MODES = 7                                     # Number of TD operation modes
-    
+    MODE_DPGP = 6                                           # Defeatured Pre-Generate Permeate Mode
+    MODE_DEGP = 7                                           # Defeatured Generate Permeate Mode
+    MODE_NLEG = 8                                           # Not legal - an illegal mode transition occurred
+    NUM_OF_FP_MODES = 9                                     # Number of TD operation modes
+
 @unique
+class FPServiceStates(DialinEnum):
+    NUM_OF_FP_SERV_STATES = 0                               # TODO populate with FP service states
+
+@unique
 class FPPostStates(DialinEnum):
     FP_POST_STATE_START = 0                                # Start initialize & POST mode state
     FP_POST_STATE_FW_INTEGRITY = 1                         # Run firmware integrity test state
@@ -40,13 +46,65 @@
     FP_POST_STATE_COMPLETED = 8                            # POST self-tests completed state
     FP_POST_STATE_FAILED = 9                               # POST self-tests failed state
     NUM_OF_FP_POST_STATES = 10                             # Number of initialize & POST mode states
-    
+
 @unique
+class FPFaultStates(DialinEnum):
+    FP_FAULT_STATE_START = 0                                # FP Fault Start State
+    FP_FAULT_DEENERGIZED_STATE = 1                          # FP Fault De-energized State
+    FP_FAULT_ENERGIZED_STATE = 2                            # FP Fault Energized State
+    NUM_OF_FP_FAULT_STATES = 3                              # Number of Fault Mode State
+
+@unique
+class FPStandbyStates(DialinEnum):
+    FP_STANDBY_MODE_STATE_IDLE = 0                          # Idle standby mode state
+    NUM_OF_FP_STANDBY_MODE_STATES = 1                       # Number of standby mode states
+
+@unique
+class FPPreGenPermeateStates(DialinEnum):
+    FP_PRE_GENP_INLET_PRES_CHECK = 0                        # FP Pre Gen Permeate Inlet Pressure Check State
+    FP_PRE_GENP_FILTER_FLUSH = 1                            # FP Pre Gen Permeate Filter Flush State
+    FP_PRE_GENP_PERMEATE_FLUSH = 2                          # FP Pre Gen Permeate Permeate Flush State
+    FP_PRE_GENP_CONCENTRATE_FLUSH = 3                       # FP Pre Gen Permeate Concentrate Flush State
+    FP_PRE_GENP_VERIFY_WATER = 4                            # FP Pre Gen Permeate Verify Water State
+    FP_PRE_GENP_PAUSED = 5                                  # FP Pre Gen Permeate Paused State
+    NUM_OF_FP_PRE_GENP_MODE_STATES = 6                      # Number of Pre-Gen Permeate mode states
+
+@unique
+class FPPreGenPDefStates(DialinEnum):
+    FP_PRE_GENP_DEF_FLUSH = 0                               # Pre Gen Permeate Defeatured Flush state
+    FP_PRE_GENP_DEF_INLET_WATER_CHECK = 1                   # Pre Gen Permeate Defeatured Inlet Water Check state
+    FP_PRE_GENP_DEF_PAUSED = 2                              # Defeatured Pre Gen Permeate Paused state
+    NUM_OF_FP_PRE_GENP_DEF_MODE_STATES = 3                  # Number of Defeatured Pre Gen Permeate states
+
+@unique
+class FPGenPermeateStates(DialinEnum):
+    FP_GENP_TANK_FILL_STATE = 0                             # Gen Permeate Tank Fill low state
+    FP_GENP_TANK_FULL_STATE = 1                             # Gen Permeate Tank Full state
+    NUM_OF_FP_GENP_MODE_STATES = 2                          # Number of Gen permeate states
+
+@unique
+class FPGenPermeateDefStates(DialinEnum):
+    FP_GENP_DEF_SUPPLY_WATER = 0                            # Gen Permeate Defeatured Supply Water state
+    FP_GENP_DEF_PAUSED = 1                                  # Gen Permeate Defeatured Paused state
+    NUM_OF_FP_GENP_DEF_MODE_STATES = 2                      # Number of gen Permeate states
+
+@unique
+class FPNotLegalStates(DialinEnum):
+    NUM_OF_NOT_LEGAL_STATES = 0                             # TODO: populate with Not Legal states
+
+@unique
 class FPEventList(DialinEnum):
     FP_EVENT_STARTUP = 0                                    # FP startup event
     FP_EVENT_OP_MODE_CHANGE = 1                             # FP Op mode change event
     FP_EVENT_SUB_MODE_CHANGE = 2                            # FP Op sub-mode change event
-    NUM_OF_FP_EVENT_IDS = 3                                 # Total number of FP events
+    FP_EVENT_PRE_GEN_RO_SET_PWM = 3                         # FP gen permeate ro set pwm event
+    FP_EVENT_GENP_BOOST_SET_PWM = 4                         # FP gen permeate boost set pwm event
+    FP_EVENT_GENP_CHANGE = 5                                # FP gen permeate state change
+    FP_EVENT_PRE_GEN_CHANGE = 6                             # FP pre gen state change
+    FP_EVENT_PRE_GEN_DEF_CHANGE = 7                         # FP defeatured pre gen state change
+    FP_EVENT_GENP_DEF_CHANGE = 8                            # FP defeatured pre gen state change
+    FP_EVENT_FAULT_ALARM_TRIGGER = 9                        # FP event for alarms that would trigger
+    NUM_OF_FP_EVENT_IDS = 10                                # Total number of FP events
 
 @unique
 class FPEventDataType(DialinEnum):