Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r4064308ce07e6e48ad62e9dececd4964af2288f9 -r655be738c7bb307fcf3baa139acba0fb6c62ec4b
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 4064308ce07e6e48ad62e9dececd4964af2288f9)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 655be738c7bb307fcf3baa139acba0fb6c62ec4b)
@@ -855,6 +855,38 @@
 
 
 @unique
+class TDBatteryRegisterNames(DialinEnum):
+    REMAINING_CAPACITY          = 0                             # Remaining capacity in mAh
+    BATTERY_STATUS              = 1                             # Battery pack status
+    BATTERY_CHARGE_STATUS       = 2                             # Battery charge status
+    BATTERY_I2C_STATUS          = 3                             # Battery I2C status
+    FAULT_STATUS                = 4                             # Charger fault status
+    THERMISTOR_PCT              = 5                             # Thermistor percentage
+    BATTERY_VOLTAGE             = 6                             # Battery voltage in mV
+    SYSTEM_VOLTAGE              = 7                             # System voltage in mV
+    BATTERY_CURRENT             = 8                             # Battery current in mAh
+    RELATIVE_STATE_OF_CHARGE    = 9                             # Relative state of charge
+    FULL_CHARGE_CAPACITY        = 10                            # Full charge capacity in mAh
+    NUM_OF_BATTERIES            = 11                            # Number of Batteries
+
+TDBatteryRegisterNames._str_list = {
+    # Official Name :       Accepted strings
+    'REMAINING_CAPACITY': [],
+    'BATTERY_STATUS': [],
+    'BATTERY_CHARGE_STATUS': [],
+    'BATTERY_I2C_STATUS': [],
+    'FAULT_STATUS': [],
+    'THERMISTOR_PCT': [],
+    'BATTERY_VOLTAGE': [],
+    'SYSTEM_VOLTAGE': [],
+    'BATTERY_CURRENT': [],
+    'RELATIVE_STATE_OF_CHARGE': [],
+    'FULL_CHARGE_CAPACITY': [],
+    'NUM_OF_BATTERIES': [],
+}
+
+
+@unique
 class TDEjectorNames(DialinEnum):
     H5_MOTOR                = 0                                 # TD Ejector Motor
     NUM_OF_EJECTOR_MOTORS   = 1                                 # Number of Ejector Motors
@@ -977,7 +1009,20 @@
     'NUM_OF_AIR_PUMP_ATTRIBUTES': [],
 }
 
+class TDAirPumpStates(DialinEnum):
+    AIR_PUMP_STATE_INIT     = 0                                 # Air Pump Initialize state
+    AIR_PUMP_STATE_OFF      = 1                                 # Air Pump Off state
+    AIR_PUMP_STATE_ON       = 2                                 # Air Pump On state
+    NUM_OF_AIR_PUMP_STATES  = 3                                 # Number of air pump states
 
+TDAirPumpStates._str_list = {
+    'AIR_PUMP_STATE_INIT': ['init'],
+    'AIR_PUMP_STATE_OFF': ['off'],
+    'AIR_PUMP_STATE_ON': ['on'],
+    'NUM_OF_AIR_PUMP_STATES ': []
+}
+
+
 @unique
 class TDAirTrapLevelSensorAttributes(DialinEnum):
     LEVEL                                   = 0                 # Level attribute for Air Trap Level Sensor
@@ -1138,47 +1183,37 @@
 
 @unique
 class TDValvePositions(DialinEnum):
-    VALVE_POSITION_NOT_IN_POSITION  = 0                         # Valve not in Position
-    VALVE_POSITION_A_INSERT_LOAD    = 1                         # Insert/Eject Valve Position
-    VALVE_POSITION_B_OPEN_BLOOD     = 2                         # Open Valve Position
-    VALVE_POSITION_C_CLOSE_SALINE   = 3                         # Closed Valve Position
-    VALVE_POSITION_C_PARTIAL_CLOSE  = 4                         # Partial Close Valve Position
-    NUM_OF_VALVE_POSITIONS          = 5                         # Partial Close Valve Position
+    NOT_IN_POSITION                 = 0                         # Valve not in Position
+    A_INSERT_INSERT_EJECT           = 1                         # Insert/Eject Valve Position
+    B_OPEN_BLOOD                    = 2                         # Open Valve Position
+    C_CLOSE                         = 3                         # Closed Valve Position
+    NUM_OF_VALVE_POSITIONS          = 4                         # Number of valve positions
 
 TDValvePositions._str_list = {
     # Official Name :       Accepted strings
-    'VALVE_POSITION_NOT_IN_POSITION': ['not in position'],
-    'VALVE_POSITION_A_INSERT_LOAD': ['a', 'insert/eject', 'insert', 'eject', 'load'],
-    'VALVE_POSITION_B_OPEN_BLOOD': ['b', 'open', 'blood'],
-    'VALVE_POSITION_C_CLOSE_SALINE': ['c', 'close', 'closed', 'saline'],
-    'VALVE_POSITION_C_PARTIAL_CLOSE': [],
+    'NOT_IN_POSITION': ['not in position'],
+    'A_INSERT_INSERT_EJECT': ['a', 'insert/eject', 'insert', 'eject', 'load'],
+    'B_OPEN_BLOOD': ['b', 'open', 'blood'],
+    'C_CLOSE': ['c', 'close', 'closed', 'saline'],
     'NUM_OF_VALVE_POSITIONS': [],
 }
 
 
 @unique
 class TDValveStates(DialinEnum):
-    VALVE_STATE_WAIT_FOR_POST                   = 0             # Waiting for POST Valve State
-    VALVE_STATE_RESET_VALVE                     = 1             # Valve state reset valve.
-    VALVE_STATE_RESET_ENCODER                   = 2             # Valve state reset encoder.
-    VALVE_STATE_ENABLE_VALVE                    = 3             # Valve state enable valve.
-    VALVE_STATE_HOMING_NOT_STARTED              = 4             # Valve state homing not started.
-    VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE      = 5             # Valve state homing find energized edge.
-    VALVE_STATE_HOMING_FIND_DEENERGIZED_EDGE    = 6             # Valve state homing find.
-    VALVE_STATE_IDLE                            = 7             # Idle Valve State.
-    VALVE_STATE_IN_TRANSITION                   = 8             # Valve state in transition.
+    WAIT_FOR_POST                   = 0             # Waiting for POST Valve State
+    HOMING_NOT_HOMED                = 1             # Valve state homing not homed.
+    IDLE                            = 2             # Idle Valve State.
+    IN_TRANSITION                   = 3             # Valve state in transition.
+    NUM_OF_VALVE_STATES             = 4             # Number of valve states.
 
 TDValveStates._str_list = {
     # Official Name :       Accepted strings
-    'VALVE_STATE_WAIT_FOR_POST': ['wait', 'wait for post'],
-    'VALVE_STATE_RESET_VALVE': ['reset valve'],
-    'VALVE_STATE_RESET_ENCODER': ['reset encoder'],
-    'VALVE_STATE_ENABLE_VALVE': ['enable', 'enable valve'],
-    'VALVE_STATE_HOMING_NOT_STARTED': ['homing not started', 'not started'],
-    'VALVE_STATE_HOMING_FIND_ENERGIZED_EDGE': ['homing find energized edge'],
-    'VALVE_STATE_HOMING_FIND_DEENERGIZED_EDGE': ['homing find deenergized edge'],
-    'VALVE_STATE_IDLE': ['idle'],
-    'VALVE_STATE_IN_TRANSITION': [],
+    'WAIT_FOR_POST': ['wait', 'wait for post'],
+    'HOMING_NOT_HOMED': ['homing not started', 'not started'],
+    'IDLE': ['idle'],
+    'IN_TRANSITION': [],
+    'NUM_OF_VALVE_STATES': [],
 }