From 8fb943ebd76a9ffb54fc89f4c2b5ff1147da46a9 Mon Sep 17 00:00:00 2001
From: lm <pixhawk@pixhawk02.(none)>
Date: Wed, 14 Apr 2010 18:46:58 +0200
Subject: [PATCH] Fixed temp and baro mixup

---
 qgroundcontrol.pri | 2 +-
 qgroundcontrol.pro | 6 +++---
 src/uas/UAS.cc     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index aa26f00..817f101 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -73,7 +73,7 @@ macx {
 
     DESTDIR = $$BASEDIR/bin/mac
     INCLUDEPATH += -framework SDL \
-        $$BASEDIR/../mavlink/src
+        $$BASEDIR/../mavlink/include
 
     LIBS += -framework IOKit \
         -framework SDL \
diff --git a/qgroundcontrol.pro b/qgroundcontrol.pro
index 5f0e681..f83d0db 100644
--- a/qgroundcontrol.pro
+++ b/qgroundcontrol.pro
@@ -30,9 +30,9 @@ DEPENDPATH += . \
     lib/QMapControl/src
 INCLUDEPATH += . \
     lib/QMapControl \
-    ../mavlink/src \
-    MAVLink/src \
-    mavlink/src
+    ../mavlink/include \
+    MAVLink/include \
+    mavlink/include
 
 # Input
 FORMS += src/ui/MainWindow.ui \
diff --git a/src/uas/UAS.cc b/src/uas/UAS.cc
index ee042bc..266c4c3 100644
--- a/src/uas/UAS.cc
+++ b/src/uas/UAS.cc
@@ -265,7 +265,7 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
                 emit valueChanged(uasId, "Mag. Y", raw.ymag, time);
                 emit valueChanged(uasId, "Mag. Z", raw.zmag, time);
                 emit valueChanged(uasId, "Pressure", raw.baro, time);
-                emit valueChanged(uasId, "Temperature", raw.baro, time);
+                emit valueChanged(uasId, "Temperature", raw.temp, time);
             }
             break;
         case MAVLINK_MSG_ID_ATTITUDE: