Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml
===================================================================
diff -u -rba15fce14caf76166c286da95974c69f8a24d4b8 -re7a8d5092cb499d6c6ed621eabde437bccbc1e0e
--- sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml	(.../DiagnosticsFP.qml)	(revision ba15fce14caf76166c286da95974c69f8a24d4b8)
+++ sources/gui/qml/dialogs/diagnostics/DiagnosticsFP.qml	(.../DiagnosticsFP.qml)	(revision e7a8d5092cb499d6c6ed621eabde437bccbc1e0e)
@@ -31,40 +31,32 @@
     contentItem : Item { id: _content
 
         DebugDataColumn { id: _FPPressureColumn
-            textObjectName  :"_FPPressureData"
-            title           : qsTr(" Pressure ")
+            textObjectName  : "_FPPressureData"
+            title           : "[0x34]" + qsTr(" Pressure ")
             anchors {
                 top     : parent.top
                 left    : parent.left
             }
 
             model: [
-                vFPPressures.beforePresureRegulator      .toFixed(2) ,
-                vFPPressures.afterPressureRegulator      .toFixed(2) ,
-                vFPPressures.beforeInletConductivity     .toFixed(2) ,
-                vFPPressures.beforeROFilter              .toFixed(2) ,
-                vFPPressures.afterROFilter               .toFixed(2) ,
-                vFPPressures.beforeROPump                .toFixed(2) ,
-                vFPPressures.ROConcentrate               .toFixed(2) ,
-                vFPPressures.ROConcentrateDrop           .toFixed(2) ,
-                vFPPressures.drainDrop                   .toFixed(2) ,
+                vFPPressures.m3Pressure    .toFixed(2) ,
+                vFPPressures.p8Pressure    .toFixed(2) ,
+                vFPPressures.p13Pressure   .toFixed(2) ,
+                vFPPressures.p17Pressure   .toFixed(2) ,
+                vFPPressures.p46Pressure   .toFixed(2) ,
             ]
             label: [
-                "M1 bRegPSI         ",
-                "M3 aRegPSI         ",
-                "P8 bInCond         ",
-                "P13 bROFilter      ",
-                "P17 aROFilter      ",
-                "X1 bROPump         ",
-                "X2 ROConc          ",
-                "X3 dROConc         ",
-                "X4 dDrain          ",
+                "M3     ",
+                "P8     ",
+                "P13    ",
+                "P17    ",
+                "P46    ",
             ]
         }
 
         DebugDataColumn { id: _FPROPumpColumn
-            textObjectName  :"_FPROPumpData"
-            title           : qsTr(" RO Pump ")
+            textObjectName  : "_FPROPumpData"
+            title           : "[0x32]" + qsTr(" RO Pump ")
             anchors {
                 top         : parent.top
                 left        : _FPPressureColumn.right
@@ -96,7 +88,7 @@
 
         DebugDataColumn { id: _FPRoRejectionPercentageColumn
             textObjectName  :"_FPRoRejectionPercentageColumn"
-            title           : qsTr(" RO Rejection Ratio ")
+            title           : "[0x71]" + qsTr(" RO Rejection Ratio ")
             anchors {
                 top         : _FPROPumpColumn.bottom
                 topMargin   : spacing
@@ -120,7 +112,7 @@
 
         DebugDataColumn { id: _FPBoostPumpColumn
             textObjectName  :"_FPBoostPumpData"
-            title           : qsTr(" Boost Pump ")
+            title           : "[0x50]" + qsTr(" Boost Pump ")
             anchors {
                 top         : parent.top
                 left        : _FPROPumpColumn.right
@@ -152,69 +144,61 @@
 
         DebugDataColumn { id: _FPTemperatureColumn
             textObjectName  :"_FPTemperatureData"
-            title           : qsTr(" Temperature ")
+            title           : "[0x39]" + qsTr(" Temperature ")
             anchors {
                 top         : parent.top
                 left        : _FPBoostPumpColumn.right
                 leftMargin  : spacing
             }
             model: [
-                vFPTemperature.inletConductivityTemp        .toFixed(2) ,
-                vFPTemperature.outletConductivityTemp       .toFixed(2) ,
-                vFPTemperature.beforePressureRegulatorTemp  .toFixed(2) ,
-                vFPTemperature.afterPressureRegulatorTemp   .toFixed(2) ,
-                vFPTemperature.beforeInletConductivityTemp  .toFixed(2) ,
-                vFPTemperature.beforeROFilterTemp           .toFixed(2) ,
-                vFPTemperature.afterROFilterTemp            .toFixed(2) ,
-                vFPTemperature.beforeROPumpTemp             .toFixed(2) ,
-                vFPTemperature.ROConcentrateTemp            .toFixed(2) ,
-                vFPTemperature.ROConcentratePumpTemp        .toFixed(2) ,
-                vFPTemperature.drainDropTemp                .toFixed(2) ,
-                vFPTemperature.ROInletTemp                  .toFixed(2) ,
-                vFPTemperature.ROOutletTemp                 .toFixed(2) ,
+                vFPTemperature.m3Temp           .toFixed(2) ,
+                vFPTemperature.p8Temp           .toFixed(2) ,
+                vFPTemperature.p13Temp          .toFixed(2) ,
+                vFPTemperature.p17Temp          .toFixed(2) ,
+                vFPTemperature.p46Temp          .toFixed(2) ,
+                vFPTemperature.p10Temp          .toFixed(2) ,
+                vFPTemperature.p19Temp          .toFixed(2) ,
+                vFPTemperature.p7Temp           .toFixed(2) ,
+                vFPTemperature.p16Temp          .toFixed(2) ,
+                vFPTemperature.p7InternalTemp   .toFixed(2) ,
+                vFPTemperature.p16InternalTemp  .toFixed(2) ,
             ]
             label: [
-                "P10 inCond     ",
-                "P19 outCond    ",
-                "M1 bReg        ",
-                "M3 aReg        ",
-                "P8 bInCond     ",
-                "P13 bRO        ",
-                "P17 aRO        ",
-                "X1 bROPump     ",
-                "X2 ROConc      ",
-                "X3 ROConcPump  ",
-                "X4 Drain       ",
-                "P7 ROIn        ",
-                "P16 ROOut      ",
+                "M3Temp            ",
+                "P8Temp            ",
+                "P13Temp           ",
+                "P17Temp           ",
+                "P46Temp           ",
+                "P10Temp           ",
+                "P19Temp           ",
+                "P7Temp            ",
+                "P16Temp           ",
+                "P7InternalTemp    ",
+                "P16InternalTemp   ",
             ]
         }
 
         DebugDataColumn { id: _FPFlowColumn
             textObjectName  :"_FPFlowData"
-            title           : qsTr(" Flow ")
+            title           :"[0x36]" + qsTr(" Flow ")
             anchors {
                 top         : parent.top
                 left        : _FPTemperatureColumn.right
                 leftMargin  : spacing
             }
             model: [
-                vFPFlow.waterInletFlow       .toFixed(2) ,
-                vFPFlow.waterInletTemp       .toFixed(2) ,
-                vFPFlow.rOFilterOutletFlow   .toFixed(2) ,
-                vFPFlow.rOFilterOutletTemp   .toFixed(2) ,
+                vFPFlow.p7Flow         .toFixed(2) ,
+                vFPFlow.p16Flow        .toFixed(2) ,
             ]
             label: [
                 "P7 FlowIn     ",
-                "P7 TempIn     ",
                 "P16 FlowOut   ",
-                "P16 TempOut   ",
             ]
         }
 
         DebugDataColumn { id: _FPLevelColumn
             textObjectName  :"_FPLevelData"
-            title           : qsTr(" Level ")
+            title           : "[0x35]" + qsTr(" Level ")
             anchors {
                 top         : parent.top
                 left        : _FPFlowColumn.right
@@ -230,7 +214,7 @@
 
         DebugDataColumn { id: _FPConductivityColumn
             textObjectName  :"_FPConductivityData"
-            title           : qsTr(" Conductivity ")
+            title           : "[0x37]" + qsTr(" Conductivity ")
             anchors {
                 top         : _FPPressureColumn.bottom
                 topMargin   : spacing