Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r89be2d248cac3f748b704cd62408cf8911991039 -r81aec0b1316a43c46f8c27c773d8f95e695ec273 --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 89be2d248cac3f748b704cd62408cf8911991039) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 81aec0b1316a43c46f8c27c773d8f95e695ec273) @@ -27,218 +27,217 @@ */ DiagnosticsBase { id: _root objectName : "_DiagnosticsDD" - spacing : Variables.defaultMargin contentItem : Item { id: _content DebugDataColumn { id: _DDConcentratePumpColumn - textObjectName :"_DDConcentratePumpData" - title : qsTr(" Conc Pump ") - anchors { - top : parent.top - left : parent.left - } - model: [ - vDDConcentratePump.D10PumpCurrentSetSpeed .toFixed(2) , - vDDConcentratePump.D10PumpMeasuredSpeed .toFixed(2) , - vDDConcentratePump.D10PumpTargetRevCount , - vDDConcentratePump.D10PumpMeasuredRevCount , - vDDConcentratePump.D10PumpState , - vDDConcentratePump.D10PumpPulseUS .toFixed(2) , - vDDConcentratePump.D10PumpTargetSpeed .toFixed(2) , - vDDConcentratePump.D10PumpParked , - vDDConcentratePump.D10PumpParkFault , - vDDConcentratePump.D11PumpCurrentSetSpeed .toFixed(2) , - vDDConcentratePump.D11PumpMeasuredSpeed .toFixed(2) , - vDDConcentratePump.D11PumpTargetRevCount , - vDDConcentratePump.D11PumpMeasuredRevCount , - vDDConcentratePump.D11PumpState , - vDDConcentratePump.D11PumpPulseUS .toFixed(2) , - vDDConcentratePump.D11PumpTargetSpeed .toFixed(2) , - vDDConcentratePump.D11PumpParked , - vDDConcentratePump.D11PumpParkFault , - vDDConcentratePump.D76PumpCurrentSetSpeed .toFixed(2) , - vDDConcentratePump.D76PumpMeasuredSpeed .toFixed(2) , - vDDConcentratePump.D76PumpTargetRevCount , - vDDConcentratePump.D76PumpMeasuredRevCount , - vDDConcentratePump.D76PumpState , - vDDConcentratePump.D76PumpPulseUS .toFixed(2) , - vDDConcentratePump.D76PumpTargetSpeed .toFixed(2) , - ] - label: [ - "sSpd (D10) ", - "mSpd (D10) ", - "rCnt (D10) ", - "mCnt (D10) ", - "State (D10) ", - "Plse (D10) ", - "tSpd (D10) ", - "park (D10) ", - "pfault (D10) ", - "sSpd (D11) ", - "mSpd (D11) ", - "rCnt (D11) ", - "mCnt (D11) ", - "State (D11) ", - "Plse (D11) ", - "tSpd (D11) ", - "park (D11) ", - "pfault (D11) ", - "sSpd (D76) ", - "mSpd (D76) ", - "rCnt (D76) ", - "mCnt (D76) ", - "State (D76) ", - "Plse (D76) ", - "tSpd (D76) ", - ] + textObjectName :"_DDConcentratePumpData" + title : qsTr(" Conc Pump ") + anchors { + top : parent.top + left : parent.left } + model: [ + vDDConcentratePump.D10PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D10PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D10PumpTargetRevCount , + vDDConcentratePump.D10PumpMeasuredRevCount , + vDDConcentratePump.D10PumpState , + vDDConcentratePump.D10PumpPulseUS .toFixed(2) , + vDDConcentratePump.D10PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D10PumpParked , + vDDConcentratePump.D10PumpParkFault , + vDDConcentratePump.D11PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D11PumpTargetRevCount , + vDDConcentratePump.D11PumpMeasuredRevCount , + vDDConcentratePump.D11PumpState , + vDDConcentratePump.D11PumpPulseUS .toFixed(2) , + vDDConcentratePump.D11PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpParked , + vDDConcentratePump.D11PumpParkFault , + vDDConcentratePump.D76PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D76PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D76PumpTargetRevCount , + vDDConcentratePump.D76PumpMeasuredRevCount , + vDDConcentratePump.D76PumpState , + vDDConcentratePump.D76PumpPulseUS .toFixed(2) , + vDDConcentratePump.D76PumpTargetSpeed .toFixed(2) , + ] + label: [ + "sSpd (D10) ", + "mSpd (D10) ", + "rCnt (D10) ", + "mCnt (D10) ", + "State (D10) ", + "Plse (D10) ", + "tSpd (D10) ", + "park (D10) ", + "pfault (D10) ", + "sSpd (D11) ", + "mSpd (D11) ", + "rCnt (D11) ", + "mCnt (D11) ", + "State (D11) ", + "Plse (D11) ", + "tSpd (D11) ", + "park (D11) ", + "pfault (D11) ", + "sSpd (D76) ", + "mSpd (D76) ", + "rCnt (D76) ", + "mCnt (D76) ", + "State (D76) ", + "Plse (D76) ", + "tSpd (D76) ", + ] + } DebugDataColumn { id: _DDDialysatePumpColumn - textObjectName :"_DDDialysatePumpData" - title : qsTr(" Dial Pump ") - anchors { - top : parent.top - left : _DDConcentratePumpColumn.right - leftMargin : spacing - } - model: [ - vDDDialysatePump.D12PumpTargetRPM .toFixed(2) , - vDDDialysatePump.D12PumpMeasuredSpeed .toFixed(2) , - vDDDialysatePump.D12PumpCurrentSpeed .toFixed(2) , - vDDDialysatePump.D12PumpState , - vDDDialysatePump.D12PumpTargetPressure .toFixed(2) , - vDDDialysatePump.D12PumpMeasuredPressure .toFixed(2) , - vDDDialysatePump.D12PumpMeasuredCurrent .toFixed(2) , - vDDDialysatePump.D12PumpControl , - vDDDialysatePump.D12PumpDirErrCnt , - vDDDialysatePump.D12PumpMeasuredDir , - vDDDialysatePump.D48PumpTargetRPM .toFixed(2) , - vDDDialysatePump.D48PumpMeasuredSpeed .toFixed(2) , - vDDDialysatePump.D48PumpCurrentSpeed .toFixed(2) , - vDDDialysatePump.D48PumpState , - vDDDialysatePump.D48PumpTargetPressure .toFixed(2) , - vDDDialysatePump.D48PumpMeasuredPressure .toFixed(2) , - vDDDialysatePump.D48PumpMeasuredCurrent .toFixed(2) , - vDDDialysatePump.D48PumpControl , - vDDDialysatePump.D48PumpDirErrCnt , - vDDDialysatePump.D48PumpMeasuredDir , - ] - label: [ - "tRPM (D12) ", - "mSpd (D12) ", - "cSpd (D12) ", - "State (D12) ", - "tPres (D12) ", - "mPres (D12) ", - "Ctrl (D12) ", - "eCnt (D12) ", - "mCurr (D12) ", - "mDir (D12) ", - "tRPM (D48) ", - "mSpd (D48) ", - "cSpd (D48) ", - "State (D48) ", - "tPres (D48) ", - "mPres (D48) ", - "mCurr (D48) ", - "Ctrl (D48) ", - "eCnt (D48) ", - "mDir (D48) ", - ] + textObjectName :"_DDDialysatePumpData" + title : qsTr(" Dial Pump ") + anchors { + top : parent.top + left : _DDConcentratePumpColumn.right + leftMargin : spacing } + model: [ + vDDDialysatePump.D12PumpTargetRPM .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredSpeed .toFixed(2) , + vDDDialysatePump.D12PumpCurrentSpeed .toFixed(2) , + vDDDialysatePump.D12PumpState , + vDDDialysatePump.D12PumpTargetPressure .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredPressure .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredCurrent .toFixed(2) , + vDDDialysatePump.D12PumpControl , + vDDDialysatePump.D12PumpDirErrCnt , + vDDDialysatePump.D12PumpMeasuredDir , + vDDDialysatePump.D48PumpTargetRPM .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredSpeed .toFixed(2) , + vDDDialysatePump.D48PumpCurrentSpeed .toFixed(2) , + vDDDialysatePump.D48PumpState , + vDDDialysatePump.D48PumpTargetPressure .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredPressure .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredCurrent .toFixed(2) , + vDDDialysatePump.D48PumpControl , + vDDDialysatePump.D48PumpDirErrCnt , + vDDDialysatePump.D48PumpMeasuredDir , + ] + label: [ + "tRPM (D12) ", + "mSpd (D12) ", + "cSpd (D12) ", + "State (D12) ", + "tPres (D12) ", + "mPres (D12) ", + "Ctrl (D12) ", + "eCnt (D12) ", + "mCurr (D12) ", + "mDir (D12) ", + "tRPM (D48) ", + "mSpd (D48) ", + "cSpd (D48) ", + "State (D48) ", + "tPres (D48) ", + "mPres (D48) ", + "mCurr (D48) ", + "Ctrl (D48) ", + "eCnt (D48) ", + "mDir (D48) ", + ] + } DebugDataColumn { id: _DDHeatersColumn - textObjectName :"_DDHeatersData" - title : qsTr(" Heaters ") - anchors { - top : parent.top - left : _DDDialysatePumpColumn.right - leftMargin : spacing - } - model: [ - vDDHeaters.mainPrimayHeaterDC .toFixed(2) , - vDDHeaters.primaryTargetTemp .toFixed(2) , - vDDHeaters.primaryHeaterState , - vDDHeaters.primaryHeaterIntervalCount , - vDDHeaters.trimmerHeaterDC .toFixed(2) , - vDDHeaters.trimmerTargetTemp .toFixed(2) , - vDDHeaters.trimmerHeaterState , - vDDHeaters.trimmerHeaterIntervalCount , - vDDHeaters.dbg1 .toFixed(2) , - vDDHeaters.dbg2 .toFixed(2) , - vDDHeaters.dbg3 .toFixed(2) , - vDDHeaters.dbg4 .toFixed(2) , - vDDHeaters.dbg5 .toFixed(2) , - vDDHeaters.dbg6 .toFixed(2) , - vDDHeaters.dbg7 .toFixed(2) , - vDDHeaters.dbg8 .toFixed(2) , - vDDHeaters.dbg9 .toFixed(2) , - ] - label: [ - "pHeat (D5) ", - "pTemp (D5) ", - "pState (D5) ", - "pIC (D5) ", - "tHeat (D45) ", - "tTemp (D45) ", - "tstate (D45) ", - "tIC (D45) ", - "dbg1 ", - "dbg2 ", - "dbg3 ", - "dbg4 ", - "dbg5 ", - "dbg6 ", - "dbg7 ", - "dbg8 ", - "dbg9 ", - ] + textObjectName :"_DDHeatersData" + title : qsTr(" Heaters ") + anchors { + top : parent.top + left : _DDDialysatePumpColumn.right + leftMargin : spacing } + model: [ + vDDHeaters.mainPrimayHeaterDC .toFixed(2) , + vDDHeaters.primaryTargetTemp .toFixed(2) , + vDDHeaters.primaryHeaterState , + vDDHeaters.primaryHeaterIntervalCount , + vDDHeaters.trimmerHeaterDC .toFixed(2) , + vDDHeaters.trimmerTargetTemp .toFixed(2) , + vDDHeaters.trimmerHeaterState , + vDDHeaters.trimmerHeaterIntervalCount , + vDDHeaters.dbg1 .toFixed(2) , + vDDHeaters.dbg2 .toFixed(2) , + vDDHeaters.dbg3 .toFixed(2) , + vDDHeaters.dbg4 .toFixed(2) , + vDDHeaters.dbg5 .toFixed(2) , + vDDHeaters.dbg6 .toFixed(2) , + vDDHeaters.dbg7 .toFixed(2) , + vDDHeaters.dbg8 .toFixed(2) , + vDDHeaters.dbg9 .toFixed(2) , + ] + label: [ + "pHeat (D5) ", + "pTemp (D5) ", + "pState (D5) ", + "pIC (D5) ", + "tHeat (D45) ", + "tTemp (D45) ", + "tstate (D45) ", + "tIC (D45) ", + "dbg1 ", + "dbg2 ", + "dbg3 ", + "dbg4 ", + "dbg5 ", + "dbg6 ", + "dbg7 ", + "dbg8 ", + "dbg9 ", + ] + } DebugDataColumn { id: _DDTemperatureColumn - textObjectName :"_DDTemperatureData" - title : qsTr(" Temp ") - 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) , - ] - label: [ - "inHE (D1) ", - "outHE (X6) ", - "hydr (D4) ", - "trim (D50) ", - "board ", - "baro ", - "Cond (D16) ", - "Cond (D28) ", - "Cond (D30) ", - "Cond (D44) ", - "Cond (D75) ", - "mAvg (D4) ", - "mAvg (D50) ", - "mAvg (D28) ", - "mAvg (D30) ", - ] + textObjectName :"_DDTemperatureData" + title : qsTr(" Temp ") + 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) , + ] + label: [ + "inHE (D1) ", + "outHE (X6) ", + "hydr (D4) ", + "trim (D50) ", + "board ", + "baro ", + "Cond (D16) ", + "Cond (D28) ", + "Cond (D30) ", + "Cond (D44) ", + "Cond (D75) ", + "mAvg (D4) ", + "mAvg (D50) ", + "mAvg (D28) ", + "mAvg (D30) ", + ] + } DebugDataColumn { id: _DDPressureColumn textObjectName :"_DDPressureData" @@ -533,9 +532,8 @@ radius : 10 anchors { bottom : parent.bottom - bottomMargin : spacing right : parent.right - rightMargin : spacing + rightMargin : Variables.defaultMargin } DebugDataColumn { id: _DDVersionsColumn