From cf55ff673b13e5388d426ed51bce9144c00396e6 Mon Sep 17 00:00:00 2001
From: ephy <ephy>
Date: Wed, 16 Jun 2010 17:03:16 +0000
Subject: [PATCH] GCS/uavobjects: flightbatterystate.cpp/h missing and
 therefore commented out for now.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@788 ebee16cc-31ac-478f-84a7-5cbb03baadba
---
 ground/src/plugins/uavobjects/uavobjects.pro     | 6 +++---
 ground/src/plugins/uavobjects/uavobjectsinit.cpp | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/ground/src/plugins/uavobjects/uavobjects.pro b/ground/src/plugins/uavobjects/uavobjects.pro
index 04f882162..d3bc241ee 100644
--- a/ground/src/plugins/uavobjects/uavobjects.pro
+++ b/ground/src/plugins/uavobjects/uavobjects.pro
@@ -1,5 +1,6 @@
 TEMPLATE = lib
 TARGET = UAVObjects
+DEFINES += UAVOBJECTS_LIBRARY
 include(../../openpilotgcsplugin.pri)
 include(uavobjects_dependencies.pri)
 HEADERS += uavobjects_global.h \
@@ -31,7 +32,7 @@ HEADERS += uavobjects_global.h \
     actuatordesired.h \
     actuatorcommand.h \
     positionactual.h \
-    flightbatterystate.h
+#    flightbatterystate.h
 SOURCES += uavobject.cpp \
     uavmetaobject.cpp \
     uavobjectmanager.cpp \
@@ -60,6 +61,5 @@ SOURCES += uavobject.cpp \
     actuatordesired.cpp \
     actuatorcommand.cpp \
     positionactual.cpp \
-    flightbatterystate.cpp
-DEFINES += UAVOBJECTS_LIBRARY
+#    flightbatterystate.cpp
 OTHER_FILES += UAVObjects.pluginspec
diff --git a/ground/src/plugins/uavobjects/uavobjectsinit.cpp b/ground/src/plugins/uavobjects/uavobjectsinit.cpp
index 996922cea..0ab188b16 100644
--- a/ground/src/plugins/uavobjects/uavobjectsinit.cpp
+++ b/ground/src/plugins/uavobjects/uavobjectsinit.cpp
@@ -37,11 +37,10 @@
 #include "attitudeactual.h"
 #include "attitudedesired.h"
 #include "attitudesettings.h"
-#include "flightbatterystate.h"
+//#include "flightbatterystate.h"
 #include "exampleobject1.h"
 #include "exampleobject2.h"
 #include "examplesettings.h"
-#include "flightbatterystate.h"
 #include "flighttelemetrystats.h"
 #include "gcstelemetrystats.h"
 #include "manualcontrolcommand.h"
@@ -68,11 +67,11 @@ void UAVObjectsInitialize(UAVObjectManager* objMngr)
     objMngr->registerObject( new AttitudeActual() );
     objMngr->registerObject( new AttitudeDesired() );
     objMngr->registerObject( new AttitudeSettings() );
-    objMngr->registerObject( new FlightBatteryState() );
+//    objMngr->registerObject( new FlightBatteryState() );
     objMngr->registerObject( new ExampleObject1() );
     objMngr->registerObject( new ExampleObject2() );
     objMngr->registerObject( new ExampleSettings() );
-    objMngr->registerObject( new FlightBatteryState() );
+//    objMngr->registerObject( new FlightBatteryState() );
     objMngr->registerObject( new FlightTelemetryStats() );
     objMngr->registerObject( new GCSTelemetryStats() );
     objMngr->registerObject( new ManualControlCommand() );