rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

Added 38400 for my XBEE

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@613 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
sambas 2010-05-08 16:22:41 +00:00 committed by sambas
parent 0ba3e0abd4
commit 9922df3524
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flight/OpenPilot/UAVObjects/inc/telemetrysettings.h
View File

@ -64,7 +64,7 @@ typedef struct {
// Field information
// Field Speed information
/* Enumeration options for field Speed */
typedef enum { TELEMETRYSETTINGS_SPEED_9600=0, TELEMETRYSETTINGS_SPEED_57600=1, } TelemetrySettingsSpeedOptions;
typedef enum { TELEMETRYSETTINGS_SPEED_9600=0, TELEMETRYSETTINGS_SPEED_38400=1, TELEMETRYSETTINGS_SPEED_57600=2, } TelemetrySettingsSpeedOptions;
// Generic interface functions

2
flight/OpenPilot/UAVObjects/telemetrysettings.c
View File

@ -73,7 +73,7 @@ static void setDefaults(UAVObjHandle obj, uint16_t instId)
// Initialize object fields to their default values
UAVObjGetInstanceData(obj, instId, &data);
memset(&data, 0, sizeof(TelemetrySettingsData));
data.Speed = 1;
data.Speed = 2;
UAVObjSetInstanceData(obj, instId, &data);

3
ground/src/plugins/uavobjects/telemetrysettings.cpp
View File

@ -44,6 +44,7 @@ TelemetrySettings::TelemetrySettings(): UAVDataObject(OBJID, ISSINGLEINST, ISSET
SpeedElemNames.append("0");
QStringList SpeedEnumOptions;
SpeedEnumOptions.append("9600");
SpeedEnumOptions.append("38400");
SpeedEnumOptions.append("57600");
fields.append( new UAVObjectField(QString("Speed"), QString(""), UAVObjectField::ENUM, SpeedElemNames, SpeedEnumOptions) );
@ -77,7 +78,7 @@ UAVObject::Metadata TelemetrySettings::getDefaultMetadata()
*/
void TelemetrySettings::setDefaultFieldValues()
{
data.Speed = 1;
data.Speed = 2;
}

2
ground/src/plugins/uavobjects/telemetrysettings.h
View File

@ -48,7 +48,7 @@ public:
// Field information
// Field Speed information
/* Enumeration options for field Speed */
typedef enum { SPEED_9600=0, SPEED_57600=1, } SpeedOptions;
typedef enum { SPEED_9600=0, SPEED_38400=1, SPEED_57600=2, } SpeedOptions;
// Constants

2
ground/src/shared/uavobjectdefinition/telemetrysettings.xml
View File

@ -1,6 +1,6 @@
<xml>
<object name="TelemetrySettings" singleinstance="true" settings="true">
<field name="Speed" units="" type="enum" elements="1" options="9600,57600" defaultvalue="57600"/>
<field name="Speed" units="" type="enum" elements="1" options="9600,38400,57600" defaultvalue="57600"/>
<telemetrygcs acked="true" updatemode="onchange" period="0"/>
<telemetryflight acked="true" updatemode="onchange" period="0"/>
<logging updatemode="never" period="0"/>