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

OP-54: GCS/ObjectGenerator: Added support for new field types on the UAVObjectGenerator

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@417 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
vassilis 2010-04-01 02:01:37 +00:00 committed by vassilis
parent fe212a22e7
commit 47ac2d4528
3 changed files with 120 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
ground/src/libs/uavobjgenerator/uavobjectparser.cpp
View File

@ -27,17 +27,29 @@
#include "uavobjectparser.h"
#include <QByteArray>
const char* UAVObjectParser::FieldTypeStr[] = {"FIELDTYPE_INT8", "FIELDTYPE_INT16", "FIELDTYPE_INT32", "FIELDTYPE_FLOAT32", "FIELDTYPE_CHAR"};
const char* UAVObjectParser::FieldTypeStrC[] = {"int8_t", "int16_t", "int32_t", "float", "char"};
const char* UAVObjectParser::FieldTypeStrCPP[] = {"qint8", "qint16", "qint32", "float", "char"};
const char* UAVObjectParser::UpdateModeStr[] = {"UPDATEMODE_PERIODIC", "UPDATEMODE_ONCHANGE", "UPDATEMODE_MANUAL", "UPDATEMODE_NEVER"};
/**
* Constructor
*/
UAVObjectParser::UAVObjectParser()
{
fieldTypeStrC << QString("int8_t") << QString("int16_t") << QString("int32_t") <<
QString("uint8_t") << QString("uint16_t") << QString("uint32_t") <<
QString("float") << QString("uint8_t");
fieldTypeStrCPP << QString("qint8") << QString("qint16") << QString("qint32") <<
QString( "quint8") << QString("quint16") << QString("quint32") <<
QString("float") << QString("quint8");
fieldTypeStrXML << QString("int8") << QString("int16") << QString("int32") <<
QString("uint8") << QString("uint16") << QString("uint32") <<
QString("float") << QString("enum");
updateModeStr << QString("UPDATEMODE_PERIODIC") << QString("UPDATEMODE_ONCHANGE") <<
QString("UPDATEMODE_MANUAL") << QString("UPDATEMODE_NEVER");
updateModeStrXML << QString("periodic") << QString("onchange") <<
QString("manual") << QString("never");
}
/**
@ -240,21 +252,10 @@ QString UAVObjectParser::processObjectMetadata(QDomNode& childNode, UpdateMode*
}
else
{
if ( elemAttr.nodeValue().compare(QString("periodic")) == 0 )
int index = updateModeStrXML.indexOf( elemAttr.nodeValue() );
if (index >= 0)
{
*mode = UPDATEMODE_PERIODIC;
}
else if ( elemAttr.nodeValue().compare(QString("onchange")) == 0 )
{
*mode = UPDATEMODE_ONCHANGE;
}
else if ( elemAttr.nodeValue().compare(QString("manual")) == 0 )
{
*mode = UPDATEMODE_MANUAL;
}
else if ( elemAttr.nodeValue().compare(QString("never")) == 0 )
{
*mode = UPDATEMODE_NEVER;
*mode = (UpdateMode)index;
}
else
{
@ -335,25 +336,10 @@ QString UAVObjectParser::processObjectFields(QDomNode& childNode, ObjectInfo* in
}
else
{
if ( elemAttr.nodeValue().compare(QString("int8")) == 0 )
int index = fieldTypeStrXML.indexOf(elemAttr.nodeValue());
if (index >= 0)
{
field->type = FIELDTYPE_INT8;
}
else if ( elemAttr.nodeValue().compare(QString("int16")) == 0 )
{
field->type = FIELDTYPE_INT16;
}
else if ( elemAttr.nodeValue().compare(QString("int32")) == 0 )
{
field->type = FIELDTYPE_INT32;
}
else if ( elemAttr.nodeValue().compare(QString("float")) == 0 )
{
field->type = FIELDTYPE_FLOAT32;
}
else if ( elemAttr.nodeValue().compare(QString("char")) == 0 )
{
field->type = FIELDTYPE_CHAR;
field->type = (FieldType)index;
}
else
{
@ -370,6 +356,25 @@ QString UAVObjectParser::processObjectFields(QDomNode& childNode, ObjectInfo* in
{
field->numElements = elemAttr.nodeValue().toInt();
}
// Get options attribute (only if an enum type)
if (field->type == FIELDTYPE_ENUM)
{
// Get options attribute
elemAttr = elemAttributes.namedItem("options");
if ( elemAttr.isNull() )
{
return QString("Object:field:options attribute is missing");
}
else
{
QStringList options = elemAttr.nodeValue().split(",", QString::SkipEmptyParts);
for (int n = 0; n < options.length(); ++n)
{
options[n] = options[n].trimmed();
}
field->options = options;
}
}
// Add field to object
info->fields.append(field);
// Done
@ -470,7 +475,7 @@ void UAVObjectParser::replaceCommonTags(QString& out, ObjectInfo* info)
value = boolToString( info->flightTelemetryAcked );
out.replace(QString("$(FLIGHTTELEM_ACKED)"), value);
// Replace $(FLIGHTTELEM_UPDATEMODE) tag
value = UpdateModeStr[info->flightTelemetryUpdateMode];
value = updateModeStr[info->flightTelemetryUpdateMode];
out.replace(QString("$(FLIGHTTELEM_UPDATEMODE)"), value);
// Replace $(FLIGHTTELEM_UPDATEPERIOD) tag
out.replace(QString("$(FLIGHTTELEM_UPDATEPERIOD)"), QString().setNum(info->flightTelemetryUpdatePeriod));
@ -478,12 +483,12 @@ void UAVObjectParser::replaceCommonTags(QString& out, ObjectInfo* info)
value = boolToString( info->gcsTelemetryAcked );
out.replace(QString("$(GCSTELEM_ACKED)"), value);
// Replace $(GCSTELEM_UPDATEMODE) tag
value = UpdateModeStr[info->gcsTelemetryUpdateMode];
value = updateModeStr[info->gcsTelemetryUpdateMode];
out.replace(QString("$(GCSTELEM_UPDATEMODE)"), value);
// Replace $(GCSTELEM_UPDATEPERIOD) tag
out.replace(QString("$(GCSTELEM_UPDATEPERIOD)"), QString().setNum(info->gcsTelemetryUpdatePeriod));
// Replace $(LOGGING_UPDATEMODE) tag
value = UpdateModeStr[info->loggingUpdateMode];
value = updateModeStr[info->loggingUpdateMode];
out.replace(QString("$(LOGGING_UPDATEMODE)"), value);
// Replace $(LOGGING_UPDATEPERIOD) tag
out.replace(QString("$(LOGGING_UPDATEPERIOD)"), QString().setNum(info->loggingUpdatePeriod));
@ -528,7 +533,7 @@ bool UAVObjectParser::generateFlightObject(int objIndex, const QString& template
for (int n = 0; n < info->fields.length(); ++n)
{
// Determine type
type = FieldTypeStrC[info->fields[n]->type];
type = fieldTypeStrC[info->fields[n]->type];
// Append field
if ( info->fields[n]->numElements > 1 )
{
@ -542,6 +547,33 @@ bool UAVObjectParser::generateFlightObject(int objIndex, const QString& template
}
outInclude.replace(QString("$(DATAFIELDS)"), fields);
// Replace the $(DATAENUM) tag
QString name;
QString enums;
for (int n = 0; n < info->fields.length(); ++n)
{
// Only for enum types
if (info->fields[n]->type == FIELDTYPE_ENUM)
{
enums.append("typedef enum { ");
// Go through each option
QStringList options = info->fields[n]->options;
for (int m = 0; m < options.length(); ++m)
{
enums.append( QString("%1_%2_%3=%4, ")
.arg( info->name.toUpper() )
.arg( info->fields[n]->name.toUpper() )
.arg( options[m].toUpper() )
.arg(m) );
}
enums.append( QString(" } %1%2Enum;\n")
.arg( info->name.toUpper() )
.arg( info->fields[n]->name.toUpper() ) );
}
}
outInclude.replace(QString("$(DATAENUM)"), enums);
// Done
return true;
}
@ -570,7 +602,7 @@ bool UAVObjectParser::generateGCSObject(int objIndex, const QString& templateInc
for (int n = 0; n < info->fields.length(); ++n)
{
// Determine type
type = FieldTypeStrCPP[info->fields[n]->type];
type = fieldTypeStrCPP[info->fields[n]->type];
// Append field
if ( info->fields[n]->numElements > 1 )
{
@ -588,14 +620,39 @@ bool UAVObjectParser::generateGCSObject(int objIndex, const QString& templateInc
QString finit;
for (int n = 0; n < info->fields.length(); ++n)
{
finit.append( QString(" fields.append(new UAVObjectField(QString(\"%1\"), QString(\"%2\"), UAVObjectField::%3, %4));\n")
finit.append( QString(" fields.append(new UAVObjectFieldPrimitives<%1>(QString(\"%2\"), QString(\"%3\"), %4));\n")
.arg(fieldTypeStrCPP[info->fields[n]->type])
.arg(info->fields[n]->name)
.arg(info->fields[n]->units)
.arg(FieldTypeStr[info->fields[n]->type])
.arg(info->fields[n]->numElements) );
}
outCode.replace(QString("$(FIELDSINIT)"), finit);
// Replace the $(DATAENUM) tag
QString name;
QString enums;
for (int n = 0; n < info->fields.length(); ++n)
{
// Only for enum types
if (info->fields[n]->type == FIELDTYPE_ENUM)
{
enums.append(" typedef enum { ");
// Go through each option
QStringList options = info->fields[n]->options;
for (int m = 0; m < options.length(); ++m)
{
enums.append( QString("%1_%2=%3, ")
.arg( info->fields[n]->name.toUpper() )
.arg( options[m].toUpper() )
.arg(m) );
}
enums.append( QString(" } %1Enum;\n")
.arg( info->fields[n]->name.toUpper() ) );
}
}
outInclude.replace(QString("$(DATAENUM)"), enums);
// Done
return true;
}

18
ground/src/libs/uavobjgenerator/uavobjectparser.h
View File

@ -28,6 +28,7 @@
#define UAVOBJECTPARSER_H
#include <QString>
#include <QStringList>
#include <QList>
#include <QDomDocument>
#include <QDomElement>
@ -41,8 +42,11 @@ public:
FIELDTYPE_INT8 = 0,
FIELDTYPE_INT16,
FIELDTYPE_INT32,
FIELDTYPE_UINT8,
FIELDTYPE_UINT16,
FIELDTYPE_UINT32,
FIELDTYPE_FLOAT32,
FIELDTYPE_CHAR
FIELDTYPE_ENUM
} FieldType;
/**
@ -60,6 +64,7 @@ public:
QString units;
FieldType type;
int numElements;
QStringList options; // for enums only
} FieldInfo;
typedef struct {
@ -78,12 +83,6 @@ public:
QList<FieldInfo*> fields;
} ObjectInfo;
// Constants
static const char* FieldTypeStr[];
static const char* FieldTypeStrC[];
static const char* FieldTypeStrCPP[];
static const char* UpdateModeStr[];
// Functions
UAVObjectParser();
QString parseXML(QString& xml, QString& filename);
@ -99,6 +98,11 @@ public:
private:
QList<ObjectInfo*> objInfo;
QString filename;
QStringList fieldTypeStrC;
QStringList fieldTypeStrCPP;
QStringList fieldTypeStrXML;
QStringList updateModeStr;
QStringList updateModeStrXML;
QString processObjectAttributes(QDomNode& node, ObjectInfo* info);
QString processObjectFields(QDomNode& childNode, ObjectInfo* info);

14
ground/src/shared/uavobjectdefinition/exampleobject.xml
View File

@ -2,10 +2,14 @@
<object name="ExampleObject" singleinstance="false" settings="false">
<field name="field1" units="unit1" type="int8" elements="1"/>
<field name="field2" units="unit2" type="int16" elements="1"/>
<field name="field3" units="unit3" type="float" elements="4"/>
<field name="field4" units="unit4" type="int32" elements="1"/>
<telemetrygcs acked="true" updatemode="periodic" period="100"/>
<telemetryflight acked="true" updatemode="onchange" period="0"/>
<field name="field3" units="unit3" type="int32" elements="1"/>
<field name="field4" units="unit4" type="float" elements="4"/>
<field name="field5" units="unit5" type="uint8" elements="1"/>
<field name="field6" units="unit6" type="uint16" elements="1"/>
<field name="field7" units="unit7" type="uint32" elements="1"/>
<field name="field8" units="unit8" type="enum" elements="1" options="option1, option2"/>
<telemetrygcs acked="true" updatemode="onchange" period="0"/>
<telemetryflight acked="true" updatemode="onchange" period="100"/>
<logging updatemode="never" period="0"/>
</object>
</xml>
</xml>