Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml
===================================================================
diff -u -r64d551143d898bf2ce79cb564e5a3389eb9be91e -r4ae0f0abdbe4edfcd93dbf5b0240417f1f079586
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml	(.../DiagnosticsDD.qml)	(revision 64d551143d898bf2ce79cb564e5a3389eb9be91e)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml	(.../DiagnosticsDD.qml)	(revision 4ae0f0abdbe4edfcd93dbf5b0240417f1f079586)
@@ -27,6 +27,7 @@
  */
 DiagnosticsBase { id: _root
     objectName  : "_DiagnosticsDD"
+    verticalSpacing: Variables.defaultMargin * 0.5
 
     contentItem : Item { id: _content
 
@@ -257,47 +258,30 @@
 
         DebugDataColumn { id: _DDPressureColumn
             textObjectName  :"_DDPressureData"
-            title           : qsTr(" Pressure ")
+            title           : qsTr("[0x1C] Pressure ")
             anchors {
                 top         : parent.top
                 left        : _DDTemperatureColumn.right
                 leftMargin  : spacing
             }
             model: [
-                vDDPressures.waterInletPSI      .toFixed(2),
-                vDDPressures.waterOutletPSI     .toFixed(2),
-                vDDPressures.hydrolicOutletPSI  .toFixed(2),
-                vDDPressures.bicarbBagPSI       .toFixed(2),
-                vDDPressures.spentDialysatePSI  .toFixed(2),
-                vDDPressures.freshDialysatePSI  .toFixed(2),
-                vDDPressures.transmembranePSI   .toFixed(2),
-                vDDPressures.waterInletTemp     .toFixed(2),
-                vDDPressures.waterOutletTemp    .toFixed(2),
-                vDDPressures.hydrolicOutletTemp .toFixed(2),
-                vDDPressures.bicarbBagTemp      .toFixed(2),
-                vDDPressures.spentDialysateTemp .toFixed(2),
-                vDDPressures.freshDialysateTemp .toFixed(2),
-                vDDPressures.transmembraneTemp  .toFixed(2),
+                vDDPressures.d9Pressure   .toFixed(2),
+                vDDPressures.d66Pressure  .toFixed(2),
+                vDDPressures.d51Pressure  .toFixed(2),
+                vDDPressures.d18Pressure  .toFixed(2),
+                vDDPressures.d41Pressure  .toFixed(2),
+                vDDPressures.d87Pressure  .toFixed(2),
             ]
             label: [
-                "WInPSI   (M1)     ",
-                "WOutPSI  (M3)     ",
-                "HOutPSI  (D9)     ",
-                "BBagPSI  (D66)    ",
-                "SDialPSI (D51)    ",
-                "FDialPSI (D18)    ",
-                "TransPSI (D41)    ",
-                "WInTmp   (M1)     ",
-                "WOutTmp  (M3)     ",
-                "HOutTmp  (D9)     ",
-                "BBagTmp  (D66)    ",
-                "SDialTmp (D51)    ",
-                "FDialTmp (D18)    ",
-                "TransTmp (D41)    ",
+                "D9     ",
+                "D66    ",
+                "D51    ",
+                "D18    ",
+                "D41    ",
+                "D87    ",
             ]
         }
 
-
         DebugDataColumn { id: _DDOpModeColumn
             textObjectName  :"_DDOpModeColumn"
             title           : qsTr("[0x13] OpMode ")
@@ -321,7 +305,7 @@
             title           : qsTr("[0x2F] GenDial ")
             anchors {
                 top         : _DDOpModeColumn.bottom
-                topMargin   : spacing
+                topMargin   : verticalSpacing
                 left        : _DDOpModeColumn.left
             }
             model: [
@@ -343,7 +327,7 @@
             title           : qsTr(" Hyd Valve ")
             anchors {
                 top         : _DDGenDialColumn.bottom
-                topMargin   : spacing
+                topMargin   : verticalSpacing
                 left        : _DDGenDialColumn.left
             }
 
@@ -388,7 +372,7 @@
             title           : qsTr("[0x1F] Conductivity ")
             anchors {
                 top         : _DDDialysatePumpColumn.bottom
-                topMargin   : spacing
+                topMargin   : verticalSpacing
                 left        : _DDDialysatePumpColumn.left
             }
             model: [
@@ -409,32 +393,35 @@
 
         DebugDataColumn { id: _DDLevelColumn
             textObjectName  :"_DDLevelData"
-            title           : qsTr(" Levels ")
+            title           : qsTr("[0x29] Levels ")
             anchors {
-                top         : _DDPressureColumn.bottom
-                topMargin   : spacing
-                left        : _DDPressureColumn.left
+                top         : _DDTemperatureColumn.bottom
+                topMargin   : verticalSpacing
+                left        : _DDTemperatureColumn.left
             }
             model: [
-                vDDLevel.floaterLevel         ,
-                vDDLevel.bicarbLevel          ,
-                vDDLevel.spentDialysateLevel  ,
+                vDDLevel.d46Level       ,
+                vDDLevel.d63Level       ,
+                vDDLevel.d98Level       ,
+                vDDLevel.d6Level        ,
+                vDDLevel.bicardLevel    ,
             ]
             label: [
-                "floater (D6)  ",
-                "bicarb (D63)  ",
-                "sptDial (D46) ",
+                "D46    ",
+                "D63    ",
+                "D98    ",
+                "D6     ",
+                "bicarb ",
             ]
         }
 
         DebugDataColumn { id: _DDBCValvesColumn
             textObjectName  :"_DDBCValvesData"
             title           : qsTr(" BC Valves ")
             anchors {
-                top         : _DDTemperatureColumn.bottom
-                topMargin   : spacing
-                left        : _DDHeatersColumn.right
-                leftMargin  : spacing
+                top         : _DDBloodLeakColumn.bottom
+                topMargin   : verticalSpacing
+                left        : _DDBloodLeakColumn.left
             }
             model: [
                 Number(vDDValvesStates.balancingChamberValve1 ) ,
@@ -462,9 +449,9 @@
             textObjectName  :"_DDIOValvesColumn"
             title           : qsTr(" IO Valves ")
             anchors {
-                top         : _DDBCValvesColumn.bottom
-                topMargin   : spacing
-                left        : _DDBCValvesColumn.left
+                top         : _DDCondColumn.bottom
+                topMargin   : verticalSpacing
+                left        : _DDCondColumn.left
             }
             model: [
                 Number(vDDValvesStates.ioValve0 ) ,
@@ -481,7 +468,7 @@
             title           : qsTr(" Spare Valves ")
             anchors {
                 top         : _DDHeatersColumn.bottom
-                topMargin   : spacing
+                topMargin   : verticalSpacing
                 left        : _DDHeatersColumn.left
             }
             model: [
@@ -510,9 +497,9 @@
             textObjectName  :"_DDFPValvesColumn"
             title           : qsTr(" FP Valves ")
             anchors {
-                top         : _DDLevelColumn.bottom
-                topMargin   : spacing
-                left        : _DDPressureColumn.left
+                top         : _DDConcentratePumpColumn.bottom
+                topMargin   : verticalSpacing
+                left        : _DDConcentratePumpColumn.left
             }
             model: [
                 Number(vDDValvesStates.fpValve0)    ,
@@ -534,17 +521,35 @@
 
         DebugDataColumn { id: _DDBloodLeakColumn
             textObjectName  :"_DDBloodLeakData"
-            title           : qsTr(" Blood Leak ")
+            title           : qsTr("[0x61] Blood Leak ")
             anchors {
-                top         : _DDConcentratePumpColumn.bottom
-                topMargin   : spacing
-                left        : parent.left
+                top         : _DDPressureColumn.bottom
+                topMargin   : verticalSpacing
+                left        : _DDPressureColumn.left
             }
             model: [
-                vDDBloodLeak.bloodLeak         ,
+                vDDBloodLeak.bloodLeakStatus                        ,
+                vDDBloodLeak.bloodLeakState                         ,
+                vDDBloodLeak.bloodLeakPersistentCounter             ,
+                vDDBloodLeak.bloodLeakSerialCommState               ,
+                vDDBloodLeak.bloodLeakIntensity                     ,
+                vDDBloodLeak.bloodLeakDetect                        ,
+                vDDBloodLeak.bloodLeakIntensityMovingAvg.toFixed(2) ,
+                vDDBloodLeak.bloodLeakTimeSinceZeroMS               ,
+                vDDBloodLeak.driftInRangeStatus                     ,
+                vDDBloodLeak.driftUpperRangeStatus                  ,
             ]
             label: [
-                "BL         ",
+                "Status                      ",
+                "State                       ",
+                "PersistentCounter           ",
+                "SerialCommState             ",
+                "Intensity                   ",
+                "Detect                      ",
+                "IntensityMovingAvg          ",
+                "TimeSinceZeroMS             ",
+                "DriftInRangeStatus          ",
+                "DriftUpperRangeStatus       ",
             ]
         }