Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -rbf9223700613ced6c377f3e3a7b4de8367c30474 -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision bf9223700613ced6c377f3e3a7b4de8367c30474) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd) @@ -27,12 +27,13 @@ */ DiagnosticsBase { id: _root objectName : "_DiagnosticsDD" + verticalSpacing: Variables.defaultMargin * 0.5 contentItem : Item { id: _content DebugDataColumn { id: _DDConcentratePumpColumn textObjectName :"_DDConcentratePumpData" - title : qsTr(" Conc Pump ") + title : "[0x25]" + qsTr(" Conc Pump ") anchors { top : parent.top left : parent.left @@ -95,7 +96,7 @@ DebugDataColumn { id: _DDDialysatePumpColumn textObjectName :"_DDDialysatePumpData" - title : qsTr(" Dial Pump ") + title : "[0x27]" + qsTr(" Dialysate Pump ") anchors { top : parent.top left : _DDConcentratePumpColumn.right @@ -149,7 +150,7 @@ DebugDataColumn { id: _DDHeatersColumn textObjectName :"_DDHeatersData" - title : qsTr(" Heaters ") + title : "[0x28]" + qsTr(" Heaters ") anchors { top : parent.top left : _DDDialysatePumpColumn.right @@ -197,129 +198,136 @@ DebugDataColumn { id: _DDTemperatureColumn textObjectName :"_DDTemperatureData" - title : qsTr(" Temp ") + 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 ") + title : "[0x1C]" + qsTr(" Pressure ") anchors { top : parent.top left : _DDTemperatureColumn.right leftMargin : spacing } 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), + 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: [ - "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) ", + "D9 ", + "D66 ", + "D51 ", + "D18 ", + "D41 ", + "D87 ", ] } - DebugDataColumn { id: _DDGenDialColumn - textObjectName :"_DDGenDialData" - title : qsTr(" GenDial ") + 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 " + ] + } + 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.fltLevel1 , - vDDGenDialysate.bicarbLevel , - vDDGenDialysate.spentLevel , - vDDGenDialysate.hydNegativePressure .toFixed(2), - vDDGenDialysate.hydPositivePressure .toFixed(2), - vDDGenDialysate.spentPressure .toFixed(2), + vDDGenDialysate.currentQd .toFixed(2) , ] label: [ "Exec ", "inProg ", "isGood ", - "fltLvL (D6) ", - "bicarbLvL (D63)", - "sptLvL (D46) ", - "hydNeg (D19) ", - "hydPos (D18) ", - "sptPres (D51) ", + "current Qd ", ] } DebugDataColumn { id: _DDHydraulicsValveColumn textObjectName :"_DDHydraulicValveData" - title : qsTr(" Hyd Valve ") + title : "[0x1B]" + qsTr(" Hyd Valve ") anchors { top : _DDGenDialColumn.bottom - topMargin : spacing + topMargin : verticalSpacing left : _DDGenDialColumn.left } @@ -361,10 +369,10 @@ DebugDataColumn { id: _DDCondColumn textObjectName :"_DDCondlData" - title : qsTr(" Cond ") + title : "[0x1F]" + qsTr(" Conductivity ") anchors { top : _DDDialysatePumpColumn.bottom - topMargin : spacing + topMargin : verticalSpacing left : _DDDialysatePumpColumn.left } model: [ @@ -385,32 +393,35 @@ DebugDataColumn { id: _DDLevelColumn textObjectName :"_DDLevelData" - title : qsTr(" Levels ") + title : "[0x29]" + qsTr(" Levels ") anchors { - top : _DDPressureColumn.bottom - topMargin : spacing - left : _DDPressureColumn.left + top : _DDTemperatureColumn.bottom + topMargin : verticalSpacing + left : _DDTemperatureColumn.left } model: [ - vDDLevel.floaterLevel , - vDDLevel.bicarbLevel , - vDDLevel.spentDialysateLevel , + vDDLevel.d46Level , + vDDLevel.d63Level , + vDDLevel.d98Level , + vDDLevel.d6Level , + vDDLevel.bicardLevel , ] label: [ - "floater (D6) ", - "bicarb (D63) ", - "sptDial (D46) ", + "D46 ", + "D63 ", + "D98 ", + "D6 ", + "bicarb ", ] } DebugDataColumn { id: _DDBCValvesColumn textObjectName :"_DDBCValvesData" - title : qsTr(" BC Valves ") + title : "[0x1B]" + qsTr(" BC Valves ") anchors { - top : _DDTemperatureColumn.bottom - topMargin : spacing - left : _DDHeatersColumn.right - leftMargin : spacing + top : _DDBloodLeakColumn.bottom + topMargin : verticalSpacing + left : _DDBloodLeakColumn.left } model: [ Number(vDDValvesStates.balancingChamberValve1 ) , @@ -436,11 +447,11 @@ DebugDataColumn { id: _DDIOValvesColumn textObjectName :"_DDIOValvesColumn" - title : qsTr(" IO Valves ") + title : "[0x1B]" + qsTr(" IO Valves ") anchors { - top : _DDBCValvesColumn.bottom - topMargin : spacing - left : _DDBCValvesColumn.left + top : _DDCondColumn.bottom + topMargin : verticalSpacing + left : _DDCondColumn.left } model: [ Number(vDDValvesStates.ioValve0 ) , @@ -454,10 +465,10 @@ DebugDataColumn { id: _DDSpareValvesColumn textObjectName :"_DDSpareValvesColumn" - title : qsTr(" Spare Valves ") + title : "[0x1B]" + qsTr(" Spare Valves ") anchors { top : _DDHeatersColumn.bottom - topMargin : spacing + topMargin : verticalSpacing left : _DDHeatersColumn.left } model: [ @@ -484,11 +495,11 @@ DebugDataColumn { id: _DDFPValvesColumn textObjectName :"_DDFPValvesColumn" - title : qsTr(" FP Valves ") + title : "[0x1B]" + qsTr(" FP Valves ") anchors { - top : _DDLevelColumn.bottom - topMargin : spacing - left : _DDPressureColumn.left + top : _DDConcentratePumpColumn.bottom + topMargin : verticalSpacing + left : _DDConcentratePumpColumn.left } model: [ Number(vDDValvesStates.fpValve0) , @@ -510,17 +521,35 @@ DebugDataColumn { id: _DDBloodLeakColumn textObjectName :"_DDBloodLeakData" - title : qsTr(" Blood Leak ") + title : "[0x61]" + qsTr(" Blood Leak ") anchors { - top : _DDConcentratePumpColumn.bottom - topMargin : spacing - left : parent.left + top : _DDPressureColumn.bottom + topMargin : verticalSpacing + left : _DDPressureColumn.left } model: [ - vDDBloodLeak.bloodLeak , + vDDBloodLeak.bloodLeakStatus , + vDDBloodLeak.bloodLeakState , + vDDBloodLeak.bloodLeakPersistentCounter , + vDDBloodLeak.bloodLeakSerialCommState , + vDDBloodLeak.bloodLeakIntensity , + vDDBloodLeak.bloodLeakDetect , + vDDBloodLeak.bloodLeakIntensityMovingAvg.toFixed(2) , + vDDBloodLeak.bloodLeakTimeSinceZeroMS , + vDDBloodLeak.driftInRangeStatus , + vDDBloodLeak.driftUpperRangeStatus , ] label: [ - "BL ", + "Status ", + "State ", + "PersistentCounter ", + "SerialCommState ", + "Intensity ", + "Detect ", + "IntensityMovingAvg ", + "TimeSinceZeroMS ", + "DriftInRangeStatus ", + "DriftUpperRangeStatus ", ] } @@ -556,13 +585,4 @@ } } } - - Connections { target: _GuiView - function onDidActionReceive( vAction, vData ) { - // DEBUG: console.debug("onDidActionReceive", vAction, vData) - if (vAction === guiActions.ID_CANBusFaultCount ) { - _canbusFaultCountText.count = vData[0] - } - } - } }