Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r7c78fc682c3b1dbfe2e416e3812f98e15875b751 -r64d551143d898bf2ce79cb564e5a3389eb9be91e --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 7c78fc682c3b1dbfe2e416e3812f98e15875b751) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 64d551143d898bf2ce79cb564e5a3389eb9be91e) @@ -32,7 +32,7 @@ DebugDataColumn { id: _DDConcentratePumpColumn textObjectName :"_DDConcentratePumpData" - title : qsTr(" Conc Pump ") + title : qsTr("[0x25] Conc Pump ") anchors { top : parent.top left : parent.left @@ -95,7 +95,7 @@ DebugDataColumn { id: _DDDialysatePumpColumn textObjectName :"_DDDialysatePumpData" - title : qsTr(" Dial Pump ") + title : qsTr("[0x27] Dialysate Pump ") anchors { top : parent.top left : _DDConcentratePumpColumn.right @@ -149,7 +149,7 @@ DebugDataColumn { id: _DDHeatersColumn textObjectName :"_DDHeatersData" - title : qsTr(" Heaters ") + title : qsTr("[0x28] Heaters ") anchors { top : parent.top left : _DDDialysatePumpColumn.right @@ -197,45 +197,61 @@ DebugDataColumn { id: _DDTemperatureColumn textObjectName :"_DDTemperatureData" - title : qsTr(" Temp ") + title : qsTr("[0x26] Temperature ") anchors { top : parent.top left : _DDHeatersColumn.right leftMargin : spacing } model: [ - vDDTemperatures.inletHeatExchanger .toFixed(2) , - vDDTemperatures.outletHeatExchanger .toFixed(2) , - vDDTemperatures.hydraulicsPrimaryHeater .toFixed(2) , - vDDTemperatures.trimmerHeater .toFixed(2) , - vDDTemperatures.boardTemperature .toFixed(2) , - vDDTemperatures.barometricTemperature .toFixed(2) , - vDDTemperatures.D16Conductivity .toFixed(2) , - vDDTemperatures.D28Conductivity .toFixed(2) , - vDDTemperatures.D30Conductivity .toFixed(2) , - vDDTemperatures.D44Conductivity .toFixed(2) , - vDDTemperatures.D75Conductivity .toFixed(2) , - vDDTemperatures.D4MovingAverage .toFixed(2) , - vDDTemperatures.D50MovingAverage .toFixed(2) , - vDDTemperatures.D28MovingAverage .toFixed(2) , - vDDTemperatures.D30MovingAverage .toFixed(2) , + vDDTemperatures.d1Temperature .toFixed(2) , + vDDTemperatures.d78Temperature .toFixed(2) , + vDDTemperatures.d4Temperature .toFixed(2) , + vDDTemperatures.d50Temperature .toFixed(2) , + vDDTemperatures.d99Temperature .toFixed(2) , + vDDTemperatures.boardTemperature .toFixed(2) , + vDDTemperatures.d16Conductivity .toFixed(2) , + vDDTemperatures.d28Conductivity .toFixed(2) , + vDDTemperatures.d30Conductivity .toFixed(2) , + vDDTemperatures.d44Conductivity .toFixed(2) , + vDDTemperatures.d75Conductivity .toFixed(2) , + vDDTemperatures.d4MovingAverage .toFixed(2) , + vDDTemperatures.d50MovingAverage .toFixed(2) , + vDDTemperatures.d99MovingAverage .toFixed(2) , + vDDTemperatures.d28MovingAverage .toFixed(2) , + vDDTemperatures.d30MovingAverage .toFixed(2) , + vDDTemperatures.d78MovingAverage .toFixed(2) , + vDDTemperatures.d9PressureAverage .toFixed(2) , + vDDTemperatures.d66PressureAverage .toFixed(2) , + vDDTemperatures.d51PressureAverage .toFixed(2) , + vDDTemperatures.d18PressureAverage .toFixed(2) , + vDDTemperatures.d41PressureAverage .toFixed(2) , + vDDTemperatures.d87PressureAverage .toFixed(2) , ] label: [ - "inHE (D1) ", - "outHE (X6) ", - "hydr (D4) ", - "trim (D50) ", + "mTmp (D1) ", + "mTmp (D78) ", + "mTmp (D4) ", + "mTmp (D50) ", + "mTmp (D99) ", "board ", - "baro ", "Cond (D16) ", "Cond (D28) ", "Cond (D30) ", "Cond (D44) ", "Cond (D75) ", "mAvg (D4) ", "mAvg (D50) ", + "mAvg (D99) ", "mAvg (D28) ", "mAvg (D30) ", + "mAvg (D78) ", + "mPressAvg (D9) ", + "mPressAvg (D66) ", + "mPressAvg (D51) ", + "mPressAvg (D18) ", + "mPressAvg (D41) ", + "mPressAvg (D87) ", ] } @@ -284,7 +300,7 @@ DebugDataColumn { id: _DDOpModeColumn textObjectName :"_DDOpModeColumn" - title : qsTr(" OpMode ") + title : qsTr("[0x13] OpMode ") anchors { top : parent.top left : _DDPressureColumn.right @@ -302,7 +318,7 @@ DebugDataColumn { id: _DDGenDialColumn textObjectName :"_DDGenDialData" - title : qsTr(" GenDial ") + title : qsTr("[0x2F] GenDial ") anchors { top : _DDOpModeColumn.bottom topMargin : spacing @@ -369,7 +385,7 @@ DebugDataColumn { id: _DDCondColumn textObjectName :"_DDCondlData" - title : qsTr(" Cond ") + title : qsTr("[0x1F] Conductivity ") anchors { top : _DDDialysatePumpColumn.bottom topMargin : spacing