Browse Source

Merge pull request #7077 from mavlink/skipSerial

Skip serial related code if serial links are disabled.
QGC4.4
Gus Grubba 7 years ago committed by GitHub
parent
commit
cafc8ceedf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      qgroundcontrol.pro
  2. 2
      src/QGCApplication.cc
  3. 6
      src/comm/LinkManager.cc
  4. 2
      src/comm/LinkManager.h
  5. 4
      src/main.cc

8
qgroundcontrol.pro

@ -922,13 +922,13 @@ HEADERS+= \ @@ -922,13 +922,13 @@ HEADERS+= \
src/Vehicle/Vehicle.h \
src/VehicleSetup/VehicleComponent.h \
!MobileBuild {
!MobileBuild { !NoSerialBuild {
HEADERS += \
src/VehicleSetup/Bootloader.h \
src/VehicleSetup/FirmwareImage.h \
src/VehicleSetup/FirmwareUpgradeController.h \
src/VehicleSetup/PX4FirmwareUpgradeThread.h \
}
}}
SOURCES += \
src/AutoPilotPlugins/AutoPilotPlugin.cc \
@ -948,13 +948,13 @@ SOURCES += \ @@ -948,13 +948,13 @@ SOURCES += \
src/Vehicle/Vehicle.cc \
src/VehicleSetup/VehicleComponent.cc \
!MobileBuild {
!MobileBuild { !NoSerialBuild {
SOURCES += \
src/VehicleSetup/Bootloader.cc \
src/VehicleSetup/FirmwareImage.cc \
src/VehicleSetup/FirmwareUpgradeController.cc \
src/VehicleSetup/PX4FirmwareUpgradeThread.cc \
}
}}
# ArduPilot FirmwarePlugin

2
src/QGCApplication.cc

@ -440,7 +440,9 @@ void QGCApplication::_initCommon(void) @@ -440,7 +440,9 @@ void QGCApplication::_initCommon(void)
#ifndef __mobile__
qmlRegisterType<ViewWidgetController> (kQGCControllers, 1, 0, "ViewWidgetController");
qmlRegisterType<CustomCommandWidgetController> (kQGCControllers, 1, 0, "CustomCommandWidgetController");
#ifndef NO_SERIAL_LINK
qmlRegisterType<FirmwareUpgradeController> (kQGCControllers, 1, 0, "FirmwareUpgradeController");
#endif
qmlRegisterType<GeoTagController> (kQGCControllers, 1, 0, "GeoTagController");
qmlRegisterType<MavlinkConsoleController> (kQGCControllers, 1, 0, "MavlinkConsoleController");
#endif

6
src/comm/LinkManager.cc

@ -52,8 +52,10 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox) @@ -52,8 +52,10 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox)
, _autoConnectSettings(NULL)
, _mavlinkProtocol(NULL)
#ifndef __mobile__
#ifndef NO_SERIAL_LINK
, _nmeaPort(NULL)
#endif
#endif
{
qmlRegisterUncreatableType<LinkManager> ("QGroundControl", 1, 0, "LinkManager", "Reference only");
qmlRegisterUncreatableType<LinkConfiguration> ("QGroundControl", 1, 0, "LinkConfiguration", "Reference only");
@ -69,8 +71,10 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox) @@ -69,8 +71,10 @@ LinkManager::LinkManager(QGCApplication* app, QGCToolbox* toolbox)
LinkManager::~LinkManager()
{
#ifndef __mobile__
#ifndef NO_SERIAL_LINK
delete _nmeaPort;
#endif
#endif
}
void LinkManager::setToolbox(QGCToolbox *toolbox)
@ -513,6 +517,7 @@ void LinkManager::_updateAutoConnectLinks(void) @@ -513,6 +517,7 @@ void LinkManager::_updateAutoConnectLinks(void)
QGCSerialPortInfo::BoardType_t boardType;
QString boardName;
#ifndef NO_SERIAL_LINK
#ifndef __mobile__
if (portInfo.systemLocation().trimmed() == _autoConnectSettings->autoConnectNmeaPort()->cookedValueString()) {
if (portInfo.systemLocation().trimmed() != _nmeaDeviceName) {
@ -539,6 +544,7 @@ void LinkManager::_updateAutoConnectLinks(void) @@ -539,6 +544,7 @@ void LinkManager::_updateAutoConnectLinks(void)
}
} else
#endif
#endif
if (portInfo.getBoardInfo(boardType, boardName)) {
if (portInfo.isBootloader()) {
// Don't connect to bootloader

2
src/comm/LinkManager.h

@ -237,9 +237,11 @@ private: @@ -237,9 +237,11 @@ private:
// NMEA GPS device for GCS position
#ifndef __mobile__
#ifndef NO_SERIAL_LINK
QString _nmeaDeviceName;
QSerialPort* _nmeaPort;
uint32_t _nmeaBaud;
#endif
#endif
};

4
src/main.cc

@ -56,8 +56,10 @@ @@ -56,8 +56,10 @@
#endif
#ifndef __mobile__
#ifndef NO_SERIAL_LINK
Q_DECLARE_METATYPE(QGCSerialPortInfo)
#endif
#endif
#ifdef Q_OS_WIN
@ -159,8 +161,10 @@ int main(int argc, char *argv[]) @@ -159,8 +161,10 @@ int main(int argc, char *argv[])
#endif
qRegisterMetaType<QAbstractSocket::SocketError>();
#ifndef __mobile__
#ifndef NO_SERIAL_LINK
qRegisterMetaType<QGCSerialPortInfo>();
#endif
#endif
// We statically link our own QtLocation plugin

Loading…
Cancel
Save