Merge pull request #5929 from DonLakeFlyer/BugFixes

Bug fixes

src/AutoPilotPlugins/PX4/SafetyComponent.qml

@@ -170,7 +170,7 @@ SetupPage {
                         mipmap:                 true
                         fillMode:               Image.PreserveAspectFit
                         source:                 qgcPal.globalTheme === qgcPal.Light ? "/qmlimages/LowBatteryLight.svg" : "/qmlimages/LowBattery.svg"
-                        Layout.rowSpan:     3
+                        Layout.rowSpan:         4
                         Layout.maximumWidth:    _imageWidth
                         Layout.maximumHeight:   _imageHeight
                         width:                  _imageWidth
@@ -204,6 +204,15 @@ SetupPage {
                         fact:                   controller.getParameterFact(-1, "BAT_CRIT_THR")
                         Layout.minimumWidth:    _editFieldWidth
                     }
+
+                    QGCLabel {
+                        text:               qsTr("Battery Emergency Level:")
+                        Layout.fillWidth:   true
+                    }
+                    FactTextField {
+                        fact:                   controller.getParameterFact(-1, "BAT_EMERGEN_THR")
+                        Layout.minimumWidth:    _editFieldWidth
+                    }
                 }
 
                 Item { width: 1; height: _margins; Layout.columnSpan: 3 }

src/FlightMap/MapItems/MissionItemIndicatorDrag.qml

@@ -71,11 +71,15 @@ Rectangle {
         drag.maximumY:      itemDragger.parent.height - parent.height
         preventStealing:    true
 
-        onClicked: itemDragger.clicked()
+        onClicked: {
+            focus = true
+            itemDragger.clicked()
+        }
 
         property bool dragActive: drag.active
         onDragActiveChanged: {
             if (dragActive) {
+                focus = true
                 if (!_dragStartSignalled) {
                     _dragStartSignalled = true
                     dragStart()

src/PlanView/SurveyItemEditor.qml

@@ -409,7 +409,7 @@ Rectangle {
             FactCheckBox {
                 text:       qsTr("Take images in turnarounds")
                 fact:       missionItem.cameraTriggerInTurnaround
-                enabled:    !missionItem.hoverAndCapture.rawValue
+                enabled:    missionItem.hoverAndCaptureAllowed ? !missionItem.hoverAndCapture.rawValue : true
             }
 
             SectionHeader {
@@ -605,7 +605,7 @@ Rectangle {
             FactCheckBox {
                 text:               qsTr("Take images in turnarounds")
                 fact:               missionItem.cameraTriggerInTurnaround
-                enabled:            !missionItem.hoverAndCapture.rawValue
+                enabled:            missionItem.hoverAndCaptureAllowed ? !missionItem.hoverAndCapture.rawValue : true
                 Layout.columnSpan:  2
             }
 

src/QmlControls/MissionItemIndexLabel.qml

@@ -116,6 +116,9 @@ Canvas {
 
     QGCMouseArea {
         fillItem:   parent
-        onClicked:  parent.clicked()
+        onClicked: {
+            focus = true
+            parent.clicked()
+        }
     }
 }

src/VehicleSetup/FirmwareUpgradeController.cc

@@ -301,24 +301,6 @@ void FirmwareUpgradeController::_initFirmwareHash()
         { AutoPilotStackAPM, DeveloperFirmware, RoverFirmware,          "http://gumstix-aerocore.s3.amazonaws.com/Rover/latest/PX4/APMrover2-v2.px4"}
     };
 
-    /////////////////////////////// FMUV1 firmwares ///////////////////////////////////////////
-    FirmwareToUrlElement_t rgPX4FMUV1FirmwareArray[] = {
-        { AutoPilotStackPX4, StableFirmware,    DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/px4fmu-v1_default.px4"},
-        { AutoPilotStackPX4, BetaFirmware,      DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/beta/px4fmu-v1_default.px4"},
-        { AutoPilotStackPX4, DeveloperFirmware, DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/master/px4fmu-v1_default.px4"},
-        { AutoPilotStackAPM, StableFirmware,    CopterFirmware,         "http://firmware.ardupilot.org/Copter/stable/PX4/ArduCopter-v1.px4"},
-        { AutoPilotStackAPM, StableFirmware,    HeliFirmware,           "http://firmware.ardupilot.org/Copter/stable/PX4-heli/ArduCopter-v1.px4"},
-        { AutoPilotStackAPM, StableFirmware,    PlaneFirmware,          "http://firmware.ardupilot.org/Plane/stable/PX4/ArduPlane-v1.px4"},
-        { AutoPilotStackAPM, StableFirmware,    RoverFirmware,          "http://firmware.ardupilot.org/Rover/stable/PX4/APMrover2-v1.px4"},
-        { AutoPilotStackAPM, BetaFirmware,      CopterFirmware,         "http://firmware.ardupilot.org/Copter/beta/PX4/ArduCopter-v1.px4"},
-        { AutoPilotStackAPM, BetaFirmware,      HeliFirmware,           "http://firmware.ardupilot.org/Copter/beta/PX4-heli/ArduCopter-v1.px4"},
-        { AutoPilotStackAPM, BetaFirmware,      PlaneFirmware,          "http://firmware.ardupilot.org/Plane/beta/PX4/ArduPlane-v1.px4"},
-        { AutoPilotStackAPM, BetaFirmware,      RoverFirmware,          "http://firmware.ardupilot.org/Rover/beta/PX4/APMrover2-v1.px4"},
-        { AutoPilotStackAPM, DeveloperFirmware, CopterFirmware,         "http://firmware.ardupilot.org/Copter/latest/PX4/ArduCopter-v1.px4"},
-        { AutoPilotStackAPM, DeveloperFirmware, HeliFirmware,           "http://firmware.ardupilot.org/Copter/latest/PX4-heli/ArduCopter-v1.px4"},
-        { AutoPilotStackAPM, DeveloperFirmware, PlaneFirmware,          "http://firmware.ardupilot.org/Plane/latest/PX4/ArduPlane-v1.px4"},
-        { AutoPilotStackAPM, DeveloperFirmware, RoverFirmware,          "http://firmware.ardupilot.org/Rover/latest/PX4/APMrover2-v1.px4"}
-    };
     //////////////////////////////////// AUAVX2_1 firmwares //////////////////////////////////////////////////
     FirmwareToUrlElement_t rgAUAVX2_1FirmwareArray[] = {
         { AutoPilotStackPX4, StableFirmware,    DefaultVehicleFirmware, "http://px4-travis.s3.amazonaws.com/Firmware/stable/auav-x21_default.px4"},
@@ -414,12 +396,6 @@ void FirmwareUpgradeController::_initFirmwareHash()
         _rgAeroCoreFirmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url);
     }
 
-    size = sizeof(rgPX4FMUV1FirmwareArray)/sizeof(rgPX4FMUV1FirmwareArray[0]);
-    for (int i = 0; i < size; i++) {
-        const FirmwareToUrlElement_t& element = rgPX4FMUV1FirmwareArray[i];
-        _rgPX4FMUV1Firmware.insert(FirmwareIdentifier(element.stackType, element.firmwareType, element.vehicleType), element.url);
-    }
-
     size = sizeof(rgAUAVX2_1FirmwareArray)/sizeof(rgAUAVX2_1FirmwareArray[0]);
     for (int i = 0; i < size; i++) {
         const FirmwareToUrlElement_t& element = rgAUAVX2_1FirmwareArray[i];
@@ -479,8 +455,6 @@ void FirmwareUpgradeController::_bootloaderSyncFailed(void)
 QHash<FirmwareUpgradeController::FirmwareIdentifier, QString>* FirmwareUpgradeController::_firmwareHashForBoardId(int boardId)
 {
     switch (boardId) {
-    case Bootloader::boardIDPX4FMUV1:
-        return &_rgPX4FMUV1Firmware;
     case Bootloader::boardIDPX4Flow:
         return &_rgPX4FLowFirmware;
     case Bootloader::boardIDPX4FMUV2:

src/VehicleSetup/FirmwareUpgradeController.h

@@ -206,7 +206,6 @@ private:
     QHash<FirmwareIdentifier, QString> _rgPX4FMUV3Firmware;
     QHash<FirmwareIdentifier, QString> _rgPX4FMUV2Firmware;
     QHash<FirmwareIdentifier, QString> _rgAeroCoreFirmware;
-    QHash<FirmwareIdentifier, QString> _rgPX4FMUV1Firmware;
     QHash<FirmwareIdentifier, QString> _rgAUAVX2_1Firmware;
     QHash<FirmwareIdentifier, QString> _rgMindPXFMUV2Firmware;
     QHash<FirmwareIdentifier, QString> _rgTAPV1Firmware;

src/ui/preferences/GeneralSettings.qml

@@ -41,6 +41,9 @@ QGCView {
     property real _editFieldWidth:              ScreenTools.defaultFontPixelWidth * 30
     property Fact _mapProvider:                 QGroundControl.settingsManager.flightMapSettings.mapProvider
     property Fact _mapType:                     QGroundControl.settingsManager.flightMapSettings.mapType
+    property real _panelWidth:                  _qgcView.width * _internalWidthRatio
+
+    readonly property real _internalWidthRatio:          0.8
 
     readonly property string _requiresRestart:  qsTr("(Requires Restart)")
 
@@ -63,7 +66,7 @@ QGCView {
                 //-----------------------------------------------------------------
                 //-- Units
                 Item {
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     height:                     unitLabel.height
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -76,7 +79,7 @@ QGCView {
                 }
                 Rectangle {
                     height:                     unitsCol.height + (ScreenTools.defaultFontPixelHeight * 2)
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     color:                      qgcPal.windowShade
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -115,7 +118,7 @@ QGCView {
                 //-----------------------------------------------------------------
                 //-- Miscellaneous
                 Item {
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     height:                     miscLabel.height
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -128,7 +131,7 @@ QGCView {
                 }
                 Rectangle {
                     height:                     miscCol.height + (ScreenTools.defaultFontPixelHeight * 2)
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     color:                      qgcPal.windowShade
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -359,7 +362,7 @@ QGCView {
 
                         //-----------------------------------------------------------------
                         //-- Save path
-                        Row {
+                        RowLayout {
                             spacing:    ScreenTools.defaultFontPixelWidth
                             visible:    _savePath.visible && !ScreenTools.isMobile
 
@@ -369,6 +372,8 @@ QGCView {
                             }
                             QGCLabel {
                                 anchors.baseline:       savePathBrowse.baseline
+                                Layout.maximumWidth:    _panelWidth * 0.5
+                                elide:                  Text.ElideMiddle
                                 text:                   _savePath.rawValue === "" ? qsTr("<not set>") : _savePath.value
                             }
                             QGCButton {
@@ -394,7 +399,7 @@ QGCView {
                 //-----------------------------------------------------------------
                 //-- RTK GPS
                 Item {
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     height:                     unitLabel.height
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -407,7 +412,7 @@ QGCView {
                 }
                 Rectangle {
                     height:                     rtkGrid.height + (ScreenTools.defaultFontPixelHeight * 2)
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     color:                      qgcPal.windowShade
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -438,7 +443,7 @@ QGCView {
                 //-----------------------------------------------------------------
                 //-- Autoconnect settings
                 Item {
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     height:                     autoConnectLabel.height
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -451,7 +456,7 @@ QGCView {
                 }
                 Rectangle {
                     height:                     autoConnectCol.height + (ScreenTools.defaultFontPixelHeight * 2)
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     color:                      qgcPal.windowShade
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -490,7 +495,7 @@ QGCView {
                 //-----------------------------------------------------------------
                 //-- Video Source
                 Item {
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     height:                     videoLabel.height
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -503,7 +508,7 @@ QGCView {
                 }
                 Rectangle {
                     height:                     videoCol.height + (ScreenTools.defaultFontPixelHeight * 2)
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     color:                      qgcPal.windowShade
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -605,7 +610,7 @@ QGCView {
                 //-----------------------------------------------------------------
                 //-- Video Source
                 Item {
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     height:                     videoRecLabel.height
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -618,7 +623,7 @@ QGCView {
                 }
                 Rectangle {
                     height:                     videoRecCol.height + (ScreenTools.defaultFontPixelHeight * 2)
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     color:                      qgcPal.windowShade
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -676,7 +681,7 @@ QGCView {
                 //-----------------------------------------------------------------
                 //-- Custom Brand Image
                 Item {
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     height:                     userBrandImageLabel.height
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter
@@ -689,7 +694,7 @@ QGCView {
                 }
                 Rectangle {
                     height:                     userBrandImageCol.height + (ScreenTools.defaultFontPixelHeight * 2)
-                    width:                      _qgcView.width * 0.8
+                    width:                      _panelWidth
                     color:                      qgcPal.windowShade
                     anchors.margins:            ScreenTools.defaultFontPixelWidth
                     anchors.horizontalCenter:   parent.horizontalCenter