Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
===================================================================
diff -u -r024129d0aa4be9de46b0b223d2980a7be4747f15 -r291906e7a62816a10cb424389df9ac3704aa8dc3
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 024129d0aa4be9de46b0b223d2980a7be4747f15)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 291906e7a62816a10cb424389df9ac3704aa8dc3)
@@ -65,50 +65,62 @@
 
         DebugDataColumn { id: _TDAirTrapCoulumn
             textObjectName  :"_TDAirTrapData"
-            title           : qsTr(" Air Trap ")
+            title           : qsTr("[0x2A] Air Trap ")
             anchors {
                 top         : parent.top
                 left        : _TDPressureOcclusionColumn.right
                 leftMargin  : spacing
             }
 
             model: [
-                vTDAirTrap.lowLevel            ,
-                vTDAirTrap.upLevel             ,
-                vTDAirTrap.lowLevelRaw         ,
-                vTDAirTrap.upLevelRaw          ,
-                vTDAirTrap.valveIntakeState    ,
-                vTDAirTrap.valveOutletState    ,
-                vTDAirTrap.controlling         ,
+                vTDAirTrap.h17State                ,
+                vTDAirTrap.h16State                ,
+                vTDAirTrap.h17RawState             ,
+                vTDAirTrap.h16RawState             ,
+                vTDAirTrap.h13State                ,
+                vTDAirTrap.h20State                ,
+                vTDAirTrap.isAutoControlling       ,
+                vTDAirTrap.airTrapState            ,
+                vTDAirTrap.airPumpLowerPowerLevel  ,
+                vTDAirTrap.airPumpRaisePowerLevel  ,
             ]
             label: [
-                "ATL    (H17)",
-                "ATH    (H16)",
-                "rARL   (H17)",
-                "rATH   (H16)",
-                "IState (H13)",
-                "OState (H20)",
-                "ctrl        ",
+                "ATL    (H17)   ",
+                "ATH    (H16)   ",
+                "rARL   (H17)   ",
+                "rATH   (H16)   ",
+                "IState (H13)   ",
+                "OState (H20)   ",
+                "ctrl           ",
+                "AT State       ",
+                "AP Lower PL    ",
+                "AP Rraise PL   ",
             ]
         }
 
         DebugDataColumn { id: _TDAirPumpColumn
             textObjectName  :"_TDAirPumpData"
-            title           : qsTr(" Air Pumps ")
+            title           : qsTr("[0x20] Air Pumps ")
             anchors {
                 top         : _TDAirTrapCoulumn.bottom
                 topMargin   : spacing
                 left        : _TDAirTrapCoulumn.left
             }
 
             model: [
-                vTDAirPump.airPumpState             ,
-                vTDAirPump.airPumpPower             ,
+                vTDAirPump.airPumpState         ,
+                vTDAirPump.airPumpRPM           ,
+                vTDAirPump.airPumpPower         ,
+                vTDAirPump.airPumpFGPARPM       ,
+                vTDAirPump.airPumpScalarPower   ,
 
             ]
             label: [
-                "state  (H12)  ",
-                "power (H12)  ",
+                "state  (H12)       ",
+                "RPM (H12)          ",
+                "power (H12)        ",
+                "FPGA RPM (H12)     ",
+                "scalar power       ",
             ]
         }