Merge branch 'next' into corvuscorax/onboardlogging

2025-01-18 03:52:11 +01:00 · 2013-11-16 18:22:01 +01:00 · 2013-11-16 18:22:01 +01:00 · f25926d4bc
commit f25926d4bc
parent 00321b09dc 89f7dab2de
39 changed files with 48 additions and 55 deletions
--- a/ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h
+++ b/ground/openpilotgcs/src/plugins/antennatrack/antennatrackplugin.h
@ -7,7 +7,7 @@ class AntennaTrackGadgetFactory;

 class AntennaTrackPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.AntennaTrack")
+                                                   Q_PLUGIN_METADATA(IID "OpenPilot.AntennaTrack")

 public:
    AntennaTrackPlugin();
--- a/ground/openpilotgcs/src/plugins/config/configplugin.h
+++ b/ground/openpilotgcs/src/plugins/config/configplugin.h
@ -40,7 +40,7 @@ class ConfigGadgetFactory;

 class ConfigPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Config")
+                                             Q_PLUGIN_METADATA(IID "OpenPilot.Config")

 public:
    ConfigPlugin();
--- a/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h
+++ b/ground/openpilotgcs/src/plugins/coreplugin/coreplugin.h
@ -33,12 +33,11 @@

 namespace Core {
 namespace Internal {
-
 class MainWindow;

 class CorePlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Core")
+                                           Q_PLUGIN_METADATA(IID "OpenPilot.Core")

 public:
    CorePlugin();
@ -54,7 +53,6 @@ public slots:
 private:
    MainWindow *m_mainWindow;
 };
-
 } // namespace Internal
 } // namespace Core

--- a/ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h
+++ b/ground/openpilotgcs/src/plugins/debuggadget/debugplugin.h
@ -34,7 +34,7 @@ class DebugGadgetFactory;

 class DebugPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Debug")
+                                            Q_PLUGIN_METADATA(IID "OpenPilot.Debug")

 public:
    DebugPlugin();
--- a/ground/openpilotgcs/src/plugins/dial/dialplugin.h
+++ b/ground/openpilotgcs/src/plugins/dial/dialplugin.h
@ -35,7 +35,7 @@ class DialGadgetFactory;

 class DialPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Dial")
+                                           Q_PLUGIN_METADATA(IID "OpenPilot.Dial")

 public:
    DialPlugin();
--- a/ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h
+++ b/ground/openpilotgcs/src/plugins/emptygadget/emptyplugin.h
@ -34,7 +34,7 @@ class EmptyGadgetFactory;

 class EmptyPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Empty")
+                                            Q_PLUGIN_METADATA(IID "OpenPilot.Empty")

 public:
    EmptyPlugin();
--- a/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h
+++ b/ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolplugin.h
@ -35,7 +35,7 @@ class GCSControlGadgetFactory;

 class GCSControlPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.GCSControl")
+                                                 Q_PLUGIN_METADATA(IID "OpenPilot.GCSControl")

 public:
    GCSControlPlugin();
--- a/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h
+++ b/ground/openpilotgcs/src/plugins/gpsdisplay/gpsdisplayplugin.h
@ -34,7 +34,7 @@ class GpsDisplayGadgetFactory;

 class GpsDisplayPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.GpsDisplay")
+                                                 Q_PLUGIN_METADATA(IID "OpenPilot.GpsDisplay")

 public:
    GpsDisplayPlugin();
--- a/ground/openpilotgcs/src/plugins/hitl/hitlplugin.h
+++ b/ground/openpilotgcs/src/plugins/hitl/hitlplugin.h
@ -37,7 +37,7 @@ class HITLFactory;

 class HITLPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.HITL")
+                                           Q_PLUGIN_METADATA(IID "OpenPilot.HITL")

 public:
    HITLPlugin();
--- a/ground/openpilotgcs/src/plugins/importexport/importexportplugin.h
+++ b/ground/openpilotgcs/src/plugins/importexport/importexportplugin.h
@ -32,7 +32,7 @@

 class IMPORTEXPORT_EXPORT ImportExportPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.ImportExport")
+                          Q_PLUGIN_METADATA(IID "OpenPilot.ImportExport")

 public:
    ImportExportPlugin();
--- a/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h
+++ b/ground/openpilotgcs/src/plugins/ipconnection/ipconnectionplugin.h
@ -85,7 +85,7 @@ private:

 class IPconnection_EXPORT IPconnectionPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.IPconnection")
+                          Q_PLUGIN_METADATA(IID "OpenPilot.IPconnection")

 public:
    IPconnectionPlugin();
--- a/ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h
+++ b/ground/openpilotgcs/src/plugins/lineardial/lineardialplugin.h
@ -34,7 +34,7 @@ class LineardialGadgetFactory;

 class LineardialPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Lineardial")
+                                                 Q_PLUGIN_METADATA(IID "OpenPilot.Lineardial")

 public:
    LineardialPlugin();
--- a/ground/openpilotgcs/src/plugins/logging/logfile.cpp
+++ b/ground/openpilotgcs/src/plugins/logging/logfile.cpp
@ -152,8 +152,8 @@ bool LogFile::startReplay()
 {
    dataBuffer.clear();
    myTime.restart();
-    timeOffset    = 0;
-    lastPlayed    = 0;
+    timeOffset = 0;
+    lastPlayed = 0;
    file.read((char *)&lastTimeStamp, sizeof(lastTimeStamp));
    timer.setInterval(10);
    timer.start();
--- a/ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/logging/loggingplugin.cpp
@ -44,9 +44,9 @@
 #include "uavobjectmanager.h"


-LoggingConnection::LoggingConnection(LoggingPlugin *loggingPlugin):
-loggingPlugin(loggingPlugin),
-m_deviceOpened(false)
+LoggingConnection::LoggingConnection(LoggingPlugin *loggingPlugin) :
+    loggingPlugin(loggingPlugin),
+    m_deviceOpened(false)
 {}

 LoggingConnection::~LoggingConnection()
@ -288,14 +288,12 @@ void LoggingThread::transactionCompleted(UAVObject *obj, bool success)


 LoggingPlugin::LoggingPlugin() :
-state(IDLE),
-loggingThread(NULL),
-logConnection(new LoggingConnection(this)),
-mf(NULL),
-cmd(NULL)
-{
-
-}
+    state(IDLE),
+    loggingThread(NULL),
+    logConnection(new LoggingConnection(this)),
+    mf(NULL),
+    cmd(NULL)
+{}

 LoggingPlugin::~LoggingPlugin()
 {
--- a/ground/openpilotgcs/src/plugins/logging/loggingplugin.h
+++ b/ground/openpilotgcs/src/plugins/logging/loggingplugin.h
@ -116,7 +116,7 @@ private:

 class LoggingPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Logging")
+                                              Q_PLUGIN_METADATA(IID "OpenPilot.Logging")

    friend class LoggingConnection;

--- a/ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h
+++ b/ground/openpilotgcs/src/plugins/magicwaypoint/magicwaypointplugin.h
@ -34,7 +34,7 @@ class MagicWaypointGadgetFactory;

 class MagicWaypointPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.MagicWaypoint")
+                                                    Q_PLUGIN_METADATA(IID "OpenPilot.MagicWaypoint")

 public:
    MagicWaypointPlugin();
--- a/ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h
+++ b/ground/openpilotgcs/src/plugins/modelview/modelviewplugin.h
@ -34,7 +34,7 @@ class ModelViewGadgetFactory;

 class ModelViewPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "Openpilot.ModelView")
+                                                Q_PLUGIN_METADATA(IID "Openpilot.ModelView")

 public:
    ModelViewPlugin();
--- a/ground/openpilotgcs/src/plugins/notify/notifyplugin.h
+++ b/ground/openpilotgcs/src/plugins/notify/notifyplugin.h
@ -49,7 +49,7 @@ typedef struct {

 class SoundNotifyPlugin : public Core::IConfigurablePlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "Openpilot.SoundNotify")
+                                       Q_PLUGIN_METADATA(IID "Openpilot.SoundNotify")

 public:
    SoundNotifyPlugin();
--- a/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h
+++ b/ground/openpilotgcs/src/plugins/ophid/inc/ophid_plugin.h
@ -83,7 +83,7 @@ protected:

 class OPHID_EXPORT RawHIDPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.RawHID")
+                   Q_PLUGIN_METADATA(IID "OpenPilot.RawHID")

 public:
    RawHIDPlugin();
--- a/ground/openpilotgcs/src/plugins/opmap/opmapplugin.h
+++ b/ground/openpilotgcs/src/plugins/opmap/opmapplugin.h
@ -34,7 +34,7 @@ class OPMapGadgetFactory;

 class OPMapPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.OPMap")
+                                            Q_PLUGIN_METADATA(IID "OpenPilot.OPMap")

 public:
    OPMapPlugin();
--- a/ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h
+++ b/ground/openpilotgcs/src/plugins/osgearthview/osgearthviewplugin.h
@ -34,7 +34,7 @@ class OsgEarthviewGadgetFactory;

 class OsgEarthviewPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.OsgEarthview")
+                                                   Q_PLUGIN_METADATA(IID "OpenPilot.OsgEarthview")

 public:
    OsgEarthviewPlugin();
--- a/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h
+++ b/ground/openpilotgcs/src/plugins/pathactioneditor/pathactioneditorplugin.h
@ -33,7 +33,7 @@ class PathActionEditorGadgetFactory;

 class PathActionEditorPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.PathActionEditor")
+                                                       Q_PLUGIN_METADATA(IID "OpenPilot.PathActionEditor")

 public:
    PathActionEditorPlugin();
--- a/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h
+++ b/ground/openpilotgcs/src/plugins/pfdqml/pfdqmlplugin.h
@ -23,7 +23,7 @@ class PfdQmlGadgetFactory;

 class PfdQmlPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.PfdQml")
+                                             Q_PLUGIN_METADATA(IID "OpenPilot.PfdQml")

 public:
    PfdQmlPlugin();
--- a/ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h
+++ b/ground/openpilotgcs/src/plugins/qmlview/qmlviewplugin.h
@ -34,7 +34,7 @@ class QmlViewGadgetFactory;

 class QmlViewPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.QmlView")
+                                              Q_PLUGIN_METADATA(IID "OpenPilot.QmlView")

 public:
    QmlViewPlugin();
--- a/ground/openpilotgcs/src/plugins/scope/scopeplugin.h
+++ b/ground/openpilotgcs/src/plugins/scope/scopeplugin.h
@ -34,7 +34,7 @@ class ScopeGadgetFactory;

 class ScopePlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Scope")
+                                            Q_PLUGIN_METADATA(IID "OpenPilot.Scope")

 public:
    ScopePlugin();
--- a/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
+++ b/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.cpp
@ -74,7 +74,7 @@ SerialConnection::SerialConnection() :
    m_enumerateThread(this),
    m_deviceOpened(false)
 {
-    m_config      = new SerialPluginConfiguration("Serial Telemetry", NULL, this);
+    m_config = new SerialPluginConfiguration("Serial Telemetry", NULL, this);
    m_config->restoresettings();

    m_optionspage = new SerialPluginOptionsPage(m_config, this);
--- a/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h
+++ b/ground/openpilotgcs/src/plugins/serialconnection/serialplugin.h
@ -118,7 +118,7 @@ protected:
 // class SERIAL_EXPORT SerialPlugin
 class SerialPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Serial")
+                                             Q_PLUGIN_METADATA(IID "OpenPilot.Serial")

 public:
    SerialPlugin();
--- a/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.h
@ -33,7 +33,7 @@

 class SetupWizardPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard")
+                                                  Q_PLUGIN_METADATA(IID "OpenPilot.SetupWizard")

 public:
    SetupWizardPlugin();
--- a/ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h
+++ b/ground/openpilotgcs/src/plugins/systemhealth/systemhealthplugin.h
@ -34,7 +34,7 @@ class SystemHealthGadgetFactory;

 class SystemHealthPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.SystemHealth")
+                                                   Q_PLUGIN_METADATA(IID "OpenPilot.SystemHealth")

 public:
    SystemHealthPlugin();
--- a/ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectbrowser/browserplugin.h
@ -34,7 +34,7 @@ class UAVObjectBrowserFactory;

 class BrowserPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Browser")
+                                              Q_PLUGIN_METADATA(IID "OpenPilot.Browser")

 public:
    BrowserPlugin();
--- a/ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h
+++ b/ground/openpilotgcs/src/plugins/uavobjects/uavobjectsplugin.h
@ -36,7 +36,7 @@
 class UAVOBJECTS_EXPORT UAVObjectsPlugin :
    public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjects")
+                        Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjects")

 public:
    UAVObjectsPlugin();
--- a/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilplugin.h
@ -35,7 +35,7 @@

 class UAVOBJECTUTIL_EXPORT UAVObjectUtilPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectUtil")
+                           Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectUtil")

 public:
    UAVObjectUtilPlugin();
--- a/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h
+++ b/ground/openpilotgcs/src/plugins/uavobjectwidgetutils/uavobjectwidgetutilsplugin.h
@ -33,7 +33,7 @@

 class UAVOBJECTWIDGETUTILS_EXPORT UAVObjectWidgetUtilsPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectWidgetUtils")
+                                  Q_PLUGIN_METADATA(IID "OpenPilot.UAVObjectWidgetUtils")

 public:
    UAVObjectWidgetUtilsPlugin();
--- a/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h
+++ b/ground/openpilotgcs/src/plugins/uavsettingsimportexport/uavsettingsimportexport.h
@ -34,7 +34,7 @@

 class UAVSETTINGSIMPORTEXPORT_EXPORT UAVSettingsImportExportPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.UAVSettingsImportExport")
+                                     Q_PLUGIN_METADATA(IID "OpenPilot.UAVSettingsImportExport")

 public:
    UAVSettingsImportExportPlugin();
--- a/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
+++ b/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
@ -184,7 +184,7 @@ void TelemetryMonitor::firmwareIAPUpdated(UAVObject *obj)
    QMutexLocker locker(mutex);

    if (firmwareIAPObj->getBoardType() != 0) {
-      emit connected();
+        emit connected();
    }
 }

--- a/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h
+++ b/ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.h
@ -69,7 +69,7 @@ private:
    QQueue<UAVObject *> queue;
    GCSTelemetryStats *gcsStatsObj;
    FlightTelemetryStats *flightStatsObj;
-    FirmwareIAPObj* firmwareIAPObj;
+    FirmwareIAPObj *firmwareIAPObj;
    QTimer *statsTimer;
    UAVObject *objPending;
    QMutex *mutex;
--- a/ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h
+++ b/ground/openpilotgcs/src/plugins/uavtalk/uavtalkplugin.h
@ -38,7 +38,7 @@

 class UAVTALK_EXPORT UAVTalkPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.UAVTalk")
+                     Q_PLUGIN_METADATA(IID "OpenPilot.UAVTalk")

 public:
    UAVTalkPlugin();
--- a/ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h
+++ b/ground/openpilotgcs/src/plugins/uploader/uploaderplugin.h
@ -35,7 +35,7 @@ class UploaderGadgetFactory;

 class UPLOADER_EXPORT UploaderPlugin : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Uploader")
+                      Q_PLUGIN_METADATA(IID "OpenPilot.Uploader")

 public:
    UploaderPlugin();
--- a/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h
+++ b/ground/openpilotgcs/src/plugins/welcome/welcomeplugin.h
@ -32,15 +32,13 @@
 #include <extensionsystem/iplugin.h>

 namespace Welcome {
-
 class WelcomeMode;

 namespace Internal {
-
 class WelcomePlugin
    : public ExtensionSystem::IPlugin {
    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "OpenPilot.Welcome")
+                              Q_PLUGIN_METADATA(IID "OpenPilot.Welcome")

 public:
    WelcomePlugin();
@ -53,7 +51,6 @@ public:
 private:
    WelcomeMode *m_welcomeMode;
 };
-
 } // namespace Welcome
 } // namespace Internal