From 05c23d110c4a7ec486f5e5fe2518538f231870e9 Mon Sep 17 00:00:00 2001
From: Federico Lolli <federico.lolli@skywarder.eu>
Date: Wed, 13 Mar 2024 20:04:10 +0100
Subject: [PATCH] Added receiver entrypoint
---
.../entrypoints/arpist_device_receiver.cpp | 36 +++++--------------
.../src/entrypoints/arpist_device_sender.cpp | 2 ++
2 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/on-device/src/entrypoints/arpist_device_receiver.cpp b/on-device/src/entrypoints/arpist_device_receiver.cpp
index 569c98c..ab72c90 100644
--- a/on-device/src/entrypoints/arpist_device_receiver.cpp
+++ b/on-device/src/entrypoints/arpist_device_receiver.cpp
@@ -30,42 +30,22 @@ using namespace miosix;
using namespace Boardcore;
using namespace Arpist;
-// === CONSTANTS ===
-/** @brief End of transmission character */
-constexpr uint8_t ACK = 0x06;
-
-using MavDriver = MavlinkDriver<20, 10>;
-
// === DEFINITIONS ===
-void onReceive(MavDriver *channel, mavlink_message_t msg);
+
+void onReceive(mavlink_message_t msg);
// === MAIN ===
+
int main()
{
- mavlink_message_t msg;
- mavlink_payload_flight_tm_t payload;
- MavDriver *mavlink;
-
- // init radio
- if (Radio::init())
- {
- printf("Radio init success\n");
- }
- else
- {
- printf("Radio init failed\n");
- return -1;
- }
-
- // init mavlink
- mavlink = new MavDriver(sx1278, onReceive, 256);
- if (mavlink->start())
+ // start radio
+ if (Radio::getInstance().start(onReceive))
{
- printf("Mavlink init success\n");
+ printf("Radio start success\n");
}
else
{
- printf("Mavlink init failed\n");
+ printf("Radio start failed\n");
return -1;
}
@@ -76,7 +56,7 @@ int main()
return 0;
}
-void onReceive(MavDriver *channel, mavlink_message_t msg)
+void onReceive(mavlink_message_t msg)
{
mavlink_payload_flight_tm_t payload;
diff --git a/on-device/src/entrypoints/arpist_device_sender.cpp b/on-device/src/entrypoints/arpist_device_sender.cpp
index 4bed47b..3c3d63b 100644
--- a/on-device/src/entrypoints/arpist_device_sender.cpp
+++ b/on-device/src/entrypoints/arpist_device_sender.cpp
@@ -31,10 +31,12 @@ using namespace Boardcore;
using namespace Arpist;
// === CONSTANTS ===
+
/** @brief End of transmission character */
constexpr uint8_t ACK = 0x06;
// === MAIN ===
+
int main()
{
mavlink_message_t msg;
--
GitLab