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

GCS/Attitude Minor change in field names and task priority

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@663 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
vassilis 2010-05-25 00:50:35 +00:00 committed by vassilis
parent 9be49ca54d
commit 06c9bef7aa
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ground/src/plugins/uavobjects/attitudeactual.cpp
View File

@ -55,15 +55,15 @@ AttitudeActual::AttitudeActual(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS,
QStringList q4ElemNames; QStringList q4ElemNames;
q4ElemNames.append("0"); q4ElemNames.append("0");
fields.append( new UAVObjectField(QString("q4"), QString("none"), UAVObjectField::FLOAT32, q4ElemNames, QStringList()) ); fields.append( new UAVObjectField(QString("q4"), QString("none"), UAVObjectField::FLOAT32, q4ElemNames, QStringList()) );
QStringList exElemNames; QStringList RollElemNames;
exElemNames.append("0"); RollElemNames.append("0");
fields.append( new UAVObjectField(QString("ex"), QString("none"), UAVObjectField::FLOAT32, exElemNames, QStringList()) ); fields.append( new UAVObjectField(QString("Roll"), QString("degrees"), UAVObjectField::FLOAT32, RollElemNames, QStringList()) );
QStringList eyElemNames; QStringList PitchElemNames;
eyElemNames.append("0"); PitchElemNames.append("0");
fields.append( new UAVObjectField(QString("ey"), QString("none"), UAVObjectField::FLOAT32, eyElemNames, QStringList()) ); fields.append( new UAVObjectField(QString("Pitch"), QString("degrees"), UAVObjectField::FLOAT32, PitchElemNames, QStringList()) );
QStringList ezElemNames; QStringList YawElemNames;
ezElemNames.append("0"); YawElemNames.append("0");
fields.append( new UAVObjectField(QString("ez"), QString("none"), UAVObjectField::FLOAT32, ezElemNames, QStringList()) ); fields.append( new UAVObjectField(QString("Yaw"), QString("degrees"), UAVObjectField::FLOAT32, YawElemNames, QStringList()) );
// Initialize object // Initialize object
initializeFields(fields, (quint8*)&data, NUMBYTES); initializeFields(fields, (quint8*)&data, NUMBYTES);
@ -79,12 +79,12 @@ UAVObject::Metadata AttitudeActual::getDefaultMetadata()
UAVObject::Metadata metadata; UAVObject::Metadata metadata;
metadata.flightAccess = ACCESS_READWRITE; metadata.flightAccess = ACCESS_READWRITE;
metadata.gcsAccess = ACCESS_READWRITE; metadata.gcsAccess = ACCESS_READWRITE;
metadata.gcsTelemetryAcked = 1; metadata.gcsTelemetryAcked = 0;
metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL; metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL;
metadata.gcsTelemetryUpdatePeriod = 0; metadata.gcsTelemetryUpdatePeriod = 0;
metadata.flightTelemetryAcked = 1; metadata.flightTelemetryAcked = 0;
metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC;
metadata.flightTelemetryUpdatePeriod = 1000; metadata.flightTelemetryUpdatePeriod = 500;
metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER; metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER;
metadata.loggingUpdatePeriod = 0; metadata.loggingUpdatePeriod = 0;
return metadata; return metadata;

14
ground/src/plugins/uavobjects/attitudeactual.h
View File

@ -46,9 +46,9 @@ public:
float q2; float q2;
float q3; float q3;
float q4; float q4;
float ex; float Roll;
float ey; float Pitch;
float ez; float Yaw;
} __attribute__((packed)) DataFields; } __attribute__((packed)) DataFields;
@ -58,13 +58,13 @@ public:
// Field q2 information // Field q2 information
// Field q3 information // Field q3 information
// Field q4 information // Field q4 information
// Field ex information // Field Roll information
// Field ey information // Field Pitch information
// Field ez information // Field Yaw information
// Constants // Constants
static const quint32 OBJID = 1949256792U; static const quint32 OBJID = 1730350400U;
static const QString NAME; static const QString NAME;
static const bool ISSINGLEINST = 1; static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0; static const bool ISSETTINGS = 0;

8
ground/src/plugins/uavobjects/attitudeactual.py
View File

@ -88,7 +88,7 @@ _fields = [ \
} }
), ),
uavobject.UAVObjectField( uavobject.UAVObjectField(
'ex', 'Roll',
'f', 'f',
1, 1,
[ [
@ -98,7 +98,7 @@ _fields = [ \
} }
), ),
uavobject.UAVObjectField( uavobject.UAVObjectField(
'ey', 'Pitch',
'f', 'f',
1, 1,
[ [
@ -108,7 +108,7 @@ _fields = [ \
} }
), ),
uavobject.UAVObjectField( uavobject.UAVObjectField(
'ez', 'Yaw',
'f', 'f',
1, 1,
[ [
@ -122,7 +122,7 @@ _fields = [ \
class AttitudeActual(uavobject.UAVObject): class AttitudeActual(uavobject.UAVObject):
## Object constants ## Object constants
OBJID = 1949256792 OBJID = 1730350400
NAME = "AttitudeActual" NAME = "AttitudeActual"
METANAME = "AttitudeActualMeta" METANAME = "AttitudeActualMeta"
ISSINGLEINST = 1 ISSINGLEINST = 1

4
ground/src/plugins/uavobjects/attitudedesired.cpp
View File

@ -67,10 +67,10 @@ UAVObject::Metadata AttitudeDesired::getDefaultMetadata()
UAVObject::Metadata metadata; UAVObject::Metadata metadata;
metadata.flightAccess = ACCESS_READWRITE; metadata.flightAccess = ACCESS_READWRITE;
metadata.gcsAccess = ACCESS_READWRITE; metadata.gcsAccess = ACCESS_READWRITE;
metadata.gcsTelemetryAcked = 1; metadata.gcsTelemetryAcked = 0;
metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL; metadata.gcsTelemetryUpdateMode = UAVObject::UPDATEMODE_MANUAL;
metadata.gcsTelemetryUpdatePeriod = 0; metadata.gcsTelemetryUpdatePeriod = 0;
metadata.flightTelemetryAcked = 1; metadata.flightTelemetryAcked = 0;
metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC; metadata.flightTelemetryUpdateMode = UAVObject::UPDATEMODE_PERIODIC;
metadata.flightTelemetryUpdatePeriod = 1000; metadata.flightTelemetryUpdatePeriod = 1000;
metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER; metadata.loggingUpdateMode = UAVObject::UPDATEMODE_NEVER;

10
ground/src/shared/uavobjectdefinition/attitudeactual.xml
View File

@ -5,12 +5,12 @@
<field name="q2" units="none" type="float" elements="1"/> <field name="q2" units="none" type="float" elements="1"/>
<field name="q3" units="none" type="float" elements="1"/> <field name="q3" units="none" type="float" elements="1"/>
<field name="q4" units="none" type="float" elements="1"/> <field name="q4" units="none" type="float" elements="1"/>
<field name="ex" units="none" type="float" elements="1"/> <field name="Roll" units="degrees" type="float" elements="1"/>
<field name="ey" units="none" type="float" elements="1"/> <field name="Pitch" units="degrees" type="float" elements="1"/>
<field name="ez" units="none" type="float" elements="1"/> <field name="Yaw" units="degrees" type="float" elements="1"/>
<access gcs="readwrite" flight="readwrite"/> <access gcs="readwrite" flight="readwrite"/>
<telemetrygcs acked="true" updatemode="manual" period="0"/> <telemetrygcs acked="false" updatemode="manual" period="0"/>
<telemetryflight acked="true" updatemode="periodic" period="1000"/> <telemetryflight acked="false" updatemode="periodic" period="500"/>
<logging updatemode="never" period="0"/> <logging updatemode="never" period="0"/>
</object> </object>
</xml> </xml>