From f63a763f40560e8740c666969174844c0316226b Mon Sep 17 00:00:00 2001
From: Alberto Nidasio <alberto.nidasio@skywarder.eu>
Date: Thu, 14 Jul 2022 00:41:46 +0200
Subject: [PATCH] [MAVLink] Updated submodule
---
.vscode/c_cpp_properties.json | 17 +++++++++++++++++
.vscode/settings.json | 5 -----
Modules/Mavlink/mavlink_skyward_lib | 2 +-
Modules/Mavlink/mavlinkcommandadapter.cpp | 4 ++--
4 files changed, 20 insertions(+), 8 deletions(-)
create mode 100644 .vscode/c_cpp_properties.json
delete mode 100644 .vscode/settings.json
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 00000000..432d41dd
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,17 @@
+{
+ "configurations": [
+ {
+ "name": "Linux",
+ "includePath": [
+ "${workspaceFolder}/**",
+ "/home/alberton/Qt/5.15.2/gcc_64/include/**"
+ ],
+ "defines": [],
+ "compilerPath": "/usr/bin/gcc",
+ "cStandard": "gnu17",
+ "cppStandard": "gnu++17",
+ "intelliSenseMode": "linux-gcc-x64"
+ }
+ ],
+ "version": 4
+}
\ No newline at end of file
diff --git a/.vscode/settings.json b/.vscode/settings.json
deleted file mode 100644
index c067a4b2..00000000
--- a/.vscode/settings.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
- "cSpell.words": [
- "mavlink"
- ]
-}
\ No newline at end of file
diff --git a/Modules/Mavlink/mavlink_skyward_lib b/Modules/Mavlink/mavlink_skyward_lib
index 96329687..4439d363 160000
--- a/Modules/Mavlink/mavlink_skyward_lib
+++ b/Modules/Mavlink/mavlink_skyward_lib
@@ -1 +1 @@
-Subproject commit 96329687cd3f44837978a91f94c84bf0a65e0d0b
+Subproject commit 4439d36371e8f39fb5a377774371b5ffa0a5fc11
diff --git a/Modules/Mavlink/mavlinkcommandadapter.cpp b/Modules/Mavlink/mavlinkcommandadapter.cpp
index ba0e1c11..55f885c5 100644
--- a/Modules/Mavlink/mavlinkcommandadapter.cpp
+++ b/Modules/Mavlink/mavlinkcommandadapter.cpp
@@ -23,10 +23,10 @@ bool MavlinkCommandAdapter::encodeCommand(const ModuleMessage& msg, mavlink_mess
mavlink_msg_command_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("command_id").getUInteger(0));
return true;
} else if(messageName == "SYSTEM_TELEMETRY_REQUEST_TC") {
- mavlink_msg_system_telemetry_request_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("tm_id").getUInteger(0));
+ mavlink_msg_system_tm_request_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("tm_id").getUInteger(0));
return true;
} else if(messageName == "SENSOR_TELEMETRY_REQUEST_TC") {
- mavlink_msg_sensor_telemetry_request_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("sensor_id").getUInteger(0));
+ mavlink_msg_sensor_tm_request_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("sensor_id").getUInteger(0));
return true;
} else if(messageName == "SET_SERVO_ANGLE_TC") {
mavlink_msg_set_servo_angle_tc_pack(MAV_SYS, MAV_CMP, &output, msg.getField("servo_id").getUInteger(0), msg.getField("angle").getDouble(0.0));
--
GitLab