Merge remote-tracking branch 'MavLink/master'

* MavLink/master:
  "Fix" for hanging on exit when Video Streaming build is enabled.
  Updating GPS lock type text.
  Adding uint16_t to the list of supported types.

src/VideoStreaming/VideoStreaming.cc

@@ -114,7 +114,16 @@ void initializeVideoStreaming(int &argc, char* argv[])
 
 void shutdownVideoStreaming()
 {
+    /* From: http://gstreamer.freedesktop.org/data/doc/gstreamer/head/gstreamer/html/gstreamer-Gst.html#gst-deinit
+     *
+     * "It is normally not needed to call this function in a normal application as the resources will automatically
+     * be freed when the program terminates. This function is therefore mostly used by testsuites and other memory
+     * profiling tools."
+     *
+     * It's causing a hang on exit. It hangs while deleting some thread.
+     *
 #if defined(QGC_GST_STREAMING)
-    gst_deinit();
+     gst_deinit();
 #endif
+    */
 }

src/uas/UAS.cc

@@ -1417,6 +1417,10 @@ void UAS::processParamValueMsg(mavlink_message_t& msg, const QString& paramName,
             paramValue = QVariant(paramUnion.param_int8);
             break;
 
+        case MAV_PARAM_TYPE_UINT16:
+            paramValue = QVariant(paramUnion.param_uint16);
+            break;
+
         case MAV_PARAM_TYPE_INT16:
             paramValue = QVariant(paramUnion.param_int16);
             break;
@@ -1429,6 +1433,14 @@ void UAS::processParamValueMsg(mavlink_message_t& msg, const QString& paramName,
             paramValue = QVariant(paramUnion.param_int32);
             break;
 
+        //-- Note: These are not handled above:
+        //
+        //   MAV_PARAM_TYPE_UINT64
+        //   MAV_PARAM_TYPE_INT64
+        //   MAV_PARAM_TYPE_REAL64
+        //
+        //   No space in message (the only storage allocation is a "float") and not present in mavlink_param_union_t
+
         default:
             qCritical() << "INVALID DATA TYPE USED AS PARAMETER VALUE: " << rawValue.param_type;
     }

src/ui/toolbar/MainToolBar.qml

@@ -200,10 +200,10 @@ Rectangle {
                 return "3D Lock"
             }
             if(activeVehicle.satelliteLock == 4) {
-                return "3D Lock with Differential"
+                return "3D DGPS Lock"
             }
             if(activeVehicle.satelliteLock == 5) {
-                return "3D Lock with Relative Positioning"
+                return "3D RTK GPS Lock"
             }
             return "Unkown Lock Type (" + activeVehicle.satelliteLock + ")"
         }