mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-11-29 07:24:13 +01:00
UAVObjects-gcs: Move generated files into build dir
Also fixes the include paths in the plugins tree. git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2521 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
stac
stac
parent
2d53902148
commit
ce64ea17a0
94
.gitignore
vendored
94
.gitignore
vendored
@ -67,52 +67,6 @@
|
||||
|
||||
|
||||
#ignore autogenerated files - they should really go into special dirs to be ignored more easy
|
||||
ground/src/plugins/uavobjects/actuatorcommand.cpp
|
||||
ground/src/plugins/uavobjects/actuatordesired.cpp
|
||||
ground/src/plugins/uavobjects/actuatorsettings.cpp
|
||||
ground/src/plugins/uavobjects/ahrscalibration.cpp
|
||||
ground/src/plugins/uavobjects/ahrssettings.cpp
|
||||
ground/src/plugins/uavobjects/ahrsstatus.cpp
|
||||
ground/src/plugins/uavobjects/attitudeactual.cpp
|
||||
ground/src/plugins/uavobjects/attitudedesired.cpp
|
||||
ground/src/plugins/uavobjects/attituderaw.cpp
|
||||
ground/src/plugins/uavobjects/baroaltitude.cpp
|
||||
ground/src/plugins/uavobjects/batterysettings.cpp
|
||||
ground/src/plugins/uavobjects/firmwareiapobj.cpp
|
||||
ground/src/plugins/uavobjects/flightbatterystate.cpp
|
||||
ground/src/plugins/uavobjects/flightplancontrol.cpp
|
||||
ground/src/plugins/uavobjects/flightplansettings.cpp
|
||||
ground/src/plugins/uavobjects/flightplanstatus.cpp
|
||||
ground/src/plugins/uavobjects/flighttelemetrystats.cpp
|
||||
ground/src/plugins/uavobjects/gcstelemetrystats.cpp
|
||||
ground/src/plugins/uavobjects/gpsposition.cpp
|
||||
ground/src/plugins/uavobjects/gpssatellites.cpp
|
||||
ground/src/plugins/uavobjects/gpstime.cpp
|
||||
ground/src/plugins/uavobjects/guidancesettings.cpp
|
||||
ground/src/plugins/uavobjects/homelocation.cpp
|
||||
ground/src/plugins/uavobjects/i2cstats.cpp
|
||||
ground/src/plugins/uavobjects/manualcontrolcommand.cpp
|
||||
ground/src/plugins/uavobjects/manualcontrolsettings.cpp
|
||||
ground/src/plugins/uavobjects/mixersettings.cpp
|
||||
ground/src/plugins/uavobjects/mixerstatus.cpp
|
||||
ground/src/plugins/uavobjects/objectpersistence.cpp
|
||||
ground/src/plugins/uavobjects/pipxtrememodemsettings.cpp
|
||||
ground/src/plugins/uavobjects/pipxtrememodemstatus.cpp
|
||||
ground/src/plugins/uavobjects/positionactual.cpp
|
||||
ground/src/plugins/uavobjects/positiondesired.cpp
|
||||
ground/src/plugins/uavobjects/ratedesired.cpp
|
||||
ground/src/plugins/uavobjects/stabilizationsettings.cpp
|
||||
ground/src/plugins/uavobjects/systemalarms.cpp
|
||||
ground/src/plugins/uavobjects/systemsettings.cpp
|
||||
ground/src/plugins/uavobjects/systemstats.cpp
|
||||
ground/src/plugins/uavobjects/taskinfo.cpp
|
||||
ground/src/plugins/uavobjects/telemetrysettings.cpp
|
||||
ground/src/plugins/uavobjects/velocityactual.cpp
|
||||
ground/src/plugins/uavobjects/velocitydesired.cpp
|
||||
ground/src/plugins/uavobjects/watchdogstatus.cpp
|
||||
|
||||
ground/src/plugins/uavobjects/uavobjectsinit.cpp
|
||||
|
||||
ground/src/plugins/uavobjects/OPLogConvert.m
|
||||
ground/src/plugins/uavobjects/actuatorcommand.py
|
||||
ground/src/plugins/uavobjects/actuatordesired.py
|
||||
@ -158,54 +112,6 @@ ground/src/plugins/uavobjects/velocityactual.py
|
||||
ground/src/plugins/uavobjects/velocitydesired.py
|
||||
ground/src/plugins/uavobjects/watchdogstatus.py
|
||||
|
||||
ground/src/plugins/uavobjects/actuatorcommand.h
|
||||
ground/src/plugins/uavobjects/actuatordesired.h
|
||||
ground/src/plugins/uavobjects/actuatorsettings.h
|
||||
ground/src/plugins/uavobjects/ahrscalibration.h
|
||||
ground/src/plugins/uavobjects/ahrssettings.h
|
||||
ground/src/plugins/uavobjects/ahrsstatus.h
|
||||
ground/src/plugins/uavobjects/attitudeactual.h
|
||||
ground/src/plugins/uavobjects/attitudedesired.h
|
||||
ground/src/plugins/uavobjects/attituderaw.h
|
||||
ground/src/plugins/uavobjects/baroaltitude.h
|
||||
ground/src/plugins/uavobjects/batterysettings.h
|
||||
ground/src/plugins/uavobjects/firmwareiapobj.h
|
||||
ground/src/plugins/uavobjects/flightbatterystate.h
|
||||
ground/src/plugins/uavobjects/flightplancontrol.h
|
||||
ground/src/plugins/uavobjects/flightplansettings.h
|
||||
ground/src/plugins/uavobjects/flightplanstatus.h
|
||||
ground/src/plugins/uavobjects/flighttelemetrystats.h
|
||||
ground/src/plugins/uavobjects/gcstelemetrystats.h
|
||||
ground/src/plugins/uavobjects/gpsposition.h
|
||||
ground/src/plugins/uavobjects/gpssatellites.h
|
||||
ground/src/plugins/uavobjects/gpstime.h
|
||||
ground/src/plugins/uavobjects/guidancesettings.h
|
||||
ground/src/plugins/uavobjects/homelocation.h
|
||||
ground/src/plugins/uavobjects/i2cstats.h
|
||||
ground/src/plugins/uavobjects/manualcontrolcommand.h
|
||||
ground/src/plugins/uavobjects/manualcontrolsettings.h
|
||||
ground/src/plugins/uavobjects/mixersettings.h
|
||||
ground/src/plugins/uavobjects/mixerstatus.h
|
||||
ground/src/plugins/uavobjects/nedaccel.cpp
|
||||
ground/src/plugins/uavobjects/nedaccel.h
|
||||
ground/src/plugins/uavobjects/nedaccel.py
|
||||
ground/src/plugins/uavobjects/objectpersistence.h
|
||||
ground/src/plugins/uavobjects/pipxtrememodemsettings.h
|
||||
ground/src/plugins/uavobjects/pipxtrememodemstatus.h
|
||||
ground/src/plugins/uavobjects/positionactual.h
|
||||
ground/src/plugins/uavobjects/positiondesired.h
|
||||
ground/src/plugins/uavobjects/ratedesired.h
|
||||
ground/src/plugins/uavobjects/stabilizationsettings.h
|
||||
ground/src/plugins/uavobjects/systemalarms.h
|
||||
ground/src/plugins/uavobjects/systemsettings.h
|
||||
ground/src/plugins/uavobjects/systemstats.h
|
||||
ground/src/plugins/uavobjects/taskinfo.h
|
||||
ground/src/plugins/uavobjects/telemetrysettings.h
|
||||
ground/src/plugins/uavobjects/velocityactual.h
|
||||
ground/src/plugins/uavobjects/velocitydesired.h
|
||||
ground/src/plugins/uavobjects/watchdogstatus.h
|
||||
|
||||
|
||||
openpilotgcs-build-desktop
|
||||
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.mode1v3
|
||||
flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser
|
||||
|
||||
1
Makefile
1
Makefile
@ -217,6 +217,7 @@ uavobject-synthetics:
|
||||
uavobjects: uavobjects_gcs uavobjects_flight
|
||||
|
||||
uavobjects_gcs: uavobject-synthetics uavobjgenerator
|
||||
mkdir -p $(BUILD_DIR)/uavobject-synthetics/gcs
|
||||
$(UAVOBJGENERATOR) -gcs "$(ROOT_DIR)/"
|
||||
|
||||
uavobjects_flight: uavobject-synthetics uavobjgenerator
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
#include "uavobjectgeneratorgcs.h"
|
||||
using namespace std;
|
||||
|
||||
bool UAVObjectGeneratorGCS::generate(UAVObjectParser* parser,QString basepath) {
|
||||
bool UAVObjectGeneratorGCS::generate(UAVObjectParser* parser,QString basepath,QString outputpath) {
|
||||
|
||||
fieldTypeStrCPP << "qint8" << "qint16" << "qint32" <<
|
||||
"quint8" << "quint16" << "quint32" << "float" << "quint8";
|
||||
@ -36,6 +36,7 @@ bool UAVObjectGeneratorGCS::generate(UAVObjectParser* parser,QString basepath) {
|
||||
<< "UINT8" << "UINT16" << "UINT32" << "FLOAT32" << "ENUM";
|
||||
|
||||
gcsCodePath = QDir( basepath + QString(GCS_CODE_DIR));
|
||||
gcsOutputPath = QDir( outputpath + QString("gcs"));
|
||||
|
||||
gcsCodeTemplate = readFile( gcsCodePath.absoluteFilePath("uavobjecttemplate.cpp") );
|
||||
gcsIncludeTemplate = readFile( gcsCodePath.absoluteFilePath("uavobjecttemplate.h") );
|
||||
@ -60,7 +61,7 @@ bool UAVObjectGeneratorGCS::generate(UAVObjectParser* parser,QString basepath) {
|
||||
// Write the gcs object inialization files
|
||||
gcsInitTemplate.replace( QString("$(OBJINC)"), objInc);
|
||||
gcsInitTemplate.replace( QString("$(OBJINIT)"), gcsObjInit);
|
||||
bool res = writeFileIfDiffrent( gcsCodePath.absolutePath() + "/uavobjectsinit.cpp", gcsInitTemplate );
|
||||
bool res = writeFileIfDiffrent( gcsOutputPath.absolutePath() + "/uavobjectsinit.cpp", gcsInitTemplate );
|
||||
if (!res) {
|
||||
cout << "Error: Could not write output files" << endl;
|
||||
return false;
|
||||
@ -254,12 +255,12 @@ bool UAVObjectGeneratorGCS::process_object(ObjectInfo* info)
|
||||
outCode.replace(QString("$(INITFIELDS)"), initfields);
|
||||
|
||||
// Write the GCS code
|
||||
bool res = writeFileIfDiffrent( gcsCodePath.absolutePath() + "/" + info->namelc + ".cpp", outCode );
|
||||
bool res = writeFileIfDiffrent( gcsOutputPath.absolutePath() + "/" + info->namelc + ".cpp", outCode );
|
||||
if (!res) {
|
||||
cout << "Error: Could not write gcs output files" << endl;
|
||||
return false;
|
||||
}
|
||||
res = writeFileIfDiffrent( gcsCodePath.absolutePath() + "/" + info->namelc + ".h", outInclude );
|
||||
res = writeFileIfDiffrent( gcsOutputPath.absolutePath() + "/" + info->namelc + ".h", outInclude );
|
||||
if (!res) {
|
||||
cout << "Error: Could not write gcs output files" << endl;
|
||||
return false;
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
class UAVObjectGeneratorGCS
|
||||
{
|
||||
public:
|
||||
bool generate(UAVObjectParser* gen,QString basepath);
|
||||
bool generate(UAVObjectParser* gen,QString basepath,QString outputpath);
|
||||
|
||||
private:
|
||||
bool process_object(ObjectInfo* info);
|
||||
@ -42,6 +42,7 @@ private:
|
||||
QString gcsCodeTemplate,gcsIncludeTemplate;
|
||||
QStringList fieldTypeStrCPP,fieldTypeStrCPPClass;
|
||||
QDir gcsCodePath;
|
||||
QDir gcsOutputPath;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -176,7 +176,7 @@ int main(int argc, char *argv[])
|
||||
if (do_gcs|do_all) {
|
||||
cout << "generating gcs code" << endl ;
|
||||
UAVObjectGeneratorGCS gcsgen;
|
||||
gcsgen.generate(parser,basepath);
|
||||
gcsgen.generate(parser,basepath,outputpath);
|
||||
}
|
||||
|
||||
// generate java code if wanted
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
#include "antennatrackwidget.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
#include "ui_antennatrackwidget.h"
|
||||
#include "antennatrackgadgetconfiguration.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobject.h"
|
||||
#include <QGraphicsView>
|
||||
#include <QtSvg/QSvgRenderer>
|
||||
#include <QtSvg/QGraphicsSvgItem>
|
||||
|
||||
@ -31,8 +31,8 @@
|
||||
#include <QObject>
|
||||
#include <QtCore>
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include "gpsparser.h"
|
||||
|
||||
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
#include "ui_ahrs.h"
|
||||
#include "configtaskwidget.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include <QtGui/QWidget>
|
||||
#include <QtSvg/QSvgRenderer>
|
||||
#include <QtSvg/QGraphicsSvgItem>
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
#include "ui_airframe.h"
|
||||
#include "configtaskwidget.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include <QtGui/QWidget>
|
||||
#include <QList>
|
||||
#include <QItemDelegate>
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
#include "ui_ccpm.h"
|
||||
#include "configtaskwidget.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include <QtSvg/QSvgRenderer>
|
||||
#include <QtSvg/QGraphicsSvgItem>
|
||||
#include <QtGui/QWidget>
|
||||
|
||||
@ -29,9 +29,9 @@
|
||||
|
||||
#include "uavtalk/telemetrymanager.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjects/objectpersistence.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include "objectpersistence.h"
|
||||
#include <QtGui/QWidget>
|
||||
#include <QList>
|
||||
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
#include "ui_settingswidget.h"
|
||||
#include "configtaskwidget.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include <QtGui/QWidget>
|
||||
#include <QList>
|
||||
|
||||
|
||||
@ -29,9 +29,9 @@
|
||||
|
||||
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjects/objectpersistence.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include "objectpersistence.h"
|
||||
#include <QQueue>
|
||||
#include <QtGui/QWidget>
|
||||
#include <QList>
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
#include "ui_telemetry.h"
|
||||
#include "configtaskwidget.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include <QtGui/QWidget>
|
||||
#include <QList>
|
||||
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
#include "dialgadgetconfiguration.h"
|
||||
#include "ui_dialgadgetoptionspage.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavdataobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavdataobject.h"
|
||||
|
||||
|
||||
#include <QFileDialog>
|
||||
|
||||
@ -31,8 +31,8 @@
|
||||
|
||||
#include "dialgadgetconfiguration.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include <QGraphicsView>
|
||||
#include <QtSvg/QSvgRenderer>
|
||||
#include <QtSvg/QGraphicsSvgItem>
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
#include "gcscontrolgadgetwidget.h"
|
||||
#include "gcscontrolgadgetconfiguration.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include <QDebug>
|
||||
|
||||
#define JOYSTICK_UPDATE_RATE 50
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#define GCSControlGADGET_H_
|
||||
|
||||
#include <coreplugin/iuavgadget.h>
|
||||
#include <uavobjects/manualcontrolcommand.h>
|
||||
#include "manualcontrolcommand.h"
|
||||
#include "gcscontrolgadgetconfiguration.h"
|
||||
#include "sdlgamepad/sdlgamepad.h"
|
||||
#include <QTime>
|
||||
|
||||
@ -34,9 +34,9 @@
|
||||
#include <QtGui/QVBoxLayout>
|
||||
#include <QtGui/QPushButton>
|
||||
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/manualcontrolcommand.h"
|
||||
#include "uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "manualcontrolcommand.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
|
||||
GCSControlGadgetWidget::GCSControlGadgetWidget(QWidget *parent) : QLabel(parent)
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#define GCSControlGADGETWIDGET_H_
|
||||
|
||||
#include <QtGui/QLabel>
|
||||
#include "uavobjects/manualcontrolcommand.h"
|
||||
#include "manualcontrolcommand.h"
|
||||
|
||||
class Ui_GCSControl;
|
||||
|
||||
|
||||
@ -33,7 +33,7 @@
|
||||
#include <QGraphicsView>
|
||||
#include <QtSvg/QSvgRenderer>
|
||||
#include <QtSvg/QGraphicsSvgItem>
|
||||
#include "uavobjects/manualcontrolcommand.h"
|
||||
#include "manualcontrolcommand.h"
|
||||
|
||||
namespace Ui {
|
||||
class JoystickControl;
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
|
||||
#include "gpsdisplaywidget.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
|
||||
#include <iostream>
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
#include "ui_gpsdisplaywidget.h"
|
||||
#include "gpsdisplaygadgetconfiguration.h"
|
||||
#include "gpsconstellationwidget.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobject.h"
|
||||
#include <QGraphicsView>
|
||||
#include <QtSvg/QSvgRenderer>
|
||||
#include <QtSvg/QGraphicsSvgItem>
|
||||
|
||||
@ -31,8 +31,8 @@
|
||||
#include <QObject>
|
||||
#include <QtCore>
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include "gpsparser.h"
|
||||
|
||||
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
|
||||
#include <hitlplugin.h>
|
||||
#include <simulator.h>
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "coreplugin/icore.h"
|
||||
#include "coreplugin/threadmanager.h"
|
||||
|
||||
|
||||
@ -7,13 +7,13 @@
|
||||
#include <QTimer>
|
||||
#include <math.h>
|
||||
#include "uavtalk/telemetrymanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/actuatordesired.h"
|
||||
#include "uavobjects/altitudeactual.h"
|
||||
#include "uavobjects/attitudeactual.h"
|
||||
#include "uavobjects/velocityactual.h"
|
||||
#include "uavobjects/positionactual.h"
|
||||
#include "uavobjects/gcstelemetrystats.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "actuatordesired.h"
|
||||
#include "altitudeactual.h"
|
||||
#include "attitudeactual.h"
|
||||
#include "velocityactual.h"
|
||||
#include "positionactual.h"
|
||||
#include "gcstelemetrystats.h"
|
||||
|
||||
class Simulator: public QObject
|
||||
{
|
||||
|
||||
@ -34,18 +34,18 @@
|
||||
#include <QProcess>
|
||||
#include "qscopedpointer.h"
|
||||
#include "uavtalk/telemetrymanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/actuatordesired.h"
|
||||
#include "uavobjects/manualcontrolcommand.h"
|
||||
// #include "uavobjects/altitudeactual.h"
|
||||
#include "uavobjects/positionactual.h"
|
||||
#include "uavobjects/velocityactual.h"
|
||||
#include "uavobjects/baroaltitude.h"
|
||||
#include "uavobjects/attitudeactual.h"
|
||||
#include "uavobjects/gpsposition.h"
|
||||
#include "uavobjects/homelocation.h"
|
||||
#include "uavobjects/attituderaw.h"
|
||||
#include "uavobjects/gcstelemetrystats.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "actuatordesired.h"
|
||||
#include "manualcontrolcommand.h"
|
||||
// #include "altitudeactual.h"
|
||||
#include "positionactual.h"
|
||||
#include "velocityactual.h"
|
||||
#include "baroaltitude.h"
|
||||
#include "attitudeactual.h"
|
||||
#include "gpsposition.h"
|
||||
#include "homelocation.h"
|
||||
#include "attituderaw.h"
|
||||
#include "gcstelemetrystats.h"
|
||||
|
||||
#include "utils/coordinateconversions.h"
|
||||
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
#include "lineardialgadgetconfiguration.h"
|
||||
#include "ui_lineardialgadgetoptionspage.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavdataobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavdataobject.h"
|
||||
|
||||
#include <QFileDialog>
|
||||
#include <QtAlgorithms>
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
|
||||
#include "lineardialgadgetconfiguration.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include <QGraphicsView>
|
||||
#include <QtSvg/QSvgRenderer>
|
||||
#include <QtSvg/QGraphicsSvgItem>
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
#include <QMutexLocker>
|
||||
#include <QDebug>
|
||||
#include <QBuffer>
|
||||
#include <uavobjects/uavobjectmanager.h>
|
||||
#include "uavobjectmanager.h"
|
||||
#include <math.h>
|
||||
|
||||
class LogFile : public QIODevice
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
#include "logginggadgetwidget.h"
|
||||
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
|
||||
LoggingGadget::LoggingGadget(QString classId, LoggingGadgetWidget *widget, QWidget *parent) :
|
||||
IUAVGadget(classId, parent),
|
||||
|
||||
@ -44,8 +44,7 @@
|
||||
#include <coreplugin/actionmanager/actionmanager.h>
|
||||
#include <coreplugin/icore.h>
|
||||
#include <QKeySequence>
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include <uavobjects/uavobjectmanager.h>
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
|
||||
LoggingConnection::LoggingConnection()
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
|
||||
#include <coreplugin/iconnection.h>
|
||||
#include <extensionsystem/iplugin.h>
|
||||
#include <uavobjects/uavobjectmanager.h>
|
||||
#include "uavobjects/gcstelemetrystats.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "gcstelemetrystats.h"
|
||||
#include <uavtalk/uavtalk.h>
|
||||
#include <logfile.h>
|
||||
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
#include "magicwaypointgadgetwidget.h"
|
||||
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include <QDebug>
|
||||
|
||||
MagicWaypointGadget::MagicWaypointGadget(QString classId, MagicWaypointGadgetWidget *widget, QWidget *parent) :
|
||||
|
||||
@ -35,9 +35,9 @@
|
||||
#include <QtGui/QVBoxLayout>
|
||||
#include <QtGui/QPushButton>
|
||||
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/manualcontrolcommand.h"
|
||||
#include "uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "manualcontrolcommand.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
#define MagicWaypointGADGETWIDGET_H_
|
||||
|
||||
#include <QtGui/QLabel>
|
||||
#include "uavobjects/positiondesired.h"
|
||||
#include "uavobjects/positionactual.h"
|
||||
#include "positiondesired.h"
|
||||
#include "positionactual.h"
|
||||
|
||||
class Ui_MagicWaypoint;
|
||||
|
||||
|
||||
@ -38,8 +38,8 @@
|
||||
#include "sceneGraph/glc_world.h"
|
||||
#include "glc_exception.h"
|
||||
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/attitudeactual.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "attitudeactual.h"
|
||||
|
||||
|
||||
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
|
||||
#include <extensionsystem/iplugin.h>
|
||||
#include "uavtalk/telemetrymanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
|
||||
#include <QSettings>
|
||||
#include <phonon>
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
#define NOTIFYPLUGINOPTIONSPAGE_H
|
||||
|
||||
#include "coreplugin/dialogs/ioptionspage.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
|
||||
#include "QString"
|
||||
#include <QStringList>
|
||||
|
||||
@ -37,8 +37,8 @@
|
||||
#include <QPixmap>
|
||||
#include <QUndoStack>
|
||||
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/positionactual.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "positionactual.h"
|
||||
|
||||
namespace Ui {
|
||||
class opmap_waypointeditor_dialog;
|
||||
|
||||
@ -44,10 +44,10 @@
|
||||
|
||||
#include "uavtalk/telemetrymanager.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjects/positionactual.h"
|
||||
#include "uavobjects/homelocation.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include "positionactual.h"
|
||||
#include "homelocation.h"
|
||||
|
||||
// #define allow_manual_home_location_move
|
||||
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
#include "pfdgadgetconfiguration.h"
|
||||
#include "ui_pfdgadgetoptionspage.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavdataobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavdataobject.h"
|
||||
|
||||
|
||||
#include <QFileDialog>
|
||||
|
||||
@ -30,8 +30,8 @@
|
||||
|
||||
#include "pfdgadgetconfiguration.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include <QGraphicsView>
|
||||
#include <QtSvg/QSvgRenderer>
|
||||
#include <QtSvg/QGraphicsSvgItem>
|
||||
|
||||
@ -28,11 +28,11 @@
|
||||
#ifndef PLOTDATA_H
|
||||
#define PLOTDATA_H
|
||||
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjects/baroaltitude.h"
|
||||
#include "uavobjects/positionactual.h"
|
||||
#include "uavobjects/attituderaw.h"
|
||||
#include "uavobjects/manualcontrolcommand.h"
|
||||
#include "uavobject.h"
|
||||
#include "baroaltitude.h"
|
||||
#include "positionactual.h"
|
||||
#include "attituderaw.h"
|
||||
#include "manualcontrolcommand.h"
|
||||
|
||||
|
||||
#include "qwt/src/qwt.h"
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
#include "scopegadgetoptionspage.h"
|
||||
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavdataobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavdataobject.h"
|
||||
|
||||
|
||||
#include <QtGui/qpalette.h>
|
||||
|
||||
@ -31,8 +31,8 @@
|
||||
|
||||
#include "uavtalk/telemetrymanager.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
#include "coreplugin/icore.h"
|
||||
#include "coreplugin/connectionmanager.h"
|
||||
|
||||
|
||||
@ -28,8 +28,8 @@
|
||||
#include "systemhealthgadgetwidget.h"
|
||||
#include "utils/stylehelper.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/systemalarms.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "systemalarms.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <QtGui/QFileDialog>
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#define SYSTEMHEALTHGADGETWIDGET_H_
|
||||
|
||||
#include "systemhealthgadgetconfiguration.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobject.h"
|
||||
#include <QGraphicsView>
|
||||
#include <QtSvg/QSvgRenderer>
|
||||
#include <QtSvg/QGraphicsSvgItem>
|
||||
|
||||
@ -28,9 +28,9 @@
|
||||
#ifndef TREEITEM_H
|
||||
#define TREEITEM_H
|
||||
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjects/uavmetaobject.h"
|
||||
#include "uavobjects/uavobjectfield.h"
|
||||
#include "uavobject.h"
|
||||
#include "uavmetaobject.h"
|
||||
#include "uavobjectfield.h"
|
||||
#include <QtCore/QList>
|
||||
#include <QtCore/QVariant>
|
||||
#include <QtCore/QTimer>
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
#include "browseritemdelegate.h"
|
||||
#include "treeitem.h"
|
||||
#include "ui_uavobjectbrowser.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include <QStringList>
|
||||
#include <QtGui/QHBoxLayout>
|
||||
#include <QtGui/QVBoxLayout>
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
|
||||
#include <QtGui/QWidget>
|
||||
#include <QtGui/QTreeView>
|
||||
#include "uavobjects/objectpersistence.h"
|
||||
#include "objectpersistence.h"
|
||||
#include "uavobjecttreemodel.h"
|
||||
|
||||
class QPushButton;
|
||||
|
||||
@ -27,10 +27,10 @@
|
||||
|
||||
#include "uavobjecttreemodel.h"
|
||||
#include "fieldtreeitem.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavdataobject.h"
|
||||
#include "uavobjects/uavmetaobject.h"
|
||||
#include "uavobjects/uavobjectfield.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavdataobject.h"
|
||||
#include "uavmetaobject.h"
|
||||
#include "uavobjectfield.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include <QtGui/QColor>
|
||||
//#include <QtGui/QIcon>
|
||||
|
||||
@ -1,3 +1,6 @@
|
||||
include(uavobjects_dependencies.pri)
|
||||
|
||||
# Add the include path to the built-in uavobject include files.
|
||||
INCLUDEPATH += $$PWD
|
||||
|
||||
LIBS *= -l$$qtLibraryTarget(UAVObjects)
|
||||
|
||||
@ -3,6 +3,7 @@ TARGET = UAVObjects
|
||||
DEFINES += UAVOBJECTS_LIBRARY
|
||||
include(../../openpilotgcsplugin.pri)
|
||||
include(uavobjects_dependencies.pri)
|
||||
|
||||
HEADERS += uavobjects_global.h \
|
||||
uavobject.h \
|
||||
uavmetaobject.h \
|
||||
@ -10,98 +11,102 @@ HEADERS += uavobjects_global.h \
|
||||
uavdataobject.h \
|
||||
uavobjectfield.h \
|
||||
uavobjectsinit.h \
|
||||
uavobjectsplugin.h \
|
||||
ahrsstatus.h \
|
||||
ahrscalibration.h \
|
||||
baroaltitude.h \
|
||||
attitudeactual.h \
|
||||
ahrssettings.h \
|
||||
gcstelemetrystats.h \
|
||||
attituderaw.h \
|
||||
flighttelemetrystats.h \
|
||||
systemstats.h \
|
||||
systemalarms.h \
|
||||
objectpersistence.h \
|
||||
telemetrysettings.h \
|
||||
systemsettings.h \
|
||||
stabilizationsettings.h \
|
||||
manualcontrolsettings.h \
|
||||
manualcontrolcommand.h \
|
||||
attitudedesired.h \
|
||||
actuatorsettings.h \
|
||||
actuatordesired.h \
|
||||
actuatorcommand.h \
|
||||
gpsposition.h \
|
||||
gpstime.h \
|
||||
gpssatellites.h \
|
||||
positionactual.h \
|
||||
flightbatterystate.h \
|
||||
homelocation.h \
|
||||
mixersettings.h \
|
||||
mixerstatus.h \
|
||||
velocitydesired.h \
|
||||
velocityactual.h \
|
||||
guidancesettings.h \
|
||||
positiondesired.h \
|
||||
ratedesired.h \
|
||||
firmwareiapobj.h \
|
||||
i2cstats.h \
|
||||
batterysettings.h \
|
||||
taskinfo.h \
|
||||
flightplanstatus.h \
|
||||
flightplansettings.h \
|
||||
flightplancontrol.h \
|
||||
watchdogstatus.h \
|
||||
nedaccel.h
|
||||
uavobjectsplugin.h
|
||||
|
||||
SOURCES += uavobject.cpp \
|
||||
uavmetaobject.cpp \
|
||||
uavobjectmanager.cpp \
|
||||
uavdataobject.cpp \
|
||||
uavobjectfield.cpp \
|
||||
uavobjectsinit.cpp \
|
||||
uavobjectsplugin.cpp \
|
||||
ahrsstatus.cpp \
|
||||
ahrscalibration.cpp \
|
||||
baroaltitude.cpp \
|
||||
attitudeactual.cpp \
|
||||
ahrssettings.cpp \
|
||||
gcstelemetrystats.cpp \
|
||||
attituderaw.cpp \
|
||||
flighttelemetrystats.cpp \
|
||||
systemstats.cpp \
|
||||
systemalarms.cpp \
|
||||
objectpersistence.cpp \
|
||||
telemetrysettings.cpp \
|
||||
systemsettings.cpp \
|
||||
stabilizationsettings.cpp \
|
||||
manualcontrolsettings.cpp \
|
||||
manualcontrolcommand.cpp \
|
||||
attitudedesired.cpp \
|
||||
actuatorsettings.cpp \
|
||||
actuatordesired.cpp \
|
||||
actuatorcommand.cpp \
|
||||
gpsposition.cpp \
|
||||
gpstime.cpp \
|
||||
gpssatellites.cpp \
|
||||
positionactual.cpp \
|
||||
flightbatterystate.cpp \
|
||||
homelocation.cpp \
|
||||
mixersettings.cpp \
|
||||
mixerstatus.cpp \
|
||||
velocitydesired.cpp \
|
||||
velocityactual.cpp \
|
||||
guidancesettings.cpp \
|
||||
positiondesired.cpp \
|
||||
ratedesired.cpp \
|
||||
firmwareiapobj.cpp \
|
||||
i2cstats.cpp \
|
||||
batterysettings.cpp \
|
||||
taskinfo.cpp \
|
||||
flightplanstatus.cpp \
|
||||
flightplansettings.cpp \
|
||||
flightplancontrol.cpp \
|
||||
watchdogstatus.cpp \
|
||||
nedaccel.cpp
|
||||
uavobjectsplugin.cpp
|
||||
|
||||
OTHER_FILES += UAVObjects.pluginspec
|
||||
|
||||
# Add in all of the synthetic/generated uavobject files
|
||||
HEADERS += $$UAVOBJECT_SYNTHETICS/ahrsstatus.h \
|
||||
$$UAVOBJECT_SYNTHETICS/ahrscalibration.h \
|
||||
$$UAVOBJECT_SYNTHETICS/baroaltitude.h \
|
||||
$$UAVOBJECT_SYNTHETICS/attitudeactual.h \
|
||||
$$UAVOBJECT_SYNTHETICS/ahrssettings.h \
|
||||
$$UAVOBJECT_SYNTHETICS/gcstelemetrystats.h \
|
||||
$$UAVOBJECT_SYNTHETICS/attituderaw.h \
|
||||
$$UAVOBJECT_SYNTHETICS/flighttelemetrystats.h \
|
||||
$$UAVOBJECT_SYNTHETICS/systemstats.h \
|
||||
$$UAVOBJECT_SYNTHETICS/systemalarms.h \
|
||||
$$UAVOBJECT_SYNTHETICS/objectpersistence.h \
|
||||
$$UAVOBJECT_SYNTHETICS/telemetrysettings.h \
|
||||
$$UAVOBJECT_SYNTHETICS/systemsettings.h \
|
||||
$$UAVOBJECT_SYNTHETICS/stabilizationsettings.h \
|
||||
$$UAVOBJECT_SYNTHETICS/manualcontrolsettings.h \
|
||||
$$UAVOBJECT_SYNTHETICS/manualcontrolcommand.h \
|
||||
$$UAVOBJECT_SYNTHETICS/attitudedesired.h \
|
||||
$$UAVOBJECT_SYNTHETICS/actuatorsettings.h \
|
||||
$$UAVOBJECT_SYNTHETICS/actuatordesired.h \
|
||||
$$UAVOBJECT_SYNTHETICS/actuatorcommand.h \
|
||||
$$UAVOBJECT_SYNTHETICS/gpsposition.h \
|
||||
$$UAVOBJECT_SYNTHETICS/gpstime.h \
|
||||
$$UAVOBJECT_SYNTHETICS/gpssatellites.h \
|
||||
$$UAVOBJECT_SYNTHETICS/positionactual.h \
|
||||
$$UAVOBJECT_SYNTHETICS/flightbatterystate.h \
|
||||
$$UAVOBJECT_SYNTHETICS/homelocation.h \
|
||||
$$UAVOBJECT_SYNTHETICS/mixersettings.h \
|
||||
$$UAVOBJECT_SYNTHETICS/mixerstatus.h \
|
||||
$$UAVOBJECT_SYNTHETICS/velocitydesired.h \
|
||||
$$UAVOBJECT_SYNTHETICS/velocityactual.h \
|
||||
$$UAVOBJECT_SYNTHETICS/guidancesettings.h \
|
||||
$$UAVOBJECT_SYNTHETICS/positiondesired.h \
|
||||
$$UAVOBJECT_SYNTHETICS/ratedesired.h \
|
||||
$$UAVOBJECT_SYNTHETICS/firmwareiapobj.h \
|
||||
$$UAVOBJECT_SYNTHETICS/i2cstats.h \
|
||||
$$UAVOBJECT_SYNTHETICS/batterysettings.h \
|
||||
$$UAVOBJECT_SYNTHETICS/taskinfo.h \
|
||||
$$UAVOBJECT_SYNTHETICS/flightplanstatus.h \
|
||||
$$UAVOBJECT_SYNTHETICS/flightplansettings.h \
|
||||
$$UAVOBJECT_SYNTHETICS/flightplancontrol.h \
|
||||
$$UAVOBJECT_SYNTHETICS/watchdogstatus.h \
|
||||
$$UAVOBJECT_SYNTHETICS/nedaccel.h
|
||||
|
||||
SOURCES += $$UAVOBJECT_SYNTHETICS/ahrsstatus.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/ahrscalibration.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/baroaltitude.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/attitudeactual.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/ahrssettings.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/gcstelemetrystats.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/attituderaw.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/flighttelemetrystats.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/systemstats.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/systemalarms.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/objectpersistence.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/telemetrysettings.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/systemsettings.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/stabilizationsettings.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/manualcontrolsettings.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/manualcontrolcommand.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/attitudedesired.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/actuatorsettings.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/actuatordesired.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/actuatorcommand.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/gpsposition.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/gpstime.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/gpssatellites.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/positionactual.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/flightbatterystate.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/homelocation.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/mixersettings.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/mixerstatus.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/velocitydesired.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/velocityactual.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/guidancesettings.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/positiondesired.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/ratedesired.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/firmwareiapobj.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/i2cstats.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/batterysettings.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/taskinfo.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/flightplanstatus.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/flightplansettings.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/flightplancontrol.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/watchdogstatus.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/nedaccel.cpp \
|
||||
$$UAVOBJECT_SYNTHETICS/uavobjectsinit.cpp
|
||||
|
||||
|
||||
@ -1,2 +1,9 @@
|
||||
include(../../plugins/coreplugin/coreplugin.pri)
|
||||
include(../../libs/utils/utils.pri)
|
||||
|
||||
# Provide the path to the auto-generated uavobject source files for the GCS.
|
||||
UAVOBJECT_SYNTHETICS=$${GCS_BUILD_TREE}/../uavobject-synthetics/gcs
|
||||
#message(UAVOBJECT_SYNTHETICS is $$UAVOBJECT_SYNTHETICS)
|
||||
|
||||
# Add the include path to the auto-generated uavobject include files.
|
||||
INCLUDEPATH += $$UAVOBJECT_SYNTHETICS
|
||||
|
||||
@ -29,8 +29,8 @@
|
||||
#define TELEMETRY_H
|
||||
|
||||
#include "uavtalk.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/gcstelemetrystats.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "gcstelemetrystats.h"
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
#include <QTimer>
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
#include "telemetrymonitor.h"
|
||||
#include "telemetry.h"
|
||||
#include "uavtalk.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include <QIODevice>
|
||||
#include <QObject>
|
||||
|
||||
|
||||
@ -34,10 +34,10 @@
|
||||
#include <QTime>
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/gcstelemetrystats.h"
|
||||
#include "uavobjects/flighttelemetrystats.h"
|
||||
#include "uavobjects/systemstats.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "gcstelemetrystats.h"
|
||||
#include "flighttelemetrystats.h"
|
||||
#include "systemstats.h"
|
||||
#include "telemetry.h"
|
||||
|
||||
class TelemetryMonitor : public QObject
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
#include <QSemaphore>
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavtalk_global.h"
|
||||
|
||||
class UAVTALK_EXPORT UAVTalk: public QObject
|
||||
|
||||
@ -34,7 +34,7 @@
|
||||
#include "telemetry.h"
|
||||
#include "uavtalk.h"
|
||||
#include "telemetrymanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjectmanager.h"
|
||||
|
||||
class UAVTALK_EXPORT UAVTalkPlugin: public ExtensionSystem::IPlugin
|
||||
{
|
||||
|
||||
@ -38,8 +38,8 @@
|
||||
|
||||
#include "uavtalk/telemetrymanager.h"
|
||||
#include "extensionsystem/pluginmanager.h"
|
||||
#include "uavobjects/uavobjectmanager.h"
|
||||
#include "uavobjects/uavobject.h"
|
||||
#include "uavobjectmanager.h"
|
||||
#include "uavobject.h"
|
||||
|
||||
#include "rawhid/rawhidplugin.h"
|
||||
#include <QtGui/QWidget>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user