Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -r42c02ce3428eecfd017c1567b0e20829acc0912f -r26a05ea7e6dd3078331b2175927b00327c7419b4
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 42c02ce3428eecfd017c1567b0e20829acc0912f)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 26a05ea7e6dd3078331b2175927b00327c7419b4)
@@ -202,15 +202,45 @@
         textObjectName: "_DGTemperaturesData"
     }
 
-    // Next row
-    DebugDataColumn { id: _DGValvesStatesColumn
+    DebugDataColumn { id: _DGConductivityColumn
         x: col(3.8)
-        y: row(5.2)
-        title: qsTr(" Valves ")
-        model: [ vDGValvesStates.text ]
-        textObjectName: "_DGValvesStatesData"
+        y: row(3.5)
+        title: qsTr(" Conduct ")
+        model: [
+            vDGConductivity.RORejectionRatio    .toFixed(3),
+            vDGConductivity.CPi                 .toFixed(1),
+            vDGConductivity.CPo                 .toFixed(1),
+            vDGConductivity.CD1                 .toFixed(1),
+            vDGConductivity.CD2                 .toFixed(1),
+        ]
+        label: [
+            "ROrr" ,
+            "CPi"  ,
+            "CPo"  ,
+            "CD1"  ,
+            "CD2"  ,
+        ]
+
+        textObjectName: "_DGConductivityData"
     }
 
+    DebugDataColumn { id: _HDAirColumn
+        x: col(6)
+        y: row(4.1)
+        title: qsTr(" Air Status ")
+        model: [
+            vHDAirBubble    .venousAirBubbleStatus              ,
+            vHDAirTrap      .airTrapLowerLevel                  ,
+            vHDAirTrap      .airTrapUpperLevel                  ,
+        ]
+        label: [
+            "ADV",
+            "ATll",
+            "ATul",
+        ]
+        textObjectName: "_HDAirData"
+    }
+
     DebugDataColumn { id: _DGOperationModeColumn
         x: col(2.5)
         y: row(2)
@@ -298,22 +328,18 @@
     }
 
     DebugDataColumn { id: _HDPressureOcclusionColumn
-        x: col(3.6)
-        y: row(2.8)
+        x: col(3.7)
+        y: row(2)
         title: qsTr(" Prsr Oc ")
         model: [
             vTreatmentPressureOcclusion.arterialPressure             .toFixed(2) ,
             vTreatmentPressureOcclusion.venousPressure               .toFixed(2) ,
-            vTreatmentPressureOcclusion.bloodPumpOcclusion                       ,
-            vTreatmentPressureOcclusion.dialysateInletPumpOcclusion              ,
-            vTreatmentPressureOcclusion.dialysateOutletPumpOcclusion
+            vTreatmentPressureOcclusion.bloodPumpOcclusion
         ]
         label: [
             "PBA" ,
             "PBo" ,
-            "OB" ,
-            "ODi" ,
-            "ODo" ,
+            "OB"  ,
         ]
 
         textObjectName: "_PressureOcclusionData"
@@ -363,7 +389,7 @@
 
     Text { id : _canbusFaultCountText
         x: col(0)
-        y: row(6)
+        y: row(6.8)
         property int count: 0
         visible: true
         text: qsTr("CAN Faults: %1").arg(count)
@@ -372,66 +398,67 @@
         font.pixelSize: 38
     }
 
-    DebugDataColumn { id: _HDAccelerometerColumn
+    DebugDataColumn { id: _DGValvesStatesColumn
         x: col(7)
-        y: row(3.2)
-        title: qsTr(" HD Acc ")
+        y: row(0)
+        title: qsTr(" DG Valves ")
         model: [
-            vHDAccelerometer.x     .toFixed(3) ,
-            vHDAccelerometer.y     .toFixed(3) ,
-            vHDAccelerometer.z     .toFixed(3) ,
-            vHDAccelerometer.xMax  .toFixed(3) ,
-            vHDAccelerometer.yMax  .toFixed(3) ,
-            vHDAccelerometer.zMax  .toFixed(3) ,
-            vHDAccelerometer.xTilt .toFixed(3) ,
-            vHDAccelerometer.yTilt .toFixed(3) ,
-            vHDAccelerometer.zTilt .toFixed(3)
+            vDGValvesStates.valveStates_01,
+            vDGValvesStates.valveStates_02,
+            vDGValvesStates.valveStates_03,
+            vDGValvesStates.valveStates_04,
+            vDGValvesStates.valveStates_05,
+            vDGValvesStates.valveStates_06,
+            vDGValvesStates.valveStates_07,
+            vDGValvesStates.valveStates_08,
+            vDGValvesStates.valveStates_09,
+            vDGValvesStates.valveStates_10,
+            vDGValvesStates.valveStates_11,
+            vDGValvesStates.valveStates_12,
+            vDGValvesStates.valveStates_13,
         ]
         label: [
-            "x"     ,
-            "y"     ,
-            "z"     ,
-            "xMax"  ,
-            "yMax"  ,
-            "zMax"  ,
-            "x°"    ,
-            "y°"    ,
-            "z°"    ,
+            "VRF",
+            "VRI",
+            "VRD",
+            "VRO",
+            "VPO",
+            "VBF",
+            "VRC",
+            "VDR",
+            "VPI",
+            "VSP",
+            "VR1",
+            "VR2",
+            "VRD",
         ]
-        textObjectName: "_HDAccelerometerData"
+
+        textObjectName: "_DGValveData"
     }
 
-    DebugDataColumn { id: _DGAccelerometerColumn
+    DebugDataColumn { id: _HDBloodLeakColumn
         x: col(7)
-        y: row(0)
-        title: qsTr(" DG Acc ")
+        y: row(4.4)
+        title: qsTr(" BLD ")
         model: [
-            vDGAccelerometer.x     .toFixed(3) ,
-            vDGAccelerometer.y     .toFixed(3) ,
-            vDGAccelerometer.z     .toFixed(3) ,
-            vDGAccelerometer.xMax  .toFixed(3) ,
-            vDGAccelerometer.yMax  .toFixed(3) ,
-            vDGAccelerometer.zMax  .toFixed(3) ,
-            vDGAccelerometer.xTilt .toFixed(3) ,
-            vDGAccelerometer.yTilt .toFixed(3) ,
-            vDGAccelerometer.zTilt .toFixed(3)
+            vHDBloodLeak.bloodLeakDetectSetPoint                        ,
+            vHDBloodLeak.bloodLeakZeroedStatus                          ,
+            vHDBloodLeak.bloodLeakState                                 ,
+            vHDBloodLeak.bloodLeakDetectLevel                           ,
         ]
         label: [
-            "x"     ,
-            "y"     ,
-            "z"     ,
-            "xMax"  ,
-            "yMax"  ,
-            "zMax"  ,
-            "x°"    ,
-            "y°"    ,
-            "z°"    ,
+            "SetPt" ,
+            "0Stat"  ,
+            "State"  ,
+            "DtLvl"  ,
+
         ]
-        textObjectName: "_DGAccelerometerData"
+
+        textObjectName: "_DGConductivityData"
     }
 
     TouchRect {
-        x           : col(6)
+        x           : col(6.6)
         y           : row(5.8)
         width       : 150
         height      : 35
@@ -440,10 +467,11 @@
     }
 
     DebugDataColumn { id: _HDVersionsColumn
-        x: col(6)
+        x: col(6.8)
         y: row(6)
+        fontPixelSizeText: 30
         title: ""
-        model: [ "HD: v%1.%2.%3-%4 %5 v%6.%7 %8"
+        model: [ "HD: v%1.%2.%3-%4 %5 v%6.%7 %8 CRev: %9"
             .arg(vAdjustmentVersions.hdVerMajor)
             .arg(vAdjustmentVersions.hdVerMinor)
             .arg(vAdjustmentVersions.hdVerMicro)
@@ -452,14 +480,16 @@
             .arg(vAdjustmentVersions.hdVerFPGAMajor)
             .arg(vAdjustmentVersions.hdVerFPGAMinor)
             .arg(vAdjustmentVersions.hdVerFPGALab)
+            .arg(vAdjustmentVersions.hdVerCompatibilityRev)
         ]
         textObjectName: "_HDVersions"
     }
     DebugDataColumn { id: _DGVersionsColumn
-        x: col(6)
+        x: col(6.8)
         y: row(6.5)
+        fontPixelSizeText: 30
         title: ""
-        model: [ "DG: v%1.%2.%3-%4 %5 v%6.%7 %8"
+        model: [ "DG: v%1.%2.%3-%4 %5 v%6.%7 %8 CRev: %9"
             .arg(vAdjustmentVersions.dgVerMajor)
             .arg(vAdjustmentVersions.dgVerMinor)
             .arg(vAdjustmentVersions.dgVerMicro)
@@ -468,14 +498,15 @@
             .arg(vAdjustmentVersions.dgVerFPGAMajor)
             .arg(vAdjustmentVersions.dgVerFPGAMinor)
             .arg(vAdjustmentVersions.dgVerFPGALab)
+            .arg(vAdjustmentVersions.dgVerCompatibilityRev)
         ]
         textObjectName: "_DGVersions"
     }
 
 
     Text { id : _mouseEventCountText
         x: col(2)
-        y: row(6)
+        y: row(6.8)
         visible: true
         text: String("Touch Count: %1,%2")
         .arg(GuiEventSpy.touchCount   /*.toString().padStart(4,'0')*/ )
@@ -490,8 +521,8 @@
     }
 
     DebugDataColumn { id: _PreTreatmentStates
-        x: col(1)
-        y: row(6.5)
+        x: col(1.5)
+        y: row(6)
         title: qsTr(" PreTx States ")
         model: [ "%1, %2, %3, %4, %5, %6, %7, %8"
             .arg(vPreTreatmentStates.subMode                 )
@@ -506,6 +537,20 @@
         textObjectName: "_PreTreatmentStates"
     }
 
+    DebugDataColumn { id: _HDAlarmTop
+        x: col(3)
+        y: row(6)
+        title: qsTr(" Alarms ")
+        model: [
+            _alarmItem.alarm_AlarmID,
+        ]
+        label: [
+            "Top" ,
+        ]
+
+        textObjectName: "_HDAlarmTopData"
+    }
+
     Connections { target: _GuiView
         onDidActionReceive: {
             if (vAction === GuiActions.ID_CANBusFaultCount ) {