From 3c63bd8e821aaad0cba0f80149a1015a51bd3cf3 Mon Sep 17 00:00:00 2001
From: Pos <pierpaolo.mancini@mail.polimi.it>
Date: Mon, 4 Oct 2021 21:26:54 +0200
Subject: [PATCH] Edit send compid and sysid
---
Modules/Mavlink/mavlinkmodule.cpp | 6 ++++++
Modules/Mavlink/mavlinkreader.h | 3 ---
Modules/Mavlink/mavlinkversionheader.h | 3 +++
SkywardHub.pro.user | 2 +-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/Modules/Mavlink/mavlinkmodule.cpp b/Modules/Mavlink/mavlinkmodule.cpp
index f49eb3ba..2c65c846 100644
--- a/Modules/Mavlink/mavlinkmodule.cpp
+++ b/Modules/Mavlink/mavlinkmodule.cpp
@@ -402,6 +402,9 @@ void MavlinkModule::onCommandReceived(const ModuleMessage &msg)
// }
// }
+ encoded_mvl_msg.sysid = validSysid;
+ encoded_mvl_msg.compid = validCompid;
+
if(portOpen && portNumber >= 0){
mavlinkCommandAdapter.send(encoded_mvl_msg);
}
@@ -480,6 +483,9 @@ void MavlinkModule::onTelemetryRequestReceived(const ModuleMessage &msg)
// encoded_mvl_msg = mavlinkCommandAdapter.encode_TELEMETRY_REQUEST_TC(MAV_STRAIN_BOARD_TM_ID);
// }
+ encoded_mvl_msg.sysid = validSysid;
+ encoded_mvl_msg.compid = validCompid;
+
if(portOpen && portNumber >= 0){
mavlinkCommandAdapter.send(encoded_mvl_msg);
}
diff --git a/Modules/Mavlink/mavlinkreader.h b/Modules/Mavlink/mavlinkreader.h
index b768d1b1..c6e2116a 100644
--- a/Modules/Mavlink/mavlinkreader.h
+++ b/Modules/Mavlink/mavlinkreader.h
@@ -66,9 +66,6 @@ private:
QString logFilePath = "";
QFile logFile;
-
- uint8_t validSysid = 171;
- uint8_t validCompid = 96;
};
#endif // MAVLINKREADER_H
diff --git a/Modules/Mavlink/mavlinkversionheader.h b/Modules/Mavlink/mavlinkversionheader.h
index f4b4d0cf..ecf5344a 100644
--- a/Modules/Mavlink/mavlinkversionheader.h
+++ b/Modules/Mavlink/mavlinkversionheader.h
@@ -4,5 +4,8 @@
//#include "mavlink_skyward_lib/mavlink_lib/hermes/mavlink.h"
#include "mavlink_skyward_lib/mavlink_lib/lynx/mavlink.h"
+static __attribute__((unused)) uint8_t validSysid = 171;
+static __attribute__((unused)) uint8_t validCompid = 96;
+
#endif // MAVLINKVERSIONHEADER_H
diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user
index 6899b2f2..863e5eae 100644
--- a/SkywardHub.pro.user
+++ b/SkywardHub.pro.user
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2021-09-29T20:55:13. -->
+<!-- Written by QtCreator 4.14.2, 2021-10-01T22:10:38. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
--
GitLab