rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-03-21 13:28:58 +01:00
Code Issues Releases Activity

LP-5 - Uncrustification

Browse Source
This commit is contained in:
Alessio Morale 2015-07-15 22:53:48 +02:00
parent 81ea0b9232
commit 5e9a034e6e
7 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ground/openpilotgcs/src/app/main.cpp
View File

@ -301,6 +301,7 @@ inline QStringList getPluginPaths()
QStringList rc;
QString pluginPath = QApplication::applicationDirPath();
pluginPath += QLatin1Char('/');
pluginPath += QLatin1String(PLUGIN_REL_PATH);
rc.push_back(pluginPath);

1
ground/openpilotgcs/src/libs/utils/pathutils.cpp
View File

@ -41,6 +41,7 @@ namespace Utils {
QString GetDataPath()
{
QString dataPath = QApplication::applicationDirPath();
dataPath += QLatin1Char('/');
dataPath += QLatin1String(DATA_REL_PATH);
dataPath += QLatin1Char('/');

2
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
View File

@ -198,7 +198,7 @@ void ConfigGadgetWidget::onAutopilotConnect()
if (board == 0x0905) {
qwd = new ConfigRevoNanoHWWidget(this);
}
stackWidget->replaceTab(ConfigGadgetWidget::hardware, qwd);
stackWidget->replaceTab(ConfigGadgetWidget::hardware, qwd);
} else {
// Unknown board
qDebug() << "Unknown board " << board;

2
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
View File

@ -353,7 +353,7 @@ void ConfigOutputWidget::refreshWidgetsValues(UAVObject *obj)
if (utilMngr) {
int board = utilMngr->getBoardModel();
// Setup labels and combos for banks according to board type
// Setup labels and combos for banks according to board type
if ((board & 0xff00) == 0x0400) {
// Coptercontrol family of boards 4 timer banks
bankLabels << "1 (1-3)" << "2 (4)" << "3 (5,7-8)" << "4 (6,9-10)";

4
ground/openpilotgcs/src/plugins/coreplugin/coreconstants.h
View File

@ -129,7 +129,7 @@ const char *const GO_FORWARD = "GCS.GoForward";
const char *const GOTOPREVIOUSGROUP = "GCS.GotoPreviousTabGroup";
const char *const GOTONEXTGROUP = "GCS.GotoNextTabGroup";
const char *const WINDOWSLIST = "GCS.WindowsList";
const char *const ABOUT_LIBREPILOTGCS = "GCS.AboutLibrePilotGCS";
const char *const ABOUT_LIBREPILOTGCS = "GCS.AboutLibrePilotGCS";
const char *const ABOUT_PLUGINS = "GCS.AboutPlugins";
const char *const ABOUT_AUTHORS = "GCS.AboutAuthors";
const char *const ABOUT_QT = "GCS.AboutQt";
@ -212,7 +212,7 @@ const char *const ICON_PLUGIN = ":/core/images/pluginicon.png";
const char *const ICON_EXIT = ":/core/images/exiticon.png";
const char *const ICON_OPTIONS = ":/core/images/optionsicon.png";
const char *const ICON_HELP = ":/core/images/helpicon.png";
const char *const ICON_LIBREPILOT = ":/core/images/librepiloticon.png";
const char *const ICON_LIBREPILOT = ":/core/images/librepiloticon.png";
// wizard kind

2
ground/openpilotgcs/src/plugins/setupwizard/vehicletemplateexportdialog.cpp
View File

@ -50,7 +50,7 @@
const char *VehicleTemplateExportDialog::EXPORT_FIXEDWING_NAME = "fixedwing";
const char *VehicleTemplateExportDialog::EXPORT_MULTI_NAME = "multirotor";
const char *VehicleTemplateExportDialog::EXPORT_HELI_NAME = "helicopter";
const char *VehicleTemplateExportDialog::EXPORT_HELI_NAME = "helicopter";
const char *VehicleTemplateExportDialog::EXPORT_SURFACE_NAME = "surface";
const char *VehicleTemplateExportDialog::EXPORT_CUSTOM_NAME = "custom";

14
ground/openpilotgcs/src/plugins/usagetracker/usagetrackerplugin.cpp
View File

@ -164,16 +164,16 @@ void UsageTrackerPlugin::collectUsageParameters(QMap<QString, QString> &paramete
parameters["board_type"] = "0x" + QString::number(boardModel, 16).toLower();
parameters["board_serial"] = utilMngr->getBoardCPUSerial().toHex();
parameters["bl_version"] = QString::number(utilMngr->getBootloaderRevision());
parameters["fw_tag"] = devDesc.gitTag;
parameters["fw_hash"] = devDesc.gitHash;
parameters["fw_tag"] = devDesc.gitTag;
parameters["fw_hash"] = devDesc.gitHash;
#if (QT_VERSION >= QT_VERSION_CHECK(5, 4, 0))
parameters["os_version"] = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture();
parameters["os_version"] = QSysInfo::prettyProductName() + " " + QSysInfo::currentCpuArchitecture();
#else
parameters["os_version"] = "none";
parameters["os_version"] = "none";
#endif
parameters["os_threads"] = QString::number(QThread::idealThreadCount());
parameters["os_timezone"] = QTimeZone::systemTimeZoneId();
parameters["gcs_version"] = VersionInfo::revision();
parameters["os_threads"] = QString::number(QThread::idealThreadCount());
parameters["os_timezone"] = QTimeZone::systemTimeZoneId();
parameters["gcs_version"] = VersionInfo::revision();
// Configuration parameters
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();