Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r7b514a9fc7fa77c7e084c6023c49859d95cbcd5a -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 7b514a9fc7fa77c7e084c6023c49859d95cbcd5a) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd) @@ -21,21 +21,23 @@ // Qml imports import "qrc:/globals" import "qrc:/components" -import "qrc:/compounds" /*! * \brief the post treatment prime stack screen */ DiagnosticsBase { id: _root - objectName: "_DiagnosticsDD" + objectName : "_DiagnosticsDD" + verticalSpacing: Variables.defaultMargin * 0.5 - title: "Dialysate Delivery" + contentItem : Item { id: _content - DebugDataColumn { id: _DDConcentratePumpColumn + DebugDataColumn { id: _DDConcentratePumpColumn textObjectName :"_DDConcentratePumpData" - title : qsTr(" Conc Pump ") - x: col(0) - y: row(0) + title : "[0x25]" + qsTr(" Conc Pump ") + anchors { + top : parent.top + left : parent.left + } model: [ vDDConcentratePump.D10PumpCurrentSetSpeed .toFixed(2) , vDDConcentratePump.D10PumpMeasuredSpeed .toFixed(2) , @@ -92,11 +94,14 @@ ] } - DebugDataColumn { id: _DDDialysatePumpColumn + DebugDataColumn { id: _DDDialysatePumpColumn textObjectName :"_DDDialysatePumpData" - title : qsTr(" Dial Pump ") - x: col(1.5) - y: row(0) + title : "[0x27]" + qsTr(" Dialysate Pump ") + anchors { + top : parent.top + left : _DDConcentratePumpColumn.right + leftMargin : spacing + } model: [ vDDDialysatePump.D12PumpTargetRPM .toFixed(2) , vDDDialysatePump.D12PumpMeasuredSpeed .toFixed(2) , @@ -143,11 +148,14 @@ ] } - DebugDataColumn { id: _DDHeatersColumn + DebugDataColumn { id: _DDHeatersColumn textObjectName :"_DDHeatersData" - title : qsTr(" Heaters ") - x: col(3) - y: row(0) + title : "[0x28]" + qsTr(" Heaters ") + anchors { + top : parent.top + left : _DDDialysatePumpColumn.right + leftMargin : spacing + } model: [ vDDHeaters.mainPrimayHeaterDC .toFixed(2) , vDDHeaters.primaryTargetTemp .toFixed(2) , @@ -188,255 +196,380 @@ ] } - DebugDataColumn { id: _DDTemperatureColumn + DebugDataColumn { id: _DDTemperatureColumn textObjectName :"_DDTemperatureData" - title : qsTr(" Temp ") - x: col(4.5) - y: row(0) + title : "[0x26]" + qsTr(" 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) ", ] } - DebugDataColumn { id: _DDPressureColumn - textObjectName :"_DDPressureData" - title : qsTr(" Pressure ") - x: col(6) - y: row(0) - model: [ - vDDPressures.waterInletPSI .toFixed(2), - vDDPressures.waterOutletPSI .toFixed(2), - vDDPressures.hydrolicOutletPSI .toFixed(2), - vDDPressures.bicarbBagPSI .toFixed(2), - vDDPressures.spentDialysatePSI .toFixed(2), - vDDPressures.freshDialysatePSI .toFixed(2), - vDDPressures.transmembranePSI .toFixed(2), - vDDPressures.waterInletTemp .toFixed(2), - vDDPressures.waterOutletTemp .toFixed(2), - vDDPressures.hydrolicOutletTemp .toFixed(2), - vDDPressures.bicarbBagTemp .toFixed(2), - vDDPressures.spentDialysateTemp .toFixed(2), - vDDPressures.freshDialysateTemp .toFixed(2), - vDDPressures.transmembraneTemp .toFixed(2), - ] - label: [ - "WInPSI (M1) ", - "WOutPSI (M3) ", - "HOutPSI (D9) ", - "BBagPSI (D66) ", - "SDialPSI (D51) ", - "FDialPSI (D18) ", - "TransPSI (D41) ", - "WInTmp (M1) ", - "WOutTmp (M3) ", - "HOutTmp (D9) ", - "BBagTmp (D66) ", - "SDialTmp (D51) ", - "FDialTmp (D18) ", - "TransTmp (D41) ", - ] - } + DebugDataColumn { id: _DDPressureColumn + textObjectName :"_DDPressureData" + title : "[0x1C]" + qsTr(" Pressure ") + anchors { + top : parent.top + left : _DDTemperatureColumn.right + leftMargin : spacing + } + model: [ + vDDPressures.d9Pressure .toFixed(2), + vDDPressures.d66Pressure .toFixed(2), + vDDPressures.d51Pressure .toFixed(2), + vDDPressures.d18Pressure .toFixed(2), + vDDPressures.d41Pressure .toFixed(2), + vDDPressures.d87Pressure .toFixed(2), + ] + label: [ + "D9 ", + "D66 ", + "D51 ", + "D18 ", + "D41 ", + "D87 ", + ] + } - DebugDataColumn { id: _DDGenDialColumn - textObjectName :"_DDGenDialData" - title : qsTr(" GenDial ") - x: col(7.5) - y: row(0) + DebugDataColumn { id: _DDOpModeColumn + textObjectName :"_DDOpModeColumn" + title : "[0x13]" + qsTr(" OpMode ") + anchors { + top : parent.top + left : _DDPressureColumn.right + leftMargin : spacing + } + model: [ + vDDOperationMode.opMode , + vDDOperationMode.subMode , + ] + label: [ + "opMode " , + "subMode " + ] + } - model: [ - vDDGenDialysate.genDialysateExec , - vDDGenDialysate.ddInProgress , - vDDGenDialysate.isDialGood , - vDDGenDialysate.fltLevel1 , - vDDGenDialysate.bicarbLevel , - vDDGenDialysate.spentLevel , - vDDGenDialysate.hydNegativePressure .toFixed(2), - vDDGenDialysate.hydPositivePressure .toFixed(2), - vDDGenDialysate.spentPressure .toFixed(2), - ] - label: [ - "Exec ", - "inProg ", - "isGood ", - "fltLvL (D6) ", - "bicarbLvL (D63)", - "sptLvL (D46) ", - "hydNeg (D19) ", - "hydPos (D18) ", - "sptPres (D51) ", - ] - } + DebugDataColumn { id: _DDGenDialColumn + textObjectName :"_DDGenDialData" + title : "[0x2F]" + qsTr(" GenDial ") + anchors { + top : _DDOpModeColumn.bottom + topMargin : verticalSpacing + left : _DDOpModeColumn.left + } + model: [ + vDDGenDialysate.genDialysateExec , + vDDGenDialysate.ddInProgress , + vDDGenDialysate.isDialGood , + vDDGenDialysate.currentQd .toFixed(2) , + ] + label: [ + "Exec ", + "inProg ", + "isGood ", + "current Qd ", + ] + } - DebugDataColumn { id: _DDHydraulicsValveColumn - textObjectName :"_DDHydraulicValveData" - title : qsTr(" Hyd Valve ") - x: col(7.8) - y: row(3.1) + DebugDataColumn { id: _DDHydraulicsValveColumn + textObjectName :"_DDHydraulicValveData" + title : "[0x1B]" + qsTr(" Hyd Valve ") + anchors { + top : _DDGenDialColumn.bottom + topMargin : verticalSpacing + left : _DDGenDialColumn.left + } - model: [ - Number(vDDValvesStates.hydraulicsOutletValve ) , - Number(vDDValvesStates.thermalDisinfectValve ) , - Number(vDDValvesStates.HydraulicsBypassValve ) , - Number(vDDValvesStates.rinsePortValve ) , - Number(vDDValvesStates.drainValve ) , - Number(vDDValvesStates.dialyzerBypassValve ) , - Number(vDDValvesStates.purgeValve1 ) , - Number(vDDValvesStates.pressureTestValve ) , - Number(vDDValvesStates.dryBicarbInletValve ) , - Number(vDDValvesStates.dialyzerInletValve ) , - Number(vDDValvesStates.dialyzerOutletValve ) , - Number(vDDValvesStates.purgeValve2 ) , - Number(vDDValvesStates.hydraulicsInletValve ) , - Number(vDDValvesStates.waterInletValve ) , - ] - label: [ - "HydOut (D14) ", - "ThemD (D52) ", - "HydByP (D8) ", - "RinseP (D54) ", - "Drain (D53) ", - "DialByP (D34) ", - "PurgV1 (D64) ", - "PresT (D31) ", - "DryBic (D65) ", - "DialIn (D35) ", - "DialOut (D40) ", - "PurgV2 (D47) ", - "HydIn (D3) ", - "WaterIn (M4) ", - ] - } + model: [ + Number(vDDValvesStates.hydraulicsOutletValve ) , + Number(vDDValvesStates.thermalDisinfectValve ) , + Number(vDDValvesStates.HydraulicsBypassValve ) , + Number(vDDValvesStates.rinsePortValve ) , + Number(vDDValvesStates.drainValve ) , + Number(vDDValvesStates.dialyzerBypassValve ) , + Number(vDDValvesStates.purgeValve1 ) , + Number(vDDValvesStates.pressureTestValve ) , + Number(vDDValvesStates.dryBicarbInletValve ) , + Number(vDDValvesStates.dialyzerInletValve ) , + Number(vDDValvesStates.dialyzerOutletValve ) , + Number(vDDValvesStates.purgeValve2 ) , + Number(vDDValvesStates.hydraulicsInletValve ) , + Number(vDDValvesStates.dryBicarbValve ) , + Number(vDDValvesStates.deScalerValve ) , + ] + label: [ + "HydOut (D14) ", + "ThemD (D52) ", + "HydByP (D8) ", + "RinseP (D54) ", + "Drain (D53) ", + "DialByP (D34) ", + "PurgV1 (D64) ", + "PresT (D31) ", + "DryBic (D65) ", + "DialIn (D35) ", + "DialOut (D40) ", + "PurgV2 (D47) ", + "HydIn (D3) ", + "Dry Bicarb (D80) ", + "De-scaler (D81) ", + ] + } - DebugDataColumn { id: _DDCondColumn - textObjectName :"_DDCondlData" - title : qsTr(" Cond ") - x: col(9) - y: row(0) - model: [ - vDDConductivity.bicarbCondutivity1 .toFixed(2), - vDDConductivity.acidBicarbCondutivity1 .toFixed(2), - vDDConductivity.acidBicarbCondutivity2 .toFixed(2), - vDDConductivity.spentCondutivity1 .toFixed(2), - vDDConductivity.bicarbCondutivity2 .toFixed(2), - ] - label: [ - "bicarb1 (D17) ", - "acidb1 (D27) ", - "acidb1 (D29) ", - "spent (D43) ", - "bicarb2 (D74) ", - ] - } + DebugDataColumn { id: _DDCondColumn + textObjectName :"_DDCondlData" + title : "[0x1F]" + qsTr(" Conductivity ") + anchors { + top : _DDDialysatePumpColumn.bottom + topMargin : verticalSpacing + left : _DDDialysatePumpColumn.left + } + model: [ + vDDConductivity.bicarbCondutivity1 .toFixed(2), + vDDConductivity.acidBicarbCondutivity1 .toFixed(2), + vDDConductivity.acidBicarbCondutivity2 .toFixed(2), + vDDConductivity.spentCondutivity1 .toFixed(2), + vDDConductivity.bicarbCondutivity2 .toFixed(2), + ] + label: [ + "bicarb1 (D17) ", + "acidb1 (D27) ", + "acidb1 (D29) ", + "spent (D43) ", + "bicarb2 (D74) ", + ] + } - DebugDataColumn { id: _DDLevelColumn - textObjectName :"_DDLevelData" - title : qsTr(" Levels ") - x: col(9) - y: row(2) - model: [ - vDDLevel.floaterLevel , - vDDLevel.bicarbLevel , - vDDLevel.spentDialysateLevel , - ] - label: [ - "floater (D6) ", - "bicarb (D63) ", - "sptDial (D46) ", - ] - } + DebugDataColumn { id: _DDLevelColumn + textObjectName :"_DDLevelData" + title : "[0x29]" + qsTr(" Levels ") + anchors { + top : _DDTemperatureColumn.bottom + topMargin : verticalSpacing + left : _DDTemperatureColumn.left + } + model: [ + vDDLevel.d46Level , + vDDLevel.d63Level , + vDDLevel.d98Level , + vDDLevel.d6Level , + vDDLevel.bicardLevel , + ] + label: [ + "D46 ", + "D63 ", + "D98 ", + "D6 ", + "bicarb ", + ] + } - DebugDataColumn { id: _DDBCValvesColumn - textObjectName :"_DDBCValvesData" - title : qsTr(" BC Valves ") - x: col(9.5) - y: row(3.3) - model: [ - Number(vDDValvesStates.balancingChamberValve1 ) , - Number(vDDValvesStates.balancingChamberValve2 ) , - Number(vDDValvesStates.balancingChamberValve3 ) , - Number(vDDValvesStates.balancingChamberValve7 ) , - Number(vDDValvesStates.balancingChamberValve5 ) , - Number(vDDValvesStates.balancingChamberValve6 ) , - Number(vDDValvesStates.balancingChamberValve4 ) , - Number(vDDValvesStates.balancingChamberValve8 ) , - ] - label: [ - "BC1 (D23) ", - "BC2 (D19) ", - "BC3 (D25) ", - "BC7 (D26) ", - "BC5 (D24) ", - "BC6 (D20) ", - "BC4 (D21) ", - "BC8 (D22) ", - ] - } + DebugDataColumn { id: _DDBCValvesColumn + textObjectName :"_DDBCValvesData" + title : "[0x1B]" + qsTr(" BC Valves ") + anchors { + top : _DDBloodLeakColumn.bottom + topMargin : verticalSpacing + left : _DDBloodLeakColumn.left + } + model: [ + Number(vDDValvesStates.balancingChamberValve1 ) , + Number(vDDValvesStates.balancingChamberValve2 ) , + Number(vDDValvesStates.balancingChamberValve3 ) , + Number(vDDValvesStates.balancingChamberValve4 ) , + Number(vDDValvesStates.balancingChamberValve5 ) , + Number(vDDValvesStates.balancingChamberValve6 ) , + Number(vDDValvesStates.balancingChamberValve7 ) , + Number(vDDValvesStates.balancingChamberValve8 ) , + ] + label: [ + "BC1 (D23) ", + "BC2 (D19) ", + "BC3 (D25) ", + "BC4 (D21) ", + "BC5 (D24) ", + "BC6 (D20) ", + "BC7 (D26) ", + "BC8 (D22) ", + ] + } - DebugDataColumn { id: _DDBloodLeakColumn - textObjectName :"_DDBloodLeakData" - title : qsTr(" Blood Leak ") - x: col(10.5) - y: row(0) - model: [ - vDDBloodLeak.bloodLeak , - ] - label: [ - "BL ", - ] - } + DebugDataColumn { id: _DDIOValvesColumn + textObjectName :"_DDIOValvesColumn" + title : "[0x1B]" + qsTr(" IO Valves ") + anchors { + top : _DDCondColumn.bottom + topMargin : verticalSpacing + left : _DDCondColumn.left + } + model: [ + Number(vDDValvesStates.ioValve0 ) , + Number(vDDValvesStates.ioValve1 ) , + ] + label: [ + "IO0 (M4) ", + "IO1 (M12) ", + ] + } - // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. - TouchRect { - x : col(9.0) - y : row(8.0) - width : 425 - height : 80 - onClicked : vAdjustmentVersions.doAdjustment() - radius : 10 - Column { - anchors.top : parent.top - anchors.topMargin: -20 - anchors.left: parent.left - anchors.leftMargin: 5 + DebugDataColumn { id: _DDSpareValvesColumn + textObjectName :"_DDSpareValvesColumn" + title : "[0x1B]" + qsTr(" Spare Valves ") + anchors { + top : _DDHeatersColumn.bottom + topMargin : verticalSpacing + left : _DDHeatersColumn.left + } + model: [ + Number(vDDValvesStates.spareValve0 ) , + Number(vDDValvesStates.spareValve1 ) , + Number(vDDValvesStates.spareValve2 ) , + Number(vDDValvesStates.spareValve3 ) , + Number(vDDValvesStates.spareValve4 ) , + Number(vDDValvesStates.spareValve5 ) , + Number(vDDValvesStates.spareValve6 ) , + Number(vDDValvesStates.spareValve7 ) , + ] + label: [ + "D79 ", + "D82 ", + "D91 ", + "Spare Valve 3 ", + "Spare Valve 4 ", + "Spare Valve 5 ", + "D100 ", + "Spare Valve 7 ", + ] + } - spacing: -30 + DebugDataColumn { id: _DDFPValvesColumn + textObjectName :"_DDFPValvesColumn" + title : "[0x1B]" + qsTr(" FP Valves ") + anchors { + top : _DDConcentratePumpColumn.bottom + topMargin : verticalSpacing + left : _DDConcentratePumpColumn.left + } + model: [ + Number(vDDValvesStates.fpValve0) , + Number(vDDValvesStates.fpValve1) , + Number(vDDValvesStates.fpValve2) , + Number(vDDValvesStates.fpValve3) , + Number(vDDValvesStates.fpValve4) , + Number(vDDValvesStates.fpValve5) , + ] + label: [ + "P11 ", + "P33 ", + "P34 ", + "P37 ", + "P39 ", + "P6 ", + ] + } + DebugDataColumn { id: _DDBloodLeakColumn + textObjectName :"_DDBloodLeakData" + title : "[0x61]" + qsTr(" Blood Leak ") + anchors { + top : _DDPressureColumn.bottom + topMargin : verticalSpacing + left : _DDPressureColumn.left + } + model: [ + vDDBloodLeak.bloodLeakStatus , + vDDBloodLeak.bloodLeakState , + vDDBloodLeak.bloodLeakPersistentCounter , + vDDBloodLeak.bloodLeakSerialCommState , + vDDBloodLeak.bloodLeakIntensity , + vDDBloodLeak.bloodLeakDetect , + vDDBloodLeak.bloodLeakIntensityMovingAvg.toFixed(2) , + vDDBloodLeak.bloodLeakTimeSinceZeroMS , + vDDBloodLeak.driftInRangeStatus , + vDDBloodLeak.driftUpperRangeStatus , + ] + label: [ + "Status ", + "State ", + "PersistentCounter ", + "SerialCommState ", + "Intensity ", + "Detect ", + "IntensityMovingAvg ", + "TimeSinceZeroMS ", + "DriftInRangeStatus ", + "DriftUpperRangeStatus ", + ] + } + + // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. + TouchRect { + width : _DDVersionsColumn.width + height : _DDVersionsColumn.height + onClicked : vAdjustmentVersions.doAdjustment() + radius : 5 + anchors { + bottom : parent.bottom + right : parent.right + } + DebugDataColumn { id: _DDVersionsColumn textObjectName :"_DDVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft fontPixelSizeText: Fonts.fontPixelDebugTitle + isTouchRect : true model: [ "DD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9\nDD Serial#: %10" .arg(vAdjustmentVersions.ddVerMajor ) .arg(vAdjustmentVersions.ddVerMinor ) @@ -452,14 +585,4 @@ } } } - - - Connections { target: _GuiView - function onDidActionReceive( vAction, vData ) { - // DEBUG: console.debug("onDidActionReceive", vAction, vData) - if (vAction === GuiActions.ID_CANBusFaultCount ) { - _canbusFaultCountText.count = vData[0] - } - } - } }