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

GCS/UAVObjectGenerator Generate more information for each field

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@552 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
vassilis 2010-04-27 01:50:45 +00:00 committed by vassilis
parent c6ca9772e5
commit 4d59a46ae4
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -572,11 +572,12 @@ bool UAVObjectParser::generateFlightObject(int objIndex, const QString& template
} }
outInclude.replace(QString("$(DATAFIELDS)"), fields); outInclude.replace(QString("$(DATAFIELDS)"), fields);
// Replace the $(DATAENUM) tag // Replace the $(DATAFIELDINFO) tag
QString name; QString name;
QString enums; QString enums;
for (int n = 0; n < info->fields.length(); ++n) for (int n = 0; n < info->fields.length(); ++n)
{ {
enums.append(QString("// Field %1 information\n").arg(info->fields[n]->name));
// Only for enum types // Only for enum types
if (info->fields[n]->type == FIELDTYPE_ENUM) if (info->fields[n]->type == FIELDTYPE_ENUM)
{ {
@ -617,8 +618,17 @@ bool UAVObjectParser::generateFlightObject(int objIndex, const QString& template
.arg( info->name ) .arg( info->name )
.arg( info->fields[n]->name ) ); .arg( info->fields[n]->name ) );
} }
// Generate array information
if (info->fields[n]->numElements > 1)
{
enums.append(QString("/* Number of elements for field %1 */\n").arg(info->fields[n]->name));
enums.append( QString("#define %1_%2_NUMELEM %3\n")
.arg( info->name.toUpper() )
.arg( info->fields[n]->name.toUpper() )
.arg( info->fields[n]->numElements ) );
}
} }
outInclude.replace(QString("$(DATAENUM)"), enums); outInclude.replace(QString("$(DATAFIELDINFO)"), enums);
// Done // Done
return true; return true;
@ -706,11 +716,12 @@ bool UAVObjectParser::generateGCSObject(int objIndex, const QString& templateInc
} }
outCode.replace(QString("$(FIELDSINIT)"), finit); outCode.replace(QString("$(FIELDSINIT)"), finit);
// Replace the $(DATAENUM) tag // Replace the $(DATAFIELDINFO) tag
QString name; QString name;
QString enums; QString enums;
for (int n = 0; n < info->fields.length(); ++n) for (int n = 0; n < info->fields.length(); ++n)
{ {
enums.append(QString(" // Field %1 information\n").arg(info->fields[n]->name));
// Only for enum types // Only for enum types
if (info->fields[n]->type == FIELDTYPE_ENUM) if (info->fields[n]->type == FIELDTYPE_ENUM)
{ {
@ -747,8 +758,16 @@ bool UAVObjectParser::generateGCSObject(int objIndex, const QString& templateInc
enums.append( QString(" } %1Elem;\n") enums.append( QString(" } %1Elem;\n")
.arg( info->fields[n]->name ) ); .arg( info->fields[n]->name ) );
} }
// Generate array information
if (info->fields[n]->numElements > 1)
{
enums.append(QString(" /* Number of elements for field %1 */\n").arg(info->fields[n]->name));
enums.append( QString(" static const quint32 %1_NUMELEM = %2;\n")
.arg( info->fields[n]->name.toUpper() )
.arg( info->fields[n]->numElements ) );
}
} }
outInclude.replace(QString("$(DATAENUM)"), enums); outInclude.replace(QString("$(DATAFIELDINFO)"), enums);
// Done // Done
return true; return true;