diff --git a/src/comm/MAVLinkSimulationLink.cc b/src/comm/MAVLinkSimulationLink.cc index 6d6ecf93579c3a6044ddc80ea6b8787850df0033..fb171c7344691197f54db5f8a10dfbc007632ab2 100644 --- a/src/comm/MAVLinkSimulationLink.cc +++ b/src/comm/MAVLinkSimulationLink.cc @@ -559,14 +559,14 @@ void MAVLinkSimulationLink::mainloop() // Send controller states - uint8_t attControl = 1; - uint8_t posXYControl = 1; - uint8_t posZControl = 0; - uint8_t posYawControl = 1; +// uint8_t attControl = 1; +// uint8_t posXYControl = 1; +// uint8_t posZControl = 0; +// uint8_t posYawControl = 1; uint8_t gpsLock = 2; uint8_t visLock = 3; - uint8_t posLock = qMax(gpsLock, visLock); + //uint8_t posLock = qMax(gpsLock, visLock); #ifdef MAVLINK_ENABLED_PIXHAWK messageSize = mavlink_msg_control_status_pack(systemId, componentId, &msg, posLock, visLock, gpsLock, attControl, posXYControl, posZControl, posYawControl); diff --git a/src/uas/PxQuadMAV.cc b/src/uas/PxQuadMAV.cc index 7f9a9125e07cf1aa4f5969057e7984e152d97655..c609a950514eaabf8843e7d48226a79a1cc0a5a6 100644 --- a/src/uas/PxQuadMAV.cc +++ b/src/uas/PxQuadMAV.cc @@ -168,5 +168,9 @@ void PxQuadMAV::sendProcessCommand(int watchdogId, int processId, unsigned int c mavlink_message_t msg; mavlink_msg_watchdog_command_encode(mavlink->getSystemId(), mavlink->getComponentId(), &msg, &payload); sendMessage(msg); +#else + Q_UNUSED(watchdogId); + Q_UNUSED(processId); + Q_UNUSED(command); #endif } diff --git a/src/ui/linechart/LinechartWidget.cc b/src/ui/linechart/LinechartWidget.cc index 4b5cbd1edc91c530fe25f3898eeb1869e836a597..d3b17b27948e00595e03afc93dfea55885de52b7 100644 --- a/src/ui/linechart/LinechartWidget.cc +++ b/src/ui/linechart/LinechartWidget.cc @@ -352,8 +352,6 @@ QWidget* LinechartWidget::createCurveItem(QString curve) QLabel* label; QLabel* value; QLabel* mean; - QLabel* median; - form->setAutoFillBackground(false); horizontalLayout = new QHBoxLayout(form); horizontalLayout->setSpacing(5); diff --git a/src/ui/map3D/QOSGWidget.h b/src/ui/map3D/QOSGWidget.h index ebc2dee7f84537bcff4c5f9fc3e5df464d93012d..22418446625e838890f8a04f0aaa8da93f11c772 100644 --- a/src/ui/map3D/QOSGWidget.h +++ b/src/ui/map3D/QOSGWidget.h @@ -123,7 +123,7 @@ public: getCamera()->setGraphicsContext(getGraphicsWindow()); } - virtual void paintEvent( QPaintEvent * event ) { frame(); } + virtual void paintEvent( QPaintEvent * event ) { Q_UNUSED(event); frame(); } protected: