rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-27 16:54:15 +01:00
Code Issues Releases Activity

OP-1170 Got rid of compiler warnings for several plugins. A few warnings are left since I dont know how to get rid of them without suppressing a whole category of warnings in all files compiled.

Browse Source
This commit is contained in:
m_thread 2014-02-26 18:33:58 +01:00
parent f306a356f3
commit 36307100f0
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowserconfiguration.h
View File

@ -111,8 +111,8 @@ public slots:
private: private:
QColor m_recentlyUpdatedColor; QColor m_recentlyUpdatedColor;
QColor m_manuallyChangedColor; QColor m_manuallyChangedColor;
int m_recentlyUpdatedTimeout;
bool m_onlyHilightChangedValues; bool m_onlyHilightChangedValues;
int m_recentlyUpdatedTimeout;
bool m_useCategorizedView; bool m_useCategorizedView;
bool m_useScientificView; bool m_useScientificView;
bool m_showMetaData; bool m_showMetaData;

4
ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjecttreemodel.h
View File

@ -110,12 +110,12 @@ private:
TreeItem *m_rootItem; TreeItem *m_rootItem;
TopTreeItem *m_settingsTree; TopTreeItem *m_settingsTree;
TopTreeItem *m_nonSettingsTree; TopTreeItem *m_nonSettingsTree;
bool m_useScientificFloatNotation;
bool m_categorize;
int m_recentlyUpdatedTimeout; int m_recentlyUpdatedTimeout;
QColor m_recentlyUpdatedColor; QColor m_recentlyUpdatedColor;
QColor m_manuallyChangedColor; QColor m_manuallyChangedColor;
bool m_onlyHilightChangedValues; bool m_onlyHilightChangedValues;
bool m_useScientificFloatNotation;
bool m_categorize;
// Highlight manager to handle highlighting of tree items. // Highlight manager to handle highlighting of tree items.
HighLightManager *m_highlightManager; HighLightManager *m_highlightManager;

2
ground/openpilotgcs/src/plugins/uploader/SSP/port.h
View File

@ -64,7 +64,7 @@ public:
uint32_t TxError; uint32_t TxError;
uint16_t flags; uint16_t flags;
port(QString name); port(QString name);
~port(); virtual ~port();
portstatus status(); portstatus status();
private: private:
portstatus mstatus; portstatus mstatus;

2
ground/openpilotgcs/src/plugins/uploader/SSP/qsspt.h
View File

@ -47,8 +47,8 @@ private:
QQueue<QByteArray> queue; QQueue<QByteArray> queue;
QMutex mutex; QMutex mutex;
QMutex sendbufmutex; QMutex sendbufmutex;
bool datapending;
bool endthread; bool endthread;
bool datapending;
uint16_t sendstatus; uint16_t sendstatus;
uint16_t receivestatus; uint16_t receivestatus;
QWaitCondition sendwait; QWaitCondition sendwait;

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

@ -225,6 +225,7 @@ void DeviceWidget::dfuStatus(QString str)
void DeviceWidget::confirmCB(int value) void DeviceWidget::confirmCB(int value)
{ {
Q_UNUSED(value);
updateButtons(true); updateButtons(true);
} }
@ -277,7 +278,7 @@ void DeviceWidget::loadFirmware()
QByteArray desc = loadedFW.right(100); QByteArray desc = loadedFW.right(100);
QPixmap px; QPixmap px;
if (loadedFW.length() > m_dfu->devices[deviceID].SizeOfCode) { if (loadedFW.length() > (int)m_dfu->devices[deviceID].SizeOfCode) {
myDevice->lblCRCL->setText(tr("Can't calculate, file too big for device")); myDevice->lblCRCL->setText(tr("Can't calculate, file too big for device"));
} else { } else {
myDevice->lblCRCL->setText(QString::number(DFUObject::CRCFromQBArray(loadedFW, m_dfu->devices[deviceID].SizeOfCode))); myDevice->lblCRCL->setText(QString::number(DFUObject::CRCFromQBArray(loadedFW, m_dfu->devices[deviceID].SizeOfCode)));

6
ground/openpilotgcs/src/plugins/uploader/op_dfu.cpp
View File

@ -637,8 +637,8 @@ bool DFUObject::findDevices()
buf[7] = 0; buf[7] = 0;
buf[8] = 0; buf[8] = 0;
buf[9] = 0; buf[9] = 0;
int result = sendData(buf, BUF_LEN); sendData(buf, BUF_LEN);
result = receiveData(buf, BUF_LEN); receiveData(buf, BUF_LEN);
devices[x].ID = buf[14]; devices[x].ID = buf[14];
devices[x].ID = devices[x].ID << 8 | (quint8)buf[15]; devices[x].ID = devices[x].ID << 8 | (quint8)buf[15];
devices[x].BL_Version = buf[7]; devices[x].BL_Version = buf[7];
@ -749,7 +749,7 @@ OP_DFU::Status DFUObject::UploadFirmwareT(const QString &sfile, const bool &veri
pad = pad - arr.length(); pad = pad - arr.length();
arr.append(QByteArray(pad, 255)); arr.append(QByteArray(pad, 255));
} }
if (devices[device].SizeOfCode < arr.length()) { if (devices[device].SizeOfCode < (quint32)arr.length()) {
if (debug) { if (debug) {
qDebug() << "ERROR file to big for device"; qDebug() << "ERROR file to big for device";
} }

2
ground/openpilotgcs/src/plugins/uploader/op_dfu.h
View File

@ -115,7 +115,7 @@ public:
// DFUObject(bool debug); // DFUObject(bool debug);
DFUObject(bool debug, bool use_serial, QString port); DFUObject(bool debug, bool use_serial, QString port);
~DFUObject(); virtual ~DFUObject();
// Service commands: // Service commands:
bool enterDFU(int const &devNumber); bool enterDFU(int const &devNumber);