Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml
===================================================================
diff -u -rc253d3ca9ef234e04747565e500faf88b07fc04e -r9143dd9055ada50b3ec13e7ce0671727a784f38f
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision c253d3ca9ef234e04747565e500faf88b07fc04e)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml	(.../DiagnosticsTD.qml)	(revision 9143dd9055ada50b3ec13e7ce0671727a784f38f)
@@ -30,33 +30,33 @@
 
     title: "Treatment Delivery & Blood Handling"
 
-    DebugDataColumn { id: _TDBloodPumpColumn
-        textObjectName  :"_TDBloodPumpData"
-        title           : qsTr(" BP ")
+    DebugDataColumn { id: _TDBloodFlowColumn
+        textObjectName  :"_TDBloodFlowData"
+        title           : qsTr(" BP(H4)")
         x: col(0)
         y: row(0)
         model: [
-            vTDBloodPump.setFlow                       ,
-            vTDBloodPump.measFlow          .toFixed(2) ,
-            vTDBloodPump.rotorSpeed        .toFixed(2) ,
-            vTDBloodPump.motorSpeed        .toFixed(2) ,
-            vTDBloodPump.currMotor         .toFixed(2) ,
-            vTDBloodPump.setRPM            .toFixed(2) ,
-            vTDBloodPump.pressureFlow                  ,
-            vTDBloodPump.rotationCount                 ,
-            vTDBloodPump.rotorHallState                ,
+            vTreatmentBloodFlow.setFlowRate                 ,
+            vTreatmentBloodFlow.measFlow        .toFixed(2) ,
+            vTreatmentBloodFlow.measRotorSpd    .toFixed(2) ,
+            vTreatmentBloodFlow.measPumpSpd     .toFixed(2) ,
+            vTreatmentBloodFlow.measCurr        .toFixed(2) ,
+            vTreatmentBloodFlow.setRPM          .toFixed(2) ,
+            vTreatmentBloodFlow.rotorCount                  ,
+            vTreatmentBloodFlow.presFlow                    ,
+            vTreatmentBloodFlow.rotorHallState              ,
 
         ]
         label: [
-            "sFLow      ",
-            "mFlow      ",
-            "rSpd       ",
-            "mSpd       ",
-            "cMot       ",
-            "RPM        ",
-            "pFlow      ",
-            "rCnt       ",
-            "state      ",
+            "sFLow   (H4)   ",
+            "mFlow   (H4)   ",
+            "rSpd    (H4)   ",
+            "mSpd    (H4)   ",
+            "mCurr   (H4)   ",
+            "RPM     (H4)   ",
+            "rCnt    (H4)   ",
+            "pFlow   (H4)   ",
+            "rHall   (H6)   ",
         ]
     }
 
@@ -66,20 +66,22 @@
         x: col(1.5)
         y: row(0)
         model: [
-            vTDAirTrap.lowLevel        ,
-            vTDAirTrap.upLevel         ,
-            vTDAirTrap.lowLevelRaw     ,
-            vTDAirTrap.upLevelRaw      ,
-            vTDAirTrap.valveState      ,
-            vTDAirTrap.controlling     ,
+            vTDAirTrap.lowLevel            ,
+            vTDAirTrap.upLevel             ,
+            vTDAirTrap.lowLevelRaw         ,
+            vTDAirTrap.upLevelRaw          ,
+            vTDAirTrap.valveIntakeState    ,
+            vTDAirTrap.valveOutletState    ,
+            vTDAirTrap.controlling         ,
         ]
         label: [
-            "ATL",
-            "ATU",
-            "rATL",
-            "rATU",
-            "state",
-            "ctrl",
+            "ATL    (H17)",
+            "ATH    (H16)",
+            "rARL   (H17)",
+            "rATH   (H16)",
+            "IState (H13)",
+            "OState (H20)",
+            "ctrl        ",
         ]
     }
 
@@ -116,8 +118,8 @@
 
         ]
         label: [
-            "state      ",
-            "Spd        " ,
+            "State  (H5)    ",
+            "Spd    (H5)    " ,
         ]
     }
 
@@ -127,11 +129,11 @@
         x: col(6)
         y: row(0)
         model: [
-            vTDSwitches.door            ,
+            vTDSwitches.door             ,
 
         ]
         label: [
-            "door        ",
+            "door  (H9)  ",
         ]
     }
 
@@ -142,7 +144,7 @@
         x: col(0)
         y: row(3.5)
         model: [
-            vTDBattery.aCPower          ,
+            vTDBattery.acPower          ,
             vTDBattery.capacity         ,
         ]
         label: [
@@ -170,7 +172,7 @@
             vTDVoltage.fpgaVpvn     .toFixed(2)
         ]
         label: [
-            "1.2V",
+            "1.2V"  ,
             "3.3V"  ,
             "L5V"   ,
             "S5V"   ,
@@ -180,7 +182,7 @@
             "Ref"   ,
             "VCC"   ,
             "Vaux"  ,
-            "VPN"
+            "VPN"   ,
         ]
     }
 
@@ -197,6 +199,39 @@
         ]
     }
 
+
+    DebugDataColumn { id: _TDTXStatesColumn
+        textObjectName  :"_TDTxStatesData"
+        title           : qsTr(" TXStates ")
+        x: col(0)
+        y: row(7)
+        model: [
+            vTDTreatmentStates.subMode      ,
+            vTDTreatmentStates.txBloodPrime ,
+            vTDTreatmentStates.txDialysis   ,
+            vTDTreatmentStates.ufState      ,
+            vTDTreatmentStates.txStop       ,
+            vTDTreatmentStates.txRinseback  ,
+            vTDTreatmentStates.txRecirculate,
+            vTDTreatmentStates.txEnd        ,
+            vTDTreatmentStates.salineState  ,
+            vTDTreatmentStates.heparin      ,
+        ]
+        label: [
+            "subMode    " ,
+            "BPrime     " ,
+            "Dial       " ,
+            "UF         " ,
+            "Stop       " ,
+            "RB         " ,
+            "Recirc     " ,
+            "End        " ,
+            "Saline     " ,
+            "Hep        " ,
+        ]
+    }
+
+
     // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version.
     TouchRect {
         x           : col(6.0)