Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -rf68b226e67eb500758ee94fe015df48931240013 -rfff4ebfd528e1ca2b4475e375130d0d4c90fe38a --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision f68b226e67eb500758ee94fe015df48931240013) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision fff4ebfd528e1ca2b4475e375130d0d4c90fe38a) @@ -1,13 +1,13 @@ /*! * - * Copyright (c) 2021-2022 Diality Inc. - All Rights Reserved. + * Copyright (c) 2021-2023 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-Mar-2022 + * \date (last) 10-Feb-2023 * \author (original) Behrouz NematiPour * \date (original) 11-May-2021 * @@ -84,16 +84,22 @@ 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 , + vDGDrainPump.currentA , + vDGDrainPump.direction , ] label: [ "TgtSpd", "DAC" , "stt" , "Spd" , + "tgt" , + "cur" , + "dir" , ] } @@ -107,12 +113,14 @@ vDGPressures.roOutletPSI .toFixed(2) , vDGPressures.drainInletPSI .toFixed(2) , vDGPressures.drainOutletPSI .toFixed(2) , + vDGPressures.barometricPSI .toFixed(2) , ] label: [ "PPi", "PPo", "PRd", "PDr", + "bar", ] } @@ -139,9 +147,9 @@ x: col(4) y: row(0) model: [ - vDGHeaters.mainPrimaryDC .toFixed(2), - vDGHeaters.smallPrimaryDC .toFixed(2), - vDGHeaters.trimmerDC .toFixed(2), + vDGHeaters.mainPrimayHeaterDC .toFixed(2), + vDGHeaters.smallPrimaryHeaterDC .toFixed(2), + vDGHeaters.trimmerHeaterDC .toFixed(2), ] label: [ "HP1", @@ -184,10 +192,18 @@ vDGTemperatures.inletDialysate .toFixed(2) , vDGTemperatures.primaryHeaterThermoCouple .toFixed(2) , vDGTemperatures.trimmerHeaterThermoCouple .toFixed(2) , - // vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , - // vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , + vDGTemperatures.primaryHeaterColdJunction .toFixed(2) , + vDGTemperatures.trimmerHeaterColdJunction .toFixed(2) , vDGTemperatures.primaryHeaterInternal .toFixed(2) , vDGTemperatures.trimmerHeaterInternal .toFixed(2) , + vDGTemperatures.fpgaBoard .toFixed(2) , + vDGTemperatures.loadCellA1B1 .toFixed(2) , + vDGTemperatures.loadCellA2B2 .toFixed(2) , + vDGTemperatures.internalTHDORTD .toFixed(2) , + vDGTemperatures.internalTDIRTD .toFixed(2) , + vDGTemperatures.interalTHDRTD .toFixed(2) , + vDGTemperatures.internalCondSnsrTemp .toFixed(2) , + vDGTemperatures.baroTempSensor .toFixed(2) , ] label: [ "TPi" , @@ -199,39 +215,63 @@ "TDi" , "HP.Trm", "HR.Trm", - // "HP.CJ" , - // "HR.CJ" , + "HP.Cld", + "HR.Cld", "HP.Int", "HR.Int", + "fpga" , + "cell11", + "cell22", + "iTHDO" , + "iTDI" , + "iTHD" , + "iCond" , + "baro" , ] } DebugDataColumn { id: _DGConductivityColumn textObjectName :"_DGConductivityData" title : qsTr(" Conduct ") x: col(3.7) - y: row(3.0) + y: row(3.2) model: [ vDGConductivity.RORejectionRatio .toFixed(3), vDGConductivity.CPi .toFixed(1), 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(6) - y: row(4.1) + title : qsTr("Air Status") + x: col(2.4) + y: row(5.5) model: [ vHDAirBubble .venousAirBubbleStatus , vHDAirTrap .airTrapLowerLevel , @@ -248,19 +288,19 @@ textObjectName :"_DGOperationModeData" title : qsTr(" DG Mode ") x: col(2.5) - y: row(1.7) + y: row(1.9) model: [ vDGOperationMode.text , ] - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle } // --- HD --- DebugDataColumn { id: _HDBloodFlowColumn textObjectName :"_HDBloodFlowData" title : qsTr(" BP ") x: col(0) - y: row(2.4) + y: row(2.5) model: [ vTreatmentBloodFlow.bloodFlow_FlowSetPoint , vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , @@ -287,7 +327,7 @@ textObjectName :"_HDDialysateInletFlowData" title : qsTr(" DPi ") x: col(1.2) - y: row(2.4) + y: row(2.5) model: [ vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , @@ -312,7 +352,7 @@ textObjectName :"_HDDialysateOutletFlowData" title : qsTr(" UF/DPo ") x: col(2.4) - y: row(2.4) + y: row(2.5) model: [ vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , @@ -321,6 +361,9 @@ 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) , ] label: [ "UFRef" , @@ -330,14 +373,17 @@ "MC.Spd" , "MC.Cur" , "PWM" , + "DopOfst" , + "DopRate" , + "UFcRate" , ] } DebugDataColumn { id: _HDPressureOcclusionColumn textObjectName :"_HDPressureOcclusionData" title : qsTr(" Prsr Oc ") x: col(3.7) - y: row(1.7) + y: row(1.9) model: [ vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , vTreatmentPressureOcclusion.venousPressure .toFixed(2) , @@ -354,7 +400,7 @@ textObjectName :"_HDSyringePumpData" title : qsTr(" Syringe ") x: col(4.6) - y: row(1.7) + y: row(1.9) model: [ vHDSyringePump.syringePumpState , vHDSyringePump.heparinState , @@ -387,11 +433,11 @@ textObjectName :"_HDOperationModeData" title : qsTr(" HD Mode ") x: col(0.5) - y: row(1.7) + y: row(1.9) model: [ vHDOperationMode.text , ] - fontPixelSizeText: 30 + fontPixelSizeText: Fonts.fontPixelDebugTitle } DebugDataColumn { id: _DGValvesStatesColumn @@ -401,24 +447,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", @@ -438,24 +484,19 @@ 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" , - ] } DebugDataColumn { id: _HDAlarmTopColumn textObjectName :"_HDAlarmTopData" title : qsTr(" Alarms ") - x: col(6) + x: col(5) y: row(5.5) model: [ _alarmItem.alarm_AlarmID , @@ -467,9 +508,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 @@ -484,7 +525,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 ) @@ -502,7 +543,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 ) @@ -521,9 +562,9 @@ DebugDataColumn { id: _PreTreatmentStatesColumn textObjectName :"_PreTreatmentStatesData" title : qsTr(" PreTx States ") - x: col(1.0) + x: col(1.5) y: row(5.5) - model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9" + model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9,%10,%11" .arg(vPreTreatmentStates.subMode ) .arg(vPreTreatmentStates.waterSampleState ) .arg(vPreTreatmentStates.selfTestConsumablesState) @@ -533,6 +574,8 @@ .arg(vPreTreatmentStates.primeState ) .arg(vPreTreatmentStates.recirculateState ) .arg(vPreTreatmentStates.patientConnectionState ) + .arg(vPreTreatmentStates.wetSelfTestsState ) + .arg(vPreTreatmentStates.preTreatmentRsrvrState ) ] } @@ -544,7 +587,7 @@ visible: true horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText MouseArea { anchors.fill: _mouseEventCountText onClicked: GuiEventSpy.doTouchReset() @@ -559,7 +602,7 @@ visible: true horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Text { id : _hdResetInformation @@ -569,7 +612,7 @@ text: "HDrst:" + vGeneralEvent.hdReset horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Text { id : _dgResetInformation @@ -579,7 +622,7 @@ text: "DGrst:" + vGeneralEvent.dgReset horizontalAlignment: Text.AlignLeft color: Colors.textMain - font.pixelSize: 30 + font.pixelSize: Fonts.fontPixelDebugText } Connections { target: _GuiView