Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
===================================================================
diff -u -r786c598a074df1620995ce09a1166a4f7173add6 -r4a751578dd768d849e6ee6dfa1521f5f1597090d
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 786c598a074df1620995ce09a1166a4f7173add6)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 4a751578dd768d849e6ee6dfa1521f5f1597090d)
@@ -32,7 +32,7 @@
 
         DebugDataColumn { id: _TDBloodFlowColumn
             textObjectName  :"_TDBloodFlowData"
-            title           : qsTr(" BP(H4)")
+            title           : qsTr("[0x11] Blood Flow)")
             anchors {
                 top     : parent.top
                 left    : parent.left
@@ -65,56 +65,68 @@
 
         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       ",
             ]
         }
 
         DebugDataColumn { id: _TDAirBubblesColumn
             textObjectName  :"_TDAirBubblesData"
-            title           : qsTr(" Bubbles ")
+            title           : qsTr("[0x1E] Bubbles ")
             anchors {
                 top         : _TDPressureOcclusionColumn.bottom
                 topMargin   : spacing
@@ -134,32 +146,42 @@
 
         DebugDataColumn { id: _TDValvesColumn
             textObjectName  :"_TDValvesData"
-            title           : qsTr(" Valves ")
+            title           : qsTr("[0X2B] Valves ")
             anchors {
                 top         : parent.top
                 left        : _TDAirTrapCoulumn.right
                 leftMargin  : spacing
             }
             model: [
-                vTDValves.valveId          ,
-                vTDValves.state            ,
-                vTDValves.posName          ,
-                vTDValves.posCount         ,
-                vTDValves.nextPos          ,
+                vTDValves.valveId       ,
+                vTDValves.state         ,
+                vTDValves.currPosID     ,
+                vTDValves.currPos       ,
+                vTDValves.cmdPos        ,
+                vTDValves.posA          ,
+                vTDValves.posB          ,
+                vTDValves.posC          ,
+                vTDValves.posD          ,
+                vTDValves.maxHomingPos  ,
 
             ]
             label: [
-                "ID     ",
-                "state  ",
-                "Name   ",
-                "Cnt    ",
-                "nPos   ",
+                "ID             ",
+                "state          ",
+                "Curr Pos ID    ",
+                "Curr Pos       ",
+                "Cmd Pos        ",
+                "Pos A          ",
+                "Pos B          ",
+                "Pos C          ",
+                "Pos D          ",
+                "Max Homing Pos ",
             ]
         }
 
         DebugDataColumn { id: _TDEjectorColumn
             textObjectName  :"_TDEjectorData"
-            title           : qsTr(" Ejector ")
+            title           : qsTr("[0x4E] Ejector ")
             anchors {
                 top         : parent.top
                 left        : _TDValvesColumn.right
@@ -168,17 +190,21 @@
             model: [
                 vTDEjector.state                    ,
                 vTDEjector.setSpeed    .toFixed(2)  ,
+                vTDEjector.retractOpticalSensor     ,
+                vTDEjector.engageOpticalSensor      ,
 
             ]
             label: [
-                "State  (H5)    ",
-                "Spd    (H5)    " ,
+                "State  (H5)        ",
+                "Spd    (H5)        " ,
+                "Retract Opt Sensor " ,
+                "Engage Opt Sensor  " ,
             ]
         }
 
         DebugDataColumn { id: _TDSwitchesColumn
             textObjectName  :"_TDSwitchesData"
-            title           : qsTr(" Switches ")
+            title           : qsTr("[0x21] Switches ")
             anchors {
                 top         : _TDVoltageCoulumn.bottom
                 topMargin   : spacing
@@ -194,7 +220,7 @@
 
         DebugDataColumn { id: _TDOpModeColumn
             textObjectName  :"_TDOpmodeData"
-            title           : qsTr(" Opmode ")
+            title           : qsTr("[0x12] Opmode ")
             anchors {
                 top         : parent.top
                 left        : _TDEjectorColumn.right
@@ -212,7 +238,7 @@
 
         DebugDataColumn { id: _TDTXStatesColumn
             textObjectName  :"_TDTxStatesData"
-            title           : qsTr(" TXStates ")
+            title           : qsTr("[0x3C] TXStates ")
 
             anchors {
                 top         : _TDOpModeColumn.bottom
@@ -248,34 +274,28 @@
 
         DebugDataColumn { id: _TDVoltageCoulumn
             textObjectName  :"_TDVoltageData"
-            title           : qsTr(" Volume ")
+            title           : qsTr("[0x1D] Voltage ")
             anchors {
                 top         : _TDBloodFlowColumn.bottom
                 topMargin   : spacing
             }
 
             model: [
-                vTDVoltage.line_1_2V    .toFixed(2) ,
-                vTDVoltage.line_3_3V    .toFixed(2) ,
-                vTDVoltage.logic5V      .toFixed(2) ,
-                vTDVoltage.sensors5V    .toFixed(2) ,
-                vTDVoltage.line_24V     .toFixed(2) ,
-                vTDVoltage.regen24V     .toFixed(2) ,
-                vTDVoltage.fpgaAdcRef   .toFixed(2) ,
-                vTDVoltage.presRef      .toFixed(2) ,
-                vTDVoltage.fpgaVcc      .toFixed(2) ,
-                vTDVoltage.fpgaVaux     .toFixed(2) ,
-                vTDVoltage.fpgaVpvn     .toFixed(2)
+                vTDVoltage.line_1_2V   .toFixed(2) ,
+                vTDVoltage.line_3_3V   .toFixed(2) ,
+                vTDVoltage.logic5V     .toFixed(2) ,
+                vTDVoltage.line_24V_1  .toFixed(2) ,
+                vTDVoltage.line_24V_2  .toFixed(2) ,
+                vTDVoltage.fpgaVcc     .toFixed(2) ,
+                vTDVoltage.fpgaVaux    .toFixed(2) ,
+                vTDVoltage.fpgaVpvn    .toFixed(2)
             ]
             label: [
                 "1.2V"  ,
                 "3.3V"  ,
                 "L5V"   ,
-                "S5V"   ,
-                "24V"   ,
-                "R24V"  ,
-                "ADC"   ,
-                "Ref"   ,
+                "24V_1" ,
+                "24V_2" ,
                 "VCC"   ,
                 "Vaux"  ,
                 "VPN"   ,
@@ -284,7 +304,7 @@
 
         DebugDataColumn { id: _TDPressureOcclusionColumn
             textObjectName  :"_TDPressureData"
-            title           : qsTr(" Pressure ")
+            title           : qsTr("[0x24] Pressure ")
 
             anchors {
                 top         : parent.top
@@ -327,7 +347,7 @@
 
         DebugDataColumn { id: _TDTemperatureCoulumn
             textObjectName  :"_TDTemperatureData"
-            title           : qsTr(" Temp ")
+            title           : qsTr("[0x53] Temperature ")
             anchors {
                 top         : _TDValvesColumn.bottom
                 topMargin   : spacing