Merge pull request #4937 from DonLakeFlyer/SafetyFix

Safety: Fix bad field

Merge pull request #4937 from DonLakeFlyer/SafetyFix
Safety: Fix bad field
ba4fca5b · Don Gagne · GitHub · 9226dcae · 35d98b23 · ba4fca5b
Commit ba4fca5b authored Apr 07, 2017 by Don Gagne Committed by GitHub Apr 07, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

SafetyComponent.qml src/AutoPilotPlugins/PX4/SafetyComponent.qml +2 -4

No files found.
--- a/src/AutoPilotPlugins/PX4/SafetyComponent.qml
+++ b/src/AutoPilotPlugins/PX4/SafetyComponent.qml
@@ -431,16 +431,14 @@ SetupPage {
                    QGCLabel {
                        id:                 landVelocityLabel
-                        text:               qsTr("Landing Velocity:")
+                        text:               qsTr("Landing Descent Rate:")
                        Layout.fillWidth:   true
                        visible:            controller.vehicle && !controller.vehicle.fixedWing
                    }
-                    FactComboBox {
+                    FactTextField {
                        fact:                   _landSpeedMC
-                        indexModel:             false
                        Layout.minimumWidth:    _editFieldWidth
                        visible:                controller.vehicle && !controller.vehicle.fixedWing
-                        enabled:                _landSpeedMC === -1
                    }
                    QGCCheckBox {