Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -r32ca8b84563394e35720ec2da6e607d45a128f39 -r26433c42f2efa2cb18af95f523581c7eeeff049d --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 32ca8b84563394e35720ec2da6e607d45a128f39) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 26433c42f2efa2cb18af95f523581c7eeeff049d) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2023 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2024 Diality Inc. - All Rights Reserved. * \copyright * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * * \file DiagnosticsDialog.qml - * \author (last) Behrouz NematiPour - * \date (last) 10-Feb-2023 + * \author (last) Dara Navaei + * \date (last) 05-Mar-2024 * \author (original) Behrouz NematiPour * \date (original) 11-May-2021 * @@ -84,16 +84,24 @@ x: col(1) y: row(0) model: [ - vDGDrainPump.rpmi , - vDGDrainPump.dac , - vDGDrainPump.state , - vDGDrainPump.rpmo , + vDGDrainPump.rpmi , + vDGDrainPump.dac , + vDGDrainPump.state , + vDGDrainPump.rpmo , + vDGDrainPump.targetFLPMO .toFixed(2) , + vDGDrainPump.currentA .toFixed(2) , + vDGDrainPump.direction , + vDGDrainPump.maxonRPM , ] label: [ "TgtSpd", "DAC" , "stt" , "Spd" , + "tgt" , + "cur" , + "dir" , + "mxn" , ] } @@ -124,9 +132,9 @@ x: col(3) y: row(0) model: [ - vDGReservoir.activeReservoir , - vDGReservoir.fillToVol , - vDGReservoir.drainToVol , + vDGReservoir.activeReservoir , + vDGReservoir.fillToVol , + vDGReservoir.drainToVol , ] label: [ "Act", @@ -152,6 +160,32 @@ ] } + Text { id : _mouseEventCountText + text: String("Touch: %1,%2").arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) + .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) + x: col(3.5) + y: row(1.5) + visible: true + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelDebugText + MouseArea { + anchors.fill: _mouseEventCountText + onClicked: GuiEventSpy.doTouchReset() + } + } + + Text { id : _canbusFaultCountText + property int count: 0 + text: qsTr("CANerr: %1").arg(count) + x: col(5.0) + y: row(1.5) + visible: true + horizontalAlignment: Text.AlignLeft + color: Colors.textMain + font.pixelSize: Fonts.fontPixelDebugText + } + DebugDataColumn { id: _DGLoadCellReadingsColumn textObjectName :"_DGLoadCellReadingsData" title : qsTr(" LoadCl ") @@ -198,6 +232,9 @@ vDGTemperatures.interalTHDRTD .toFixed(2) , vDGTemperatures.internalCondSnsrTemp .toFixed(2) , vDGTemperatures.baroTempSensor .toFixed(2) , + // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen + //vDGTemperatures.dialysateInletMvngAvg .toFixed(2) , + //vDGTemperatures.redundantOutletMvngAvg .toFixed(2) , ] label: [ "TPi" , @@ -221,6 +258,9 @@ "iTHD" , "iCond" , "baro" , + // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen + // TDiAvg, + // TROAvg, ] } @@ -235,30 +275,50 @@ vDGConductivity.CPo .toFixed(1), vDGConductivity.CD1 .toFixed(1), vDGConductivity.CD2 .toFixed(1), + vDGConductivity.CPiRaw .toFixed(1), + vDGConductivity.CPoRaw .toFixed(1), + vDGConductivity.CD1Raw .toFixed(1), + vDGConductivity.CD2Raw .toFixed(1), + vDGConductivity.CPiSensorStatus .toFixed(1), + vDGConductivity.CPoSensorStatus .toFixed(1), + vDGConductivity.CD1SensorStatus .toFixed(1), + vDGConductivity.CD2SensorStatus .toFixed(1), ] label: [ "ROrr" , "CPi" , "CPo" , "CD1" , "CD2" , + "CPir" , + "CPor" , + "CD1r" , + "CD2r" , + "CPis" , + "CPos" , + "CD1s" , + "CD2s" , ] } DebugDataColumn { id: _HDAirColumn textObjectName :"_HDAirData" - title : qsTr(" Air Status ") - x: col(3.0) + title : qsTr("Air Status") + x: col(2.4) y: row(5.5) model: [ vHDAirBubble .venousAirBubbleStatus , vHDAirTrap .airTrapLowerLevel , vHDAirTrap .airTrapUpperLevel , + vHDAirTrap .airTrapRawLowerLevel , + vHDAirTrap .airTrapRawUpperLevel , ] label: [ "ADV" , "ATll" , "ATul" , + "ATRll" , + "ATRul" , ] } @@ -270,15 +330,15 @@ model: [ vDGOperationMode.text , ] - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle } // --- HD --- DebugDataColumn { id: _HDBloodFlowColumn textObjectName :"_HDBloodFlowData" title : qsTr(" BP ") x: col(0) - y: row(2.6) + y: row(2.5) model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , @@ -307,7 +367,7 @@ textObjectName :"_HDDialysateInletFlowData" title : qsTr(" DPi ") x: col(1.2) - y: row(2.6) + y: row(2.5) model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , @@ -336,7 +396,7 @@ textObjectName :"_HDDialysateOutletFlowData" title : qsTr(" UF/DPo ") x: col(2.4) - y: row(2.6) + y: row(2.5) model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , @@ -345,6 +405,13 @@ vTreatmentUltrafiltration.ultrafiltration_MotorCtlSpeed .toFixed(2) , vTreatmentUltrafiltration.ultrafiltration_MotorCtlCurrent.toFixed(2) , "%" + vTreatmentUltrafiltration.ultrafiltration_PWMDtCycle .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_DopCorrOffset .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_DopCalcRate .toFixed(2) , + vTreatmentUltrafiltration.ultrafiltration_UfCalcRate .toFixed(2) , + // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen + //vTreatmentUltrafiltration.ultrafiltration_RotorHall .toFixed(2) , + //vTreatmentUltrafiltration.ultrafiltration_UfCurrentRate .toFixed(2) , + //vTreatmentUltrafiltration.ultrafiltration_dialOutPumpState.toFixed(2) , ] label: [ "UFRef" , @@ -354,6 +421,13 @@ "MC.Spd" , "MC.Cur" , "PWM" , + "DopOfst" , + "DopRate" , + "UFcRate" , + // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen + //"RotorHall" , + //"CUFRate" , + //"DOPumpSt" , ] } @@ -415,7 +489,7 @@ model: [ vHDOperationMode.text , ] - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle } DebugDataColumn { id: _DGValvesStatesColumn @@ -425,24 +499,24 @@ y: row(0.0) width: 50 model: [ - vDGValvesStates.valveStates_VRF , - vDGValvesStates.valveStates_VRI , - vDGValvesStates.valveStates_VRD , - vDGValvesStates.valveStates_VRO , - vDGValvesStates.valveStates_VPO , - vDGValvesStates.valveStates_VBF , - vDGValvesStates.valveStates_VRC , - vDGValvesStates.valveStates_VDR , - vDGValvesStates.valveStates_VPI , - vDGValvesStates.valveStates_VSP , - vDGValvesStates.valveStates_VR1 , - vDGValvesStates.valveStates_VR2 , - vDGValvesStates.valveStates_VPD , + "%1,%2".arg(vDGValvesStates.valveStatus_VRF).arg(vDGValvesStates.valveStates_VRF), + "%1,%2".arg(vDGValvesStates.valveStatus_VRI).arg(vDGValvesStates.valveStates_VRI), + "%1,%2".arg(vDGValvesStates.valveStatus_RES).arg(vDGValvesStates.valveStates_RES), + "%1,%2".arg(vDGValvesStates.valveStatus_VRO).arg(vDGValvesStates.valveStates_VRO), + "%1,%2".arg(vDGValvesStates.valveStatus_VPO).arg(vDGValvesStates.valveStates_VPO), + "%1,%2".arg(vDGValvesStates.valveStatus_VBF).arg(vDGValvesStates.valveStates_VBF), + "%1,%2".arg(vDGValvesStates.valveStatus_VRC).arg(vDGValvesStates.valveStates_VRC), + "%1,%2".arg(vDGValvesStates.valveStatus_VDR).arg(vDGValvesStates.valveStates_VDR), + "%1,%2".arg(vDGValvesStates.valveStatus_VPI).arg(vDGValvesStates.valveStates_VPI), + "%1,%2".arg(vDGValvesStates.valveStatus_VSP).arg(vDGValvesStates.valveStates_VSP), + "%1,%2".arg(vDGValvesStates.valveStatus_VR1).arg(vDGValvesStates.valveStates_VR1), + "%1,%2".arg(vDGValvesStates.valveStatus_VR2).arg(vDGValvesStates.valveStates_VR2), + "%1,%2".arg(vDGValvesStates.valveStatus_VPD).arg(vDGValvesStates.valveStates_VPD), ] label: [ "VRF", "VRI", - "VRD", + "RES", "VRO", "VPO", "VBF", @@ -462,17 +536,12 @@ x: col(7) y: row(4.5) model: [ - vHDBloodLeak.bloodLeakDetectSetPoint , - vHDBloodLeak.bloodLeakZeroedStatus , - vHDBloodLeak.bloodLeakState , - vHDBloodLeak.bloodLeakDetectLevel , + vHDBloodLeak.bloodLeakStatus , + vHDBloodLeak.bloodLeakState , ] label: [ - "SetPt" , - "0Stat" , + "Stats" , "State" , - "DtLvl" , - ] } @@ -482,7 +551,7 @@ x: col(5) y: row(5.5) model: [ - _alarmItem.alarm_AlarmID , + _alarmItem.hasAlarm ? _alarmItem.alarm_AlarmID : 0, ] label: [ "Top" , @@ -491,9 +560,9 @@ // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. TouchRect { - x : col(4.6) + x : col(5.0) y : row(6.4) - width : 475 + width : 425 height : 80 onClicked : vAdjustmentVersions.doAdjustment() radius : 10 @@ -508,7 +577,7 @@ textObjectName :"_HDVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" .arg(vAdjustmentVersions.hdVerMajor ) .arg(vAdjustmentVersions.hdVerMinor ) @@ -526,7 +595,7 @@ textObjectName :"_DGVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle model: [ "DG: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" .arg(vAdjustmentVersions.dgVerMajor ) .arg(vAdjustmentVersions.dgVerMinor ) @@ -560,53 +629,26 @@ .arg(vPreTreatmentStates.wetSelfTestsState ) .arg(vPreTreatmentStates.preTreatmentRsrvrState ) ] - fontPixelSizeText: 30 } - Text { id : _mouseEventCountText - text: String("Touch: %1,%2").arg(GuiEventSpy.touchCount /*.toString().padStart(4,'0')*/ ) - .arg(GuiEventSpy.touchPoints /*.toString().padStart(4,'0')*/ ) - x: col(0.3) - y: row(6.4) - visible: true - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: 30 - MouseArea { - anchors.fill: _mouseEventCountText - onClicked: GuiEventSpy.doTouchReset() - } - } - - Text { id : _canbusFaultCountText - property int count: 0 - text: qsTr("CANerr: %1").arg(count) - x: col(0.2) - y: row(6.8) - visible: true - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: 30 - } - Text { id : _hdResetInformation - x: col(1.5) + x: col(0.2) y: row(6.4) visible: true text: "HDrst:" + vGeneralEvent.hdReset horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Text { id : _dgResetInformation - x: col(1.5) + x: col(0.2) y: row(6.8) visible: true text: "DGrst:" + vGeneralEvent.dgReset horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Connections { target: _GuiView