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

Merged in filnet/librepilot (pull request #114)

Browse Source 
hotfix for windows + uncrustified
This commit is contained in:
Philippe Renon 2015-11-06 22:22:12 +01:00
commit 8c3beaa28c
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ground/gcs/src/libs/utils/textbubbleslider.h
View File

@ -28,10 +28,12 @@
#ifndef TEXTBUBBLESLIDER_H #ifndef TEXTBUBBLESLIDER_H
#define TEXTBUBBLESLIDER_H #define TEXTBUBBLESLIDER_H
#include "utils_global.h"
#include <QSlider> #include <QSlider>
#include <QtDesigner/QDesignerExportWidget> #include <QtDesigner/QDesignerExportWidget>
class TextBubbleSlider : public QSlider { class QTCREATOR_UTILS_EXPORT TextBubbleSlider : public QSlider {
Q_OBJECT Q_OBJECT
public: public:

1
ground/gcs/src/plugins/config/configstabilizationwidget.cpp
View File

@ -639,6 +639,7 @@ void ConfigStabilizationWidget::onBoardConnected()
void ConfigStabilizationWidget::stabBankChanged(int index) void ConfigStabilizationWidget::stabBankChanged(int index)
{ {
bool dirty = isDirty(); bool dirty = isDirty();
disconnect(this, SIGNAL(widgetContentsChanged(QWidget *)), this, SLOT(processLinkedWidgets(QWidget *))); disconnect(this, SIGNAL(widgetContentsChanged(QWidget *)), this, SLOT(processLinkedWidgets(QWidget *)));
updateObjectFromThrottleCurve(); updateObjectFromThrottleCurve();

4
ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -241,7 +241,7 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
AuxMagSettings *magSettings = AuxMagSettings::GetInstance(m_uavoManager); AuxMagSettings *magSettings = AuxMagSettings::GetInstance(m_uavoManager);
Q_ASSERT(magSettings); Q_ASSERT(magSettings);
AuxMagSettings::DataFields magsData = magSettings->getData(); AuxMagSettings::DataFields magsData = magSettings->getData();
magsData.Type = AuxMagSettings::TYPE_GPSV9; magsData.Type = AuxMagSettings::TYPE_GPSV9;
magsData.Usage = AuxMagSettings::USAGE_AUXONLY; magsData.Usage = AuxMagSettings::USAGE_AUXONLY;
magSettings->setData(magsData); magSettings->setData(magsData);
addModifiedObject(magSettings, tr("Writing External Mag sensor settings")); addModifiedObject(magSettings, tr("Writing External Mag sensor settings"));
@ -255,7 +255,7 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
AuxMagSettings *magSettings = AuxMagSettings::GetInstance(m_uavoManager); AuxMagSettings *magSettings = AuxMagSettings::GetInstance(m_uavoManager);
Q_ASSERT(magSettings); Q_ASSERT(magSettings);
AuxMagSettings::DataFields magsData = magSettings->getData(); AuxMagSettings::DataFields magsData = magSettings->getData();
magsData.Type = AuxMagSettings::TYPE_FLEXI; magsData.Type = AuxMagSettings::TYPE_FLEXI;
magsData.Usage = AuxMagSettings::USAGE_AUXONLY; magsData.Usage = AuxMagSettings::USAGE_AUXONLY;
magSettings->setData(magsData); magSettings->setData(magsData);
addModifiedObject(magSettings, tr("Writing I2C Mag sensor settings")); addModifiedObject(magSettings, tr("Writing I2C Mag sensor settings"));

2
ground/gcs/src/plugins/uploader/op_dfu.cpp
View File

@ -574,7 +574,7 @@ OP_DFU::Status DFUObject::StatusRequest()
buf[8] = 0; buf[8] = 0;
buf[9] = 0; buf[9] = 0;
int result = sendData(buf, BUF_LEN); int result = sendData(buf, BUF_LEN);
int retry_cnt = 0; int retry_cnt = 0;
const int MaxSendRetry = 10, SendRetryIntervalMS = 1000; const int MaxSendRetry = 10, SendRetryIntervalMS = 1000;
while (result < 0 && retry_cnt < MaxSendRetry) { while (result < 0 && retry_cnt < MaxSendRetry) {