Index: sources/gui/qml/dialogs/DiagnosticsDialog.qml =================================================================== diff -u -ra245272e6d8eee5c3658245570b6d31bd039af74 -raf9b5ee3e759ca45c4e55488f46601f30143edae --- sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision a245272e6d8eee5c3658245570b6d31bd039af74) +++ sources/gui/qml/dialogs/DiagnosticsDialog.qml (.../DiagnosticsDialog.qml) (revision af9b5ee3e759ca45c4e55488f46601f30143edae) @@ -69,21 +69,23 @@ 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 , ] label: [ - "setFlow ", - "measFlow ", - "rotorSpeed ", - "motorSpeed ", - "setRPM ", - "pressureFlow ", - "rotationCount ", - "rotorHallState", + "sFLow ", + "mFlow ", + "rSpd ", + "mSpd ", + "cMot ", + "RPM ", + "pFlow ", + "rCnt ", + "state ", ] } @@ -101,10 +103,10 @@ vTDAirTrap.controlling , ] label: [ - "lower", - "upper", - "lowerR", - "upperR", + "ATL", + "ATU", + "rATL", + "rATU", "state", "ctrl", ] @@ -116,19 +118,19 @@ x: col(3) y: row(0) model: [ - vTDValves.nextPos , - vTDValves.posCount , - vTDValves.posName , - vTDValves.state , vTDValves.valveId , + vTDValves.state , + vTDValves.posName , + vTDValves.posCount , + vTDValves.nextPos , ] label: [ - "nextPos ", - "posCount ", - "posName ", - "state ", - "valveId ", + "ID ", + "state ", + "Name ", + "Cnt ", + "nPos ", ] } @@ -138,13 +140,13 @@ x: col(4.5) y: row(0) model: [ - vTDEjector.setSpeed , - vTDEjector.state , + vTDEjector.state , + vTDEjector.setSpeed .toFixed(2) , ] label: [ - "setSpeed ", - "state ", + "state ", + "Spd " , ] } @@ -173,8 +175,8 @@ vTDBattery.capacity , ] label: [ - "aCPower ", - "capacity ", + "AC ", + "cap ", ] } @@ -220,421 +222,10 @@ vTDTemperature.boardTemp .toFixed(2) ] label: [ - "boardTemp", + "board", ] } -// DebugDataColumn { id: _DGReservoirColumn -// textObjectName :"_DGReservoirData" -// title : qsTr(" Rsrvr ") -// x: col(3) -// y: row(0) -// model: [ -// vDGReservoir.activeReservoir , -// vDGReservoir.fillToVol , -// vDGReservoir.drainToVol , -// ] -// label: [ -// "Act", -// "Fil", -// "Drn", -// ] -// } - -// 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" , -// ] -// } - -// 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) -// y: row(0) -// model: [ -// vDGLoadCellReadings.reservoir1Prim .toFixed(2) , -// vDGLoadCellReadings.reservoir1Bkup .toFixed(2) , -// vDGLoadCellReadings.reservoir2Prim .toFixed(2) , -// vDGLoadCellReadings.reservoir2Bkup .toFixed(2) , -// ] -// label: [ -// "A1", -// "A2", -// "B1", -// "B2", -// ] -// } - -// DebugDataColumn { id: _DGTemperaturesColumn -// textObjectName :"_DGTemperaturesData" -// title : qsTr(" Tmprtr ") -// 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, -// ] -// } - -// 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" , -// ] -// } - -// 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 ") -// x: col(0) -// y: row(6.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) , -// ] -// label: [ -// "Tgt.Flow" , -// "Msr.Flow" , -// "Rot.Spd" , -// "Mot.Spd" , -// "MC.Spd" , -// "MC.Cur" , -// "PWM" , -// "Rtr.Cnt" , -// "Prs.Flow" , -// ] -// } - -// DebugDataColumn { id: _HDDialysateInletFlowColumn -// textObjectName :"_HDDialysateInletFlowData" -// title : qsTr(" DPi ") -// x: col(1.2) -// y: row(2.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) , -// ] -// label: [ -// "Tgt.Flow" , -// "Msr.Flow" , -// "Rot.Spd" , -// "Mot.Spd" , -// "MC.Spd" , -// "MC.Cur" , -// "PWM" , -// "Rtr.Cnt" , -// "Prs.Flow" , -// ] -// } - -// DebugDataColumn { id: _HDDialysateOutletFlowColumn -// textObjectName :"_HDDialysateOutletFlowData" -// title : qsTr(" UF/DPo ") -// x: col(2.4) -// y: row(2.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) , -// ] -// 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" , -// ] -// } - -// DebugDataColumn { id: _HDPressureOcclusionColumn -// textObjectName :"_HDPressureOcclusionData" -// title : qsTr(" Prsr Oc ") -// x: col(3.7) -// y: row(1.9) -// model: [ -// vTreatmentPressureOcclusion.arterialPressure .toFixed(2) , -// vTreatmentPressureOcclusion.venousPressure .toFixed(2) , -// vTreatmentPressureOcclusion.bloodPumpOcclusion , -// ] -// label: [ -// "PBA" , -// "PBo" , -// "OB" , -// ] -// } - -// DebugDataColumn { id: _HDSyringePumpColumn -// textObjectName :"_HDSyringePumpData" -// title : qsTr(" Syringe ") -// x: col(4.6) -// y: row(1.9) -// model: [ -// vHDSyringePump.syringePumpState , -// vHDSyringePump.heparinState , -// vHDSyringePump.setRate .toFixed(2) , -// vHDSyringePump.measuredRate .toFixed(2) , -// vHDSyringePump.syringePumpPosition , -// vHDSyringePump.volumeDelivered .toFixed(2) , -// vHDSyringePump.measuredHome .toFixed(2) , -// vHDSyringePump.measuredSwitch .toFixed(2) , -// vHDSyringePump.measuredForce .toFixed(2) , -// vHDSyringePump.safetyVol .toFixed(2) , -// vHDSyringePump.status , -// ] -// label: [ -// "srng.St", -// "hprn.St", -// "setRate", -// "msrRate", -// "srngPos", -// "VolumeD", -// "Msr.Hom", -// "Msr.Swt", -// "Msr.Frc", -// "safe.Vl", -// "status" , -// ] -// } - -// DebugDataColumn { id: _HDOperationModeColumn -// textObjectName :"_HDOperationModeData" -// title : qsTr(" HD Mode ") -// x: col(0.5) -// y: row(4.0) -// model: [ -// vHDOperationMode.text , -// ] -// fontPixelSizeText: Fonts.fontPixelDebugTitle -// } - -// DebugDataColumn { id: _DGValvesStatesColumn -// textObjectName :"_DGValvesStatesData" -// title : qsTr("Vlv") -// x: col(7.65) // pleae don't use 2 digits, this one is an exception -// y: row(0.0) -// width: 50 -// model: [ -// "%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", -// "RES", -// "VRO", -// "VPO", -// "VBF", -// "VRC", -// "VDR", -// "VPI", -// "VSP", -// "VR1", -// "VR2", -// "VPD", -// ] -// } - -// DebugDataColumn { id: _HDBloodLeakColumn -// textObjectName :"_HDBloodLeakData" -// title : qsTr(" BLD ") -// x: col(7) -// y: row(4.5) -// model: [ -// vHDBloodLeak.bloodLeakStatus , -// vHDBloodLeak.bloodLeakState , -// ] -// label: [ -// "Stats" , -// "State" , -// ] -// } - -// DebugDataColumn { id: _HDAlarmTopColumn -// textObjectName :"_HDAlarmTopData" -// title : qsTr(" Alarms ") -// x: col(5) -// y: row(5.5) -// model: [ -// _alarmItem.hasAlarm ? _alarmItem.alarm_AlarmID : 0, -// ] -// label: [ -// "Top" , -// ] -// } - // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. TouchRect { x : col(7.0) @@ -655,7 +246,7 @@ title : "" horizontalAlignmentText: Text.AlignLeft fontPixelSizeText: Fonts.fontPixelDebugTitle - model: [ "HD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9" + model: [ "TD: v%1.%2.%3-%4 v%5.%6.%7-%8 c%9\nSerial#: %10" .arg(vAdjustmentVersions.tdVerMajor ) .arg(vAdjustmentVersions.tdVerMinor ) .arg(vAdjustmentVersions.tdVerMicro ) @@ -665,69 +256,12 @@ .arg(vAdjustmentVersions.tdVerFPGALab ) .arg(vAdjustmentVersions.tdVerFPGAId ) .arg(vAdjustmentVersions.tdVerCompatibilityRev ) + .arg(vAdjustmentVersions.tdSerial ) ] } - - DebugDataColumn { id: _DGVersionsColumn - textObjectName :"_DGVersionsData" - 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 ) - ] - } - } } -// 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 : _tdResetInformation -// 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 : _ddResetInformation -// 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) @@ -738,3 +272,4 @@ } } +}