mavlink2
This commit is contained in:
+7
-7
@@ -100,13 +100,13 @@ INCLUDEPATH += $$PWD/../thirdpart/include
|
||||
|
||||
#添加mavlink目录(给mavlinknode模块打补丁)
|
||||
|
||||
INCLUDEPATH += $$PWD/../mavlink3 \
|
||||
$$PWD/../mavlink3/ardupilotmega \
|
||||
$$PWD/../mavlink3/common \
|
||||
$$PWD/../mavlink3/icarous \
|
||||
$$PWD/../mavlink3/uAvionix \
|
||||
$$PWD/../mavlink3/XYK \
|
||||
$$PWD/../mavlink3/message_definitions
|
||||
INCLUDEPATH += $$PWD/../mavlink \
|
||||
$$PWD/../mavlink/ardupilotmega \
|
||||
$$PWD/../mavlink/common \
|
||||
$$PWD/../mavlink/icarous \
|
||||
$$PWD/../mavlink/uAvionix \
|
||||
$$PWD/../mavlink/XYK \
|
||||
$$PWD/../mavlink/message_definitions
|
||||
|
||||
|
||||
# Capture whether this is a release/debug build.
|
||||
|
||||
+13
-17
@@ -8,20 +8,16 @@ QT += core gui network
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
|
||||
# Target name.
|
||||
TARGET = MavLinkNode
|
||||
|
||||
|
||||
|
||||
|
||||
# Capture whether this is a release/debug build.
|
||||
CONFIG(debug, debug|release) {
|
||||
# Target name.
|
||||
TARGET = MavLinkNoded
|
||||
}
|
||||
CONFIG(release, debug|release) {
|
||||
# Target name.
|
||||
TARGET = MavLinkNode
|
||||
CONFIG(debug, debug|release){
|
||||
# 在DEBUG 版本后加入 d后缀
|
||||
TARGET = $$join(TARGET,,,d)
|
||||
}
|
||||
|
||||
|
||||
TEMPLATE = lib
|
||||
|
||||
DEFINES += MAV_LIBRARY
|
||||
@@ -90,13 +86,13 @@ CONFIG(release, debug|release) {
|
||||
#添加mavlink目录
|
||||
|
||||
|
||||
INCLUDEPATH += $$PWD/../mavlink3 \
|
||||
$$PWD/../mavlink3/ardupilotmega \
|
||||
$$PWD/../mavlink3/common \
|
||||
$$PWD/../mavlink3/icarous \
|
||||
$$PWD/../mavlink3/uAvionix \
|
||||
$$PWD/../mavlink3/XYK \
|
||||
$$PWD/../mavlink3/message_definitions
|
||||
INCLUDEPATH += $$PWD/../mavlink \
|
||||
$$PWD/../mavlink/ardupilotmega \
|
||||
$$PWD/../mavlink/common \
|
||||
$$PWD/../mavlink/icarous \
|
||||
$$PWD/../mavlink/uAvionix \
|
||||
$$PWD/../mavlink/XYK \
|
||||
$$PWD/../mavlink/message_definitions
|
||||
|
||||
|
||||
|
||||
|
||||
+110
-110
@@ -1,110 +1,110 @@
|
||||
|
||||
QT += serialport
|
||||
QT += network
|
||||
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
|
||||
|
||||
|
||||
# Capture whether this is a release/debug build.
|
||||
CONFIG(debug, debug|release) {
|
||||
# Target name.
|
||||
TARGET = Dlinkd
|
||||
}
|
||||
CONFIG(release, debug|release) {
|
||||
# Target name.
|
||||
TARGET = Dlink
|
||||
}
|
||||
|
||||
TEMPLATE = lib
|
||||
|
||||
|
||||
DEFINES += DLINK_LIBRARY \
|
||||
QtDlink
|
||||
|
||||
CONFIG += c++11 \
|
||||
dll \
|
||||
resources_big \
|
||||
warn_off
|
||||
|
||||
|
||||
|
||||
|
||||
# The following define makes your compiler emit warnings if you use
|
||||
# any feature of Qt which has been marked as deprecated (the exact warnings
|
||||
# depend on your compiler). Please consult the documentation of the
|
||||
# deprecated API in order to know how to port your code away from it.
|
||||
DEFINES += QT_DEPRECATED_WARNINGS
|
||||
|
||||
# You can also make your code fail to compile if you use deprecated APIs.
|
||||
# In order to do so, uncomment the following line.
|
||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||
|
||||
|
||||
HEADERS += \
|
||||
$$PWD/dlink.h \
|
||||
$$PWD/dlinkglobal.h
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/dlink.cpp
|
||||
|
||||
#加入第三方库
|
||||
INCLUDEPATH += $$PWD/../thirdpart/include
|
||||
|
||||
#添加mavlink目录
|
||||
INCLUDEPATH += $$PWD/../mavlink3 \
|
||||
$$PWD/../mavlink3/ardupilotmega \
|
||||
$$PWD/../mavlink3/common \
|
||||
$$PWD/../mavlink3/icarous \
|
||||
$$PWD/../mavlink3/uAvionix \
|
||||
$$PWD/../mavlink3/XYK \
|
||||
$$PWD/../mavlink3/message_definitions
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Capture whether this is a release/debug build.
|
||||
CONFIG(debug, debug|release) {
|
||||
LIBS += -L$$PWD/../thirdpart/lib -lMavLinkNoded
|
||||
}
|
||||
CONFIG(release, debug|release) {
|
||||
LIBS += -L$$PWD/../thirdpart/lib -lMavLinkNode
|
||||
}
|
||||
|
||||
|
||||
DESTDIR = $$PWD/../thirdpart/lib
|
||||
MOC_DIR = $$PWD/../build
|
||||
OBJECTS_DIR = $$PWD/../build
|
||||
|
||||
|
||||
|
||||
win32|win64 {
|
||||
src_dir = $$PWD\\*.h
|
||||
dst_dir = $$PWD\\..\\thirdpart\\include\\
|
||||
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
|
||||
|
||||
# Replace slashes in paths with backslashes for Windows
|
||||
src_dir ~= s,/,\\,g
|
||||
dst_dir ~= s,/,\\,g
|
||||
|
||||
system(xcopy $$src_dir $$dst_dir /y /e)
|
||||
}
|
||||
|
||||
unix {
|
||||
src_dir = $$PWD/*.h
|
||||
dst_dir = $$PWD/../thirdpart/include/
|
||||
|
||||
!exists($$dst_dir): system(mkdir -p $$dst_dir)
|
||||
|
||||
system(cp $$src_dir $$dst_dir -arf )
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
QT += serialport
|
||||
QT += network
|
||||
|
||||
|
||||
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
|
||||
|
||||
|
||||
|
||||
# Capture whether this is a release/debug build.
|
||||
CONFIG(debug, debug|release) {
|
||||
# Target name.
|
||||
TARGET = Dlinkd
|
||||
}
|
||||
CONFIG(release, debug|release) {
|
||||
# Target name.
|
||||
TARGET = Dlink
|
||||
}
|
||||
|
||||
TEMPLATE = lib
|
||||
|
||||
|
||||
DEFINES += DLINK_LIBRARY \
|
||||
QtDlink
|
||||
|
||||
CONFIG += c++11 \
|
||||
dll \
|
||||
resources_big \
|
||||
warn_off
|
||||
|
||||
|
||||
|
||||
|
||||
# The following define makes your compiler emit warnings if you use
|
||||
# any feature of Qt which has been marked as deprecated (the exact warnings
|
||||
# depend on your compiler). Please consult the documentation of the
|
||||
# deprecated API in order to know how to port your code away from it.
|
||||
DEFINES += QT_DEPRECATED_WARNINGS
|
||||
|
||||
# You can also make your code fail to compile if you use deprecated APIs.
|
||||
# In order to do so, uncomment the following line.
|
||||
# You can also select to disable deprecated APIs only up to a certain version of Qt.
|
||||
#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # disables all the APIs deprecated before Qt 6.0.0
|
||||
|
||||
|
||||
HEADERS += \
|
||||
$$PWD/dlink.h \
|
||||
$$PWD/dlinkglobal.h
|
||||
|
||||
SOURCES += \
|
||||
$$PWD/dlink.cpp
|
||||
|
||||
#加入第三方库
|
||||
INCLUDEPATH += $$PWD/../thirdpart/include
|
||||
|
||||
#添加mavlink目录
|
||||
INCLUDEPATH += $$PWD/../mavlink \
|
||||
$$PWD/../mavlink/ardupilotmega \
|
||||
$$PWD/../mavlink/common \
|
||||
$$PWD/../mavlink/icarous \
|
||||
$$PWD/../mavlink/uAvionix \
|
||||
$$PWD/../mavlink/XYK \
|
||||
$$PWD/../mavlink/message_definitions
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
# Capture whether this is a release/debug build.
|
||||
CONFIG(debug, debug|release) {
|
||||
LIBS += -L$$PWD/../thirdpart/lib -lMavLinkNoded
|
||||
}
|
||||
CONFIG(release, debug|release) {
|
||||
LIBS += -L$$PWD/../thirdpart/lib -lMavLinkNode
|
||||
}
|
||||
|
||||
|
||||
DESTDIR = $$PWD/../thirdpart/lib
|
||||
MOC_DIR = $$PWD/../build
|
||||
OBJECTS_DIR = $$PWD/../build
|
||||
|
||||
|
||||
|
||||
win32|win64 {
|
||||
src_dir = $$PWD\\*.h
|
||||
dst_dir = $$PWD\\..\\thirdpart\\include\\
|
||||
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
|
||||
|
||||
# Replace slashes in paths with backslashes for Windows
|
||||
src_dir ~= s,/,\\,g
|
||||
dst_dir ~= s,/,\\,g
|
||||
|
||||
system(xcopy $$src_dir $$dst_dir /y /e)
|
||||
}
|
||||
|
||||
unix {
|
||||
src_dir = $$PWD/*.h
|
||||
dst_dir = $$PWD/../thirdpart/include/
|
||||
|
||||
!exists($$dst_dir): system(mkdir -p $$dst_dir)
|
||||
|
||||
system(cp $$src_dir $$dst_dir -arf )
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
+1
-1
Submodule mavlink updated: 17d3462b14...438e824241
+132
-132
@@ -1,132 +1,132 @@
|
||||
|
||||
QT += widgets
|
||||
QT += opengl
|
||||
QT += network
|
||||
QT += sql
|
||||
QT += svg
|
||||
|
||||
|
||||
# Capture whether this is a release/debug build.
|
||||
CONFIG(debug, debug|release) {
|
||||
# Target name.
|
||||
TARGET = opmapwidgetd
|
||||
}
|
||||
CONFIG(release, debug|release) {
|
||||
# Target name.
|
||||
TARGET = opmapwidget
|
||||
}
|
||||
|
||||
TEMPLATE = lib
|
||||
|
||||
|
||||
DEFINES += OPMAPWIDGET_LIBRARY
|
||||
|
||||
DEFINES += QtopmapWidget
|
||||
|
||||
|
||||
#VS的补丁 使用 自定义的数学常数
|
||||
|
||||
DEFINES += _USE_MATH_DEFINES
|
||||
#目标生成路径
|
||||
DESTDIR = $$PWD/../../thirdpart/lib
|
||||
MOC_DIR = $$PWD/../../build
|
||||
OBJECTS_DIR = $$PWD/../../build
|
||||
|
||||
|
||||
CONFIG += resources_big
|
||||
|
||||
SOURCES += $$PWD/mapgraphicitem.cpp \
|
||||
$$PWD/opmapwidget.cpp \
|
||||
$$PWD/configuration.cpp \
|
||||
$$PWD/waypointitem.cpp \
|
||||
$$PWD/uavitem.cpp \
|
||||
$$PWD/gpsitem.cpp \
|
||||
$$PWD/trailitem.cpp \
|
||||
$$PWD/homeitem.cpp \
|
||||
$$PWD/mapripform.cpp \
|
||||
$$PWD/mapripper.cpp \
|
||||
$$PWD/traillineitem.cpp \
|
||||
$$PWD/waypointline.cpp \
|
||||
$$PWD/waypointcircle.cpp \
|
||||
$$PWD/AltitudeItem.cpp
|
||||
|
||||
HEADERS += $$PWD/mapgraphicitem.h \
|
||||
$$PWD/opmapwidget.h \
|
||||
$$PWD/configuration.h \
|
||||
$$PWD/waypointitem.h \
|
||||
$$PWD/uavitem.h \
|
||||
$$PWD/gpsitem.h \
|
||||
$$PWD/uavmapfollowtype.h \
|
||||
$$PWD/uavtrailtype.h \
|
||||
$$PWD/trailitem.h \
|
||||
$$PWD/homeitem.h \
|
||||
$$PWD/mapripform.h \
|
||||
$$PWD/mapripper.h \
|
||||
$$PWD/traillineitem.h \
|
||||
$$PWD/waypointline.h \
|
||||
$$PWD/waypointcircle.h \
|
||||
$$PWD/mapwidgetglobal.h \
|
||||
$$PWD/AltitudeItem.h
|
||||
|
||||
RESOURCES += mapresources.qrc
|
||||
|
||||
FORMS += \
|
||||
mapripform.ui \
|
||||
|
||||
INCLUDEPATH += $$PWD/../../thirdpart/include
|
||||
|
||||
#添加mavlink目录
|
||||
INCLUDEPATH += $$PWD/../../mavlink3 \
|
||||
$$PWD/../../mavlink3/ardupilotmega \
|
||||
$$PWD/../../mavlink3/common \
|
||||
$$PWD/../../mavlink3/icarous \
|
||||
$$PWD/../../mavlink3/uAvionix \
|
||||
$$PWD/../../mavlink3/XYK \
|
||||
$$PWD/../../mavlink3/message_definitions
|
||||
|
||||
# Capture whether this is a release/debug build.
|
||||
CONFIG(debug, debug|release) {
|
||||
LIBS += -L$$PWD/../../thirdpart/lib -lcored
|
||||
LIBS += -L$$PWD/../../thirdpart/lib -linternalsd
|
||||
}
|
||||
CONFIG(release, debug|release) {
|
||||
LIBS += -L$$PWD/../../thirdpart/lib -lcore
|
||||
LIBS += -L$$PWD/../../thirdpart/lib -linternals
|
||||
}
|
||||
|
||||
win32|win64 {
|
||||
src_dir = $$PWD\\*.h
|
||||
dst_dir = $$PWD\\..\\..\\thirdpart\\include\\
|
||||
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
|
||||
|
||||
# Replace slashes in paths with backslashes for Windows
|
||||
src_dir ~= s,/,\\,g
|
||||
dst_dir ~= s,/,\\,g
|
||||
|
||||
system(xcopy $$src_dir $$dst_dir /y /e)
|
||||
|
||||
|
||||
#复制qml文件
|
||||
qml_src_dir = $$PWD\\*.qml
|
||||
qml_dst_dir = $$PWD\\..\\..\\app_bin\\qml\\
|
||||
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
|
||||
|
||||
# Replace slashes in paths with backslashes for Windows
|
||||
qml_src_dir ~= s,/,\\,g
|
||||
qml_dst_dir ~= s,/,\\,g
|
||||
|
||||
system(xcopy $$qml_src_dir $$qml_dst_dir /y /s)
|
||||
}
|
||||
|
||||
|
||||
unix {
|
||||
src_dir = $$PWD/*.h
|
||||
dst_dir = $$PWD/../../thirdpart/include/
|
||||
|
||||
!exists($$dst_dir): system(mkdir -p $$dst_dir)
|
||||
|
||||
system(cp $$src_dir $$dst_dir -arf )
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
QT += widgets
|
||||
QT += opengl
|
||||
QT += network
|
||||
QT += sql
|
||||
QT += svg
|
||||
|
||||
|
||||
# Capture whether this is a release/debug build.
|
||||
CONFIG(debug, debug|release) {
|
||||
# Target name.
|
||||
TARGET = opmapwidgetd
|
||||
}
|
||||
CONFIG(release, debug|release) {
|
||||
# Target name.
|
||||
TARGET = opmapwidget
|
||||
}
|
||||
|
||||
TEMPLATE = lib
|
||||
|
||||
|
||||
DEFINES += OPMAPWIDGET_LIBRARY
|
||||
|
||||
DEFINES += QtopmapWidget
|
||||
|
||||
|
||||
#VS的补丁 使用 自定义的数学常数
|
||||
|
||||
DEFINES += _USE_MATH_DEFINES
|
||||
#目标生成路径
|
||||
DESTDIR = $$PWD/../../thirdpart/lib
|
||||
MOC_DIR = $$PWD/../../build
|
||||
OBJECTS_DIR = $$PWD/../../build
|
||||
|
||||
|
||||
CONFIG += resources_big
|
||||
|
||||
SOURCES += $$PWD/mapgraphicitem.cpp \
|
||||
$$PWD/opmapwidget.cpp \
|
||||
$$PWD/configuration.cpp \
|
||||
$$PWD/waypointitem.cpp \
|
||||
$$PWD/uavitem.cpp \
|
||||
$$PWD/gpsitem.cpp \
|
||||
$$PWD/trailitem.cpp \
|
||||
$$PWD/homeitem.cpp \
|
||||
$$PWD/mapripform.cpp \
|
||||
$$PWD/mapripper.cpp \
|
||||
$$PWD/traillineitem.cpp \
|
||||
$$PWD/waypointline.cpp \
|
||||
$$PWD/waypointcircle.cpp \
|
||||
$$PWD/AltitudeItem.cpp
|
||||
|
||||
HEADERS += $$PWD/mapgraphicitem.h \
|
||||
$$PWD/opmapwidget.h \
|
||||
$$PWD/configuration.h \
|
||||
$$PWD/waypointitem.h \
|
||||
$$PWD/uavitem.h \
|
||||
$$PWD/gpsitem.h \
|
||||
$$PWD/uavmapfollowtype.h \
|
||||
$$PWD/uavtrailtype.h \
|
||||
$$PWD/trailitem.h \
|
||||
$$PWD/homeitem.h \
|
||||
$$PWD/mapripform.h \
|
||||
$$PWD/mapripper.h \
|
||||
$$PWD/traillineitem.h \
|
||||
$$PWD/waypointline.h \
|
||||
$$PWD/waypointcircle.h \
|
||||
$$PWD/mapwidgetglobal.h \
|
||||
$$PWD/AltitudeItem.h
|
||||
|
||||
RESOURCES += mapresources.qrc
|
||||
|
||||
FORMS += \
|
||||
mapripform.ui \
|
||||
|
||||
INCLUDEPATH += $$PWD/../../thirdpart/include
|
||||
|
||||
#添加mavlink目录
|
||||
INCLUDEPATH += $$PWD/../../mavlink \
|
||||
$$PWD/../../mavlink/ardupilotmega \
|
||||
$$PWD/../../mavlink/common \
|
||||
$$PWD/../../mavlink/icarous \
|
||||
$$PWD/../../mavlink/uAvionix \
|
||||
$$PWD/../../mavlink/XYK \
|
||||
$$PWD/../../mavlink/message_definitions
|
||||
|
||||
# Capture whether this is a release/debug build.
|
||||
CONFIG(debug, debug|release) {
|
||||
LIBS += -L$$PWD/../../thirdpart/lib -lcored
|
||||
LIBS += -L$$PWD/../../thirdpart/lib -linternalsd
|
||||
}
|
||||
CONFIG(release, debug|release) {
|
||||
LIBS += -L$$PWD/../../thirdpart/lib -lcore
|
||||
LIBS += -L$$PWD/../../thirdpart/lib -linternals
|
||||
}
|
||||
|
||||
win32|win64 {
|
||||
src_dir = $$PWD\\*.h
|
||||
dst_dir = $$PWD\\..\\..\\thirdpart\\include\\
|
||||
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
|
||||
|
||||
# Replace slashes in paths with backslashes for Windows
|
||||
src_dir ~= s,/,\\,g
|
||||
dst_dir ~= s,/,\\,g
|
||||
|
||||
system(xcopy $$src_dir $$dst_dir /y /e)
|
||||
|
||||
|
||||
#复制qml文件
|
||||
qml_src_dir = $$PWD\\*.qml
|
||||
qml_dst_dir = $$PWD\\..\\..\\app_bin\\qml\\
|
||||
# dst_dir 最后的 \\ 是必须的，用来标示 xcopy 到一个文件夹，若不存在，创建之
|
||||
|
||||
# Replace slashes in paths with backslashes for Windows
|
||||
qml_src_dir ~= s,/,\\,g
|
||||
qml_dst_dir ~= s,/,\\,g
|
||||
|
||||
system(xcopy $$qml_src_dir $$qml_dst_dir /y /s)
|
||||
}
|
||||
|
||||
|
||||
unix {
|
||||
src_dir = $$PWD/*.h
|
||||
dst_dir = $$PWD/../../thirdpart/include/
|
||||
|
||||
!exists($$dst_dir): system(mkdir -p $$dst_dir)
|
||||
|
||||
system(cp $$src_dir $$dst_dir -arf )
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user