rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

Merge branch 'next' into corvuscorax/onboardlogging

Browse Source
This commit is contained in:
Corvus Corax 2013-11-16 18:22:01 +01:00
commit f25926d4bc
39 changed files with 48 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h
View File

@ -33,7 +33,6 @@
namespace Core { namespace Core {
namespace Internal { namespace Internal {
class MainWindow; class MainWindow;
class CorePlugin : public ExtensionSystem::IPlugin { class CorePlugin : public ExtensionSystem::IPlugin {
@ -54,7 +53,6 @@ public slots:
private: private:
MainWindow *m_mainWindow; MainWindow *m_mainWindow;
}; };
} // namespace Internal } // namespace Internal
} // namespace Core } // namespace Core

20
ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
View File

@ -44,9 +44,9 @@
#include "uavobjectmanager.h" #include "uavobjectmanager.h"
LoggingConnection::LoggingConnection(LoggingPlugin *loggingPlugin): LoggingConnection::LoggingConnection(LoggingPlugin *loggingPlugin) :
loggingPlugin(loggingPlugin), loggingPlugin(loggingPlugin),
m_deviceOpened(false) m_deviceOpened(false)
{} {}
LoggingConnection::~LoggingConnection() LoggingConnection::~LoggingConnection()
@ -288,14 +288,12 @@ void LoggingThread::transactionCompleted(UAVObject *obj, bool success)
LoggingPlugin::LoggingPlugin() : LoggingPlugin::LoggingPlugin() :
state(IDLE), state(IDLE),
loggingThread(NULL), loggingThread(NULL),
logConnection(new LoggingConnection(this)), logConnection(new LoggingConnection(this)),
mf(NULL), mf(NULL),
cmd(NULL) cmd(NULL)
{ {}
}
LoggingPlugin::~LoggingPlugin() LoggingPlugin::~LoggingPlugin()
{ {

2
ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h
View File

@ -69,7 +69,7 @@ private:
QQueue<UAVObject *> queue; QQueue<UAVObject *> queue;
GCSTelemetryStats *gcsStatsObj; GCSTelemetryStats *gcsStatsObj;
FlightTelemetryStats *flightStatsObj; FlightTelemetryStats *flightStatsObj;
FirmwareIAPObj* firmwareIAPObj; FirmwareIAPObj *firmwareIAPObj;
QTimer *statsTimer; QTimer *statsTimer;
UAVObject *objPending; UAVObject *objPending;
QMutex *mutex; QMutex *mutex;

3
ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h
View File

@ -32,11 +32,9 @@
#include <extensionsystem/iplugin.h> #include <extensionsystem/iplugin.h>
namespace Welcome { namespace Welcome {
class WelcomeMode; class WelcomeMode;
namespace Internal { namespace Internal {
class WelcomePlugin class WelcomePlugin
: public ExtensionSystem::IPlugin { : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
@ -53,7 +51,6 @@ public:
private: private:
WelcomeMode *m_welcomeMode; WelcomeMode *m_welcomeMode;
}; };
} // namespace Welcome } // namespace Welcome
} // namespace Internal } // namespace Internal