diff --git a/src/comm/QGCFlightGearLink.cc b/src/comm/QGCFlightGearLink.cc index ecd81fa8c23d722c1986dabb30f2684bc7998649..03128854907f9c2f2318fdfcc808171c278ac15b 100644 --- a/src/comm/QGCFlightGearLink.cc +++ b/src/comm/QGCFlightGearLink.cc @@ -40,11 +40,11 @@ This file is part of the QGROUNDCONTROL project #include "MainWindow.h" QGCFlightGearLink::QGCFlightGearLink(UASInterface* mav, QString startupArguments, QString remoteHost, QHostAddress host, quint16 port) : + socket(NULL), process(NULL), terraSync(NULL), - socket(NULL), - startupArguments(startupArguments), - flightGearVersion(0) + flightGearVersion(0), + startupArguments(startupArguments) { this->host = host; this->port = port+mav->getUASID(); diff --git a/src/ui/DebugConsole.cc b/src/ui/DebugConsole.cc index 4f4cdf22471d33b834380ee39ce2c0bc357d6330..5468d2c93ae213f9c595dd0e288b0d22f31ef0fb 100644 --- a/src/ui/DebugConsole.cc +++ b/src/ui/DebugConsole.cc @@ -49,6 +49,8 @@ DebugConsole::DebugConsole(QWidget *parent) : autoHold(true), bytesToIgnore(0), lastByte(-1), + escReceived(false), + escIndex(0), sentBytes(), holdBuffer(), lineBuffer(""), @@ -61,8 +63,6 @@ DebugConsole::DebugConsole(QWidget *parent) : lowpassDataRate(0.0f), dataRateThreshold(400), commandIndex(0), - escReceived(false), - escIndex(0), m_ui(new Ui::DebugConsole) { // Setup basic user interface diff --git a/src/ui/HDDisplay.cc b/src/ui/HDDisplay.cc index fd9e6d29a75fd73e922d48d1fb6ceae45ba794d7..cfeaae750851dacc2776134cc0df9464d7fc1e60 100644 --- a/src/ui/HDDisplay.cc +++ b/src/ui/HDDisplay.cc @@ -201,9 +201,7 @@ void HDDisplay::triggerUpdate() void HDDisplay::paintEvent(QPaintEvent * event) { Q_UNUSED(event); - quint64 interval = 0; //qDebug() << "INTERVAL:" << MG::TIME::getGroundTimeNow() - interval << __FILE__ << __LINE__; - interval = QGC::groundTimeMilliseconds(); renderOverlay(); } diff --git a/src/ui/HSIDisplay.cc b/src/ui/HSIDisplay.cc index 97a47f0349b5bfbad77c89141c1cb90d3b0e67a7..284780b1fff82bfb2d66f57cbb329545033dcf48 100644 --- a/src/ui/HSIDisplay.cc +++ b/src/ui/HSIDisplay.cc @@ -118,12 +118,6 @@ HSIDisplay::HSIDisplay(QWidget *parent) : visionFixKnown(false), gpsFixKnown(false), iruFixKnown(false), - setPointKnown(false), - positionSetPointKnown(false), - userSetPointSet(false), - userXYSetPointSet(false), - userZSetPointSet(false), - userYawSetPointSet(false), gyroKnown(false), gyroON(false), gyroOK(false), @@ -150,7 +144,13 @@ HSIDisplay::HSIDisplay(QWidget *parent) : viconOK(false), actuatorsKnown(false), actuatorsON(false), - actuatorsOK(false) + actuatorsOK(false), + setPointKnown(false), + positionSetPointKnown(false), + userSetPointSet(false), + userXYSetPointSet(false), + userZSetPointSet(false), + userYawSetPointSet(false) { refreshTimer->setInterval(updateInterval); diff --git a/src/ui/QGCVehicleConfig.cc b/src/ui/QGCVehicleConfig.cc index fef70f624d36b80249509b07bd50dba61af14901..70877388cef14e47b2895843ecc2f0c97b7ff185 100644 --- a/src/ui/QGCVehicleConfig.cc +++ b/src/ui/QGCVehicleConfig.cc @@ -19,8 +19,6 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) : QWidget(parent), mav(NULL), chanCount(0), - changed(true), - rc_mode(RC_MODE_2), rcRoll(0.0f), rcPitch(0.0f), rcYaw(0.0f), @@ -29,6 +27,8 @@ QGCVehicleConfig::QGCVehicleConfig(QWidget *parent) : rcAux1(0.0f), rcAux2(0.0f), rcAux3(0.0f), + changed(true), + rc_mode(RC_MODE_2), calibrationEnabled(false), ui(new Ui::QGCVehicleConfig) {