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

Fix misspelling in function name

Browse Source
This commit is contained in:
Richard von Lehe 2015-03-28 23:27:07 -05:00
parent f00b4a24d8
commit 69fae1b977
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ground/uavobjgenerator/generators/flight/uavobjectgeneratorflight.cpp
View File

@ -68,7 +68,7 @@ bool UAVObjectGeneratorFlight::generate(UAVObjectParser *parser, QString templat
// Write the flight object inialization files // Write the flight object inialization files
flightInitTemplate.replace(QString("$(OBJINC)"), objInc); flightInitTemplate.replace(QString("$(OBJINC)"), objInc);
flightInitTemplate.replace(QString("$(OBJINIT)"), flightObjInit); flightInitTemplate.replace(QString("$(OBJINIT)"), flightObjInit);
bool res = writeFileIfDiffrent(flightOutputPath.absolutePath() + "/uavobjectsinit.c", bool res = writeFileIfDifferent(flightOutputPath.absolutePath() + "/uavobjectsinit.c",
flightInitTemplate); flightInitTemplate);
if (!res) { if (!res) {
cout << "Error: Could not write flight object init file" << endl; cout << "Error: Could not write flight object init file" << endl;
@ -77,7 +77,7 @@ bool UAVObjectGeneratorFlight::generate(UAVObjectParser *parser, QString templat
// Write the flight object initialization header // Write the flight object initialization header
flightInitIncludeTemplate.replace(QString("$(SIZECALCULATION)"), QString().setNum(sizeCalc)); flightInitIncludeTemplate.replace(QString("$(SIZECALCULATION)"), QString().setNum(sizeCalc));
res = writeFileIfDiffrent(flightOutputPath.absolutePath() + "/uavobjectsinit.h", res = writeFileIfDifferent(flightOutputPath.absolutePath() + "/uavobjectsinit.h",
flightInitIncludeTemplate); flightInitIncludeTemplate);
if (!res) { if (!res) {
cout << "Error: Could not write flight object init header file" << endl; cout << "Error: Could not write flight object init header file" << endl;
@ -87,7 +87,7 @@ bool UAVObjectGeneratorFlight::generate(UAVObjectParser *parser, QString templat
// Write the flight object Makefile // Write the flight object Makefile
flightMakeTemplate.replace(QString("$(UAVOBJFILENAMES)"), objFileNames); flightMakeTemplate.replace(QString("$(UAVOBJFILENAMES)"), objFileNames);
flightMakeTemplate.replace(QString("$(UAVOBJNAMES)"), objNames); flightMakeTemplate.replace(QString("$(UAVOBJNAMES)"), objNames);
res = writeFileIfDiffrent(flightOutputPath.absolutePath() + "/Makefile.inc", res = writeFileIfDifferent(flightOutputPath.absolutePath() + "/Makefile.inc",
flightMakeTemplate); flightMakeTemplate);
if (!res) { if (!res) {
cout << "Error: Could not write flight Makefile" << endl; cout << "Error: Could not write flight Makefile" << endl;
@ -394,13 +394,13 @@ bool UAVObjectGeneratorFlight::process_object(ObjectInfo *info)
outInclude.replace(QString("$(SETGETFIELDSEXTERN)"), setgetfieldsextern); outInclude.replace(QString("$(SETGETFIELDSEXTERN)"), setgetfieldsextern);
// Write the flight code // Write the flight code
bool res = writeFileIfDiffrent(flightOutputPath.absolutePath() + "/" + info->namelc + ".c", outCode); bool res = writeFileIfDifferent(flightOutputPath.absolutePath() + "/" + info->namelc + ".c", outCode);
if (!res) { if (!res) {
cout << "Error: Could not write flight code files" << endl; cout << "Error: Could not write flight code files" << endl;
return false; return false;
} }
res = writeFileIfDiffrent(flightOutputPath.absolutePath() + "/" + info->namelc + ".h", outInclude); res = writeFileIfDifferent(flightOutputPath.absolutePath() + "/" + info->namelc + ".h", outInclude);
if (!res) { if (!res) {
cout << "Error: Could not write flight include files" << endl; cout << "Error: Could not write flight include files" << endl;
return false; return false;

6
ground/uavobjgenerator/generators/gcs/uavobjectgeneratorgcs.cpp
View File

@ -62,7 +62,7 @@ bool UAVObjectGeneratorGCS::generate(UAVObjectParser *parser, QString templatepa
// Write the gcs object inialization files // Write the gcs object inialization files
gcsInitTemplate.replace(QString("$(OBJINC)"), objInc); gcsInitTemplate.replace(QString("$(OBJINC)"), objInc);
gcsInitTemplate.replace(QString("$(OBJINIT)"), gcsObjInit); gcsInitTemplate.replace(QString("$(OBJINIT)"), gcsObjInit);
bool res = writeFileIfDiffrent(gcsOutputPath.absolutePath() + "/uavobjectsinit.cpp", gcsInitTemplate); bool res = writeFileIfDifferent(gcsOutputPath.absolutePath() + "/uavobjectsinit.cpp", gcsInitTemplate);
if (!res) { if (!res) {
cout << "Error: Could not write output files" << endl; cout << "Error: Could not write output files" << endl;
return false; return false;
@ -371,12 +371,12 @@ bool UAVObjectGeneratorGCS::process_object(ObjectInfo *info)
outCode.replace(QString("$(INITFIELDS)"), initfields); outCode.replace(QString("$(INITFIELDS)"), initfields);
// Write the GCS code // Write the GCS code
bool res = writeFileIfDiffrent(gcsOutputPath.absolutePath() + "/" + info->namelc + ".cpp", outCode); bool res = writeFileIfDifferent(gcsOutputPath.absolutePath() + "/" + info->namelc + ".cpp", outCode);
if (!res) { if (!res) {
cout << "Error: Could not write gcs output files" << endl; cout << "Error: Could not write gcs output files" << endl;
return false; return false;
} }
res = writeFileIfDiffrent(gcsOutputPath.absolutePath() + "/" + info->namelc + ".h", outInclude); res = writeFileIfDifferent(gcsOutputPath.absolutePath() + "/" + info->namelc + ".h", outInclude);
if (!res) { if (!res) {
cout << "Error: Could not write gcs output files" << endl; cout << "Error: Could not write gcs output files" << endl;
return false; return false;

2
ground/uavobjgenerator/generators/generator_io.cpp
View File

@ -75,7 +75,7 @@ bool writeFile(QString name, QString & str)
/** /**
* Write contents of string to file if the content changes * Write contents of string to file if the content changes
*/ */
bool writeFileIfDiffrent(QString name, QString & str) bool writeFileIfDifferent(QString name, QString & str)
{ {
if (str == readFile(name, false)) { if (str == readFile(name, false)) {
return true; return true;

2
ground/uavobjgenerator/generators/generator_io.h
View File

@ -37,6 +37,6 @@
QString readFile(QString name); QString readFile(QString name);
QString readFile(QString name); QString readFile(QString name);
bool writeFile(QString name, QString & str); bool writeFile(QString name, QString & str);
bool writeFileIfDiffrent(QString name, QString & str); bool writeFileIfDifferent(QString name, QString & str);
#endif #endif

4
ground/uavobjgenerator/generators/java/uavobjectgeneratorjava.cpp
View File

@ -62,7 +62,7 @@ bool UAVObjectGeneratorJava::generate(UAVObjectParser *parser, QString templatep
// Write the gcs object inialization files // Write the gcs object inialization files
javaInitTemplate.replace(QString("$(OBJINC)"), objInc); javaInitTemplate.replace(QString("$(OBJINC)"), objInc);
javaInitTemplate.replace(QString("$(OBJINIT)"), javaObjInit); javaInitTemplate.replace(QString("$(OBJINIT)"), javaObjInit);
bool res = writeFileIfDiffrent(javaOutputPath.absolutePath() + "/UAVObjectsInitialize.java", javaInitTemplate); bool res = writeFileIfDifferent(javaOutputPath.absolutePath() + "/UAVObjectsInitialize.java", javaInitTemplate);
if (!res) { if (!res) {
cout << "Error: Could not write output files" << endl; cout << "Error: Could not write output files" << endl;
return false; return false;
@ -238,7 +238,7 @@ bool UAVObjectGeneratorJava::process_object(ObjectInfo *info)
outCode.replace(QString("$(INITFIELDS)"), initfields); outCode.replace(QString("$(INITFIELDS)"), initfields);
// Write the java code // Write the java code
bool res = writeFileIfDiffrent(javaOutputPath.absolutePath() + "/" + info->name + ".java", outCode); bool res = writeFileIfDifferent(javaOutputPath.absolutePath() + "/" + info->name + ".java", outCode);
if (!res) { if (!res) {
cout << "Error: Could not write gcs output files" << endl; cout << "Error: Could not write gcs output files" << endl;
return false; return false;

2
ground/uavobjgenerator/generators/python/uavobjectgeneratorpython.cpp
View File

@ -110,7 +110,7 @@ bool UAVObjectGeneratorPython::process_object(ObjectInfo *info)
outCode.replace(QString("$(DATAFIELDINIT)"), fields); outCode.replace(QString("$(DATAFIELDINIT)"), fields);
// Write the Python code // Write the Python code
bool res = writeFileIfDiffrent(pythonOutputPath.absolutePath() + "/" + info->namelc + ".py", outCode); bool res = writeFileIfDifferent(pythonOutputPath.absolutePath() + "/" + info->namelc + ".py", outCode);
if (!res) { if (!res) {
cout << "Error: Could not write Python output files" << endl; cout << "Error: Could not write Python output files" << endl;
return false; return false;

4
ground/uavobjgenerator/generators/wireshark/uavobjectgeneratorwireshark.cpp
View File

@ -93,7 +93,7 @@ bool UAVObjectGeneratorWireshark::generate(UAVObjectParser *parser, QString temp
/* Write the uavobject dissector's Makefile.common */ /* Write the uavobject dissector's Makefile.common */
wiresharkMakeTemplate.replace(QString("$(UAVOBJFILENAMES)"), objFileNames); wiresharkMakeTemplate.replace(QString("$(UAVOBJFILENAMES)"), objFileNames);
bool res = writeFileIfDiffrent(uavobjectsOutputPath.absolutePath() + "/Makefile.common", bool res = writeFileIfDifferent(uavobjectsOutputPath.absolutePath() + "/Makefile.common",
wiresharkMakeTemplate); wiresharkMakeTemplate);
if (!res) { if (!res) {
cout << "Error: Could not write wireshark Makefile" << endl; cout << "Error: Could not write wireshark Makefile" << endl;
@ -279,7 +279,7 @@ bool UAVObjectGeneratorWireshark::process_object(ObjectInfo *info, QDir outputpa
outCode.replace(QString("$(HEADERFIELDS)"), headerfields); outCode.replace(QString("$(HEADERFIELDS)"), headerfields);
// Write the flight code // Write the flight code
bool res = writeFileIfDiffrent(outputpath.absolutePath() + "/packet-op-uavobjects-" + info->namelc + ".c", outCode); bool res = writeFileIfDifferent(outputpath.absolutePath() + "/packet-op-uavobjects-" + info->namelc + ".c", outCode);
if (!res) { if (!res) {
cout << "Error: Could not write wireshark code files" << endl; cout << "Error: Could not write wireshark code files" << endl;
return false; return false;