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

uncrustify

Browse Source
This commit is contained in:
Alessio Morale 2014-03-09 16:43:31 +01:00
parent 0f2d65a8e4
commit 8218becdac
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
flight/modules/Logging/Logging.c
View File

@ -74,11 +74,11 @@ int32_t LoggingStart(void)
SettingsUpdatedCb(DebugLogSettingsHandle()); SettingsUpdatedCb(DebugLogSettingsHandle());
UAVObjEvent ev = { UAVObjEvent ev = {
.obj = DebugLogSettingsHandle(), .obj = DebugLogSettingsHandle(),
.instId = 0, .instId = 0,
.event = EV_UPDATED_PERIODIC, .event = EV_UPDATED_PERIODIC,
.lowPriority = true, .lowPriority = true,
}; };
EventPeriodicCallbackCreate(&ev, StatusUpdatedCb, 1000); EventPeriodicCallbackCreate(&ev, StatusUpdatedCb, 1000);
// invoke a periodic dispatcher callback - the event struct is a dummy, it could be filled with anything! // invoke a periodic dispatcher callback - the event struct is a dummy, it could be filled with anything!
StatusUpdatedCb(&ev); StatusUpdatedCb(&ev);

2
ground/openpilotgcs/src/plugins/config/calibration/thermal/thermalcalibrationmodel.cpp
View File

@ -72,7 +72,7 @@ ThermalCalibrationModel::ThermalCalibrationModel(QObject *parent) :
} }
void ThermalCalibrationModel::init() void ThermalCalibrationModel::init()
{ {
if(!m_initDone){ if (!m_initDone) {
m_initDone = true; m_initDone = true;
setStartEnabled(true); setStartEnabled(true);
setEndEnabled(false); setEndEnabled(false);

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

@ -236,7 +236,7 @@ ConfigRevoWidget::ConfigRevoWidget(QWidget *parent) :
connect(m_thermalCalibrationModel, SIGNAL(temperatureChanged(QString)), m_ui->textTemperature, SLOT(setText(QString))); connect(m_thermalCalibrationModel, SIGNAL(temperatureChanged(QString)), m_ui->textTemperature, SLOT(setText(QString)));
connect(m_thermalCalibrationModel, SIGNAL(temperatureGradientChanged(QString)), m_ui->textThermalGradient, SLOT(setText(QString))); connect(m_thermalCalibrationModel, SIGNAL(temperatureGradientChanged(QString)), m_ui->textThermalGradient, SLOT(setText(QString)));
connect(m_thermalCalibrationModel, SIGNAL(progressChanged(int)), m_ui->thermalBiasProgress, SLOT(setValue(int))); connect(m_thermalCalibrationModel, SIGNAL(progressChanged(int)), m_ui->thermalBiasProgress, SLOT(setValue(int)));
//note: init for m_thermalCalibrationModel is done in showEvent to prevent cases wiht "Start" button not enabled due to some itming issue. // note: init for m_thermalCalibrationModel is done in showEvent to prevent cases wiht "Start" button not enabled due to some itming issue.
// Connect the signals // Connect the signals
connect(m_ui->accelBiasStart, SIGNAL(clicked()), this, SLOT(doStartAccelGyroBiasCalibration())); connect(m_ui->accelBiasStart, SIGNAL(clicked()), this, SLOT(doStartAccelGyroBiasCalibration()));

5
ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp
View File

@ -136,7 +136,7 @@ void DeviceWidget::populate()
status("Ready...", STATUSICON_INFO); status("Ready...", STATUSICON_INFO);
QString fwFileName = getDevFirmwarePath(); QString fwFileName = getDevFirmwarePath();
QFile fwFile(fwFileName); QFile fwFile(fwFileName);
if(fwFile.exists()){ if (fwFile.exists()) {
loadFirmware(fwFileName); loadFirmware(fwFileName);
} }
} }
@ -261,6 +261,7 @@ void DeviceWidget::status(QString str, StatusIcon ic)
void DeviceWidget::loadFirmware() void DeviceWidget::loadFirmware()
{ {
QString file = setOpenFileName(); QString file = setOpenFileName();
loadFirmware(file); loadFirmware(file);
} }
@ -525,6 +526,7 @@ QString DeviceWidget::getDevFirmwarePath()
{ {
QDir fwDirectory; QDir fwDirectory;
QString fwDirectoryStr; QString fwDirectoryStr;
fwDirectoryStr = QCoreApplication::applicationDirPath(); fwDirectoryStr = QCoreApplication::applicationDirPath();
fwDirectory = QDir(fwDirectoryStr); fwDirectory = QDir(fwDirectoryStr);
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
@ -553,6 +555,7 @@ QString DeviceWidget::setOpenFileName()
tr("Select firmware file"), tr("Select firmware file"),
fwDirectoryStr, fwDirectoryStr,
tr("Firmware Files (*.opfw *.bin)")); tr("Firmware Files (*.opfw *.bin)"));
return fileName; return fileName;
} }