mavlink 3

This commit is contained in:
hm
2020-09-23 14:40:11 +08:00
parent d033169982
commit 22fd7a97f8
5 changed files with 39 additions and 29 deletions
+7 -7
View File
@@ -100,13 +100,13 @@ INCLUDEPATH += $$PWD/../thirdpart/include
#添加mavlink目录(给mavlinknode模块打补丁)
INCLUDEPATH += $$PWD/../mavlink \
$$PWD/../mavlink/ardupilotmega \
$$PWD/../mavlink/common \
$$PWD/../mavlink/icarous \
$$PWD/../mavlink/uAvionix \
$$PWD/../mavlink/XYK \
$$PWD/../mavlink/message_definitions
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.
@@ -485,8 +485,11 @@ void MAVLinkInspector::updateField(mavlink_message_t* msg, const mavlink_message
}
#ifdef MAVLINK_VERSION_2
uint8_t* m = (uint8_t*)&uasMessage->payload64[0];
#else
uint8_t* m = (uint8_t*)&uasMessage->payload[0];
#endif
switch (msgInfo->fields[fieldid].type)
{
+9 -7
View File
@@ -88,13 +88,15 @@ CONFIG(release, debug|release) {
#添加mavlink目录
INCLUDEPATH += $$PWD/../mavlink \
$$PWD/../mavlink/ardupilotmega \
$$PWD/../mavlink/common \
$$PWD/../mavlink/icarous \
$$PWD/../mavlink/uAvionix \
$$PWD/../mavlink/XYK \
$$PWD/../mavlink/message_definitions
INCLUDEPATH += $$PWD/../mavlink3 \
$$PWD/../mavlink3/ardupilotmega \
$$PWD/../mavlink3/common \
$$PWD/../mavlink3/icarous \
$$PWD/../mavlink3/uAvionix \
$$PWD/../mavlink3/XYK \
$$PWD/../mavlink3/message_definitions
+12 -7
View File
@@ -54,13 +54,18 @@ SOURCES += \
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
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.
+7 -7
View File
@@ -76,13 +76,13 @@ FORMS += \
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
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) {