Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml
===================================================================
diff -u -rc9f8f8cf3c6c37fc6460d8675c62c9442c4d4263 -r2b8b5f01a15397b7a32a312f2f3d14f05ac99355
--- sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision c9f8f8cf3c6c37fc6460d8675c62c9442c4d4263)
+++ sources/gui/qml/dialogs/DiagnosticsDialog.qml	(.../DiagnosticsDialog.qml)	(revision 2b8b5f01a15397b7a32a312f2f3d14f05ac99355)
@@ -107,12 +107,14 @@
             vDGPressures.roOutletPSI    .toFixed(2) ,
             vDGPressures.drainInletPSI  .toFixed(2) ,
             vDGPressures.drainOutletPSI .toFixed(2) ,
+            vDGPressures.barometricPSI  .toFixed(2) ,
         ]
         label: [
             "PPi",
             "PPo",
             "PRd",
             "PDr",
+            "bar",
         ]
     }
 
@@ -139,9 +141,9 @@
         x: col(4)
         y: row(0)
         model: [
-            vDGHeaters.mainPrimaryDC    .toFixed(2),
-            vDGHeaters.smallPrimaryDC   .toFixed(2),
-            vDGHeaters.trimmerDC        .toFixed(2),
+            vDGHeaters.mainPrimayHeaterDC       .toFixed(2),
+            vDGHeaters.smallPrimaryHeaterDC     .toFixed(2),
+            vDGHeaters.trimmerHeaterDC          .toFixed(2),
         ]
         label: [
             "HP1",
@@ -184,10 +186,18 @@
             vDGTemperatures.inletDialysate              .toFixed(2) ,
             vDGTemperatures.primaryHeaterThermoCouple   .toFixed(2) ,
             vDGTemperatures.trimmerHeaterThermoCouple   .toFixed(2) ,
-            // vDGTemperatures.primaryHeaterColdJunction   .toFixed(2) ,
-            // vDGTemperatures.trimmerHeaterColdJunction   .toFixed(2) ,
+            vDGTemperatures.primaryHeaterColdJunction   .toFixed(2) ,
+            vDGTemperatures.trimmerHeaterColdJunction   .toFixed(2) ,
             vDGTemperatures.primaryHeaterInternal       .toFixed(2) ,
             vDGTemperatures.trimmerHeaterInternal       .toFixed(2) ,
+            vDGTemperatures.fpgaBoard                   .toFixed(2) ,
+            vDGTemperatures.loadCellA1B1                .toFixed(2) ,
+            vDGTemperatures.loadCellA2B2                .toFixed(2) ,
+            vDGTemperatures.internalTHDORTD             .toFixed(2) ,
+            vDGTemperatures.internalTDIRTD              .toFixed(2) ,
+            vDGTemperatures.interalTHDRTD               .toFixed(2) ,
+            vDGTemperatures.internalCondSnsrTemp        .toFixed(2) ,
+            vDGTemperatures.baroTempSensor              .toFixed(2) ,
         ]
         label: [
             "TPi"   ,
@@ -199,18 +209,26 @@
             "TDi"   ,
             "HP.Trm",
             "HR.Trm",
-            // "HP.CJ" ,
-            // "HR.CJ" ,
+            "HP.Cld",
+            "HR.Cld",
             "HP.Int",
             "HR.Int",
+            "fpga"  ,
+            "cell11",
+            "cell22",
+            "iTHDO" ,
+            "iTDI"  ,
+            "iTHD"  ,
+            "iCond" ,
+            "baro"  ,
         ]
     }
 
     DebugDataColumn { id: _DGConductivityColumn
         textObjectName  :"_DGConductivityData"
         title           : qsTr(" Conduct ")
         x: col(3.7)
-        y: row(3.0)
+        y: row(3.2)
         model: [
             vDGConductivity.RORejectionRatio    .toFixed(3),
             vDGConductivity.CPi                 .toFixed(1),
@@ -230,8 +248,8 @@
     DebugDataColumn { id: _HDAirColumn
         textObjectName  :"_HDAirData"
         title           : qsTr(" Air Status ")
-        x: col(6)
-        y: row(4.1)
+        x: col(3.0)
+        y: row(5.5)
         model: [
             vHDAirBubble    .venousAirBubbleStatus  ,
             vHDAirTrap      .airTrapLowerLevel      ,
@@ -248,7 +266,7 @@
         textObjectName  :"_DGOperationModeData"
         title           : qsTr(" DG Mode ")
         x: col(2.5)
-        y: row(1.7)
+        y: row(1.9)
         model: [
             vDGOperationMode.text ,
         ]
@@ -260,7 +278,7 @@
         textObjectName  :"_HDBloodFlowData"
         title           : qsTr(" BP ")
         x: col(0)
-        y: row(2.4)
+        y: row(2.6)
         model: [
             vTreatmentBloodFlow.bloodFlow_FlowSetPoint                 ,
             vTreatmentBloodFlow.bloodFlow_MeasuredFlow     .toFixed(2) ,
@@ -287,7 +305,7 @@
         textObjectName  :"_HDDialysateInletFlowData"
         title           : qsTr(" DPi ")
         x: col(1.2)
-        y: row(2.4)
+        y: row(2.6)
         model: [
             vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint   .toFixed(2) ,
             vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow   .toFixed(2) ,
@@ -312,7 +330,7 @@
         textObjectName  :"_HDDialysateOutletFlowData"
         title           : qsTr(" UF/DPo ")
         x: col(2.4)
-        y: row(2.4)
+        y: row(2.6)
         model: [
             vTreatmentUltrafiltration.ultrafiltration_RefUFVol       .toFixed(3) ,
             vTreatmentUltrafiltration.ultrafiltration_MeasUFVol      .toFixed(3) ,
@@ -337,7 +355,7 @@
         textObjectName  :"_HDPressureOcclusionData"
         title           : qsTr(" Prsr Oc ")
         x: col(3.7)
-        y: row(1.7)
+        y: row(1.9)
         model: [
             vTreatmentPressureOcclusion.arterialPressure             .toFixed(2) ,
             vTreatmentPressureOcclusion.venousPressure               .toFixed(2) ,
@@ -354,7 +372,7 @@
         textObjectName  :"_HDSyringePumpData"
         title           : qsTr(" Syringe ")
         x: col(4.6)
-        y: row(1.7)
+        y: row(1.9)
         model: [
             vHDSyringePump.syringePumpState                 ,
             vHDSyringePump.heparinState                     ,
@@ -387,7 +405,7 @@
         textObjectName  :"_HDOperationModeData"
         title           : qsTr(" HD Mode ")
         x: col(0.5)
-        y: row(1.7)
+        y: row(1.9)
         model: [
             vHDOperationMode.text ,
         ]
@@ -455,7 +473,7 @@
     DebugDataColumn { id: _HDAlarmTopColumn
         textObjectName  :"_HDAlarmTopData"
         title           : qsTr(" Alarms ")
-        x: col(6)
+        x: col(5)
         y: row(5.5)
         model: [
             _alarmItem.alarm_AlarmID ,
@@ -521,9 +539,9 @@
     DebugDataColumn { id: _PreTreatmentStatesColumn
         textObjectName  :"_PreTreatmentStatesData"
         title           : qsTr(" PreTx States ")
-        x: col(1.0)
+        x: col(1.5)
         y: row(5.5)
-        model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9"
+        model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9,%10,%11"
             .arg(vPreTreatmentStates.subMode                 )
             .arg(vPreTreatmentStates.waterSampleState        )
             .arg(vPreTreatmentStates.selfTestConsumablesState)
@@ -533,7 +551,10 @@
             .arg(vPreTreatmentStates.primeState              )
             .arg(vPreTreatmentStates.recirculateState        )
             .arg(vPreTreatmentStates.patientConnectionState  )
+            .arg(vPreTreatmentStates.wetSelfTestsState       )
+            .arg(vPreTreatmentStates.preTreatmentRsrvrState  )
         ]
+        fontPixelSizeText: 30
     }
 
     Text { id : _mouseEventCountText