From 839c29845796621249e1576e0ea7c02fd020d25a Mon Sep 17 00:00:00 2001
From: Mariano Lizarraga <malife@gmail.com>
Date: Thu, 13 Jan 2011 16:07:22 -0600
Subject: [PATCH] Removed duplicated declaration of method in SlugsMAV.h

---
 qgcunittest.pro    | 12 +++++++++---
 src/uas/SlugsMAV.h |  7 +++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/qgcunittest.pro b/qgcunittest.pro
index d8612b2b1..5fe080ff4 100644
--- a/qgcunittest.pro
+++ b/qgcunittest.pro
@@ -11,7 +11,7 @@ QT       += network \
 
 TEMPLATE = app
 
-TARGET = tst_uasunittest
+TARGET = qgcunittest
 
 BASEDIR = $$IN_PWD
 TESTDIR = $$BASEDIR/qgcunittest
@@ -97,8 +97,7 @@ INCLUDEPATH += . \
     $$BASEDIR/src/ui/ \
 
 
-SOURCES += $$TESTDIR/tst_uasunittest.cc \
-            src/uas/UAS.cc \
+SOURCES +=  src/uas/UAS.cc \
             src/comm/MAVLinkProtocol.cc \
             src/uas/UASWaypointManager.cc \
             src/Waypoint.cc \
@@ -111,6 +110,10 @@ SOURCES += $$TESTDIR/tst_uasunittest.cc \
             src/comm/LinkManager.cc \
             src/QGC.cc \
             src/comm/SerialLink.cc \
+            $$TESTDIR/SlugsMavUnitTest.cc \
+            $$TESTDIR/testSuite.cc \
+            $$TESTDIR/UASUnitTest.cc
+
 
 HEADERS += src/uas/UASInterface.h \
             src/uas/UAS.h \
@@ -129,6 +132,9 @@ HEADERS += src/uas/UASInterface.h \
             src/QGC.h \
             src/comm/SerialLinkInterface.h \
             src/comm/SerialLink.h \
+            $$TESTDIR//SlugsMavUnitTest.h \
+            $$TESTDIR/AutoTest.h \
+            $$TESTDIR/UASUnitTest.h
 
 
 
diff --git a/src/uas/SlugsMAV.h b/src/uas/SlugsMAV.h
index 435a041bd..d0d0e56e9 100644
--- a/src/uas/SlugsMAV.h
+++ b/src/uas/SlugsMAV.h
@@ -36,9 +36,7 @@ class SlugsMAV : public UAS
 public:
     SlugsMAV(MAVLinkProtocol* mavlink, int id = 0);
 
-#ifdef MAVLINK_ENABLED_SLUGS
-    mavlink_pwm_commands_t* getPwmCommands();
-#endif
+
 
 public slots:
     /** @brief Receive a MAVLink message from this MAV */
@@ -46,8 +44,9 @@ public slots:
 
     void emitSignals (void);
 
+#ifdef MAVLINK_ENABLED_SLUGS
     mavlink_pwm_commands_t* getPwmCommands();
-
+#endif
 
 signals:
 
-- 
2.22.0