Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -r3c07dc803109f716937b692cb4a67a5324bb9ca3 -r47b25a76644ca44b81b5a4a728346f8e72e1dc3b --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 3c07dc803109f716937b692cb4a67a5324bb9ca3) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 47b25a76644ca44b81b5a4a728346f8e72e1dc3b) @@ -36,58 +36,58 @@ x: col(0) y: row(0) model: [ - vDDConcentratePump.D11PumpCurrentSetSpeed .toFixed(2) , - vDDConcentratePump.D11PumpMeasuredSpeed .toFixed(2) , vDDConcentratePump.D10PumpCurrentSetSpeed .toFixed(2) , vDDConcentratePump.D10PumpMeasuredSpeed .toFixed(2) , - vDDConcentratePump.D11PumpTargetRevCount , - vDDConcentratePump.D11PumpMeasuredRevCount , vDDConcentratePump.D10PumpTargetRevCount , vDDConcentratePump.D10PumpMeasuredRevCount , - vDDConcentratePump.D11PumpState , vDDConcentratePump.D10PumpState , - vDDConcentratePump.D11PumpPulseUS .toFixed(2) , vDDConcentratePump.D10PumpPulseUS .toFixed(2) , - vDDConcentratePump.D11PumpTargetSpeed .toFixed(2) , vDDConcentratePump.D10PumpTargetSpeed .toFixed(2) , - vDDConcentratePump.D11PumpParked , vDDConcentratePump.D10PumpParked , - vDDConcentratePump.D11PumpParkFault , vDDConcentratePump.D10PumpParkFault , - vDDConcentratePump.D76PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpCurrentSetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpMeasuredSpeed .toFixed(2) , + vDDConcentratePump.D11PumpTargetRevCount , + vDDConcentratePump.D11PumpMeasuredRevCount , + vDDConcentratePump.D11PumpState , + vDDConcentratePump.D11PumpPulseUS .toFixed(2) , + vDDConcentratePump.D11PumpTargetSpeed .toFixed(2) , + vDDConcentratePump.D11PumpParked , + vDDConcentratePump.D11PumpParkFault , vDDConcentratePump.D76PumpCurrentSetSpeed .toFixed(2) , vDDConcentratePump.D76PumpMeasuredSpeed .toFixed(2) , vDDConcentratePump.D76PumpTargetRevCount , vDDConcentratePump.D76PumpMeasuredRevCount , vDDConcentratePump.D76PumpState , vDDConcentratePump.D76PumpPulseUS .toFixed(2) , + vDDConcentratePump.D76PumpTargetSpeed .toFixed(2) , ] label: [ - "sSpd (D11) ", - "mSpd (D11) ", "sSpd (D10) ", "mSpd (D10) ", - "rCnt (D11) ", - "mCnt (D11) ", "rCnt (D10) ", "mCnt (D10) ", - "State (D11) ", "State (D10) ", - "Plse (D11) ", "Plse (D10) ", - "tSpd (D11) ", "tSpd (D10) ", - "park (D11) ", "park (D10) ", - "pfault (D11) ", "pfault (D10) ", - "tSpd (D76) ", + "sSpd (D11) ", + "mSpd (D11) ", + "rCnt (D11) ", + "mCnt (D11) ", + "State (D11) ", + "Plse (D11) ", + "tSpd (D11) ", + "park (D11) ", + "pfault (D11) ", "sSpd (D76) ", "mSpd (D76) ", "rCnt (D76) ", "mCnt (D76) ", "State (D76) ", "Plse (D76) ", + "tSpd (D76) ", ] } @@ -98,46 +98,46 @@ y: row(0) model: [ vDDDialysatePump.D12PumpTargetRPM .toFixed(2) , - vDDDialysatePump.D48PumpTargetRPM .toFixed(2) , vDDDialysatePump.D12PumpMeasuredSpeed .toFixed(2) , - vDDDialysatePump.D48PumpMeasuredSpeed .toFixed(2) , vDDDialysatePump.D12PumpCurrentSpeed .toFixed(2) , - vDDDialysatePump.D48PumpCurrentSpeed .toFixed(2) , vDDDialysatePump.D12PumpState , - vDDDialysatePump.D48PumpState , vDDDialysatePump.D12PumpTargetPressure .toFixed(2) , - vDDDialysatePump.D48PumpTargetPressure .toFixed(2) , vDDDialysatePump.D12PumpMeasuredPressure .toFixed(2) , - vDDDialysatePump.D48PumpMeasuredPressure .toFixed(2) , vDDDialysatePump.D12PumpMeasuredCurrent .toFixed(2) , - vDDDialysatePump.D48PumpMeasuredCurrent .toFixed(2) , vDDDialysatePump.D12PumpControl , - vDDDialysatePump.D48PumpControl , vDDDialysatePump.D12PumpDirErrCnt , - vDDDialysatePump.D48PumpDirErrCnt , vDDDialysatePump.D12PumpMeasuredDir , + vDDDialysatePump.D48PumpTargetRPM .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredSpeed .toFixed(2) , + vDDDialysatePump.D48PumpCurrentSpeed .toFixed(2) , + vDDDialysatePump.D48PumpState , + vDDDialysatePump.D48PumpTargetPressure .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredPressure .toFixed(2) , + vDDDialysatePump.D48PumpMeasuredCurrent .toFixed(2) , + vDDDialysatePump.D48PumpControl , + vDDDialysatePump.D48PumpDirErrCnt , vDDDialysatePump.D48PumpMeasuredDir , ] label: [ "tRPM (D12) ", - "tRPM (D48) ", "mSpd (D12) ", - "mSpd (D48) ", "cSpd (D12) ", - "cSpd (D48) ", "State (D12) ", - "State (D48) ", "tPres (D12) ", - "tPres (D48) ", "mPres (D12) ", - "mPres (D48) ", + "Ctrl (D12) ", + "eCnt (D12) ", "mCurr (D12) ", + "mDir (D12) ", + "tRPM (D48) ", + "mSpd (D48) ", + "cSpd (D48) ", + "State (D48) ", + "tPres (D48) ", + "mPres (D48) ", "mCurr (D48) ", - "Ctrl (D12) ", "Ctrl (D48) ", - "eCnt (D12) ", "eCnt (D48) ", - "mDir (D12) ", "mDir (D48) ", ] } @@ -149,12 +149,12 @@ y: row(0) model: [ vDDHeaters.mainPrimayHeaterDC .toFixed(2) , - vDDHeaters.trimmerHeaterDC .toFixed(2) , vDDHeaters.primaryTargetTemp .toFixed(2) , - vDDHeaters.trimmerTargetTemp .toFixed(2) , vDDHeaters.primaryHeaterState , - vDDHeaters.trimmerHeaterState , vDDHeaters.primaryHeaterIntervalCount , + vDDHeaters.trimmerHeaterDC .toFixed(2) , + vDDHeaters.trimmerTargetTemp .toFixed(2) , + vDDHeaters.trimmerHeaterState , vDDHeaters.trimmerHeaterIntervalCount , vDDHeaters.dbg1 .toFixed(2) , vDDHeaters.dbg2 .toFixed(2) , @@ -168,12 +168,12 @@ ] label: [ "pHeat (D5) ", - "tHeat (D45) ", "pTemp (D5) ", - "tTemp (D45) ", "pState (D5) ", - "tstate (D45) ", "pIC (D5) ", + "tHeat (D45) ", + "tTemp (D45) ", + "tstate (D45) ", "tIC (D45) ", "dbg1 ", "dbg2 ", @@ -276,28 +276,67 @@ 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.isDialGood , ] label: [ - "Exec ", - "inProg ", - "fltLvL ", - "bicarbLvL ", - "spentLvL ", - "sptDial ", - "hydNeg ", - "hydPos ", - "spend ", - "isGood ", + "Exec ", + "inProg ", + "isGood ", + "fltLvL (D6) ", + "bicarbLvL (D63)", + "sptLvL (D46) ", + "hydNeg (D19) ", + "hydPos (D18) ", + "sptPres (D51) ", ] } + DebugDataColumn { id: _DDHydraulicsValveColumn + textObjectName :"_DDHydraulicValveData" + title : qsTr(" Hyd Valve ") + x: col(7.8) + y: row(3.1) + + model: [ + Number(vDDValvesStates.hydraulicsOutletValve ) , + Number(vDDValvesStates.thermalDisinfectValve ) , + Number(vDDValvesStates.HydraulicsBypassValve ) , + Number(vDDValvesStates.rinsePortValve ) , + Number(vDDValvesStates.drainValve ) , + Number(vDDValvesStates.dialyzerBypassValve ) , + Number(vDDValvesStates.purgeValve1 ) , + Number(vDDValvesStates.pressureTestValve ) , + Number(vDDValvesStates.dryBicarbInletValve ) , + Number(vDDValvesStates.dialyzerInletValve ) , + Number(vDDValvesStates.dialyzerOutletValve ) , + Number(vDDValvesStates.purgeValve2 ) , + Number(vDDValvesStates.hydraulicsInletValve ) , + Number(vDDValvesStates.waterInletValve ) , + ] + label: [ + "HydOut (D14) ", + "ThemD (D52) ", + "HydByP (D8) ", + "RinseP (D54) ", + "Drain (D53) ", + "DialByP (D34) ", + "PurgV1 (D64) ", + "PresT (D31) ", + "DryBic (D65) ", + "DialIn (D35) ", + "DialOut (D40) ", + "PurgV2 (D47) ", + "HydIn (D3) ", + "WaterIn (M4) ", + ] + } + DebugDataColumn { id: _DDCondColumn textObjectName :"_DDCondlData" title : qsTr(" Cond ") @@ -311,11 +350,11 @@ vDDConductivity.bicarbCondutivity2 .toFixed(2), ] label: [ - "bicarb1 ", - "acidb1 ", - "acidb1 ", - "spent ", - "bicarb2 ", + "bicarb1 (D17) ", + "acidb1 (D27) ", + "acidb1 (D29) ", + "spent (D43) ", + "bicarb2 (D74) ", ] } @@ -330,12 +369,39 @@ vDDLevel.spentDialysateLevel , ] label: [ - "float ", - "bicarb ", - "sptDial ", + "floater (D6) ", + "bicarb (D63) ", + "sptDial (D46) ", ] } + DebugDataColumn { id: _DDBCValvesColumn + textObjectName :"_DDBCValvesData" + title : qsTr(" BC Valves ") + x: col(9.5) + y: row(3.3) + model: [ + Number(vDDValvesStates.balancingChamberValve1 ) , + Number(vDDValvesStates.balancingChamberValve2 ) , + Number(vDDValvesStates.balancingChamberValve3 ) , + Number(vDDValvesStates.balancingChamberValve7 ) , + Number(vDDValvesStates.balancingChamberValve5 ) , + Number(vDDValvesStates.balancingChamberValve6 ) , + Number(vDDValvesStates.balancingChamberValve4 ) , + Number(vDDValvesStates.balancingChamberValve8 ) , + ] + label: [ + "BC1 (D23) ", + "BC2 (D19) ", + "BC3 (D25) ", + "BC7 (D26) ", + "BC5 (D24) ", + "BC6 (D20) ", + "BC4 (D21) ", + "BC8 (D22) ", + ] + } + DebugDataColumn { id: _DDBloodLeakColumn textObjectName :"_DDBloodLeakData" title : qsTr(" Blood Leak ")