Merge pull request #4957 from DonLakeFlyer/Fixes

Fixes

Merge pull request #4957 from DonLakeFlyer/Fixes
Fixes
0fc888a0 · Don Gagne · GitHub · 5b9ba40d · 72254352 · 0fc888a0
Commit 0fc888a0 authored Apr 11, 2017 by Don Gagne Committed by GitHub Apr 11, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

ArduCopterFirmwarePlugin.cc src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc +1 -1

QGCTextField.qml src/QmlControls/QGCTextField.qml +1 -1

No files found.
--- a/src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc
+++ b/src/FirmwarePlugin/APM/ArduCopterFirmwarePlugin.cc
@@ -252,6 +252,6 @@ void ArduCopterFirmwarePlugin::missionFlightSpeedInfo(Vehicle* vehicle, double&
    cruiseSpeed = 0;
    if (vehicle->parameterManager()->parameterExists(FactSystem::defaultComponentId, hoverSpeedParam)) {
        Fact* speed = vehicle->parameterManager()->getParameter(FactSystem::defaultComponentId, hoverSpeedParam);
-        hoverSpeed = speed->rawValue().toDouble();
+        hoverSpeed = speed->rawValue().toDouble() / 100; // cm/s -> m/s
    }
 }
--- a/src/QmlControls/QGCTextField.qml
+++ b/src/QmlControls/QGCTextField.qml
@@ -116,7 +116,7 @@ TextField {
    }

    onActiveFocusChanged: {
-        if (!ScreenTools.isMobile && activeFocus) {
+        if (activeFocus) {
            selectAll()
        }
    }