Merge branch 'master' of https://github.com/mavlink/qgroundcontrol into Airmap

# Conflicts:
#	libs/mavlink/include/mavlink/v2.0

localization/gen_translation_source.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 # This is set to find lupdate in my particular installation. You will need to set the path
 # where you have Qt installed.
-QT_PATH=~/Applications/Qt/5.9.1/clang_64/bin
+QT_PATH=~/Applications/Qt/5.11.0/clang_64/bin
 $QT_PATH/lupdate ../src -ts qgc.ts

src/QmlControls/QmlObjectListModel.cc

@@ -194,7 +194,7 @@ void QmlObjectListModel::insert(int i, QList<QObject*> objects)
         }
         j++;
 
-        _objectList.insert(i, object);
+        _objectList.insert(j, object);
     }
 
     insertRows(i, objects.count());

src/Vehicle/Vehicle.cc

@@ -875,8 +875,8 @@ void Vehicle::_handleEstimatorStatus(mavlink_message_t& message)
          float pos_horiz_accuracy; /*< Horizontal position 1-STD accuracy relative to the EKF local origin (m)*/
          float pos_vert_accuracy; /*< Vertical position 1-STD accuracy relative to the EKF local origin (m)*/
          uint16_t flags; /*< Integer bitmask indicating which EKF outputs are valid. See definition for ESTIMATOR_STATUS_FLAGS.*/
-        }) mavlink_estimator_status_t;
+        } mavlink_estimator_status_t;
-
+    };
 #endif
 }
 

src/Vehicle/Vehicle.h

@@ -477,8 +477,8 @@ private:
          float pos_horiz_accuracy; /*< Horizontal position 1-STD accuracy relative to the EKF local origin (m)*/
          float pos_vert_accuracy; /*< Vertical position 1-STD accuracy relative to the EKF local origin (m)*/
          uint16_t flags; /*< Integer bitmask indicating which EKF outputs are valid. See definition for ESTIMATOR_STATUS_FLAGS.*/
-        }) mavlink_estimator_status_t;
+        } mavlink_estimator_status_t;
-
+    };
 #endif
 };
 

src/comm/USBBoardInfo.json

@@ -27,7 +27,8 @@
         { "vendorID": 1027, "productID": 24577,     "boardClass": "SiK Radio",  "name": "SiK Radio",            "comment": "3DR Radio on FTDI" },
         { "vendorID": 4292, "productID": 60000,     "boardClass": "SiK Radio",  "name": "SiK Radio",            "comment": "SILabs Radio" },
 
-        { "vendorID": 5446, "productID": 424,        "boardClass": "RTK GPS",    "name": "U-blox RTK GPS",               "comment": "U-blox RTK GPS" },
+        { "vendorID": 5446, "productID": 424,        "boardClass": "RTK GPS",    "name": "U-blox RTK GPS",               "comment": "U-blox RTK GPS (M8P)" },
+        { "vendorID": 5446, "productID": 425,        "boardClass": "RTK GPS",    "name": "U-blox RTK GPS",               "comment": "U-blox RTK GPS (F9P)" },
         { "vendorID": 1317, "productID": 42151,      "boardClass": "RTK GPS",    "name": "Trimble RTK GPS",              "comment": "Trimble RTK GPS" },
 
         { "vendorID": 8352, "productID": 16732,     "boardClass": "OpenPilot",  "name": "OpenPilot OPLink" },