rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

GCS/uavobjects: flightbatterystate.cpp/h missing and therefore commented out for now.

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@788 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
ephy 2010-06-16 17:03:16 +00:00 committed by ephy
parent a8fac007d7
commit cf55ff673b
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ground/src/plugins/uavobjects/uavobjects.pro
View File

@ -1,5 +1,6 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = UAVObjects TARGET = UAVObjects
DEFINES += UAVOBJECTS_LIBRARY
include(../../openpilotgcsplugin.pri) include(../../openpilotgcsplugin.pri)
include(uavobjects_dependencies.pri) include(uavobjects_dependencies.pri)
HEADERS += uavobjects_global.h \ HEADERS += uavobjects_global.h \
@ -31,7 +32,7 @@ HEADERS += uavobjects_global.h \
actuatordesired.h \ actuatordesired.h \
actuatorcommand.h \ actuatorcommand.h \
positionactual.h \ positionactual.h \
flightbatterystate.h # flightbatterystate.h
SOURCES += uavobject.cpp \ SOURCES += uavobject.cpp \
uavmetaobject.cpp \ uavmetaobject.cpp \
uavobjectmanager.cpp \ uavobjectmanager.cpp \
@ -60,6 +61,5 @@ SOURCES += uavobject.cpp \
actuatordesired.cpp \ actuatordesired.cpp \
actuatorcommand.cpp \ actuatorcommand.cpp \
positionactual.cpp \ positionactual.cpp \
flightbatterystate.cpp # flightbatterystate.cpp
DEFINES += UAVOBJECTS_LIBRARY
OTHER_FILES += UAVObjects.pluginspec OTHER_FILES += UAVObjects.pluginspec

7
ground/src/plugins/uavobjects/uavobjectsinit.cpp
View File

@ -37,11 +37,10 @@
#include "attitudeactual.h" #include "attitudeactual.h"
#include "attitudedesired.h" #include "attitudedesired.h"
#include "attitudesettings.h" #include "attitudesettings.h"
#include "flightbatterystate.h" //#include "flightbatterystate.h"
#include "exampleobject1.h" #include "exampleobject1.h"
#include "exampleobject2.h" #include "exampleobject2.h"
#include "examplesettings.h" #include "examplesettings.h"
#include "flightbatterystate.h"
#include "flighttelemetrystats.h" #include "flighttelemetrystats.h"
#include "gcstelemetrystats.h" #include "gcstelemetrystats.h"
#include "manualcontrolcommand.h" #include "manualcontrolcommand.h"
@ -68,11 +67,11 @@ void UAVObjectsInitialize(UAVObjectManager* objMngr)
objMngr->registerObject( new AttitudeActual() ); objMngr->registerObject( new AttitudeActual() );
objMngr->registerObject( new AttitudeDesired() ); objMngr->registerObject( new AttitudeDesired() );
objMngr->registerObject( new AttitudeSettings() ); objMngr->registerObject( new AttitudeSettings() );
objMngr->registerObject( new FlightBatteryState() ); // objMngr->registerObject( new FlightBatteryState() );
objMngr->registerObject( new ExampleObject1() ); objMngr->registerObject( new ExampleObject1() );
objMngr->registerObject( new ExampleObject2() ); objMngr->registerObject( new ExampleObject2() );
objMngr->registerObject( new ExampleSettings() ); objMngr->registerObject( new ExampleSettings() );
objMngr->registerObject( new FlightBatteryState() ); // objMngr->registerObject( new FlightBatteryState() );
objMngr->registerObject( new FlightTelemetryStats() ); objMngr->registerObject( new FlightTelemetryStats() );
objMngr->registerObject( new GCSTelemetryStats() ); objMngr->registerObject( new GCSTelemetryStats() );
objMngr->registerObject( new ManualControlCommand() ); objMngr->registerObject( new ManualControlCommand() );