Index: leahi_dialin/common/dd_defs_proxy.py
===================================================================
diff -u -r5994adea1a1022175f9cc4e6dacfa02de3fc45a0 -rba415df9f8e76d6b0f21e8f69ba99346e42f7b09
--- leahi_dialin/common/dd_defs_proxy.py	(.../dd_defs_proxy.py)	(revision 5994adea1a1022175f9cc4e6dacfa02de3fc45a0)
+++ leahi_dialin/common/dd_defs_proxy.py	(.../dd_defs_proxy.py)	(revision ba415df9f8e76d6b0f21e8f69ba99346e42f7b09)
@@ -20,76 +20,76 @@
 
 class DD_Defs():
     # Operation Modes - Lvl 1
-    DDOpModes                       = dd_defs.DDOpModes
+    DDOpModes                           = dd_defs.DDOpModes
     
     # Operation Modes - Lvl 2
-    DDFaultStates                   = dd_defs.DDFaultStates
-    DDServiceStates                 = dd_defs.DDServiceStates
-    DDInitStates                    = dd_defs.DDInitStates
-    DDStandbyStates                 = dd_defs.DDStandbyStates
-    DDPreGenDialysateStates         = dd_defs.DDPreGenDialysateStates
-    DDGenDialysateModeStates        = dd_defs.DDGenDialysateModeStates
-    DDPostGenDialysateStates        = dd_defs.DDPostGenDialysateStates
-    DDHeatDisinfectStates           = dd_defs.DDHeatDisinfectStates
-    DDHeaterCoolingStates           = dd_defs.DDHeaterCoolingStates
-    DDROPermeateStates              = dd_defs.DDROPermeateStates
-    DDNotLegalStates                = dd_defs.DDNotLegalStates
+    DDFaultStates                       = dd_defs.DDFaultStates
+    DDServiceStates                     = dd_defs.DDServiceStates
+    DDInitStates                        = dd_defs.DDInitStates
+    DDStandbyStates                     = dd_defs.DDStandbyStates
+    DDPreGenDialysateStates             = dd_defs.DDPreGenDialysateStates
+    DDGenDialysateModeStates            = dd_defs.DDGenDialysateModeStates
+    DDPostGenDialysateStates            = dd_defs.DDPostGenDialysateStates
+    DDHeatDisinfectStates               = dd_defs.DDHeatDisinfectStates
+    DDHeaterCoolingStates               = dd_defs.DDHeaterCoolingStates
+    DDROPermeateStates                  = dd_defs.DDROPermeateStates
+    DDNotLegalStates                    = dd_defs.DDNotLegalStates
     
     # Operation Modes - Lvl 3
-    DDFaultNVDataStates             = dd_defs.DDFaultNVDataStates
-    DDPreGenWetSelfTestStates       = dd_defs.DDPreGenWetSelfTestStates
+    DDFaultNVDataStates                 = dd_defs.DDFaultNVDataStates
+    DDPreGenWetSelfTestStates           = dd_defs.DDPreGenWetSelfTestStates
 
     # Events
-    DDEventList                     = dd_defs.DDEventList
-    DataTypes                       = generic_defs.DataTypes
+    DDEventList                         = dd_defs.DDEventList
+    DataTypes                           = generic_defs.DataTypes
 
     # Sensor Names
-    DDConcentratePumpNames          = dd_defs.DDConcentratePumpNames
-    DDConductivitySensorNames       = dd_defs.DDConductivitySensorNames
-    DDDialysatePumpNames            = dd_defs.DDDialysatePumpNames
-    DDHeaterNames                   = dd_defs.DDHeaterNames
-    DDLevelSensorNames              = dd_defs.DDLevelSensorNames
-    DDPistonPumpNames               = dd_defs.DDPistonPumpNames
-    DDPressureSensorNames           = dd_defs.DDPressureSensorNames
-    DDTemperatureSensorNames        = dd_defs.DDTemperatureSensorNames
-    DDValveNames                    = dd_defs.DDValveNames
-    DDMonitoredVoltages             = dd_defs.DDMonitoredVoltages
-    DDSubstitutionPumpNames         = dd_defs.DDSubstitutionPumpNames
+    DDConcentratePumpNames              = dd_defs.DDConcentratePumpNames
+    DDConductivitySensorNames           = dd_defs.DDConductivitySensorNames
+    DDDialysatePumpNames                = dd_defs.DDDialysatePumpNames
+    DDHeaterNames                       = dd_defs.DDHeaterNames
+    DDLevelSensorNames                  = dd_defs.DDLevelSensorNames
+    DDPistonPumpNames                   = dd_defs.DDPistonPumpNames
+    DDPressureSensorNames               = dd_defs.DDPressureSensorNames
+    DDTemperatureSensorNames            = dd_defs.DDTemperatureSensorNames
+    DDValveNames                        = dd_defs.DDValveNames
+    DDMonitoredVoltages                 = dd_defs.DDMonitoredVoltages
+    DDSubstitutionPumpNames             = dd_defs.DDSubstitutionPumpNames
 
     # Sensor Attributes
-    DDBalancingChamberStates        = dd_defs.DDBalancingChamberStates
-    DDBalancingChamberSwitchStates  = dd_defs.DDBalancingChamberSwitchStates
-    DDBicartChFFillExecStates       = dd_defs.DDBicartChFFillExecStates
-    DDBloodLeakStates               = dd_defs.DDBloodLeakStates
-    DDConcentratePumpAttributes     = dd_defs.DDConcentratePumpAttributes
-    DDConcentratePumpStates         = dd_defs.DDConcentratePumpStates
-    DDDialysatePumpAttributes       = dd_defs.DDDialysatePumpAttributes
-    DDDialysatePumpsStates          = dd_defs.DDDialysatePumpsStates
-    DDDryBicartDrainExecStates      = dd_defs.DDDryBicartDrainExecStates
-    DDDryBicartFillExecStates       = dd_defs.DDDryBicartFillExecStates
-    DDHeaterStartStop               = dd_defs.DDHeaterStartStop
-    DDHeaterAttributes              = dd_defs.DDHeaterAttributes
-    DDHeaterExecState               = dd_defs.DDHeaterExecState
-    DDPistonPumpAttributes          = dd_defs.DDPistonPumpAttributes
-    DDSpentChFillExecState          = dd_defs.DDSpentChFillExecState
-    DDValveStates                   = dd_defs.DDValveStates
-    DDCancelModes                   = dd_defs.DDCancelModes
-    DDSubstitutionPumpAttributes    = dd_defs.DDSubstitutionPumpAttributes
+    DDBalancingChamberStates            = dd_defs.DDBalancingChamberStates
+    DDBalancingChamberSwitchStates      = dd_defs.DDBalancingChamberSwitchStates
+    DDBicartChFFillExecStates           = dd_defs.DDBicartChFFillExecStates
+    DDBloodLeakStates                   = dd_defs.DDBloodLeakStates
+    DDConcentratePumpAttributes         = dd_defs.DDConcentratePumpAttributes
+    DDConcentratePumpStates             = dd_defs.DDConcentratePumpStates
+    DDDialysatePumpAttributes           = dd_defs.DDDialysatePumpAttributes
+    DDDialysatePumpsStates              = dd_defs.DDDialysatePumpsStates
+    DDDryBicartDrainExecStates          = dd_defs.DDDryBicartDrainExecStates
+    DDDryBicartFillExecStates           = dd_defs.DDDryBicartFillExecStates
+    DDHeaterStartStop                   = dd_defs.DDHeaterStartStop
+    DDHeaterAttributes                  = dd_defs.DDHeaterAttributes
+    DDHeaterExecState                   = dd_defs.DDHeaterExecState
+    DDPistonPumpAttributes              = dd_defs.DDPistonPumpAttributes
+    DDSpentChFillExecState              = dd_defs.DDSpentChFillExecState
+    DDValveStates                       = dd_defs.DDValveStates
+    DDCancelModes                       = dd_defs.DDCancelModes
+    DDSubstitutionPumpAttributes        = dd_defs.DDSubstitutionPumpAttributes
     DDConductivityResistanceAttributes  = dd_defs.DDConductivityResistanceAttributes
 
     # Records
-    RecordTypes                     = generic_defs.RecordTypes
-    SystemRecordFields              = generic_defs.SystemRecordFields
-    ServiceRecordFields             = generic_defs.ServiceRecordFields
-    CalibrationRecordFields         = generic_defs.get_calibration_record_fields()
-    InstitutionalRecordFields       = generic_defs.InstitutionalRecordFields
-    UsageInformationRecordFields    = generic_defs.UsageInformationRecordFields
+    RecordTypes                         = generic_defs.RecordTypes
+    SystemRecordFields                  = generic_defs.SystemRecordFields
+    ServiceRecordFields                 = generic_defs.ServiceRecordFields
+    CalibrationRecordFields             = generic_defs.get_calibration_record_fields()
+    InstitutionalRecordFields           = generic_defs.InstitutionalRecordFields
+    UsageInformationRecordFields        = generic_defs.UsageInformationRecordFields
 
     # Record support
-    CalibRecordAccelerometerFields  = generic_defs.CalibRecordAccelerometerFields
-    CalibRecordBloodLeakFields      = generic_defs.CalibRecordBloodLeakFields
-    CalibRecordConcentrateFields    = generic_defs.CalibRecordConcentrateFields
-    CalibRecordSensorFields         = generic_defs.CalibRecordSensorFields
+    CalibRecordAccelerometerFields      = generic_defs.CalibRecordAccelerometerFields
+    CalibRecordBloodLeakFields          = generic_defs.CalibRecordBloodLeakFields
+    CalibRecordConcentrateFields        = generic_defs.CalibRecordConcentrateFields
+    CalibRecordSensorFields             = generic_defs.CalibRecordSensorFields
 
 
 dd_enum_repository = DD_Defs()