Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml =================================================================== diff -u -rc253d3ca9ef234e04747565e500faf88b07fc04e -r0cb2630813e6f7216adaf990f4129deb87b849bf --- sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision c253d3ca9ef234e04747565e500faf88b07fc04e) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsDD.qml (.../DiagnosticsDD.qml) (revision 0cb2630813e6f7216adaf990f4129deb87b849bf) @@ -15,7 +15,7 @@ // Qt import QtQuick 2.12 - +import Gui.Actions 0.1 // Project // Qml imports import "qrc:/globals" @@ -30,10 +30,49 @@ title: "Dialysate Delivery" + DebugDataColumn { id: _DDPressureColumn + textObjectName :"_DDPressureData" + title : qsTr(" Pressure ") + x: col(0) + y: row(0) + model: [ + vDDPressures.waterInletPSI .toFixed(2), + vDDPressures.waterOutletPSI .toFixed(2), + vDDPressures.hydrolicOutletPSI .toFixed(2), + vDDPressures.bicarbBagPSI .toFixed(2), + vDDPressures.spentDialysatePSI .toFixed(2), + vDDPressures.freshDialysatePSI .toFixed(2), + vDDPressures.transmembranePSI .toFixed(2), + vDDPressures.waterInletTemp .toFixed(2), + vDDPressures.waterOutletTemp .toFixed(2), + vDDPressures.hydrolicOutletTemp .toFixed(2), + vDDPressures.bicarbBagTemp .toFixed(2), + vDDPressures.spentDialysateTemp .toFixed(2), + vDDPressures.freshDialysateTemp .toFixed(2), + vDDPressures.transmembraneTemp .toFixed(2), + ] + label: [ + "WInPSI (M1) ", + "WOutPSI (M3) ", + "HOutPSI (D9) ", + "BBagPSI (D66) ", + "SDialPSI (D51) ", + "FDialPSI (D18) ", + "TransPSI (D41) ", + "WInTmp (M1) ", + "WOutTmp (M3) ", + "HOutTmp (D9) ", + "BBagTmp (D66) ", + "SDialTmp (D51) ", + "FDialTmp (D18) ", + "TransTmp (D41) ", + ] + } + DebugDataColumn { id: _DDLevelColumn textObjectName :"_DDLevelData" title : qsTr(" Levels ") - x: col(0) + x: col(1.5) y: row(0) model: [ vDDLevel.floaterLevel , @@ -46,147 +85,146 @@ "sptDial ", ] } + DebugDataColumn { id: _DDCondColumn + textObjectName :"_DDCondlData" + title : qsTr(" Cond ") + x: col(3) + y: row(0) + model: [ + vDDConductivity.bicarbCondutivity1 , + vDDConductivity.acidBicarbCondutivity1 , + vDDConductivity.acidBicarbCondutivity2 , + vDDConductivity.spentCondutivity1 , + vDDConductivity.bicarbCondutivity2 , + ] + label: [ + "bicarb1 ", + "acidb1 ", + "acidb1 ", + "spent ", + "bicarb2 ", + ] + } + DebugDataColumn { id: _DDGenDialColumn + textObjectName :"_DDGenDialData" + title : qsTr(" GenDial ") + x: col(4.5) + y: row(0) -// DebugDataColumn { id: _TDAirTrapCoulumn -// textObjectName :"_TDAirTrapData" -// title : qsTr(" Air Trap ") -// x: col(1.5) -// y: row(0) -// model: [ -// vTDAirTrap.lowLevel , -// vTDAirTrap.upLevel , -// vTDAirTrap.lowLevelRaw , -// vTDAirTrap.upLevelRaw , -// vTDAirTrap.valveState , -// vTDAirTrap.controlling , -// ] -// label: [ -// "ATL", -// "ATU", -// "rATL", -// "rATU", -// "state", -// "ctrl", -// ] -// } + model: [ + vDDGenDialysate.genDialysateExec , + vDDGenDialysate.ddInProgress , + 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 ", + ] + } -// DebugDataColumn { id: _TDValvesColumn -// textObjectName :"_TDValvesData" -// title : qsTr(" Vlv ") -// x: col(3) -// y: row(0) -// model: [ -// vTDValves.valveId , -// vTDValves.state , -// vTDValves.posName , -// vTDValves.posCount , -// vTDValves.nextPos , + DebugDataColumn { id: _DDTemperatureColumn + textObjectName :"_DDTemperatureData" + title : qsTr(" Temperature ") + x: col(6) + y: row(0) + model: [ + vDDTemperatures.inletHeatExchanger .toFixed(2) , + vDDTemperatures.outletHeatExchanger .toFixed(2) , + vDDTemperatures.hydraulicsPrimaryHeater .toFixed(2) , + vDDTemperatures.trimmerHeater .toFixed(2) , + vDDTemperatures.boardTemperature .toFixed(2) , + vDDTemperatures.barometricTemperature .toFixed(2) , + vDDTemperatures.D16Conductivity .toFixed(2) , + vDDTemperatures.D28Conductivity .toFixed(2) , + vDDTemperatures.D30Conductivity .toFixed(2) , + vDDTemperatures.D44Conductivity .toFixed(2) , + vDDTemperatures.D75Conductivity .toFixed(2) , + vDDTemperatures.D4MovingAverage .toFixed(2) , + vDDTemperatures.D50MovingAverage .toFixed(2) , + vDDTemperatures.D28MovingAverage .toFixed(2) , + vDDTemperatures.D30MovingAverage .toFixed(2) , + ] + label: [ + "inHE (D1) ", + "outHE (X6) ", + "hydr (D4) ", + "trim (D50) ", + "board ", + "baro ", + "Cond (D16) ", + "Cond (D28) ", + "Cond (D30) ", + "Cond (D44) ", + "Cond (D75) ", + "mAvg (D4) ", + "mAvg (D50) ", + "mAvg (D28) ", + "mAvg (D30) ", + ] + } -// ] -// label: [ -// "ID ", -// "state ", -// "Name ", -// "Cnt ", -// "nPos ", -// ] -// } + DebugDataColumn { id: _DDHeatersColumn + textObjectName :"_DDHeatersData" + title : qsTr(" Heaters ") + x: col(7.5) + 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.trimmerHeaterIntervalCount , + vDDHeaters.dbg1 .toFixed(2) , + vDDHeaters.dbg2 .toFixed(2) , + vDDHeaters.dbg3 .toFixed(2) , + vDDHeaters.dbg4 .toFixed(2) , + vDDHeaters.dbg5 .toFixed(2) , + vDDHeaters.dbg6 .toFixed(2) , + vDDHeaters.dbg7 .toFixed(2) , + vDDHeaters.dbg8 .toFixed(2) , + vDDHeaters.dbg9 .toFixed(2) , + ] + label: [ + "pHeat (D5) ", + "tHeat (D45) ", + "pTemp (D5) ", + "tTemp (D45) ", + "pState (D5) ", + "tstate (D45) ", + "pIC (D5) ", + "tIC (D45) ", + "dbg1 ", + "dbg2 ", + "dbg3 ", + "dbg4 ", + "dbg5 ", + "dbg6 ", + "dbg7 ", + "dbg8 ", + "dbg9 ", + ] + } -// DebugDataColumn { id: _TDEjectorColumn -// textObjectName :"_TDEjectorData" -// title : qsTr(" Ejt ") -// x: col(4.5) -// y: row(0) -// model: [ -// vTDEjector.state , -// vTDEjector.setSpeed .toFixed(2) , - -// ] -// label: [ -// "state ", -// "Spd " , -// ] -// } - -// DebugDataColumn { id: _TDSwitchesColumn -// textObjectName :"_TDSwitchesData" -// title : qsTr(" Switches ") -// x: col(6) -// y: row(0) -// model: [ -// vTDSwitches.door , - -// ] -// label: [ -// "door ", -// ] -// } - - -// DebugDataColumn { id: _TDBatteryCoulumn -// textObjectName :"_TDBatterypData" -// title : qsTr(" Battery ") -// x: col(0) -// y: row(3.5) -// model: [ -// vTDBattery.aCPower , -// vTDBattery.capacity , -// ] -// label: [ -// "AC ", -// "cap ", -// ] -// } - -// DebugDataColumn { id: _TDVoltageCoulumn -// textObjectName :"_TDVoltageData" -// title : qsTr(" Vol ") -// x: col(1.5) -// y: row(3.5) -// model: [ -// 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: [ -// "1.2V", -// "3.3V" , -// "L5V" , -// "S5V" , -// "24V" , -// "R24V" , -// "ADC" , -// "Ref" , -// "VCC" , -// "Vaux" , -// "VPN" -// ] -// } - -// DebugDataColumn { id: _TDTemperatureCoulumn -// textObjectName :"_TDTemperatureData" -// title : qsTr(" Temp ") -// x: col(3) -// y: row(3.5) -// model: [ -// vTDTemperature.boardTemp .toFixed(2) -// ] -// label: [ -// "board", -// ] -// } - - // TODO: The TouchRect should be unnecessary since the first communication message with UI/HD is the version. + // TODO: The TouchRect should be unnecessary since the first communication message with UI/TD is the version. TouchRect { - x : col(6.0) + x : col(9.0) y : row(6.4) width : 425 height : 80