Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r52aa7af16b98730ba59fc2577dbe8f73b5959775 -rbac0a2d09d57dc27cfa2f2a596d57fdcbed392ee
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 52aa7af16b98730ba59fc2577dbe8f73b5959775)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision bac0a2d09d57dc27cfa2f2a596d57fdcbed392ee)
@@ -14,6 +14,8 @@
 #
 ############################################################################
 from enum import unique
+from numbers import Number
+
 from ..utils.base import DialinEnum
 
 
@@ -71,7 +73,7 @@
     NUM_OF_TD_TREATMENT_PARAMS_MODE_STATES                  = 2     # Number of treatment params mode states
 
 @unique
-class TDPreTreatmentSubModes(DialinEnum):
+class TDPreTreatmentModesStates(DialinEnum):
     TD_PRE_TREATMENT_WATER_SAMPLE_STATE                     =  0    # Water sample state
     TD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE             =  1    # Consumable self-tests state
     TD_PRE_TREATMENT_SELF_TEST_NO_CART_STATE                =  2    # No cartridge self-tests state
@@ -110,10 +112,9 @@
 
 @unique
 class TDFaultStates(DialinEnum):
-    TD_FAULT_STATE_START                                    =  0    # Start fault state
-    TD_FAULT_STATE_RUN_NV_POSTS                             =  1    # TD fault run NV posts state
-    TD_FAULT_STATE_COMPLETE                                 =  2    # TD fault run complete state
-    NUM_OF_TD_FAULT_STATES                                  =  3    # Number of fault mode states
+    TD_FAULT_ENERGIZED_STATE                                =  0    # TD fault mode energized state
+    TD_FAULT_DEENERGIZED_STATE                              =  1    # TD fault mode deenergized state
+    NUM_OF_TD_FAULT_STATES                                  =  2    # Number of fault mode states
 
 @unique
 class TDTreatmentStates(DialinEnum):
@@ -136,6 +137,15 @@
     NUM_OF_DIALYSIS_STATES                                  = 2     # Number of dialysis sub-mode states
 
 @unique
+class TDServiceStates(DialinEnum):
+    TD_SERVICE_STATE_START                                  = 0     # Start service mode state
+    NUM_OF_TD_SERVICE_STATES                                = 1     # Number of service mode states
+
+@unique
+class TDNotLegalStates(DialinEnum):
+    NUM_OF_NOT_LEGAL_STATES = 0                             # TODO: populate with Not Legal states
+
+@unique
 class TDEventList(DialinEnum):
     TD_EVENT_STARTUP                                        =  0    # TD startup event
     TD_EVENT_OP_MODE_CHANGE                                 =  1    # TD Op mode change event
@@ -151,24 +161,17 @@
     TD_EVENT_SW_CONFIG_UPDATE                               = 11    # TD new software configuration has been updated
     TD_EVENT_BUTTON                                         = 12    # TD button pressed/released
     TD_EVENT_SAFETY_LINE                                    = 13    # TD safety line pulled/released
-    TD_EVENT_RSRVR_1_LOAD_CELL_START_VALUES                 = 14    # TD reservoir 1 load cells start values
-    TD_EVENT_RSRVR_1_LOAD_CELL_END_VALUES                   = 15    # TD reservoir 2 load cells end values
-    TD_EVENT_RSRVR_2_LOAD_CELL_START_VALUES                 = 16    # TD reservoir 2 load cells start values
-    TD_EVENT_RSRVR_2_LOAD_CELL_END_VALUES                   = 17    # TD reservoir 2 load cells end values
-    TD_EVENT_SUB_STATE_CHANGE                               = 18    # TD Op sub-state change event
-    TD_EVENT_SYRINGE_PUMP_STATE                             = 19    # TD syringe pump state change event
-    TD_EVENT_OCCLUSION_BASELINE                             = 20    # TD event occlusion baseline event
-    TD_EVENT_RSRVR_UF_VOLUME_AND_TIME                       = 21    # TD ultrafiltration volume and time for a reservoir use
-    TD_EVENT_RSRVR_UF_RATE                                  = 22    # TD ultrafiltration measured and expected rates
-    TD_EVENT_OPERATION_STATUS                               = 23    # TD operation status event.
-    TD_EVENT_AIR_TRAP_FILL                                  = 24    # TD initiated an air trap fill (opened VBT briefly).
-    TD_EVENT_AIR_PUMP_ON_OFF                                = 25    # TD turned air pump on or off.
-    TD_EVENT_BLOOD_LEAK_SELF_TEST_RESULT                    = 26    # TD Blood leak self test result.
-    TD_EVENT_BLOOD_LEAK_NUM_OF_SET_POINT_CHECK_FAILURES     = 27    # TD blood leak number of setpoint check failures
-    TD_EVENT_DRY_SELF_TEST_PRESSURE_DECAY_WAIT_PERIOD       = 28    # TD dry self test pressure decay wait period
-    TD_EVENT_INSTIT_RECORD_UPDATE                           = 29    # TD new institutional record has been updated.
-    TD_EVENT_PARTIAL_OCCLUSION_BASELINE                     = 30    # TD event partial occlusion baseline event
-    NUM_OF_EVENT_IDS                                        = 31    # Total number of TD events
+    TD_EVENT_SUB_STATE_CHANGE                               = 14    # TD Op sub-state change event
+    TD_EVENT_RSRVR_UF_RATE                                  = 15    # TD ultrafiltration measured and expected rates
+    TD_EVENT_OPERATION_STATUS                               = 16    # TD operation status event.
+    TD_EVENT_AIR_TRAP_FILL                                  = 17    # TD initiated an air trap fill (opened VBT briefly).
+    TD_EVENT_AIR_TRAP_LOWER                                 = 18    # TD started/stopped an air trap lower level operation
+    TD_EVENT_AIR_PUMP_ON_OFF                                = 19    # TD turned air pump on or off.
+    TD_EVENT_DRY_SELF_TEST_PRESSURE_DECAY_WAIT_PERIOD       = 20    # TD dry self test pressure decay wait period
+    TD_EVENT_INSTIT_RECORD_UPDATE                           = 21    # TD new institutional record has been updated.
+    TD_EVENT_VALVE_POS_CHANGE                               = 22    # TD pinch valve position change
+    TD_EVENT_VALVE_HOMED_POS_SETTING                        = 23    # TD pinch valve homed encoder positions for A/B/C
+    NUM_OF_EVENT_IDS                                        = 24    # Total number of TD events
 
 @unique
 class TDEventDataType(DialinEnum):