Merge pull request #4926 from DonLakeFlyer/Fixes

Fixes

src/FactSystem/FactControls/FactTextField.qml

@@ -21,7 +21,7 @@ QGCTextField {
     property string _validateString
 
     // At this point all Facts are numeric
-    inputMethodHints: (fact || fact.typeIsString || ScreenTools.isiOS) ?
+    inputMethodHints: ((fact && fact.typeIsString) || ScreenTools.isiOS) ?
                           Qt.ImhNone :                // iOS numeric keyboard has no done button, we can't use it
                           Qt.ImhFormattedNumbersOnly  // Forces use of virtual numeric keyboard
 

src/FirmwarePlugin/FirmwarePlugin.cc

@@ -438,7 +438,7 @@ bool FirmwarePlugin::_armVehicle(Vehicle* vehicle)
     return vehicle->armed();
 }
 
-void FirmwarePlugin::batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, int& hoverAmps, int& cruiseAmps) const
+void FirmwarePlugin::batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, double& hoverAmps, double& cruiseAmps) const
 {
     Q_UNUSED(vehicle);
     mAhBattery = 0;

src/FirmwarePlugin/FirmwarePlugin.h

@@ -280,7 +280,7 @@ public:
     ///     @param[out] mAhBattery Battery milliamp-hours rating (0 for no battery data available)
     ///     @param[out] hoverAmps Current draw in amps during hover
     ///     @param[out] cruiseAmps Current draw in amps during cruise
-    virtual void batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, int& hoverAmps, int& cruiseAmps) const;
+    virtual void batteryConsumptionData(Vehicle* vehicle, int& mAhBattery, double& hoverAmps, double& cruiseAmps) const;
 
     // FIXME: Hack workaround for non pluginize FollowMe support
     static const char* px4FollowMeFlightMode;

src/MissionManager/MissionController.h

@@ -50,8 +50,8 @@ public:
         double  vehicleSpeed;           ///< Either cruise or hover speed based on vehicle type and vtol state
         double  gimbalYaw;              ///< NaN signals yaw was never changed
         int     mAhBattery;             ///< 0 for not available
-        int     hoverAmps;              ///< Amp consumption during hover
-        int     cruiseAmps;             ///< Amp consumption during cruise
+        double  hoverAmps;              ///< Amp consumption during hover
+        double  cruiseAmps;             ///< Amp consumption during cruise
         double  ampMinutesAvailable;    ///< Amp minutes available from single battery
         double  hoverAmpsTotal;         ///< Total hover amps used
         double  cruiseAmpsTotal;        ///< Total cruise amps used

src/PlanView/PlanToolBar.qml

@@ -39,11 +39,6 @@ Rectangle {
     property bool   _controllerValid:           missionController != undefined
     property bool   _manualUpload:              QGroundControl.settingsManager.appSettings.automaticMissionUpload.rawValue == 0
 
-    Connections {
-        target: QGroundControl.settingsManager.appSettings.automaticMissionUpload
-        onRawValueChanged: console.log("changed", QGroundControl.settingsManager.appSettings.automaticMissionUpload.rawValue)
-    }
-
     property real   _largeValueWidth:           ScreenTools.defaultFontPixelWidth * 8
     property real   _smallValueWidth:           ScreenTools.defaultFontPixelWidth * 4
     property real   _labelToValueSpacing:       ScreenTools.defaultFontPixelWidth

src/PlanView/PlanView.qml

@@ -718,6 +718,7 @@ QGCView {
             // Mission Item Editor
             Item {
                 id:                 missionItemEditor
+                anchors.topMargin:  ScreenTools.defaultFontPixelHeight / 2
                 anchors.top:        planElementSelectorRow.visible ? planElementSelectorRow.bottom : planElementSelectorRow.top
                 anchors.left:       parent.left
                 anchors.right:      parent.right