Index: leahi_dialin/common/dd_defs.py
===================================================================
diff -u -r57ca71b2ff74ef3b96b29586f5aefd5abea222df -r71f2092930ad621e8a738de12faf806e8c46b1b9
--- leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 57ca71b2ff74ef3b96b29586f5aefd5abea222df)
+++ leahi_dialin/common/dd_defs.py	(.../dd_defs.py)	(revision 71f2092930ad621e8a738de12faf806e8c46b1b9)
@@ -438,18 +438,18 @@
 
 @unique
 class DDLevelSensorNames(DialinEnum):
-    D6_LEVEL                        = 0                         # floater switch low, medium and high status
-    D63_LEVEL                       = 1                         # bicarb level low or high status
-    D46_LEVEL                       = 2                         # Spent dialysate air separation chamber level low or high status
-    D98_LEVEL                       = 3                         # D98 Conductivity Level Sensor
+    D46_LEVEL                       = 0                         # Spent dialysate air separation chamber level low or high status
+    D63_LEVEL                       = 1                         # bicarb lower conductivity level sensor low or high status
+    D98_LEVEL                       = 2                         # bicarb upper conductivity level sensor low or high status
+    D6_LEVEL                        = 3                         # floater switch low, medium and high status
     NUM_OF_LEVELS                   = 4                         # Number of Level Sensors
 
 DDLevelSensorNames._str_list = {
     # Official Name :       Accepted strings
-    'D6_LEVEL': ['d6'],
-    'D63_LEVEL': ['d63'],
     'D46_LEVEL': ['d46'],
+    'D63_LEVEL': ['d63'],
     'D98_LEVEL': ['d98'],
+    'D6_LEVEL': ['d6'],
     'NUM_OF_LEVELS': [],
 }
 
@@ -895,7 +895,7 @@
     HEAT_DUTY_CYCLE             = 0                             # Heat Duty Cycle Attribute for Heaters
     HEAT_TARGET_TEMP            = 1                             # Target Temperature Attribute for Heaters
     HEAT_STATE                  = 2                             # State to command Attribute for Heaters
-    DUTY_CYCLE_COUNT            = 3                             # Duty Cycle Count Attribute for Heaters
+    FEED_FORWARD                = 3                             # Feed Forward Attribute for Heaters
     PWM_PERIOD                  = 4                             # Pulse Width Modulation Attribute for Heaters
     ADJUSTED_TARGET_TEMP        = 5                             # Adjusted Target Temperature Attribute for Heaters
     TARGET_TEMP_TD              = 6                             # Target Temperature Attribute for Heaters
@@ -906,7 +906,7 @@
     'HEAT_DUTY_CYCLE': ['duty cycle'],
     'HEAT_TARGET_TEMP': ['target temperature', 'target temp'],
     'HEAT_STATE': ['state', 'heat state'],
-    'DUTY_CYCLE_COUNT': ['duty cycle count'],
+    'FEED_FORWARD': [],
     'PWM_PERIOD': ['pwm', 'pwm period'],
     'ADJUSTED_TARGET_TEMP': ['adjusted target temperature', 'adj target temp'],
     'TARGET_TEMP_TD': ['target temperature td', 'target temp td'],