Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
===================================================================
diff -u -r036d378b4b89db03c812584c1d0f682494d81568 -r7b514a9fc7fa77c7e084c6023c49859d95cbcd5a
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 036d378b4b89db03c812584c1d0f682494d81568)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 7b514a9fc7fa77c7e084c6023c49859d95cbcd5a)
@@ -15,7 +15,6 @@
 
 // Qt
 import QtQuick 2.12
-
 // Project
 import Gui.Actions      0.1
 
@@ -87,10 +86,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          ,
@@ -111,8 +142,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                    ,
@@ -128,7 +159,7 @@
     DebugDataColumn { id: _TDSwitchesColumn
         textObjectName  :"_TDSwitchesData"
         title           : qsTr(" Switches ")
-        x: col(6)
+        x: col(7.5)
         y: row(0)
         model: [
             vTDSwitches.door             ,
@@ -139,25 +170,55 @@
         ]
     }
 
-
-    DebugDataColumn { id: _TDBatteryCoulumn
-        textObjectName  :"_TDBatterypData"
-        title           : qsTr(" Battery ")
+    DebugDataColumn { id: _TDTXStatesColumn
+        textObjectName  :"_TDTxStatesData"
+        title           : qsTr(" TXStates ")
         x: col(0)
         y: row(3.5)
         model: [
-            vTDBattery.acPower          ,
-            vTDBattery.capacity         ,
+            Number(vTDTreatmentStates.subMode        ),
+            Number(vTDTreatmentStates.txBloodPrime   ),
+            Number(vTDTreatmentStates.txDialysis     ),
+            Number(vTDTreatmentStates.ufState        ),
+            Number(vTDTreatmentStates.txStop         ),
+            Number(vTDTreatmentStates.txRinseback    ),
+            Number(vTDTreatmentStates.txRecirculate  ),
+            Number(vTDTreatmentStates.txEnd          ),
+            Number(vTDTreatmentStates.salineState    ),
+            Number(vTDTreatmentStates.heparin        ),
         ]
         label: [
-            "AC     ",
-            "cap    ",
+            "subMode    " ,
+            "BPrime     " ,
+            "Dial       " ,
+            "UF         " ,
+            "Stop       " ,
+            "RB         " ,
+            "Recirc     " ,
+            "End        " ,
+            "Saline     " ,
+            "Hep        " ,
         ]
     }
 
+    DebugDataColumn { id: _TDOpModeColumn
+        textObjectName  :"_TDOpmodeData"
+        title           : qsTr(" Opmode ")
+        x: col(0)
+        y: row(7)
+        model: [
+            vTDOpMode.opMode   ,
+            vTDOpMode.subMode
+        ]
+        label: [
+            "opMode    " ,
+            "subMode     "
+        ]
+    }
+
     DebugDataColumn { id: _TDVoltageCoulumn
         textObjectName  :"_TDVoltageData"
-        title           : qsTr(" Vol ")
+        title           : qsTr(" Volume ")
         x: col(1.5)
         y: row(3.5)
         model: [
@@ -188,10 +249,45 @@
         ]
     }
 
+    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 ")
-        x: col(3)
+        x: col(4.5)
         y: row(3.5)
         model: [
             vTDTemperature.boardTemp    .toFixed(2)
@@ -201,43 +297,26 @@
         ]
     }
 
-
-    DebugDataColumn { id: _TDTXStatesColumn
-        textObjectName  :"_TDTxStatesData"
-        title           : qsTr(" TXStates ")
-        x: col(0)
-        y: row(7)
+    DebugDataColumn { id: _TDBatteryCoulumn
+        textObjectName  :"_TDBatteryData"
+        title           : qsTr(" Battery ")
+        x: col(6)
+        y: row(3.5)
         model: [
-            vTDTreatmentStates.subMode      ,
-            vTDTreatmentStates.txBloodPrime ,
-            vTDTreatmentStates.txDialysis   ,
-            vTDTreatmentStates.ufState      ,
-            vTDTreatmentStates.txStop       ,
-            vTDTreatmentStates.txRinseback  ,
-            vTDTreatmentStates.txRecirculate,
-            vTDTreatmentStates.txEnd        ,
-            vTDTreatmentStates.salineState  ,
-            vTDTreatmentStates.heparin      ,
+            vTDBattery.acPower          ,
+            vTDBattery.capacity         ,
         ]
         label: [
-            "subMode    " ,
-            "BPrime     " ,
-            "Dial       " ,
-            "UF         " ,
-            "Stop       " ,
-            "RB         " ,
-            "Recirc     " ,
-            "End        " ,
-            "Saline     " ,
-            "Hep        " ,
+            "AC     ",
+            "cap    ",
         ]
     }
 
 
-    // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version.
+    // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version.
     TouchRect {
-        x           : col(6.0)
-        y           : row(6.4)
+        x           : col(9.0)
+        y           : row(8.0)
         width       : 425
         height      : 80
         onClicked   : vAdjustmentVersions.doAdjustment()