Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -rbf9223700613ced6c377f3e3a7b4de8367c30474 -rb12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision bf9223700613ced6c377f3e3a7b4de8367c30474) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision b12cc2840bb819c5222bfd3bc2cc5ca6eb4c37fd) @@ -32,7 +32,7 @@ DebugDataColumn { id: _TDBloodFlowColumn textObjectName :"_TDBloodFlowData" - title : qsTr(" BP(H4)") + title : "[0x11]" + qsTr(" Blood Flow ") anchors { top : parent.top left : parent.left @@ -65,56 +65,68 @@ DebugDataColumn { id: _TDAirTrapCoulumn textObjectName :"_TDAirTrapData" - title : qsTr(" Air Trap ") + title : "[0x2A]" + qsTr(" Air Trap ") anchors { top : parent.top left : _TDPressureOcclusionColumn.right leftMargin : spacing } model: [ - vTDAirTrap.lowLevel , - vTDAirTrap.upLevel , - vTDAirTrap.lowLevelRaw , - vTDAirTrap.upLevelRaw , - vTDAirTrap.valveIntakeState , - vTDAirTrap.valveOutletState , - vTDAirTrap.controlling , + vTDAirTrap.h17State , + vTDAirTrap.h16State , + vTDAirTrap.h17RawState , + vTDAirTrap.h16RawState , + vTDAirTrap.h13State , + vTDAirTrap.h20State , + vTDAirTrap.isAutoControlling , + vTDAirTrap.airTrapState , + vTDAirTrap.airPumpLowerPowerLevel , + vTDAirTrap.airPumpRaisePowerLevel , ] label: [ - "ATL (H17)", - "ATH (H16)", - "rARL (H17)", - "rATH (H16)", - "IState (H13)", - "OState (H20)", - "ctrl ", + "ATL (H17) ", + "ATH (H16) ", + "rARL (H17) ", + "rATH (H16) ", + "IState (H13) ", + "OState (H20) ", + "ctrl ", + "AT State ", + "AP Lower PL ", + "AP Rraise PL ", ] } DebugDataColumn { id: _TDAirPumpColumn textObjectName :"_TDAirPumpData" - title : qsTr(" Air Pumps ") + title : "[0x20]" + qsTr(" Air Pumps ") anchors { top : _TDAirTrapCoulumn.bottom topMargin : spacing left : _TDAirTrapCoulumn.left } model: [ - vTDAirPump.airPumpState , - vTDAirPump.airPumpPower , + vTDAirPump.airPumpState , + vTDAirPump.airPumpRPM , + vTDAirPump.airPumpPower , + vTDAirPump.airPumpFGPARPM , + vTDAirPump.airPumpScalarPower , ] label: [ - "state (H12) ", - "power (H12) ", + "state (H12) ", + "RPM (H12) ", + "power (H12) ", + "FPGA RPM (H12) ", + "scalar power ", ] } DebugDataColumn { id: _TDAirBubblesColumn textObjectName :"_TDAirBubblesData" - title : qsTr(" Bubbles ") + title : "[0x1E]" + qsTr(" Bubbles ") anchors { top : _TDPressureOcclusionColumn.bottom topMargin : spacing @@ -134,32 +146,42 @@ DebugDataColumn { id: _TDValvesColumn textObjectName :"_TDValvesData" - title : qsTr(" Valves ") + title : "[0X2B]" + qsTr(" Valves ") anchors { top : parent.top left : _TDAirTrapCoulumn.right leftMargin : spacing } model: [ - vTDValves.valveId , - vTDValves.state , - vTDValves.posName , - vTDValves.posCount , - vTDValves.nextPos , + vTDValves.valveId , + vTDValves.state , + vTDValves.currPosID , + vTDValves.currPos , + vTDValves.cmdPos , + vTDValves.posA , + vTDValves.posB , + vTDValves.posC , + vTDValves.posD , + vTDValves.maxHomingPos , ] label: [ - "ID ", - "state ", - "Name ", - "Cnt ", - "nPos ", + "ID ", + "state ", + "Curr Pos ID ", + "Curr Pos ", + "Cmd Pos ", + "Pos A ", + "Pos B ", + "Pos C ", + "Pos D ", + "Max Homing Pos ", ] } DebugDataColumn { id: _TDEjectorColumn textObjectName :"_TDEjectorData" - title : qsTr(" Ejector ") + title : "[0x4E]" + qsTr(" Ejector ") anchors { top : parent.top left : _TDValvesColumn.right @@ -168,17 +190,21 @@ model: [ vTDEjector.state , vTDEjector.setSpeed .toFixed(2) , + vTDEjector.retractOpticalSensor , + vTDEjector.engageOpticalSensor , ] label: [ - "State (H5) ", - "Spd (H5) " , + "State (H5) ", + "Spd (H5) " , + "Retract Opt Sensor " , + "Engage Opt Sensor " , ] } DebugDataColumn { id: _TDSwitchesColumn textObjectName :"_TDSwitchesData" - title : qsTr(" Switches ") + title : "[0x21]" + qsTr(" Switches ") anchors { top : _TDVoltageCoulumn.bottom topMargin : spacing @@ -194,7 +220,7 @@ DebugDataColumn { id: _TDOpModeColumn textObjectName :"_TDOpmodeData" - title : qsTr(" Opmode ") + title : "[0x12]" + qsTr(" Opmode ") anchors { top : parent.top left : _TDEjectorColumn.right @@ -212,7 +238,7 @@ DebugDataColumn { id: _TDTXStatesColumn textObjectName :"_TDTxStatesData" - title : qsTr(" TXStates ") + title : "[0x3C]" + qsTr(" TXStates ") anchors { top : _TDOpModeColumn.bottom @@ -248,34 +274,28 @@ DebugDataColumn { id: _TDVoltageCoulumn textObjectName :"_TDVoltageData" - title : qsTr(" Volume ") + title : "[0x1D]" + qsTr(" Voltage ") anchors { top : _TDBloodFlowColumn.bottom topMargin : spacing } 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) + vTDVoltage.line_1_2V .toFixed(2) , + vTDVoltage.line_3_3V .toFixed(2) , + vTDVoltage.logic5V .toFixed(2) , + vTDVoltage.line_24V_1 .toFixed(2) , + vTDVoltage.line_24V_2 .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" , + "24V_1" , + "24V_2" , "VCC" , "Vaux" , "VPN" , @@ -284,7 +304,7 @@ DebugDataColumn { id: _TDPressureOcclusionColumn textObjectName :"_TDPressureData" - title : qsTr(" Pressure ") + title : "[0x24]" + qsTr(" Pressure ") anchors { top : parent.top @@ -302,28 +322,32 @@ vTreatmentPressureOcclusion.arterialLongFilter .toFixed(2), vTreatmentPressureOcclusion.venousLongFilter .toFixed(2), vTreatmentPressureOcclusion.tmpPressure .toFixed(2), + vTreatmentPressureOcclusion.tmpLongFilter .toFixed(2), vTreatmentPressureOcclusion.tmpMin .toFixed(2), - vTreatmentPressureOcclusion.tmpMax .toFixed(2) + vTreatmentPressureOcclusion.tmpMax .toFixed(2), + vTreatmentPressureOcclusion.barometricPresure .toFixed(2) ] label: [ - "Arterial (H12) " , - "Venous (H14) " , - "limit " , - "artMin (H12) " , - "artMax (H12) " , - "venMin (H14) " , - "venMax (H14) " , - "aLong (H12) " , - "vLong (H14) " , - "TMP " , - "tmpMin " , - "tmpMax " , + "Arterial (H12) " , + "Venous (H14) " , + "limit " , + "artMin (H12) " , + "artMax (H12) " , + "venMin (H14) " , + "venMax (H14) " , + "aLong (H12) " , + "vLong (H14) " , + "TMP " , + "TMPonng " , + "tmpMin " , + "tmpMax " , + "barometric (H23) " , ] } DebugDataColumn { id: _TDTemperatureCoulumn textObjectName :"_TDTemperatureData" - title : qsTr(" Temp ") + title : "[0x53]" + qsTr(" Temperature ") anchors { top : _TDValvesColumn.bottom topMargin : spacing @@ -385,13 +409,4 @@ } } } - - Connections { target: _GuiView - function onDidActionReceive( vAction, vData ) { - // DEBUG: console.debug("onDidActionReceive", vAction, vData) - if (vAction === guiActions.ID_CANBusFaultCount ) { - _canbusFaultCountText.count = vData[0] - } - } - } }