Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
===================================================================
diff -u -r3d13050e0319cf30a1686b58c8f2328f6860910a -r3c07dc803109f716937b692cb4a67a5324bb9ca3
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 3d13050e0319cf30a1686b58c8f2328f6860910a)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 3c07dc803109f716937b692cb4a67a5324bb9ca3)
@@ -15,8 +15,8 @@
 
 // Qt
 import QtQuick 2.12
-import Gui.Actions 0.1
 // Project
+import Gui.Actions 0.1
 //  Qml imports
 import "qrc:/globals"
 import "qrc:/components"
@@ -85,10 +85,42 @@
         ]
     }
 
+    DebugDataColumn { id: _TDAirPumpColumn
+        textObjectName  :"_TDAirPumpData"
+        title           : qsTr(" Air Pumps ")
+        x: col(3)
+        y: row(0)
+        model: [
+            vTDAirPump.airPumpState             ,
+            vTDAirPump.airPumpPower             ,
+
+        ]
+        label: [
+            "state  (H12)  ",
+            "power (H12)  ",
+        ]
+    }
+
+    DebugDataColumn { id: _TDAirBubblesColumn
+        textObjectName  :"_TDAirBubblesData"
+        title           : qsTr(" Bubbles ")
+        x: col(3)
+        y: row(1.5)
+        model: [
+            vTDAirBubble.venousAirBubbleStatus            ,
+            vTDAirBubble.venousAirBubbleState             ,
+
+        ]
+        label: [
+            "status (H18)  ",
+            "state (H18)  ",
+        ]
+    }
+
     DebugDataColumn { id: _TDValvesColumn
         textObjectName  :"_TDValvesData"
-        title           : qsTr(" Vlv ")
-        x: col(3)
+        title           : qsTr(" Valves ")
+        x: col(4.5)
         y: row(0)
         model: [
             vTDValves.valveId          ,
@@ -109,8 +141,8 @@
 
     DebugDataColumn { id: _TDEjectorColumn
         textObjectName  :"_TDEjectorData"
-        title           : qsTr(" Ejt ")
-        x: col(4.5)
+        title           : qsTr(" Ejector ")
+        x: col(6)
         y: row(0)
         model: [
             vTDEjector.state                    ,
@@ -126,7 +158,7 @@
     DebugDataColumn { id: _TDSwitchesColumn
         textObjectName  :"_TDSwitchesData"
         title           : qsTr(" Switches ")
-        x: col(6)
+        x: col(7.5)
         y: row(0)
         model: [
             vTDSwitches.door             ,
@@ -137,7 +169,6 @@
         ]
     }
 
-
     DebugDataColumn { id: _TDTXStatesColumn
         textObjectName  :"_TDTxStatesData"
         title           : qsTr(" TXStates ")
@@ -169,25 +200,25 @@
         ]
     }
 
-    DebugDataColumn { id: _TDBatteryCoulumn
-        textObjectName  :"_TDBatterypData"
-        title           : qsTr(" Battery ")
-        x: col(1.5)
-        y: row(3.5)
+    DebugDataColumn { id: _TDOpModeColumn
+        textObjectName  :"_TDOpmodeData"
+        title           : qsTr(" Opmode ")
+        x: col(0)
+        y: row(7)
         model: [
-            vTDBattery.acPower          ,
-            vTDBattery.capacity         ,
+            vTDOpMode.opMode   ,
+            vTDOpMode.subMode
         ]
         label: [
-            "AC     ",
-            "cap    ",
+            "opMode    " ,
+            "subMode     "
         ]
     }
 
     DebugDataColumn { id: _TDVoltageCoulumn
         textObjectName  :"_TDVoltageData"
-        title           : qsTr(" Vol ")
-        x: col(3)
+        title           : qsTr(" Volume ")
+        x: col(1.5)
         y: row(3.5)
         model: [
             vTDVoltage.line_1_2V    .toFixed(2) ,
@@ -217,6 +248,41 @@
         ]
     }
 
+    DebugDataColumn { id: _TDPressureOcclusionCoulumn
+        textObjectName  :"_TDPressureData"
+        title           : qsTr(" Pressure ")
+        x: col(3)
+        y: row(3.5)
+        model: [
+            vTreatmentPressureOcclusion.arterialPressure    .toFixed(2),
+            vTreatmentPressureOcclusion.venousPressure                 ,
+            vTreatmentPressureOcclusion.limitState                     ,
+            vTreatmentPressureOcclusion.arterialMin                    ,
+            vTreatmentPressureOcclusion.arterialMax                    ,
+            vTreatmentPressureOcclusion.venousMin                      ,
+            vTreatmentPressureOcclusion.venousMax                      ,
+            vTreatmentPressureOcclusion.arterialLongFilter  .toFixed(2),
+            vTreatmentPressureOcclusion.venousLongFilter    .toFixed(2),
+            vTreatmentPressureOcclusion.tmpPressure         .toFixed(2),
+            vTreatmentPressureOcclusion.tmpMin              .toFixed(2),
+            vTreatmentPressureOcclusion.tmpMax              .toFixed(2)
+        ]
+        label: [
+            "Arterial (H12) " ,
+            "Venous (H14)   " ,
+            "limit          " ,
+            "artMin (H12)   " ,
+            "artMax (H12)   " ,
+            "venMin (H14)   " ,
+            "venMax (H14)   " ,
+            "aLong (H12)    " ,
+            "vLong (H14)    " ,
+            "TMP            " ,
+            "tmpMin         " ,
+            "tmpMax         " ,
+        ]
+    }
+
     DebugDataColumn { id: _TDTemperatureCoulumn
         textObjectName  :"_TDTemperatureData"
         title           : qsTr(" Temp ")
@@ -230,7 +296,22 @@
         ]
     }
 
+    DebugDataColumn { id: _TDBatteryCoulumn
+        textObjectName  :"_TDBatteryData"
+        title           : qsTr(" Battery ")
+        x: col(6)
+        y: row(3.5)
+        model: [
+            vTDBattery.acPower          ,
+            vTDBattery.capacity         ,
+        ]
+        label: [
+            "AC     ",
+            "cap    ",
+        ]
+    }
 
+
     // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version.
     TouchRect {
         x           : col(9.0)