Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -rf2e4eba6e85c5d36537be782926f23cc9dc01037 -r7f61f6da0818d40aed3ef528ae498ea3f619ae07 --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision f2e4eba6e85c5d36537be782926f23cc9dc01037) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision 7f61f6da0818d40aed3ef528ae498ea3f619ae07) @@ -59,375 +59,170 @@ onClicked : close() } - DebugDataColumn { id: _DGROPumpColumn - textObjectName :"_DGROPumpData" - title : qsTr(" ROP ") + DebugDataColumn { id: _TDBloodPumpColumn + textObjectName :"_TDBloodPumpData" + title : qsTr(" BP ") x: col(0) y: row(0) model: [ - vDGROPump.pressure .toFixed(2) , - vDGROPump.flowRate .toFixed(2) , - vDGROPump.pwm .toFixed(2) , - vDGROPump.state - ] - label: [ - "MaxPrs", - "Flow" , - "PWM" , - "stt" , - ] - } + vTDBloodPump.setFlow , + vTDBloodPump.measFlow .toFixed(2) , + vTDBloodPump.rotorSpeed .toFixed(2) , + vTDBloodPump.motorSpeed .toFixed(2) , + vTDBloodPump.currMotor .toFixed(2) , + vTDBloodPump.setRPM .toFixed(2) , + vTDBloodPump.pressureFlow , + vTDBloodPump.rotationCount , + vTDBloodPump.rotorHallState , - DebugDataColumn { id: _DGDrainPumpColumn - textObjectName :"_DGDrainPumpData" - title : qsTr(" DRP ") - x: col(1) - y: row(0) - model: [ - 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" , + "sFLow ", + "mFlow ", + "rSpd ", + "mSpd ", + "cMot ", + "RPM ", + "pFlow ", + "rCnt ", + "state ", ] } - DebugDataColumn { id: _DGPressuresColumn - textObjectName :"_DGPressuresData" - title : qsTr(" Prssr ") - x: col(2) + DebugDataColumn { id: _TDAirTrapCoulumn + textObjectName :"_TDAirTrapData" + title : qsTr(" Air Trap ") + x: col(1.5) y: row(0) model: [ - vDGPressures.roInletPSI .toFixed(2) , - vDGPressures.roOutletPSI .toFixed(2) , - vDGPressures.drainInletPSI .toFixed(2) , - vDGPressures.drainOutletPSI .toFixed(2) , - vDGPressures.barometricPSI .toFixed(2) , + vTDAirTrap.lowLevel , + vTDAirTrap.upLevel , + vTDAirTrap.lowLevelRaw , + vTDAirTrap.upLevelRaw , + vTDAirTrap.valveState , + vTDAirTrap.controlling , ] label: [ - "PPi", - "PPo", - "PRd", - "PDr", - "bar", + "ATL", + "ATU", + "rATL", + "rATU", + "state", + "ctrl", ] } - DebugDataColumn { id: _DGReservoirColumn - textObjectName :"_DGReservoirData" - title : qsTr(" Rsrvr ") + DebugDataColumn { id: _TDValvesColumn + textObjectName :"_TDValvesData" + title : qsTr(" Vlv ") x: col(3) y: row(0) model: [ - vDGReservoir.activeReservoir , - vDGReservoir.fillToVol , - vDGReservoir.drainToVol , - ] - label: [ - "Act", - "Fil", - "Drn", - ] - } + vTDValves.valveId , + vTDValves.state , + vTDValves.posName , + vTDValves.posCount , + vTDValves.nextPos , - DebugDataColumn { id: _DGHeatersColumn - textObjectName :"_DGHeatersData" - title : qsTr(" Heatrs ") - x: col(4) - y: row(0) - model: [ - vDGHeaters.mainPrimayHeaterDC .toFixed(2), - vDGHeaters.smallPrimaryHeaterDC .toFixed(2), - vDGHeaters.trimmerHeaterDC .toFixed(2), ] label: [ - "HP1", - "HP2", - "HR" , + "ID ", + "state ", + "Name ", + "Cnt ", + "nPos ", ] } - 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 ") - x: col(5) + DebugDataColumn { id: _TDEjectorColumn + textObjectName :"_TDEjectorData" + title : qsTr(" Ejt ") + x: col(4.5) y: row(0) model: [ - vDGLoadCellReadings.reservoir1Prim .toFixed(2) , - vDGLoadCellReadings.reservoir1Bkup .toFixed(2) , - vDGLoadCellReadings.reservoir2Prim .toFixed(2) , - vDGLoadCellReadings.reservoir2Bkup .toFixed(2) , + vTDEjector.state , + vTDEjector.setSpeed .toFixed(2) , + ] label: [ - "A1", - "A2", - "B1", - "B2", + "state ", + "Spd " , ] } - DebugDataColumn { id: _DGTemperaturesColumn - textObjectName :"_DGTemperaturesData" - title : qsTr(" Tmprtr ") + DebugDataColumn { id: _TDSwitchesColumn + textObjectName :"_TDSwitchesData" + title : qsTr(" Switches ") x: col(6) y: row(0) model: [ - vDGTemperatures.inletPrimaryHeater .toFixed(2) , - vDGTemperatures.heatDisinfect .toFixed(2) , - vDGTemperatures.outletPrimaryHeater .toFixed(2) , - vDGTemperatures.conductivitySensor1 .toFixed(2) , - vDGTemperatures.conductivitySensor2 .toFixed(2) , - vDGTemperatures.outletRedundancy .toFixed(2) , - vDGTemperatures.inletDialysate .toFixed(2) , - vDGTemperatures.primaryHeaterThermoCouple .toFixed(2) , - vDGTemperatures.trimmerHeaterThermoCouple .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) , - // 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" , - "THd" , - "TPo" , - "TD1" , - "TD2" , - "TRo" , - "TDi" , - "HP.Trm", - "HR.Trm", - "HP.Cld", - "HR.Cld", - "HP.Int", - "HR.Int", - "fpga" , - "cell11", - "cell22", - "iTHDO" , - "iTDI" , - "iTHD" , - "iCond" , - "baro" , - // NOTE: the below fields are commented out due to lack of real estate in the diagnostics screen - // TDiAvg, - // TROAvg, - ] - } + vTDSwitches.door , - DebugDataColumn { id: _DGConductivityColumn - textObjectName :"_DGConductivityData" - title : qsTr(" Conduct ") - x: col(3.7) - 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" , + "door ", ] } - DebugDataColumn { id: _HDAirColumn - textObjectName :"_HDAirData" - 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" , - ] - } - DebugDataColumn { id: _DGOperationModeColumn - textObjectName :"_DGOperationModeData" - title : qsTr(" DG Mode ") - x: col(2.5) - y: row(1.9) - model: [ - vDGOperationMode.text , - ] - fontPixelSizeText: Fonts.fontPixelDebugTitle - } - - // --- HD --- - DebugDataColumn { id: _HDBloodFlowColumn - textObjectName :"_HDBloodFlowData" - title : qsTr(" BP ") + DebugDataColumn { id: _TDBatteryCoulumn + textObjectName :"_TDBatterypData" + title : qsTr(" Battery ") x: col(0) - y: row(2.5) + y: row(3.5) model: [ - vTreatmentBloodFlow.bloodFlow_FlowSetPoint , - vTreatmentBloodFlow.bloodFlow_MeasuredFlow .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_RotorSpeed .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_MotorSpeed .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_MotorCtlSpeed .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_MotorCtlCurrent .toFixed(2) , - "%" + vTreatmentBloodFlow.bloodFlow_PWMDutyCycle .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_RotorCount .toFixed(2) , - vTreatmentBloodFlow.bloodFlow_PresFlow .toFixed(2) , + vTDBattery.aCPower , + vTDBattery.capacity , ] label: [ - "Tgt.Flow" , - "Msr.Flow" , - "Rot.Spd" , - "Mot.Spd" , - "MC.Spd" , - "MC.Cur" , - "PWM" , - "Rtr.Cnt" , - "Prs.Flow" , + "AC ", + "cap ", ] } - DebugDataColumn { id: _HDDialysateInletFlowColumn - textObjectName :"_HDDialysateInletFlowData" - title : qsTr(" DPi ") - x: col(1.2) - y: row(2.5) + DebugDataColumn { id: _TDVoltageCoulumn + textObjectName :"_TDVoltageData" + title : qsTr(" Vol ") + x: col(1.5) + y: row(3.5) model: [ - vTreatmentDialysateFlow.dialysateFlow_FlowSetPoint .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MeasuredFlow .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_RotorSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorCtlSpeed .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_MotorCtlCurrent.toFixed(2) , - "%" + vTreatmentDialysateFlow.dialysateFlow_PWMDutyCycle .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_RotorCount .toFixed(2) , - vTreatmentDialysateFlow.dialysateFlow_PresFlow .toFixed(2) , + vTDVoltage.line_1_2V .toFixed(2) , + vTDVoltage.line_3_3V .toFixed(2) , + vTDVoltage.logic5V .toFixed(2) , + vTDVoltage.sensors5V .toFixed(2) , + vTDVoltage.line_24V .toFixed(2) , + vTDVoltage.regen24V .toFixed(2) , + vTDVoltage.fpgaAdcRef .toFixed(2) , + vTDVoltage.presRef .toFixed(2) , + vTDVoltage.fpgaVcc .toFixed(2) , + vTDVoltage.fpgaVaux .toFixed(2) , + vTDVoltage.fpgaVpvn .toFixed(2) ] label: [ - "Tgt.Flow" , - "Msr.Flow" , - "Rot.Spd" , - "Mot.Spd" , - "MC.Spd" , - "MC.Cur" , - "PWM" , - "Rtr.Cnt" , - "Prs.Flow" , + "1.2V", + "3.3V" , + "L5V" , + "S5V" , + "24V" , + "R24V" , + "ADC" , + "Ref" , + "VCC" , + "Vaux" , + "VPN" ] } - DebugDataColumn { id: _HDDialysateOutletFlowColumn - textObjectName :"_HDDialysateOutletFlowData" - title : qsTr(" UF/DPo ") - x: col(2.4) - y: row(2.5) + DebugDataColumn { id: _TDTemperatureCoulumn + textObjectName :"_TDTemperatureData" + title : qsTr(" Temp ") + x: col(3) + y: row(3.5) model: [ - vTreatmentUltrafiltration.ultrafiltration_RefUFVol .toFixed(3) , - vTreatmentUltrafiltration.ultrafiltration_MeasUFVol .toFixed(3) , - vTreatmentUltrafiltration.ultrafiltration_RotorSpeed .toFixed(2) , - vTreatmentUltrafiltration.ultrafiltration_MotorSpeed .toFixed(2) , - 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) , + vTDTemperature.boardTemp .toFixed(2) ] label: [ - "UFRef" , - "UFMeas" , - "Rot.Spd" , - "Mot.Spd" , - "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" , + "board", ] } @@ -560,10 +355,10 @@ // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. TouchRect { - x : col(5.0) + x : col(6.0) y : row(6.4) width : 425 - height : 80 + height : 160 onClicked : vAdjustmentVersions.doAdjustment() radius : 10 Column { @@ -573,84 +368,46 @@ anchors.leftMargin: 5 spacing: -30 - DebugDataColumn { id: _HDVersionsColumn - textObjectName :"_HDVersionsData" + DebugDataColumn { id: _TDVersionsColumn + textObjectName :"_TDVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft fontPixelSizeText: Fonts.fontPixelDebugTitle - model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" - .arg(vAdjustmentVersions.hdVerMajor ) - .arg(vAdjustmentVersions.hdVerMinor ) - .arg(vAdjustmentVersions.hdVerMicro ) - .arg(vAdjustmentVersions.hdVerBuild ) - .arg(vAdjustmentVersions.hdVerFPGAMajor ) - .arg(vAdjustmentVersions.hdVerFPGAMinor ) - .arg(vAdjustmentVersions.hdVerFPGALab ) - .arg(vAdjustmentVersions.hdVerFPGAId ) - .arg(vAdjustmentVersions.hdVerCompatibilityRev ) + model: [ "TD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9\nTD Serial#: %10" + .arg(vAdjustmentVersions.tdVerMajor ) + .arg(vAdjustmentVersions.tdVerMinor ) + .arg(vAdjustmentVersions.tdVerMicro ) + .arg(vAdjustmentVersions.tdVerBuild ) + .arg(vAdjustmentVersions.tdVerFPGAMajor ) + .arg(vAdjustmentVersions.tdVerFPGAMinor ) + .arg(vAdjustmentVersions.tdVerFPGALab ) + .arg(vAdjustmentVersions.tdVerFPGAId ) + .arg(vAdjustmentVersions.tdVerCompatibilityRev ) + .arg(vAdjustmentVersions.tdSerial ) ] } - DebugDataColumn { id: _DGVersionsColumn - textObjectName :"_DGVersionsData" + DebugDataColumn { id: _DDVersionsColumn + textObjectName :"_DDVersionsData" title : "" horizontalAlignmentText: Text.AlignLeft fontPixelSizeText: Fonts.fontPixelDebugTitle - model: [ "DG: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" - .arg(vAdjustmentVersions.dgVerMajor ) - .arg(vAdjustmentVersions.dgVerMinor ) - .arg(vAdjustmentVersions.dgVerMicro ) - .arg(vAdjustmentVersions.dgVerBuild ) - .arg(vAdjustmentVersions.dgVerFPGAMajor ) - .arg(vAdjustmentVersions.dgVerFPGAMinor ) - .arg(vAdjustmentVersions.dgVerFPGALab ) - .arg(vAdjustmentVersions.dgVerFPGAId ) - .arg(vAdjustmentVersions.dgVerCompatibilityRev ) + model: [ "DD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9\nDD Serial#: %10" + .arg(vAdjustmentVersions.ddVerMajor ) + .arg(vAdjustmentVersions.ddVerMinor ) + .arg(vAdjustmentVersions.ddVerMicro ) + .arg(vAdjustmentVersions.ddVerBuild ) + .arg(vAdjustmentVersions.ddVerFPGAMajor ) + .arg(vAdjustmentVersions.ddVerFPGAMinor ) + .arg(vAdjustmentVersions.ddVerFPGALab ) + .arg(vAdjustmentVersions.ddVerFPGAId ) + .arg(vAdjustmentVersions.ddVerCompatibilityRev ) + .arg(vAdjustmentVersions.ddSerial ) ] } - } } - DebugDataColumn { id: _PreTreatmentStatesColumn - textObjectName :"_PreTreatmentStatesData" - title : qsTr(" PreTx States ") - x: col(1.5) - y: row(5.5) - model: [ "%1,%2,%3,%4,%5,%6,%7,%8,%9,%10,%11" - .arg(vPreTreatmentStates.subMode ) - .arg(vPreTreatmentStates.waterSampleState ) - .arg(vPreTreatmentStates.selfTestConsumablesState) - .arg(vPreTreatmentStates.selfTestNoCartridgeState) - .arg(vPreTreatmentStates.installationState ) - .arg(vPreTreatmentStates.selfTestDryState ) - .arg(vPreTreatmentStates.primeState ) - .arg(vPreTreatmentStates.recirculateState ) - .arg(vPreTreatmentStates.patientConnectionState ) - .arg(vPreTreatmentStates.wetSelfTestsState ) - .arg(vPreTreatmentStates.preTreatmentRsrvrState ) - ] - } - Text { id : _hdResetInformation - x: col(0.2) - y: row(6.4) - visible: true - text: "HDrst:" + vGeneralEvent.hdReset - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelDebugText - } - - Text { id : _dgResetInformation - x: col(0.2) - y: row(6.8) - visible: true - text: "DGrst:" + vGeneralEvent.dgReset - horizontalAlignment: Text.AlignLeft - color: Colors.textMain - font.pixelSize: Fonts.fontPixelDebugText - } - Connections { target: _GuiView function onDidActionReceive( vAction, vData ) { // DEBUG: console.debug("onDidActionReceive", vAction, vData) @@ -661,3 +418,4 @@ } } +}