rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Code Issues Releases Activity

UAVOBjects: Just ran object genearator to get things compiling again

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1913 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
peabody124 2010-10-07 13:09:35 +00:00 committed by peabody124
parent 3079476bb0
commit c4cb494a22
4 changed files with 20 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
flight/OpenPilot/UAVObjects/mixersettings.c
View File

@ -84,16 +84,16 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
data.FeedForward = 0;
data.AccelTime = 0;
data.DecelTime = 0;
data.ThrottleCurve1[0] = -10;
data.ThrottleCurve1[1] = -10;
data.ThrottleCurve1[2] = -10;
data.ThrottleCurve1[3] = -10;
data.ThrottleCurve1[4] = -10;
data.ThrottleCurve2[0] = -10;
data.ThrottleCurve2[1] = -10;
data.ThrottleCurve2[2] = -10;
data.ThrottleCurve2[3] = -10;
data.ThrottleCurve2[4] = -10;
data.ThrottleCurve1[0] = 0;
data.ThrottleCurve1[1] = 0.25;
data.ThrottleCurve1[2] = 0.5;
data.ThrottleCurve1[3] = 0.75;
data.ThrottleCurve1[4] = 1;
data.ThrottleCurve2[0] = 0;
data.ThrottleCurve2[1] = 0.25;
data.ThrottleCurve2[2] = 0.5;
data.ThrottleCurve2[3] = 0.75;
data.ThrottleCurve2[4] = 1;
data.Mixer0Type = 0;
data.Mixer0Vector[0] = 0;
data.Mixer0Vector[1] = 0;

6
flight/OpenPilot/UAVObjects/uavobjectsinit.c
View File

@ -38,9 +38,6 @@
#include "attitudedesired.h"
#include "attituderaw.h"
#include "baroaltitude.h"
#include "exampleobject1.h"
#include "exampleobject2.h"
#include "examplesettings.h"
#include "firmwareiapobj.h"
#include "flightbatterystate.h"
#include "flighttelemetrystats.h"
@ -83,9 +80,6 @@ void UAVObjectsInitializeAll()
AttitudeDesiredInitialize();
AttitudeRawInitialize();
BaroAltitudeInitialize();
ExampleObject1Initialize();
ExampleObject2Initialize();
ExampleSettingsInitialize();
FirmwareIAPObjInitialize();
FlightBatteryStateInitialize();
FlightTelemetryStatsInitialize();

20
ground/src/plugins/uavobjects/mixersettings.cpp
View File

@ -217,16 +217,16 @@ void MixerSettings::setDefaultFieldValues()
data.FeedForward = 0;
data.AccelTime = 0;
data.DecelTime = 0;
data.ThrottleCurve1[0] = -10;
data.ThrottleCurve1[1] = -10;
data.ThrottleCurve1[2] = -10;
data.ThrottleCurve1[3] = -10;
data.ThrottleCurve1[4] = -10;
data.ThrottleCurve2[0] = -10;
data.ThrottleCurve2[1] = -10;
data.ThrottleCurve2[2] = -10;
data.ThrottleCurve2[3] = -10;
data.ThrottleCurve2[4] = -10;
data.ThrottleCurve1[0] = 0;
data.ThrottleCurve1[1] = 0.25;
data.ThrottleCurve1[2] = 0.5;
data.ThrottleCurve1[3] = 0.75;
data.ThrottleCurve1[4] = 1;
data.ThrottleCurve2[0] = 0;
data.ThrottleCurve2[1] = 0.25;
data.ThrottleCurve2[2] = 0.5;
data.ThrottleCurve2[3] = 0.75;
data.ThrottleCurve2[4] = 1;
data.Mixer0Type = 0;
data.Mixer0Vector[0] = 0;
data.Mixer0Vector[1] = 0;

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

@ -40,9 +40,6 @@
#include "attitudedesired.h"
#include "attituderaw.h"
#include "baroaltitude.h"
#include "exampleobject1.h"
#include "exampleobject2.h"
#include "examplesettings.h"
#include "firmwareiapobj.h"
#include "flightbatterystate.h"
#include "flighttelemetrystats.h"
@ -85,9 +82,6 @@ void UAVObjectsInitialize(UAVObjectManager* objMngr)
objMngr->registerObject( new AttitudeDesired() );
objMngr->registerObject( new AttitudeRaw() );
objMngr->registerObject( new BaroAltitude() );
objMngr->registerObject( new ExampleObject1() );
objMngr->registerObject( new ExampleObject2() );
objMngr->registerObject( new ExampleSettings() );
objMngr->registerObject( new FirmwareIAPObj() );
objMngr->registerObject( new FlightBatteryState() );
objMngr->registerObject( new FlightTelemetryStats() );