mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2025-02-27 16:54:15 +01:00
Fix aerosimrc hitl merge issues.
This commit is contained in:
Laura Sebesta
parent
b740fefa56
commit
db8563f69f
@ -922,14 +922,14 @@
|
||||
<groundTruthEnabled>true</groundTruthEnabled>
|
||||
<groundTruthRate>100</groundTruthRate>
|
||||
<hostAddress>0.0.0.0</hostAddress>
|
||||
<inPort>6756</inPort>
|
||||
<inPort>40100</inPort>
|
||||
<inputCommand>true</inputCommand>
|
||||
<latitude></latitude>
|
||||
<longitude></longitude>
|
||||
<manualControlEnabled>false</manualControlEnabled>
|
||||
<manualOutput>false</manualOutput>
|
||||
<minOutputPeriod>40</minOutputPeriod>
|
||||
<outPort>49000</outPort>
|
||||
<outPort>40200</outPort>
|
||||
<remoteAddress>127.0.0.1</remoteAddress>
|
||||
<simulatorId>ASimRC</simulatorId>
|
||||
<startSim>false</startSim>
|
||||
|
||||
@ -38,13 +38,7 @@ const quint16 DBG_BUFFER_MAX_SIZE = 4096;
|
||||
#define OBSOLETE_MIT_CHECKBOX (1 << 1)
|
||||
#define OBSOLETE_MIT_SEPARATOR (1 << 7)
|
||||
|
||||
#if defined(Q_CC_MSVC)
|
||||
#define PACK_STRUCT
|
||||
#define MAX_PATH 260
|
||||
#pragma pack (push, r1, 1)
|
||||
#elif defined(Q_CC_GNU)
|
||||
#define PACK_STRUCT __attribute__((packed))
|
||||
#endif
|
||||
|
||||
struct simToPlugin
|
||||
{
|
||||
@ -207,9 +201,6 @@ struct pluginInit
|
||||
const char *strOutputFolder;
|
||||
} PACK_STRUCT ; // normal - 144, packed - 144 OK (3.81 & 3.83 & 3.90)
|
||||
|
||||
#ifdef Q_CC_MSVC
|
||||
#pragma pack (pop, r1)
|
||||
#endif
|
||||
#undef PACK_STRUCT
|
||||
|
||||
#endif // AEROSIMRCDATASTRUCT_H
|
||||
|
||||
@ -15,12 +15,6 @@ SIM_DIR = $$GCS_BUILD_TREE/../AeroSIM-RC
|
||||
PLUGIN_DIR = $$SIM_DIR/Plugin/CopterControl
|
||||
DLLDESTDIR = $$PLUGIN_DIR
|
||||
|
||||
# Don't depend on MSVRT*.dll
|
||||
win32-msvc* {
|
||||
QMAKE_CXXFLAGS_RELEASE -= -MD
|
||||
QMAKE_CXXFLAGS_MT_DLL += -MT
|
||||
}
|
||||
|
||||
HEADERS = \
|
||||
aerosimrcdatastruct.h \
|
||||
enums.h \
|
||||
@ -57,14 +51,20 @@ equals(copydata, 1) {
|
||||
|
||||
# Qt DLLs
|
||||
QT_DLLS = \
|
||||
libgcc_s_dw2-1.dll \
|
||||
mingwm10.dll \
|
||||
QtCore4.dll \
|
||||
QtNetwork4.dll
|
||||
for(dll, QT_DLLS) {
|
||||
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$[QT_INSTALL_BINS]/$$dll\") $$targetPath(\"$$SIM_DIR/$$dll\") $$addNewline()
|
||||
}
|
||||
|
||||
# MinGW DLLs
|
||||
MINGW_DLLS = \
|
||||
libgcc_s_dw2-1.dll \
|
||||
mingwm10.dll
|
||||
for(dll, MINGW_DLLS) {
|
||||
data_copy.commands += $(COPY_FILE) $$targetPath(\"$$[QT_INSTALL_BINS]/../../../../../mingw/bin/$$dll\") $$targetPath(\"$$SIM_DIR/$$dll\") $$addNewline()
|
||||
}
|
||||
|
||||
data_copy.target = FORCE
|
||||
QMAKE_EXTRA_TARGETS += data_copy
|
||||
}
|
||||
|
||||
@ -31,9 +31,6 @@
|
||||
#include <QWidget>
|
||||
#include <QUdpSocket>
|
||||
#include <QTime>
|
||||
#if defined(Q_CC_MSVC)
|
||||
#define _USE_MATH_DEFINES
|
||||
#endif
|
||||
#include <qmath.h>
|
||||
#include <QVector3D>
|
||||
#include <QMatrix4x4>
|
||||
|
||||
@ -1,39 +1,5 @@
|
||||
TEMPLATE = lib
|
||||
TARGET = HITL
|
||||
QT += network
|
||||
|
||||
include(../../openpilotgcsplugin.pri)
|
||||
include(hitl_dependencies.pri)
|
||||
|
||||
HEADERS += hitlplugin.h \
|
||||
hitlwidget.h \
|
||||
hitloptionspage.h \
|
||||
hitlfactory.h \
|
||||
hitlconfiguration.h \
|
||||
hitlgadget.h \
|
||||
hitlnoisegeneration.h \
|
||||
simulator.h \
|
||||
aerosimrcsimulator.h \
|
||||
fgsimulator.h \
|
||||
il2simulator.h \
|
||||
xplanesimulator.h
|
||||
SOURCES += hitlplugin.cpp \
|
||||
hitlwidget.cpp \
|
||||
hitloptionspage.cpp \
|
||||
hitlfactory.cpp \
|
||||
hitlconfiguration.cpp \
|
||||
hitlgadget.cpp \
|
||||
hitlnoisegeneration.cpp \
|
||||
simulator.cpp \
|
||||
aerosimrcsimulator.cpp \
|
||||
fgsimulator.cpp \
|
||||
il2simulator.cpp \
|
||||
xplanesimulator.cpp
|
||||
OTHER_FILES += hitl.pluginspec
|
||||
FORMS += hitloptionspage.ui \
|
||||
hitlwidget.ui
|
||||
RESOURCES += hitlresources.qrc
|
||||
|
||||
TEMPLATE = subdirs
|
||||
SUBDIRS = aerosimrc
|
||||
|
||||
SUBDIRS = plugin aerosimrc
|
||||
|
||||
plugin.file = plugin.pro
|
||||
|
||||
37
ground/openpilotgcs/src/plugins/hitl/plugin.pro
Normal file
37
ground/openpilotgcs/src/plugins/hitl/plugin.pro
Normal file
@ -0,0 +1,37 @@
|
||||
TEMPLATE = lib
|
||||
TARGET = HITL
|
||||
QT += network
|
||||
|
||||
include(../../openpilotgcsplugin.pri)
|
||||
include(hitl_dependencies.pri)
|
||||
|
||||
HEADERS += hitlplugin.h \
|
||||
hitlwidget.h \
|
||||
hitloptionspage.h \
|
||||
hitlfactory.h \
|
||||
hitlconfiguration.h \
|
||||
hitlgadget.h \
|
||||
hitlnoisegeneration.h \
|
||||
simulator.h \
|
||||
aerosimrcsimulator.h \
|
||||
fgsimulator.h \
|
||||
il2simulator.h \
|
||||
xplanesimulator.h
|
||||
SOURCES += hitlplugin.cpp \
|
||||
hitlwidget.cpp \
|
||||
hitloptionspage.cpp \
|
||||
hitlfactory.cpp \
|
||||
hitlconfiguration.cpp \
|
||||
hitlgadget.cpp \
|
||||
hitlnoisegeneration.cpp \
|
||||
simulator.cpp \
|
||||
aerosimrcsimulator.cpp \
|
||||
fgsimulator.cpp \
|
||||
il2simulator.cpp \
|
||||
xplanesimulator.cpp
|
||||
OTHER_FILES += hitl.pluginspec
|
||||
FORMS += hitloptionspage.ui \
|
||||
hitlwidget.ui
|
||||
RESOURCES += hitlresources.qrc
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user