AP_RCProtocol: add support for MAVLink receiver, handle RADIO_RC_CHAN…

…NELS message
ArduPilot · Mar 2, 2024 · 3167de1 · 3167de1
1 parent 50b7e7e
commit 3167de1
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 0 deletions.
diff --git a/libraries/AP_RCProtocol/AP_RCProtocol.cpp b/libraries/AP_RCProtocol/AP_RCProtocol.cpp
@@ -34,6 +34,7 @@
 #include "AP_RCProtocol_FPort2.h"
 #include "AP_RCProtocol_DroneCAN.h"
 #include "AP_RCProtocol_GHST.h"
+#include "AP_RCProtocol_MAVLinkRadio.h"
 #include <AP_Math/AP_Math.h>
 #include <RC_Channel/RC_Channel.h>
 
@@ -88,6 +89,9 @@ void AP_RCProtocol::init()
 #if AP_RCPROTOCOL_GHST_ENABLED
     backend[AP_RCProtocol::GHST] = new AP_RCProtocol_GHST(*this);
 #endif
+#if AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+    backend[AP_RCProtocol::MAVLINK_RADIO] = new AP_RCProtocol_MAVLinkRadio(*this);
+#endif
 }
 
 AP_RCProtocol::~AP_RCProtocol()
@@ -422,6 +426,9 @@ bool AP_RCProtocol::new_input()
     const rcprotocol_t pollable[] {
 #if AP_RCPROTOCOL_DRONECAN_ENABLED
         AP_RCProtocol::DRONECAN,
+#endif
+#if AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+        AP_RCProtocol::MAVLINK_RADIO,
 #endif
     };
     for (const auto protocol : pollable) {
@@ -554,6 +561,10 @@ const char *AP_RCProtocol::protocol_name_from_protocol(rcprotocol_t protocol)
 #if AP_RCPROTOCOL_GHST_ENABLED
     case GHST:
         return "GHST";
+#endif
+#if AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+    case MAVLINK_RADIO:
+        return "MAVRadio";
 #endif
     case NONE:
         break;
@@ -589,6 +600,23 @@ bool AP_RCProtocol::protocol_enabled(rcprotocol_t protocol) const
     return ((1U<<(uint8_t(protocol)+1)) & rc_protocols_mask) != 0;
 }
 
+#if AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+void AP_RCProtocol::handle_radio_rc_channels(const mavlink_radio_rc_channels_t* packet)
+{
+    // take a shortcut if protocol is known to be MAVLINK_RADIO
+    if (_detected_protocol == AP_RCProtocol::MAVLINK_RADIO) {
+        backend[_detected_protocol]->update_radio_rc_channels(packet);
+        return;
+    }
+
+    for (uint8_t i = 0; i < ARRAY_SIZE(backend); i++) {
+        if (backend[i] != nullptr) {
+            backend[i]->update_radio_rc_channels(packet);
+        }
+    }
+};
+#endif // AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+
 namespace AP {
     AP_RCProtocol &RC()
     {

diff --git a/libraries/AP_RCProtocol/AP_RCProtocol.h b/libraries/AP_RCProtocol/AP_RCProtocol.h
@@ -20,6 +20,9 @@
 
 #include <AP_HAL/AP_HAL.h>
 #include <AP_Common/AP_Common.h>
+#if AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+#include <GCS_MAVLink/GCS_MAVLink.h>
+#endif
 
 #define MAX_RCIN_CHANNELS 18
 #define MIN_RCIN_CHANNELS  5
@@ -74,6 +77,9 @@ class AP_RCProtocol {
 #endif
 #if AP_RCPROTOCOL_GHST_ENABLED
         GHST       = 14,
+#endif
+#if AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+        MAVLINK_RADIO = 15,
 #endif
         NONE    //last enum always is None
     };
@@ -158,6 +164,9 @@ class AP_RCProtocol {
 #endif
 #if AP_RCPROTOCOL_DRONECAN_ENABLED
         case DRONECAN:
+#endif
+#if AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+        case MAVLINK_RADIO:
 #endif
         case NONE:
             return false;
@@ -205,6 +214,11 @@ class AP_RCProtocol {
         return _detected_with_bytes;
     }
 
+    // handle mavlink radio
+#if AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+    void handle_radio_rc_channels(const mavlink_radio_rc_channels_t* packet);
+#endif
+
 private:
     void check_added_uart(void);
 

diff --git a/libraries/AP_RCProtocol/AP_RCProtocol_Backend.h b/libraries/AP_RCProtocol/AP_RCProtocol_Backend.h
@@ -44,6 +44,11 @@ class AP_RCProtocol_Backend {
     // allow for backends that need regular polling
     virtual void update(void) {}
 
+    // update from mavlink messages
+#if AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+    virtual void update_radio_rc_channels(const mavlink_radio_rc_channels_t* packet) {}
+#endif
+
     // get number of frames, ignoring failsafe
     uint32_t get_rc_frame_count(void) const {
         return rc_frame_count;

diff --git a/libraries/AP_RCProtocol/AP_RCProtocol_config.h b/libraries/AP_RCProtocol/AP_RCProtocol_config.h
@@ -2,6 +2,7 @@
 
 #include <AP_HAL/AP_HAL_Boards.h>
 #include <AP_Frsky_Telem/AP_Frsky_config.h>
+#include <GCS_MAVLink/GCS_config.h>
 
 #ifndef AP_RCPROTOCOL_ENABLED
 #define AP_RCPROTOCOL_ENABLED 1
@@ -69,3 +70,8 @@
 #ifndef AP_RCPROTOCOL_GHST_ENABLED
 #define AP_RCPROTOCOL_GHST_ENABLED AP_RCPROTOCOL_BACKEND_DEFAULT_ENABLED
 #endif
+
+#ifndef AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED
+#define AP_RCPROTOCOL_MAVLINK_RADIO_ENABLED AP_RCPROTOCOL_BACKEND_DEFAULT_ENABLED && BOARD_FLASH_SIZE > 1024 && HAL_GCS_ENABLED
+#endif
+