Index: sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml =================================================================== diff -u -r292beb22109065953f769ace13c3a395674612ac -r4a751578dd768d849e6ee6dfa1521f5f1597090d --- sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 292beb22109065953f769ace13c3a395674612ac) +++ sources/gui/qml/dialogs/diagnostics/DiagnosticsTD.qml (.../DiagnosticsTD.qml) (revision 4a751578dd768d849e6ee6dfa1521f5f1597090d) @@ -181,7 +181,7 @@ DebugDataColumn { id: _TDEjectorColumn textObjectName :"_TDEjectorData" - title : qsTr(" Ejector ") + title : qsTr("[0x4E] Ejector ") anchors { top : parent.top left : _TDValvesColumn.right @@ -190,11 +190,15 @@ 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 " , ] } @@ -270,34 +274,28 @@ DebugDataColumn { id: _TDVoltageCoulumn textObjectName :"_TDVoltageData" - title : qsTr(" Volume ") + title : qsTr("[0x1D] 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" ,