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

attitude: Remove seq field from uavobject

Browse Source 
The sequence number field for the attitude solution is
likely unnecessary.  Removed.

git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1000 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
stac 2010-07-04 02:21:04 +00:00 committed by stac
parent 4f8d81343f
commit 1cc6981ee5
8 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flight/OpenPilot/Modules/Attitude/attitude.c
View File

@ -95,7 +95,6 @@ static void attitudeTask(void* parameters)
PIOS_OPAHRS_ReadAttitude();
// Update the data
data.seq++;
data.q1 += 0.111;
data.q2 += 1.1;
data.q3 += 7.0;

4
flight/OpenPilot/UAVObjects/inc/attitudeactual.h
View File

@ -33,7 +33,7 @@
#define ATTITUDEACTUAL_H
// Object constants
#define ATTITUDEACTUAL_OBJID 1730350400U
#define ATTITUDEACTUAL_OBJID 4233858292U
#define ATTITUDEACTUAL_NAME "AttitudeActual"
#define ATTITUDEACTUAL_METANAME "AttitudeActualMeta"
#define ATTITUDEACTUAL_ISSINGLEINST 1
@ -57,7 +57,6 @@
// Object data
typedef struct {
uint32_t seq;
float q1;
float q2;
float q3;
@ -69,7 +68,6 @@ typedef struct {
} __attribute__((packed)) AttitudeActualData;
// Field information
// Field seq information
// Field q1 information
// Field q2 information
// Field q3 information

1
ground/src/plugins/hitl/flightgearbridge.cpp
View File

@ -265,7 +265,6 @@ void FlightGearBridge::processUpdate(QString& data)
attActualData.q2 = 0;
attActualData.q3 = 0;
attActualData.q4 = 0;
attActualData.seq = 0;
attActual->setData(attActualData);
// Update gps objects

1
ground/src/plugins/hitlil2/il2bridge.cpp
View File

@ -342,7 +342,6 @@ void Il2Bridge::processUpdate(QString& data)
attActualData.q2 = 0;
attActualData.q3 = 0;
attActualData.q4 = 0;
attActualData.seq = 0;
attActual->setData(attActualData);
// Update gps objects

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

@ -40,9 +40,6 @@ AttitudeActual::AttitudeActual(): UAVDataObject(OBJID, ISSINGLEINST, ISSETTINGS,
{
// Create fields
QList<UAVObjectField*> fields;
QStringList seqElemNames;
seqElemNames.append("0");
fields.append( new UAVObjectField(QString("seq"), QString("none"), UAVObjectField::UINT32, seqElemNames, QStringList()) );
QStringList q1ElemNames;
q1ElemNames.append("0");
fields.append( new UAVObjectField(QString("q1"), QString("none"), UAVObjectField::FLOAT32, q1ElemNames, QStringList()) );

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

@ -41,7 +41,6 @@ class UAVOBJECTS_EXPORT AttitudeActual: public UAVDataObject
public:
// Field structure
typedef struct {
quint32 seq;
float q1;
float q2;
float q3;
@ -53,7 +52,6 @@ public:
} __attribute__((packed)) DataFields;
// Field information
// Field seq information
// Field q1 information
// Field q2 information
// Field q3 information
@ -64,7 +62,7 @@ public:
// Constants
static const quint32 OBJID = 1730350400U;
static const quint32 OBJID = 4233858292U;
static const QString NAME;
static const bool ISSINGLEINST = 1;
static const bool ISSETTINGS = 0;

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

@ -37,16 +37,6 @@ from collections import namedtuple
# This is a list of instances of the data fields contained in this object
_fields = [ \
uavobject.UAVObjectField(
'seq',
'I',
1,
[
'0',
],
{
}
),
uavobject.UAVObjectField(
'q1',
'f',
@ -122,7 +112,7 @@ _fields = [ \
class AttitudeActual(uavobject.UAVObject):
## Object constants
OBJID = 1730350400
OBJID = 4233858292
NAME = "AttitudeActual"
METANAME = "AttitudeActualMeta"
ISSINGLEINST = 1

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

@ -1,6 +1,5 @@
<xml>
<object name="AttitudeActual" singleinstance="true" settings="false">
<field name="seq" units="none" type="uint32" elements="1"/>
<field name="q1" units="none" type="float" elements="1"/>
<field name="q2" units="none" type="float" elements="1"/>
<field name="q3" units="none" type="float" elements="1"/>