Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -r43ae56f762e6f3e1416d39e3d16f9103fc597e41 -r9d27f14c2b528c0f199004614f10d55589e08614
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 43ae56f762e6f3e1416d39e3d16f9103fc597e41)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 9d27f14c2b528c0f199004614f10d55589e08614)
@@ -59,29 +59,29 @@
         onClicked       : close()
     }
 
-    DebugDataColumn { id: _TDBloodPumpColumn
-        textObjectName  :"_TDBloodPumpData"
+    DebugDataColumn { id: _TDBloodFlowColumn
+        textObjectName  :"_TDBloodFlowData"
         title           : qsTr(" BP(H4)")
         x: col(0)
         y: row(0)
         model: [
-            vTreatmentBloodFlow.flowSetPoint                  ,
-            vTreatmentBloodFlow.measuredFlow      .toFixed(2) ,
-            vTreatmentBloodFlow.rotorSpeed        .toFixed(2) ,
-            vTreatmentBloodFlow.motorSpeed        .toFixed(2) ,
-            vTreatmentBloodFlow.motorCtlCurrent   .toFixed(2) ,
-            vTreatmentBloodFlow.rPM               .toFixed(2) ,
-            vTreatmentBloodFlow.rotorCount                    ,
-            vTreatmentBloodFlow.presFlow                      ,
-            vTreatmentBloodFlow.rotorHall                     ,
+            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   (H4)   ",
             "mFlow   (H4)   ",
             "rSpd    (H4)   ",
             "mSpd    (H4)   ",
-            "mCurr   (H4)    ",
+            "mCurr   (H4)   ",
             "RPM     (H4)   ",
             "rCnt    (H4)   ",
             "pFlow   (H4)   ",
@@ -110,7 +110,7 @@
             "rATH   (H16)",
             "IState (H13)",
             "OState (H20)",
-            "ctrl",
+            "ctrl        ",
         ]
     }
 
@@ -158,7 +158,7 @@
         x: col(6)
         y: row(0)
         model: [
-            vTDSwitches.door            ,
+            vTDSwitches.door             ,
             vTreatmentBloodFlow.rotorHall,
 
         ]
@@ -175,7 +175,7 @@
         x: col(0)
         y: row(3.5)
         model: [
-            vTDBattery.aCPower          ,
+            vTDBattery.acPower          ,
             vTDBattery.capacity         ,
         ]
         label: [
@@ -203,7 +203,7 @@
             vTDVoltage.fpgaVpvn     .toFixed(2)
         ]
         label: [
-            "1.2V",
+            "1.2V"  ,
             "3.3V"  ,
             "L5V"   ,
             "S5V"   ,
@@ -213,7 +213,7 @@
             "Ref"   ,
             "VCC"   ,
             "Vaux"  ,
-            "VPN"
+            "VPN"   ,
         ]
     }
 
@@ -233,23 +233,33 @@
 
     DebugDataColumn { id: _TDTXStatesColumn
         textObjectName  :"_TDTxStatesData"
-        title           : ""
-        horizontalAlignmentText: Text.AlignLeft
-        fontPixelSizeText: Fonts.fontPixelDebugTitle
+        title           : qsTr(" TXStates ")
         x: col(0)
         y: row(7)
-        model: [ "TX States: %1 %2 %3 %4 %5 %6 %7 %8 %9 %10"
-            .arg(vTDTreatmentStates.subMode             )
-            .arg(vTDTreatmentStates.txBloodPrime        )
-            .arg(vTDTreatmentStates.txDialysis          )
-            .arg(vTDTreatmentStates.ufState             )
-            .arg(vTDTreatmentStates.txStop              )
-            .arg(vTDTreatmentStates.txRinseback         )
-            .arg(vTDTreatmentStates.txRecirculate       )
-            .arg(vTDTreatmentStates.txEnd               )
-            .arg(vTDTreatmentStates.salineState         )
-            .arg(vTDTreatmentStates.heparin             )
+        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        " ,
+        ]
     }