Browse Source

added OpalLink to core. protected with ifdef OPAL_RT

QGC4.4
Bryan Godbolt 15 years ago
parent
commit
efb1428b2b
  1. 2
      qgroundcontrol.pro
  2. 5
      src/Core.cc
  3. 4
      src/Core.h

2
qgroundcontrol.pro

@ -213,7 +213,7 @@ RESOURCES = mavground.qrc @@ -213,7 +213,7 @@ RESOURCES = mavground.qrc
# Include RT-LAB Library
win32 {
LIBS += C:\OPAL-RT\RT-LAB7.2.4\Common\lib\OpalApi.lib
INCLUDEPATH += C:\OPAL-RT\RT-LAB7.2.4\Common\Include
INCLUDEPATH += src/lib/opalrt
SOURCES += src/comm/OpalLink.cc
HEADERS += src/comm/OpalLink.h
DEFINES += OPAL_RT

5
src/Core.cc

@ -132,6 +132,11 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv) @@ -132,6 +132,11 @@ Core::Core(int &argc, char* argv[]) : QApplication(argc, argv)
}
}
#ifdef OPAL_RT
// Add OpalRT Link, but do not connect
OpalLink* opalLink = new OpalLink();
mainWindow->addLink(opalLink);
#endif
// MAVLinkSimulationLink* simulationLink = new MAVLinkSimulationLink(MG::DIR::getSupportFilesDirectory() + "/demo-log.txt");
MAVLinkSimulationLink* simulationLink = new MAVLinkSimulationLink(":/demo-log.txt");
mainWindow->addLink(simulationLink);

4
src/Core.h

@ -39,7 +39,11 @@ This file is part of the PIXHAWK project @@ -39,7 +39,11 @@ This file is part of the PIXHAWK project
#include "UASManager.h"
#include "LinkManager.h"
/*#include "ViconTarsusProtocol.h" */
#ifdef OPAL_RT
#include "OpalLink.h"
#endif
/**
* @brief The main application and management class.
*

Loading…
Cancel
Save