Commit 839c2984 authored by Mariano Lizarraga's avatar Mariano Lizarraga

Removed duplicated declaration of method in SlugsMAV.h

parent 3e34eaab
......@@ -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
......
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment