Index: leahi_dialin/common/td_defs.py
===================================================================
diff -u -r893966363336e5425afd5ad88a6e2d6f5b0ed916 -re8bdeec38984b4b800f6d0eca8b9097800efbf40
--- leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision 893966363336e5425afd5ad88a6e2d6f5b0ed916)
+++ leahi_dialin/common/td_defs.py	(.../td_defs.py)	(revision e8bdeec38984b4b800f6d0eca8b9097800efbf40)
@@ -581,13 +581,21 @@
     STATE                       = 0                             # TD Air Pump State to command attribute
     DUTY_CYCLE                  = 1                             # TD Air Pump Duty Cycle attribute
     RPM                         = 2                             # TD Air Pump RPM attribute
-    NUM_OF_AIR_PUMP_ATTRIBUTES  = 3                             # Number of Air Pump attributes
+    # TODO remove after feature validation
+    FPGA_RPM                    = 3                             # TD Air Pump FPGA_RPM attribute
+    #TODO remove after feature validation
+    SCALAR_POWER                = 4                             # TD Air Pump scalar power
+    NUM_OF_AIR_PUMP_ATTRIBUTES  = 5                             # Number of Air Pump attributes
 
 TDAirPumpAttributes._str_list = {
     # Official Name :       Accepted strings
     'STATE': [],
     'DUTY_CYCLE': [],
     'RPM': [],
+    # TODO remove after feature validation
+    'FPGA_RPM': [],
+    # TODO remove after feature validation
+    'SCALAR_POWER': [],
     'NUM_OF_AIR_PUMP_ATTRIBUTES': [],
 }
 
Index: leahi_dialin/td/modules/air_pump.py
===================================================================
diff -u -rb246e7473d3ccac5327b9967c1ca2798d0c5452e -re8bdeec38984b4b800f6d0eca8b9097800efbf40
--- leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision b246e7473d3ccac5327b9967c1ca2798d0c5452e)
+++ leahi_dialin/td/modules/air_pump.py	(.../air_pump.py)	(revision e8bdeec38984b4b800f6d0eca8b9097800efbf40)
@@ -52,7 +52,11 @@
             td_enum_repository.TDAirPumpNames.H12_AIR_PUMP.name: {
                 td_enum_repository.TDAirPumpAttributes.STATE.name: 0,
                 td_enum_repository.TDAirPumpAttributes.DUTY_CYCLE.name: 0,
-                td_enum_repository.TDAirPumpAttributes.RPM.name: 0
+                td_enum_repository.TDAirPumpAttributes.RPM.name: 0,
+                # TODO remove after FPGA air pump speed validation
+                td_enum_repository.TDAirPumpAttributes.FPGA_RPM.name: 0,
+                # TODO remove after FPGA air pump speed validation
+                td_enum_repository.TDAirPumpAttributes.SCALAR_POWER.name: 0
             }
         }
 
@@ -71,6 +75,10 @@
         sensor_list.append((td_enum_repository.TDAirPumpAttributes.STATE.name, 'i'))
         sensor_list.append((td_enum_repository.TDAirPumpAttributes.DUTY_CYCLE.name, 'f'))
         sensor_list.append((td_enum_repository.TDAirPumpAttributes.RPM.name, 'i'))
+        # TODO remove after FPGA air pump speed validation
+        sensor_list.append((td_enum_repository.TDAirPumpAttributes.FPGA_RPM.name, 'i'))
+        # TODO remove after FPGA air pump speed validation
+        sensor_list.append((td_enum_repository.TDAirPumpAttributes.SCALAR_POWER.name, 'i'))
         
         i = 1
         for sensor in sensor_list:
Index: leahi_dialin/td/modules/air_trap.py
===================================================================
diff -u -r63551aca47d43cfa87a154f94f00485605db6a68 -re8bdeec38984b4b800f6d0eca8b9097800efbf40
--- leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision 63551aca47d43cfa87a154f94f00485605db6a68)
+++ leahi_dialin/td/modules/air_trap.py	(.../air_trap.py)	(revision e8bdeec38984b4b800f6d0eca8b9097800efbf40)
@@ -67,6 +67,10 @@
         }
         self.air_control = 0
         self.airTrapState = 0
+        # TODO remove after testing
+        self.AirPumpLowerPowerLevel = 0
+        # TODO remove after testing
+        self.AirPumpRaisePowerLevel = 0
         self.td_air_trap_timestamp = 0.0
 
 
@@ -99,6 +103,12 @@
             message['message'][MsgFieldPositions.START_POS_FIELD_7:MsgFieldPositions.END_POS_FIELD_7]))
         air_trap_state = struct.unpack('i', bytearray(
             message['message'][MsgFieldPositions.START_POS_FIELD_8:MsgFieldPositions.END_POS_FIELD_8]))
+        #TODO remove after testing
+        lower_power = struct.unpack('i', bytearray(
+            message['message'][MsgFieldPositions.START_POS_FIELD_9:MsgFieldPositions.END_POS_FIELD_9]))
+        # TODO remove after testing
+        raise_power = struct.unpack('i', bytearray(
+        message['message'][MsgFieldPositions.START_POS_FIELD_10:MsgFieldPositions.END_POS_FIELD_10]))
 
         self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H17_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name] = lower[0]
         self.air_trap_level_sensors[td_enum_repository.TDAirTrapLevelSensorNames.H16_LEVEL.name][td_enum_repository.TDAirTrapLevelSensorAttributes.LEVEL.name] = upper[0]
@@ -108,6 +118,8 @@
         self.air_trap_valve_states[td_enum_repository.TDAirTrapValveNames.H20_VALV.name] = h20_vlv_st[0]
         self.air_control = controlling[0]
         self.airTrapState = air_trap_state[0]
+        self.AirPumpLowerPowerLevel = lower_power[0]
+        self.AirPumpRaisePowerLevel = raise_power[0]
         self.td_air_trap_timestamp = timestamp