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

OP-1628 Uncrustify

Browse Source
This commit is contained in:
m_thread 2014-12-29 14:51:12 +01:00
parent 82c65b6b3f
commit 9614397694
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/openpilotgcs/src/plugins/setupwizard/connectiondiagram.cpp
View File

@ -141,7 +141,7 @@ void ConnectionDiagram::setupGraphicsScene()
break;
default:
break;
}
}
case VehicleConfigurationSource::VEHICLE_SURFACE:
switch (m_configSource->getVehicleSubType()) {
case VehicleConfigurationSource::GROUNDVEHICLE_CAR:
@ -156,7 +156,7 @@ void ConnectionDiagram::setupGraphicsScene()
default:
break;
}
case VehicleConfigurationSource::VEHICLE_HELI:
case VehicleConfigurationSource::VEHICLE_HELI:
default:
break;
}

6
ground/openpilotgcs/src/plugins/setupwizard/pages/rebootpage.cpp
View File

@ -38,7 +38,7 @@ RebootPage::RebootPage(SetupWizard *wizard, QWidget *parent) :
connect(ui->rebootButton, SIGNAL(clicked()), this, SLOT(reboot()));
ExtensionSystem::PluginManager *pm = ExtensionSystem::PluginManager::instance();
Q_ASSERT(pm);
m_uploader = pm->getObject<UploaderGadgetFactory>();
m_uploader = pm->getObject<UploaderGadgetFactory>();
Q_ASSERT(m_uploader);
}
@ -87,7 +87,7 @@ void RebootPage::reboot()
enableButtons(false);
ui->rebootProgress->setValue(0);
QApplication::processEvents();
connect(m_uploader, SIGNAL(progressUpdate(uploader::ProgressStep,QVariant)), this, SLOT(progressUpdate(uploader::ProgressStep,QVariant)));
connect(m_uploader, SIGNAL(progressUpdate(uploader::ProgressStep, QVariant)), this, SLOT(progressUpdate(uploader::ProgressStep, QVariant)));
ui->messageLabel->setText(tr("Reboot in progress..."));
m_uploader->reboot();
}
@ -96,7 +96,7 @@ void RebootPage::progressUpdate(uploader::ProgressStep progress, QVariant messag
{
Q_UNUSED(message);
if (progress == uploader::SUCCESS || progress == uploader::FAILURE) {
disconnect(m_uploader, SIGNAL(progressUpdate(uploader::ProgressStep,QVariant)), this, SLOT(progressUpdate(uploader::ProgressStep,QVariant)));
disconnect(m_uploader, SIGNAL(progressUpdate(uploader::ProgressStep, QVariant)), this, SLOT(progressUpdate(uploader::ProgressStep, QVariant)));
if (progress == uploader::FAILURE) {
ui->messageLabel->setText(tr("<font color='red'>Software reboot failed!</font><p> Please perform a manual reboot by power cycling the board. "
"To power cycle the controller remove all batteries and the USB cable for at least 30 seconds. "