Index: leahi_dialin/common/td_defs_proxy.py
===================================================================
diff -u -r436742844a3fbbb6a3b0bc81dc87bc6385c3e368 -rbe799e12803dba3054ff893b68f8b79a9dde440b
--- leahi_dialin/common/td_defs_proxy.py	(.../td_defs_proxy.py)	(revision 436742844a3fbbb6a3b0bc81dc87bc6385c3e368)
+++ leahi_dialin/common/td_defs_proxy.py	(.../td_defs_proxy.py)	(revision be799e12803dba3054ff893b68f8b79a9dde440b)
@@ -21,101 +21,100 @@
 class TD_Defs():
 
     # Operation Modes - Lvl 1
-    TDOpModes                           = td_defs.TDOpModes
+    TDOpModes                               = td_defs.TDOpModes
 
     # 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
+    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
 
     # 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
+    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
+    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
+    TDPreTreaSamplWaterUserActionStates     = td_defs.TDPreTreaSamplWaterUserActionStates
+    TDWetSelfTestsStates                    = td_defs.TDWetSelfTestsStates
+    TDTreaBloodPrimeUserActionStates        = td_defs.TDTreaBloodPrimeUserActionStates
+    TDTreaRinsebackUserActionStates         = td_defs.TDTreaRinsebackUserActionStates
+    TDTreaRecircUserActionStates            = td_defs.TDTreaRecircUserActionStates
+    TDTreaEndUserActionStates               = td_defs.TDTreaEndUserActionStates
 
     # Events
-    TDEventList                         = td_defs.TDEventList
-    DataTypes                           = generic_defs.DataTypes
+    TDEventList                             = td_defs.TDEventList
+    DataTypes                               = generic_defs.DataTypes
 
     # Sensor Names
-    TDAirPumpNames                      = td_defs.TDAirPumpNames
-    TDAirTrapValveNames                 = td_defs.TDAirTrapValveNames
-    TDAirTrapLevelSensorNames           = td_defs.TDAirTrapLevelSensorNames
-    TDAirBubbleDetectorNames            = td_defs.TDAirBubbleDetectorNames
-    TDBatteryRegisterNames              = td_defs.TDBatteryRegisterNames
-    TDEjectorNames                      = td_defs.TDEjectorNames
-    TDPressureSensorNames               = td_defs.TDPressureSensorNames
-    TDTemperatureSensorNames            = td_defs.TDTemperatureSensorNames
-    TDSwitchNames                       = td_defs.TDSwitchNames
-    TDValveNames                        = td_defs.TDValveNames
-    TDMonitoredVoltages                 = td_defs.TDMonitoredVoltages
+    TDAirPumpNames                          = td_defs.TDAirPumpNames
+    TDAirTrapValveNames                     = td_defs.TDAirTrapValveNames
+    TDAirTrapLevelSensorNames               = td_defs.TDAirTrapLevelSensorNames
+    TDAirBubbleDetectorNames                = td_defs.TDAirBubbleDetectorNames
+    TDBatteryRegisterNames                  = td_defs.TDBatteryRegisterNames
+    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
-    TDAirPumpStates                     = td_defs.TDAirPumpStates
-    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
+    TDAirPumpAttributes                     = td_defs.TDAirPumpAttributes
+    TDAirPumpStates                         = td_defs.TDAirPumpStates
+    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
-    TDTreatmentModalityTypes            = td_defs.TDTreatmentModalityTypes
-    TDTreatmentHDFDilution              = td_defs.TDTreatmentHDFDilution
+    TDTreatmentParameters                   = td_defs.TDTreatmentParameters
+    TDTreatmentModalityTypes                = td_defs.TDTreatmentModalityTypes
+    TDTreatmentHDFDilution                  = td_defs.TDTreatmentHDFDilution
 
     # Alarms
-    AlarmLampPatterns                   = generic_defs.AlarmLampPatterns
-    AlarmPriorities                     = generic_defs.AlarmPriorities
-    AlarmProperties                     = generic_defs.AlarmProperties
-    AlarmResponseButtons                = generic_defs.AlarmResponseButtons
+    AlarmLampPatterns                       = generic_defs.AlarmLampPatterns
+    AlarmPriorities                         = generic_defs.AlarmPriorities
+    AlarmProperties                         = generic_defs.AlarmProperties
+    AlarmResponseButtons                    = generic_defs.AlarmResponseButtons
 
     # Records
-    RecordTypes                         = generic_defs.RecordTypes
-    SystemRecordFields                  = generic_defs.SystemRecordFields
-    ServiceRecordFields                 = generic_defs.ServiceRecordFields
-    CalibrationRecordFields             = generic_defs.get_calibration_record_fields()
-    InstitutionalRecordFields           = generic_defs.InstitutionalRecordBasicFields
-    UsageInformationRecordFields        = generic_defs.UsageInformationRecordFields
+    RecordTypes                             = generic_defs.RecordTypes
+    TDSystemRecordFields                    = td_defs.TDSystemRecordFields
+    TDServiceRecordFields                   = td_defs.TDServiceRecordFields
+    TDCalibrationRecordFields               = td_defs.get_calibration_record_fields()
+    TDInstitutionalRecordBasicFields        = td_defs.TDInstitutionalRecordBasicFields
+    TDInstitutionalRecordAdvancedFields     = td_defs.TDInstitutionalRecordAdvancedFields
+    TDInstitutionalRecordAdditionalFields   = td_defs.TDInstitutionalRecordAdditionalFields
+    TDUsageInformationRecordFields          = td_defs.TDUsageInformationRecordFields
 
     # Record support
-    CalibRecordAccelerometerFields      = generic_defs.CalibRecordAccelerometerFields
-    CalibRecordBloodLeakFields          = generic_defs.CalibRecordBloodLeakFields
-    CalibRecordConcentrateFields        = generic_defs.CalibRecordConcentrateFields
-    CalibRecordSensorFields             = generic_defs.CalibRecordSensorFields
 
 
+
 td_enum_repository = TD_Defs()