Skip to content

Q
qgroundcontrol
Commit b073e9fe authored by Don Gagne's avatar Don Gagne
Browse files
Options

Handle airspeed circuit breaker correctly 

Also pull fixedWing directly from Vehicle
parent fee7929e
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/AutoPilotPlugins/PX4/SafetyComponent.qml
View file @ b073e9fe
...@@ -100,7 +100,7 @@ QGCView { ...@@ -100,7 +100,7 @@ QGCView {
spacing: _margins * 0.5 spacing: _margins * 0.5
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
Row { Row {
visible: !controller.fixedWing visible: !controller.vehicle.fixedWing
QGCLabel { QGCLabel {
anchors.baseline: lowBattCombo.baseline anchors.baseline: lowBattCombo.baseline
width: _middleRowWidth width: _middleRowWidth
...@@ -364,7 +364,7 @@ QGCView { ...@@ -364,7 +364,7 @@ QGCView {
sourceSize.width: width sourceSize.width: width
mipmap: true mipmap: true
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: controller.fixedWing ? "/qmlimages/ReturnToHomeAltitude.svg" : "/qmlimages/ReturnToHomeAltitudeCopter.svg" source: controller.vehicle.fixedWing ? "/qmlimages/ReturnToHomeAltitude.svg" : "/qmlimages/ReturnToHomeAltitudeCopter.svg"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
Item { width: _margins * 0.5; height: 1; } Item { width: _margins * 0.5; height: 1; }
...@@ -479,7 +479,7 @@ QGCView { ...@@ -479,7 +479,7 @@ QGCView {
sourceSize.width: width sourceSize.width: width
mipmap: true mipmap: true
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
source: controller.fixedWing ? "/qmlimages/LandMode.svg" : "/qmlimages/LandModeCopter.svg" source: controller.vehicle.fixedWing ? "/qmlimages/LandMode.svg" : "/qmlimages/LandModeCopter.svg"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
} }
Item { Item {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment