Merge pull request #856 from mavlink/altitude

Add misssing arguments, fixes #847

src/uas/UASWaypointManager.cc

@@ -55,7 +55,7 @@ UASWaypointManager::UASWaypointManager(UAS* _uas)
         uasid = uas->getUASID();
         connect(&protocol_timer, SIGNAL(timeout()), this, SLOT(timeout()));
         connect(uas, SIGNAL(localPositionChanged(UASInterface*,double,double,double,quint64)), this, SLOT(handleLocalPositionChanged(UASInterface*,double,double,double,quint64)));
-        connect(uas, SIGNAL(globalPositionChanged(UASInterface*,double,double,double,double,quint64)), this, SLOT(handleGlobalPositionChanged(UASInterface*,double,double,double,double,double,quint64)));
+        connect(uas, SIGNAL(globalPositionChanged(UASInterface*,double,double,double,double,quint64)), this, SLOT(handleGlobalPositionChanged(UASInterface*,double,double,double,double,quint64)));
     }
     else
     {

src/ui/map/QGCMapWidget.cc

@@ -421,9 +421,10 @@ void QGCMapWidget::activeUASSet(UASInterface* uas)
  * @param alt Altitude over mean sea level
  * @param usec Timestamp of the position message in milliseconds FIXME will move to microseconds
  */
-void QGCMapWidget::updateGlobalPosition(UASInterface* uas, double lat, double lon, double alt, quint64 usec)
+void QGCMapWidget::updateGlobalPosition(UASInterface* uas, double lat, double lon, double altAMSL, double altWGS84, quint64 usec)
 {
     Q_UNUSED(usec);
+    Q_UNUSED(altAMSL);
 
     // Immediate update
     if (maxUpdateInterval == 0)
@@ -452,7 +453,7 @@ void QGCMapWidget::updateGlobalPosition(UASInterface* uas, double lat, double lo
 
         // Set new lat/lon position of UAV icon
         internals::PointLatLng pos_lat_lon = internals::PointLatLng(lat, lon);
-        uav->SetUAVPos(pos_lat_lon, alt);
+        uav->SetUAVPos(pos_lat_lon, altWGS84);
         // Follow status
         if (followUAVEnabled && uas->getUASID() == followUAVID) SetCurrentPosition(pos_lat_lon);
         // Convert from radians to degrees and apply

src/ui/map/QGCMapWidget.h

@@ -56,7 +56,7 @@ public slots:
     /** @brief Add system to map view */
     void addUAS(UASInterface* uas);
     /** @brief Update the global position of a system */
-    void updateGlobalPosition(UASInterface* uas, double lat, double lon, double alt, quint64 usec);
+    void updateGlobalPosition(UASInterface* uas, double lat, double lon, double altAMSL, double altWGS84, quint64 usec);
     /** @brief Update the global position of all systems */
     void updateGlobalPosition();
     /** @brief Update the local position and draw it converted to GPS reference */

src/ui/uas/UASView.cc

@@ -396,13 +396,14 @@ void UASView::updateLocalPosition(UASInterface* uas, double x, double y, double
     localFrame = true;
 }
 
-void UASView::updateGlobalPosition(UASInterface* uas, double lon, double lat, double alt, quint64 usec)
+void UASView::updateGlobalPosition(UASInterface* uas, double lon, double lat, double altAMSL, double altWGS84, quint64 usec)
 {
     Q_UNUSED(uas);
     Q_UNUSED(usec);
+    Q_UNUSED(altAMSL);
     this->lon = lon;
     this->lat = lat;
-    this->alt = alt;
+    this->alt = altWGS84;
     globalFrameKnown = true;
 }
 

src/ui/uas/UASView.h

@@ -58,7 +58,7 @@ public slots:
     void updateThrust(UASInterface* uas, double thrust);
     void updateBattery(UASInterface* uas, double voltage, double current, double percent, int seconds);
     void updateLocalPosition(UASInterface*, double x, double y, double z, quint64 usec);
-    void updateGlobalPosition(UASInterface*, double lon, double lat, double alt, quint64 usec);
+    void updateGlobalPosition(UASInterface*, double lon, double lat, double altAMSL, double altWGS84, quint64 usec);
     void updateSpeed(UASInterface*, double x, double y, double z, quint64 usec);
     void updateState(UASInterface*, QString uasState, QString stateDescription);
     /** @brief Update the MAV mode */