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/antennatrack/antennatrackplugin.h
View File

@ -7,7 +7,7 @@ class AntennaTrackGadgetFactory;
class AntennaTrackPlugin : public ExtensionSystem::IPlugin { class AntennaTrackPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.AntennaTrack") Q_PLUGIN_METADATA(IID "OpenPilot.AntennaTrack")
public: public:
AntennaTrackPlugin(); AntennaTrackPlugin();

2
ground/openpilotgcs/src/plugins/config/configplugin.h
View File

@ -40,7 +40,7 @@ class ConfigGadgetFactory;
class ConfigPlugin : public ExtensionSystem::IPlugin { class ConfigPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Config") Q_PLUGIN_METADATA(IID "OpenPilot.Config")
public: public:
ConfigPlugin(); ConfigPlugin();

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

@ -33,12 +33,11 @@
namespace Core { namespace Core {
namespace Internal { namespace Internal {
class MainWindow; class MainWindow;
class CorePlugin : public ExtensionSystem::IPlugin { class CorePlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Core") Q_PLUGIN_METADATA(IID "OpenPilot.Core")
public: public:
CorePlugin(); CorePlugin();
@ -54,7 +53,6 @@ public slots:
private: private:
MainWindow *m_mainWindow; MainWindow *m_mainWindow;
}; };
} // namespace Internal } // namespace Internal
} // namespace Core } // namespace Core

2
ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h
View File

@ -34,7 +34,7 @@ class DebugGadgetFactory;
class DebugPlugin : public ExtensionSystem::IPlugin { class DebugPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Debug") Q_PLUGIN_METADATA(IID "OpenPilot.Debug")
public: public:
DebugPlugin(); DebugPlugin();

2
ground/openpilotgcs/src/plugins/dial/dialplugin.h
View File

@ -35,7 +35,7 @@ class DialGadgetFactory;
class DialPlugin : public ExtensionSystem::IPlugin { class DialPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Dial") Q_PLUGIN_METADATA(IID "OpenPilot.Dial")
public: public:
DialPlugin(); DialPlugin();

2
ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h
View File

@ -34,7 +34,7 @@ class EmptyGadgetFactory;
class EmptyPlugin : public ExtensionSystem::IPlugin { class EmptyPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Empty") Q_PLUGIN_METADATA(IID "OpenPilot.Empty")
public: public:
EmptyPlugin(); EmptyPlugin();

2
ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h
View File

@ -35,7 +35,7 @@ class GCSControlGadgetFactory;
class GCSControlPlugin : public ExtensionSystem::IPlugin { class GCSControlPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.GCSControl") Q_PLUGIN_METADATA(IID "OpenPilot.GCSControl")
public: public:
GCSControlPlugin(); GCSControlPlugin();

2
ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h
View File

@ -34,7 +34,7 @@ class GpsDisplayGadgetFactory;
class GpsDisplayPlugin : public ExtensionSystem::IPlugin { class GpsDisplayPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.GpsDisplay") Q_PLUGIN_METADATA(IID "OpenPilot.GpsDisplay")
public: public:
GpsDisplayPlugin(); GpsDisplayPlugin();

2
ground/openpilotgcs/src/plugins/hitl/hitlplugin.h
View File

@ -37,7 +37,7 @@ class HITLFactory;
class HITLPlugin : public ExtensionSystem::IPlugin { class HITLPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.HITL") Q_PLUGIN_METADATA(IID "OpenPilot.HITL")
public: public:
HITLPlugin(); HITLPlugin();

2
ground/openpilotgcs/src/plugins/importexport/importexportplugin.h
View File

@ -32,7 +32,7 @@
class IMPORTEXPORT_EXPORT ImportExportPlugin : public ExtensionSystem::IPlugin { class IMPORTEXPORT_EXPORT ImportExportPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.ImportExport") Q_PLUGIN_METADATA(IID "OpenPilot.ImportExport")
public: public:
ImportExportPlugin(); ImportExportPlugin();

2
ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h
View File

@ -85,7 +85,7 @@ private:
class IPconnection_EXPORT IPconnectionPlugin : public ExtensionSystem::IPlugin { class IPconnection_EXPORT IPconnectionPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.IPconnection") Q_PLUGIN_METADATA(IID "OpenPilot.IPconnection")
public: public:
IPconnectionPlugin(); IPconnectionPlugin();

2
ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h
View File

@ -34,7 +34,7 @@ class LineardialGadgetFactory;
class LineardialPlugin : public ExtensionSystem::IPlugin { class LineardialPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Lineardial") Q_PLUGIN_METADATA(IID "OpenPilot.Lineardial")
public: public:
LineardialPlugin(); LineardialPlugin();

4
ground/openpilotgcs/src/plugins/logging/logfile.cpp
View File

@ -152,8 +152,8 @@ bool LogFile::startReplay()
{ {
dataBuffer.clear(); dataBuffer.clear();
myTime.restart(); myTime.restart();
timeOffset = 0; timeOffset = 0;
lastPlayed = 0; lastPlayed = 0;
file.read((char *)&lastTimeStamp, sizeof(lastTimeStamp)); file.read((char *)&lastTimeStamp, sizeof(lastTimeStamp));
timer.setInterval(10); timer.setInterval(10);
timer.start(); timer.start();

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/logging/loggingplugin.h
View File

@ -116,7 +116,7 @@ private:
class LoggingPlugin : public ExtensionSystem::IPlugin { class LoggingPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Logging") Q_PLUGIN_METADATA(IID "OpenPilot.Logging")
friend class LoggingConnection; friend class LoggingConnection;

2
ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h
View File

@ -34,7 +34,7 @@ class MagicWaypointGadgetFactory;
class MagicWaypointPlugin : public ExtensionSystem::IPlugin { class MagicWaypointPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.MagicWaypoint") Q_PLUGIN_METADATA(IID "OpenPilot.MagicWaypoint")
public: public:
MagicWaypointPlugin(); MagicWaypointPlugin();

2
ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h
View File

@ -34,7 +34,7 @@ class ModelViewGadgetFactory;
class ModelViewPlugin : public ExtensionSystem::IPlugin { class ModelViewPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "Openpilot.ModelView") Q_PLUGIN_METADATA(IID "Openpilot.ModelView")
public: public:
ModelViewPlugin(); ModelViewPlugin();

2
ground/openpilotgcs/src/plugins/notify/notifyplugin.h
View File

@ -49,7 +49,7 @@ typedef struct {
class SoundNotifyPlugin : public Core::IConfigurablePlugin { class SoundNotifyPlugin : public Core::IConfigurablePlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "Openpilot.SoundNotify") Q_PLUGIN_METADATA(IID "Openpilot.SoundNotify")
public: public:
SoundNotifyPlugin(); SoundNotifyPlugin();

2
ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h
View File

@ -83,7 +83,7 @@ protected:
class OPHID_EXPORT RawHIDPlugin : public ExtensionSystem::IPlugin { class OPHID_EXPORT RawHIDPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.RawHID") Q_PLUGIN_METADATA(IID "OpenPilot.RawHID")
public: public:
RawHIDPlugin(); RawHIDPlugin();

2
ground/openpilotgcs/src/plugins/opmap/opmapplugin.h
View File

@ -34,7 +34,7 @@ class OPMapGadgetFactory;
class OPMapPlugin : public ExtensionSystem::IPlugin { class OPMapPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.OPMap") Q_PLUGIN_METADATA(IID "OpenPilot.OPMap")
public: public:
OPMapPlugin(); OPMapPlugin();

2
ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h
View File

@ -34,7 +34,7 @@ class OsgEarthviewGadgetFactory;
class OsgEarthviewPlugin : public ExtensionSystem::IPlugin { class OsgEarthviewPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.OsgEarthview") Q_PLUGIN_METADATA(IID "OpenPilot.OsgEarthview")
public: public:
OsgEarthviewPlugin(); OsgEarthviewPlugin();

2
ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h
View File

@ -33,7 +33,7 @@ class PathActionEditorGadgetFactory;
class PathActionEditorPlugin : public ExtensionSystem::IPlugin { class PathActionEditorPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.PathActionEditor") Q_PLUGIN_METADATA(IID "OpenPilot.PathActionEditor")
public: public:
PathActionEditorPlugin(); PathActionEditorPlugin();

2
ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h
View File

@ -23,7 +23,7 @@ class PfdQmlGadgetFactory;
class PfdQmlPlugin : public ExtensionSystem::IPlugin { class PfdQmlPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.PfdQml") Q_PLUGIN_METADATA(IID "OpenPilot.PfdQml")
public: public:
PfdQmlPlugin(); PfdQmlPlugin();

2
ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h
View File

@ -34,7 +34,7 @@ class QmlViewGadgetFactory;
class QmlViewPlugin : public ExtensionSystem::IPlugin { class QmlViewPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.QmlView") Q_PLUGIN_METADATA(IID "OpenPilot.QmlView")
public: public:
QmlViewPlugin(); QmlViewPlugin();

2
ground/openpilotgcs/src/plugins/scope/scopeplugin.h
View File

@ -34,7 +34,7 @@ class ScopeGadgetFactory;
class ScopePlugin : public ExtensionSystem::IPlugin { class ScopePlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Scope") Q_PLUGIN_METADATA(IID "OpenPilot.Scope")
public: public:
ScopePlugin(); ScopePlugin();

2
ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
View File

@ -74,7 +74,7 @@ SerialConnection::SerialConnection() :
m_enumerateThread(this), m_enumerateThread(this),
m_deviceOpened(false) m_deviceOpened(false)
{ {
m_config = new SerialPluginConfiguration("Serial Telemetry", NULL, this); m_config = new SerialPluginConfiguration("Serial Telemetry", NULL, this);
m_config->restoresettings(); m_config->restoresettings();
m_optionspage = new SerialPluginOptionsPage(m_config, this); m_optionspage = new SerialPluginOptionsPage(m_config, this);

2
ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h
View File

@ -118,7 +118,7 @@ protected:
// class SERIAL_EXPORT SerialPlugin // class SERIAL_EXPORT SerialPlugin
class SerialPlugin : public ExtensionSystem::IPlugin { class SerialPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Serial") Q_PLUGIN_METADATA(IID "OpenPilot.Serial")
public: public:
SerialPlugin(); SerialPlugin();

2
ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
View File

@ -33,7 +33,7 @@
class SetupWizardPlugin : public ExtensionSystem::IPlugin { class SetupWizardPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard") Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard")
public: public:
SetupWizardPlugin(); SetupWizardPlugin();

2
ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h
View File

@ -34,7 +34,7 @@ class SystemHealthGadgetFactory;
class SystemHealthPlugin : public ExtensionSystem::IPlugin { class SystemHealthPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.SystemHealth") Q_PLUGIN_METADATA(IID "OpenPilot.SystemHealth")
public: public:
SystemHealthPlugin(); SystemHealthPlugin();

2
ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h
View File

@ -34,7 +34,7 @@ class UAVObjectBrowserFactory;
class BrowserPlugin : public ExtensionSystem::IPlugin { class BrowserPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Browser") Q_PLUGIN_METADATA(IID "OpenPilot.Browser")
public: public:
BrowserPlugin(); BrowserPlugin();

2
ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h
View File

@ -36,7 +36,7 @@
class UAVOBJECTS_EXPORT UAVObjectsPlugin : class UAVOBJECTS_EXPORT UAVObjectsPlugin :
public ExtensionSystem::IPlugin { public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjects") Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjects")
public: public:
UAVObjectsPlugin(); UAVObjectsPlugin();

2
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h
View File

@ -35,7 +35,7 @@
class UAVOBJECTUTIL_EXPORT UAVObjectUtilPlugin : public ExtensionSystem::IPlugin { class UAVOBJECTUTIL_EXPORT UAVObjectUtilPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectUtil") Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectUtil")
public: public:
UAVObjectUtilPlugin(); UAVObjectUtilPlugin();

2
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h
View File

@ -33,7 +33,7 @@
class UAVOBJECTWIDGETUTILS_EXPORT UAVObjectWidgetUtilsPlugin : public ExtensionSystem::IPlugin { class UAVOBJECTWIDGETUTILS_EXPORT UAVObjectWidgetUtilsPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectWidgetUtils") Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectWidgetUtils")
public: public:
UAVObjectWidgetUtilsPlugin(); UAVObjectWidgetUtilsPlugin();

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

@ -34,7 +34,7 @@
class UAVSETTINGSIMPORTEXPORT_EXPORT UAVSettingsImportExportPlugin : public ExtensionSystem::IPlugin { class UAVSETTINGSIMPORTEXPORT_EXPORT UAVSettingsImportExportPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.UAVSettingsImportExport") Q_PLUGIN_METADATA(IID "OpenPilot.UAVSettingsImportExport")
public: public:
UAVSettingsImportExportPlugin(); UAVSettingsImportExportPlugin();

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

@ -184,7 +184,7 @@ void TelemetryMonitor::firmwareIAPUpdated(UAVObject *obj)
QMutexLocker locker(mutex); QMutexLocker locker(mutex);
if (firmwareIAPObj->getBoardType() != 0) { if (firmwareIAPObj->getBoardType() != 0) {
emit connected(); emit connected();
} }
} }

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;

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

@ -38,7 +38,7 @@
class UAVTALK_EXPORT UAVTalkPlugin : public ExtensionSystem::IPlugin { class UAVTALK_EXPORT UAVTalkPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.UAVTalk") Q_PLUGIN_METADATA(IID "OpenPilot.UAVTalk")
public: public:
UAVTalkPlugin(); UAVTalkPlugin();

2
ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h
View File

@ -35,7 +35,7 @@ class UploaderGadgetFactory;
class UPLOADER_EXPORT UploaderPlugin : public ExtensionSystem::IPlugin { class UPLOADER_EXPORT UploaderPlugin : public ExtensionSystem::IPlugin {
Q_OBJECT Q_OBJECT
Q_PLUGIN_METADATA(IID "OpenPilot.Uploader") Q_PLUGIN_METADATA(IID "OpenPilot.Uploader")
public: public:
UploaderPlugin(); UploaderPlugin();

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

@ -32,15 +32,13 @@
#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
Q_PLUGIN_METADATA(IID "OpenPilot.Welcome") Q_PLUGIN_METADATA(IID "OpenPilot.Welcome")
public: public:
WelcomePlugin(); WelcomePlugin();
@ -53,7 +51,6 @@ public:
private: private:
WelcomeMode *m_welcomeMode; WelcomeMode *m_welcomeMode;
}; };
} // namespace Welcome } // namespace Welcome
} // namespace Internal } // namespace Internal