Index: leahi_dialin/common/td_defs_proxy.py
===================================================================
diff -u -r99f9233b24e6115bb1384ec8f5a077aefc37ab4b -rc6b28ca8a6aae3f70458f05b5bf445069e2fe457
--- leahi_dialin/common/td_defs_proxy.py	(.../td_defs_proxy.py)	(revision 99f9233b24e6115bb1384ec8f5a077aefc37ab4b)
+++ leahi_dialin/common/td_defs_proxy.py	(.../td_defs_proxy.py)	(revision c6b28ca8a6aae3f70458f05b5bf445069e2fe457)
@@ -19,43 +19,77 @@
 
 class TD_Defs():
 
-    TDOpModes                       = td_defs.TDOpModes
-    TDFaultStates                   = td_defs.TDFaultStates
-    TDServiceStates                 = td_defs.TDServiceStates
-    TDInitStates                    = td_defs.TDInitStates
-    TDStandbyStates                 = td_defs.TDStandbyStates
-    TDTreatmentParamStates          = td_defs.TDTreatmentParamStates
-    TDPreTreatmentModesStates       = td_defs.TDPreTreatmentModesStates
-    TDTreatmentStates               = td_defs.TDTreatmentStates
-    TDPostTreatmentStates           = td_defs.TDPostTreatmentStates
-    TDNotLegalStates                = td_defs.TDNotLegalStates
-    TDPreTreatmentPrimeStates       = td_defs.TDPreTreatmentPrimeStates
-    TDDialysisStates                = td_defs.TDDialysisStates
-    TDTreatmentParameters           = td_defs.TDTreatmentParameters
+    # Operation Modes - Lvl 1
+    TDOpModes                           = td_defs.TDOpModes
 
-    TDEventList                     = td_defs.TDEventList
-    TDEventDataTypes                = td_defs.TDEventDataTypes
+    # Operation Modes - Lvl 2
+    TDFaultStates                       = td_defs.TDFaultStates
+    TDServiceStates                     = td_defs.TDServiceStates
+    TDInitStates                        = td_defs.TDInitStates
+    TDStandbyStates                     = td_defs.TDStandbyStates
+    TDTreatmentParamStates              = td_defs.TDTreatmentParamStates
+    TDPreTreatmentModesStates           = td_defs.TDPreTreatmentModesStates
+    TDTreatmentStates                   = td_defs.TDTreatmentStates
+    TDPostTreatmentStates               = td_defs.TDPostTreatmentStates
+    TDNotLegalStates                    = td_defs.TDNotLegalStates
 
-    TDAirPumpNames                  = td_defs.TDAirPumpNames
-    TDAirTrapValveNames             = td_defs.TDAirTrapValveNames
-    TDAirTrapLevelSensorNames       = td_defs.TDAirTrapLevelSensorNames
-    TDAirBubbleDetectorNames        = td_defs.TDAirBubbleDetectorNames
-    TDEjectorNames                  = td_defs.TDEjectorNames
-    TDPressureSensorNames           = td_defs.TDPressureSensorNames
-    TDTemperatureSensorNames        = td_defs.TDTemperatureSensorNames
-    TDSwitchNames                   = td_defs.TDSwitchNames
-    TDValveNames                    = td_defs.TDValveNames
-    TDMonitoredVoltages             = td_defs.TDMonitoredVoltages
+    # Operation Modes - Lvl 3
+    # Pre-treatment
+    TDPreTreaSampleWaterStates          = td_defs.TDPreTreaSampleWaterStates
+    TDPreTreaConsumableSelfTestStates   = td_defs.TDPreTreaConsumableSelfTestStates
+    TDPreTreaNoCartSelfTestStates       = td_defs.TDPreTreaNoCartSelfTestStates
+    TDPreTreaDrySelfTestStates          = td_defs.TDPreTreaDrySelfTestStates
+    TDPreTreaPrimeStates                = td_defs.TDPreTreaPrimeStates
+    TDPreTreaRecircStates               = td_defs.TDPreTreaRecircStates
+    TDPreTreaPatientConnectStates       = td_defs.TDPreTreaPatientConnectStates
+    # Treatment
+    TDTreaBloodPrimeStates              = td_defs.TDTreaBloodPrimeStates
+    TDTreaDialysisStates                = td_defs.TDTreaDialysisStates
+    TDTreaPausedStates                  = td_defs.TDTreaPausedStates
+    TDTreaRinsebackStates               = td_defs.TDTreaRinsebackStates
+    TDTreaRecircStates                  = td_defs.TDTreaRecircStates
+    TDTreaBolusStates                   = td_defs.TDTreaBolusStates
+    TDTreaHeparinStates                 = td_defs.TDTreaHeparinStates
+    TDTreaEndStates                     = td_defs.TDTreaEndStates
+    
+    # Operation Modes - Lvl 4
+    TDPreTreaSamplWaterUserActionStates = td_defs.TDPreTreaSamplWaterUserActionStates
+    TDWetSelfTestsStates                = td_defs.TDWetSelfTestsStates
+    TDTreaBloodPrimeUserActionStates    = td_defs.TDTreaBloodPrimeUserActionStates
+    TDTreaRinsebackUserActionStates     = td_defs.TDTreaRinsebackUserActionStates
+    TDTreaRecircUserActionStates        = td_defs.TDTreaRecircUserActionStates
+    TDTreaEndUserActionStates           = td_defs.TDTreaEndUserActionStates
 
-    TDAirPumpAttributes             = td_defs.TDAirPumpAttributes
-    TDAirTrapLevelSensorAttributes  = td_defs.TDAirTrapLevelSensorAttributes
-    TDAirTrapState                  = td_defs.TDAirTrapState
-    TDBloodFlowMotorAttributes      = td_defs.TDBloodFlowMotorAttributes
-    TDAirBubbleDetectorAttributes   = td_defs.TDAirBubbleDetectorAttributes
-    TDEjectorAttributes             = td_defs.TDEjectorAttributes
-    TDPressureSensorAttributes      = td_defs.TDPressureSensorAttributes
-    TDSwitchStatus                  = td_defs.TDSwitchStatus
-    TDValvePositions                = td_defs.TDValvePositions
-    TDValveStates                   = td_defs.TDValveStates
+    # Events
+    TDEventList                         = td_defs.TDEventList
+    TDEventDataTypes                    = td_defs.TDEventDataTypes
 
+    # Sensor Names
+    TDAirPumpNames                      = td_defs.TDAirPumpNames
+    TDAirTrapValveNames                 = td_defs.TDAirTrapValveNames
+    TDAirTrapLevelSensorNames           = td_defs.TDAirTrapLevelSensorNames
+    TDAirBubbleDetectorNames            = td_defs.TDAirBubbleDetectorNames
+    TDEjectorNames                      = td_defs.TDEjectorNames
+    TDPressureSensorNames               = td_defs.TDPressureSensorNames
+    TDTemperatureSensorNames            = td_defs.TDTemperatureSensorNames
+    TDSwitchNames                       = td_defs.TDSwitchNames
+    TDValveNames                        = td_defs.TDValveNames
+    TDMonitoredVoltages                 = td_defs.TDMonitoredVoltages
+
+    # Sensor Attributes
+    TDAirPumpAttributes                 = td_defs.TDAirPumpAttributes
+    TDAirTrapLevelSensorAttributes      = td_defs.TDAirTrapLevelSensorAttributes
+    TDAirTrapState                      = td_defs.TDAirTrapState
+    TDBloodFlowMotorAttributes          = td_defs.TDBloodFlowMotorAttributes
+    TDAirBubbleDetectorAttributes       = td_defs.TDAirBubbleDetectorAttributes
+    TDEjectorAttributes                 = td_defs.TDEjectorAttributes
+    TDEjectorStates                     = td_defs.TDEjectorStates
+    TDPressureSensorAttributes          = td_defs.TDPressureSensorAttributes
+    TDSwitchStatus                      = td_defs.TDSwitchStatus
+    TDValvePositions                    = td_defs.TDValvePositions
+    TDValveStates                       = td_defs.TDValveStates
+
+    # Support
+    TDTreatmentParameters               = td_defs.TDTreatmentParameters
+
 td_enum_repository = TD_Defs()