Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r0cb2630813e6f7216adaf990f4129deb87b849bf -r3d13050e0319cf30a1686b58c8f2328f6860910a --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 3d13050e0319cf30a1686b58c8f2328f6860910a) @@ -30,10 +30,208 @@ title: "Dialysate Delivery" + DebugDataColumn { id: _DDConcentratePumpColumn + textObjectName :"_DDConcentratePumpData" + title : qsTr(" Conc Pump ") + x: col(0) + y: row(0) + model: [ + vDDConcentratePump.D11PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D10PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D10PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D11PumpTargetRevCount , + vDDConcentratePump.D11PumpMeasuredRevCount , + vDDConcentratePump.D10PumpTargetRevCount , + vDDConcentratePump.D10PumpMeasuredRevCount , + vDDConcentratePump.D11PumpState , + vDDConcentratePump.D10PumpState , + vDDConcentratePump.D11PumpPulseUS .toFixed(2) , + vDDConcentratePump.D10PumpPulseUS .toFixed(2) , + vDDConcentratePump.D11PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D10PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpParked , + vDDConcentratePump.D10PumpParked , + vDDConcentratePump.D11PumpParkFault , + vDDConcentratePump.D10PumpParkFault , + vDDConcentratePump.D76PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D76PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D76PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D76PumpTargetRevCount , + vDDConcentratePump.D76PumpMeasuredRevCount , + vDDConcentratePump.D76PumpState , + vDDConcentratePump.D76PumpPulseUS .toFixed(2) , + ] + label: [ + "sSpd (D11) ", + "mSpd (D11) ", + "sSpd (D10) ", + "mSpd (D10) ", + "rCnt (D11) ", + "mCnt (D11) ", + "rCnt (D10) ", + "mCnt (D10) ", + "State (D11) ", + "State (D10) ", + "Plse (D11) ", + "Plse (D10) ", + "tSpd (D11) ", + "tSpd (D10) ", + "park (D11) ", + "park (D10) ", + "pfault (D11) ", + "pfault (D10) ", + "tSpd (D76) ", + "sSpd (D76) ", + "mSpd (D76) ", + "rCnt (D76) ", + "mCnt (D76) ", + "State (D76) ", + "Plse (D76) ", + ] + } + + DebugDataColumn { id: _DDDialysatePumpColumn + textObjectName :"_DDDialysatePumpData" + title : qsTr(" Dial Pump ") + x: col(1.5) + y: row(0) + model: [ + vDDDialysatePump.D12PumpTargetRPM .toFixed(2) , + vDDDialysatePump.D48PumpTargetRPM .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredSpeed .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredSpeed .toFixed(2) , + vDDDialysatePump.D12PumpCurrentSpeed .toFixed(2) , + vDDDialysatePump.D48PumpCurrentSpeed .toFixed(2) , + vDDDialysatePump.D12PumpState , + vDDDialysatePump.D48PumpState , + vDDDialysatePump.D12PumpTargetPressure .toFixed(2) , + vDDDialysatePump.D48PumpTargetPressure .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredPressure .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredPressure .toFixed(2) , + vDDDialysatePump.D12PumpMeasuredCurrent .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredCurrent .toFixed(2) , + vDDDialysatePump.D12PumpControl , + vDDDialysatePump.D48PumpControl , + vDDDialysatePump.D12PumpDirErrCnt , + vDDDialysatePump.D48PumpDirErrCnt , + vDDDialysatePump.D12PumpMeasuredDir , + vDDDialysatePump.D48PumpMeasuredDir , + ] + label: [ + "tRPM (D12) ", + "tRPM (D48) ", + "mSpd (D12) ", + "mSpd (D48) ", + "cSpd (D12) ", + "cSpd (D48) ", + "State (D12) ", + "State (D48) ", + "tPres (D12) ", + "tPres (D48) ", + "mPres (D12) ", + "mPres (D48) ", + "mCurr (D12) ", + "mCurr (D48) ", + "Ctrl (D12) ", + "Ctrl (D48) ", + "eCnt (D12) ", + "eCnt (D48) ", + "mDir (D12) ", + "mDir (D48) ", + ] + } + + DebugDataColumn { id: _DDHeatersColumn + textObjectName :"_DDHeatersData" + title : qsTr(" Heaters ") + x: col(3) + y: row(0) + model: [ + vDDHeaters.mainPrimayHeaterDC .toFixed(2) , + vDDHeaters.trimmerHeaterDC .toFixed(2) , + vDDHeaters.primaryTargetTemp .toFixed(2) , + vDDHeaters.trimmerTargetTemp .toFixed(2) , + vDDHeaters.primaryHeaterState , + vDDHeaters.trimmerHeaterState , + vDDHeaters.primaryHeaterIntervalCount , + 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) ", + "tHeat (D45) ", + "pTemp (D5) ", + "tTemp (D45) ", + "pState (D5) ", + "tstate (D45) ", + "pIC (D5) ", + "tIC (D45) ", + "dbg1 ", + "dbg2 ", + "dbg3 ", + "dbg4 ", + "dbg5 ", + "dbg6 ", + "dbg7 ", + "dbg8 ", + "dbg9 ", + ] + } + + DebugDataColumn { id: _DDTemperatureColumn + textObjectName :"_DDTemperatureData" + title : qsTr(" Temperature ") + x: col(4.5) + y: row(0) + 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" title : qsTr(" Pressure ") - x: col(0) + x: col(6) y: row(0) model: [ vDDPressures.waterInletPSI .toFixed(2), @@ -69,26 +267,41 @@ ] } - DebugDataColumn { id: _DDLevelColumn - textObjectName :"_DDLevelData" - title : qsTr(" Levels ") - x: col(1.5) + DebugDataColumn { id: _DDGenDialColumn + textObjectName :"_DDGenDialData" + title : qsTr(" GenDial ") + x: col(7.5) y: row(0) + model: [ - vDDLevel.floaterLevel , - vDDLevel.bicarbLevel , - vDDLevel.spentDialysateLevel , + vDDGenDialysate.genDialysateExec , + vDDGenDialysate.ddInProgress , + vDDGenDialysate.fltLevel1 , + vDDGenDialysate.bicarbLevel , + vDDGenDialysate.spentLevel , + vDDGenDialysate.hydNegativePressure .toFixed(2), + vDDGenDialysate.hydPositivePressure .toFixed(2), + vDDGenDialysate.spentPressure .toFixed(2), + vDDGenDialysate.isDialGood , ] label: [ - "float ", - "bicarb ", - "sptDial ", + "Exec ", + "inProg ", + "fltLvL ", + "bicarbLvL ", + "spentLvL ", + "sptDial ", + "hydNeg ", + "hydPos ", + "spend ", + "isGood ", ] } + DebugDataColumn { id: _DDCondColumn textObjectName :"_DDCondlData" title : qsTr(" Cond ") - x: col(3) + x: col(9) y: row(0) model: [ vDDConductivity.bicarbCondutivity1 , @@ -105,127 +318,28 @@ "bicarb2 ", ] } - DebugDataColumn { id: _DDGenDialColumn - textObjectName :"_DDGenDialData" - title : qsTr(" GenDial ") - x: col(4.5) - y: row(0) + DebugDataColumn { id: _DDLevelColumn + textObjectName :"_DDLevelData" + title : qsTr(" Levels ") + x: col(9) + y: row(2) model: [ - vDDGenDialysate.genDialysateExec , - vDDGenDialysate.ddInProgress , - vDDGenDialysate.fltLevel1 , - vDDGenDialysate.bicarbLevel , - vDDGenDialysate.spentLevel , - vDDGenDialysate.hydNegativePressure .toFixed(2), - vDDGenDialysate.hydPositivePressure .toFixed(2), - vDDGenDialysate.spentPressure .toFixed(2), - vDDGenDialysate.isDialGood , + vDDLevel.floaterLevel , + vDDLevel.bicarbLevel , + vDDLevel.spentDialysateLevel , ] label: [ - "Exec ", - "inProg ", - "fltLvL ", - "bicarbLvL ", - "spentLvL ", - "sptDial ", - "hydNeg ", - "hydPos ", - "spend ", - "isGood ", + "float ", + "bicarb ", + "sptDial ", ] } - DebugDataColumn { id: _DDTemperatureColumn - textObjectName :"_DDTemperatureData" - title : qsTr(" Temperature ") - x: col(6) - y: row(0) - 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: _DDHeatersColumn - textObjectName :"_DDHeatersData" - title : qsTr(" Heaters ") - x: col(7.5) - y: row(0) - model: [ - vDDHeaters.mainPrimayHeaterDC .toFixed(2) , - vDDHeaters.trimmerHeaterDC .toFixed(2) , - vDDHeaters.primaryTargetTemp .toFixed(2) , - vDDHeaters.trimmerTargetTemp .toFixed(2) , - vDDHeaters.primaryHeaterState , - vDDHeaters.trimmerHeaterState , - vDDHeaters.primaryHeaterIntervalCount , - 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) ", - "tHeat (D45) ", - "pTemp (D5) ", - "tTemp (D45) ", - "pState (D5) ", - "tstate (D45) ", - "pIC (D5) ", - "tIC (D45) ", - "dbg1 ", - "dbg2 ", - "dbg3 ", - "dbg4 ", - "dbg5 ", - "dbg6 ", - "dbg7 ", - "dbg8 ", - "dbg9 ", - ] - } - // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. TouchRect { x : col(9.0) - y : row(6.4) + y : row(8.0) width : 425 height : 80 onClicked : vAdjustmentVersions.doAdjustment()