Commit 58c5b220 authored by lm's avatar lm

Fixed compile warnings

parent ef361d41
...@@ -559,14 +559,14 @@ void MAVLinkSimulationLink::mainloop() ...@@ -559,14 +559,14 @@ void MAVLinkSimulationLink::mainloop()
// Send controller states // Send controller states
uint8_t attControl = 1; // uint8_t attControl = 1;
uint8_t posXYControl = 1; // uint8_t posXYControl = 1;
uint8_t posZControl = 0; // uint8_t posZControl = 0;
uint8_t posYawControl = 1; // uint8_t posYawControl = 1;
uint8_t gpsLock = 2; uint8_t gpsLock = 2;
uint8_t visLock = 3; uint8_t visLock = 3;
uint8_t posLock = qMax(gpsLock, visLock); //uint8_t posLock = qMax(gpsLock, visLock);
#ifdef MAVLINK_ENABLED_PIXHAWK #ifdef MAVLINK_ENABLED_PIXHAWK
messageSize = mavlink_msg_control_status_pack(systemId, componentId, &msg, posLock, visLock, gpsLock, attControl, posXYControl, posZControl, posYawControl); messageSize = mavlink_msg_control_status_pack(systemId, componentId, &msg, posLock, visLock, gpsLock, attControl, posXYControl, posZControl, posYawControl);
......
...@@ -168,5 +168,9 @@ void PxQuadMAV::sendProcessCommand(int watchdogId, int processId, unsigned int c ...@@ -168,5 +168,9 @@ void PxQuadMAV::sendProcessCommand(int watchdogId, int processId, unsigned int c
mavlink_message_t msg; mavlink_message_t msg;
mavlink_msg_watchdog_command_encode(mavlink->getSystemId(), mavlink->getComponentId(), &msg, &payload); mavlink_msg_watchdog_command_encode(mavlink->getSystemId(), mavlink->getComponentId(), &msg, &payload);
sendMessage(msg); sendMessage(msg);
#else
Q_UNUSED(watchdogId);
Q_UNUSED(processId);
Q_UNUSED(command);
#endif #endif
} }
...@@ -352,8 +352,6 @@ QWidget* LinechartWidget::createCurveItem(QString curve) ...@@ -352,8 +352,6 @@ QWidget* LinechartWidget::createCurveItem(QString curve)
QLabel* label; QLabel* label;
QLabel* value; QLabel* value;
QLabel* mean; QLabel* mean;
QLabel* median;
form->setAutoFillBackground(false); form->setAutoFillBackground(false);
horizontalLayout = new QHBoxLayout(form); horizontalLayout = new QHBoxLayout(form);
horizontalLayout->setSpacing(5); horizontalLayout->setSpacing(5);
......
...@@ -123,7 +123,7 @@ public: ...@@ -123,7 +123,7 @@ public:
getCamera()->setGraphicsContext(getGraphicsWindow()); getCamera()->setGraphicsContext(getGraphicsWindow());
} }
virtual void paintEvent( QPaintEvent * event ) { frame(); } virtual void paintEvent( QPaintEvent * event ) { Q_UNUSED(event); frame(); }
protected: protected:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment