rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-31 16:52:10 +01:00
Code Issues Releases Activity

OP-1628 Uncrustify

Browse Source
This commit is contained in:
m_thread 2014-12-16 18:26:52 +01:00
parent 8d4adeae13
commit 35a11d5a71
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ground/openpilotgcs/src/plugins/setupwizard/pages/autoupdatepage.cpp
View File

@ -47,8 +47,6 @@ void AutoUpdatePage::autoUpdate()
void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value)
{
QString msg;
switch (status) {
case uploader::WAITING_DISCONNECT:
disableButtons();
@ -65,6 +63,7 @@ void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value)
ui->levellinProgressBar->setValue(value.toInt());
break;
case uploader::JUMP_TO_BL:
disableButtons();
ui->levellinProgressBar->setValue(value.toInt());
ui->levellinProgressBar->setMaximum(5);
ui->statusLabel->setText(tr("Board going into bootloader mode. Please wait."));
@ -81,7 +80,7 @@ void AutoUpdatePage::updateStatus(uploader::ProgressStep status, QVariant value)
ui->statusLabel->setText(tr("Uploading description."));
break;
case uploader::BOOTING:
ui->statusLabel->setText(tr("Booting the board%. Please wait").arg(value.toString()));
ui->statusLabel->setText(tr("Booting the board%1. Please wait").arg(value.toString()));
break;
case uploader::SUCCESS:
enableButtons(true);

2
ground/openpilotgcs/src/plugins/uploader/uploadergadgetfactory.cpp
View File

@ -46,7 +46,7 @@ Core::IUAVGadget *UploaderGadgetFactory::createGadget(QWidget *parent)
isautocapable = gadgetWidget->autoUpdateCapable();
connect(this, SIGNAL(autoUpdate(bool)), gadgetWidget, SLOT(autoUpdate(bool)));
connect(this, SIGNAL(reboot()), gadgetWidget, SLOT(systemReset()));
connect(gadgetWidget, SIGNAL(progressUpdate(uploader::ProgressStep,QVariant)), this, SIGNAL(progressUpdate(uploader::ProgressStep, QVariant)));
connect(gadgetWidget, SIGNAL(progressUpdate(uploader::ProgressStep, QVariant)), this, SIGNAL(progressUpdate(uploader::ProgressStep, QVariant)));
return new UploaderGadget(QString("Uploader"), gadgetWidget, parent);
}

2
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
View File

@ -738,7 +738,7 @@ bool UploaderGadgetWidget::autoUpdate(bool erase)
TelemetryManager *telemetryManager = pluginManager->getObject<TelemetryManager>();
Q_ASSERT(telemetryManager);
if(!telemetryManager->isConnected()) {
if (!telemetryManager->isConnected()) {
progressUpdate(BOOTING, erase ? tr(" and erasing settings") : QVariant());
ResultEventLoop eventLoop;