From 28b769f045c3878bfe107fdd83087a6104d8f2b5 Mon Sep 17 00:00:00 2001
From: earocorn <amavb789@gmail.com>
Date: Wed, 30 Jul 2025 17:27:33 -0500
Subject: [PATCH 1/2] Add mavlink direct plugin and update proto commit

---
 sdk/proto                               | 2 +-
 sdk/src/main/java/io/mavsdk/System.java | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/sdk/proto b/sdk/proto
index 20aa335..61b1b1a 160000
--- a/sdk/proto
+++ b/sdk/proto
@@ -1 +1 @@
-Subproject commit 20aa335ef85b50d844ffb3d3a53420c6fbcc289b
+Subproject commit 61b1b1a197966faed181f8c7c5f2fa57d832cf1f
diff --git a/sdk/src/main/java/io/mavsdk/System.java b/sdk/src/main/java/io/mavsdk/System.java
index 3372f1d..413f046 100644
--- a/sdk/src/main/java/io/mavsdk/System.java
+++ b/sdk/src/main/java/io/mavsdk/System.java
@@ -14,6 +14,7 @@
 import io.mavsdk.internal.LazyPlugin;
 import io.mavsdk.log_files.LogFiles;
 import io.mavsdk.manual_control.ManualControl;
+import io.mavsdk.mavlink_direct.MavlinkDirect;
 import io.mavsdk.mission.Mission;
 import io.mavsdk.mission_raw.MissionRaw;
 import io.mavsdk.mission_raw_server.MissionRawServer;
@@ -57,6 +58,7 @@ public class System {
   private final LazyPlugin<TelemetryServer> telemetryServer;
   private final LazyPlugin<Transponder> transponder;
   private final LazyPlugin<Tune> tune;
+  private final LazyPlugin<MavlinkDirect> mavlinkDirect;
 
   /**
    * Create a System object. The plugins are initialized lazily, when the corresponding
@@ -102,6 +104,7 @@ public System(@NonNull String host, int port) {
     telemetryServer = LazyPlugin.from(() -> new TelemetryServer(host, port));
     transponder = LazyPlugin.from(() -> new Transponder(host, port));
     tune = LazyPlugin.from(() -> new Tune(host, port));
+    mavlinkDirect = LazyPlugin.from(() -> new MavlinkDirect(host, port));
   }
 
   @NonNull
@@ -235,6 +238,9 @@ public Tune getTune() {
     return tune.get();
   }
 
+  @NonNull
+  public MavlinkDirect getMavlinkDirect() { return mavlinkDirect.get(); }
+
   /**
    * Dispose of all the plugins.
    */
@@ -265,5 +271,6 @@ public void dispose() {
     telemetryServer.dispose();
     transponder.dispose();
     tune.dispose();
+    mavlinkDirect.dispose();
   }
 }

From b999f3dfbe3b6910f0b40b2f37b64aa3b440008a Mon Sep 17 00:00:00 2001
From: earocorn <amavb789@gmail.com>
Date: Wed, 30 Jul 2025 17:32:12 -0500
Subject: [PATCH 2/2] Align mavlink direct alphabetically

---
 sdk/src/main/java/io/mavsdk/System.java | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sdk/src/main/java/io/mavsdk/System.java b/sdk/src/main/java/io/mavsdk/System.java
index 413f046..116c0e4 100644
--- a/sdk/src/main/java/io/mavsdk/System.java
+++ b/sdk/src/main/java/io/mavsdk/System.java
@@ -45,6 +45,7 @@ public class System {
   private final LazyPlugin<Info> info;
   private final LazyPlugin<LogFiles> logFiles;
   private final LazyPlugin<ManualControl> manualControl;
+  private final LazyPlugin<MavlinkDirect> mavlinkDirect;
   private final LazyPlugin<Mission> mission;
   private final LazyPlugin<MissionRaw> missionRaw;
   private final LazyPlugin<MissionRawServer> missionRawServer;
@@ -58,7 +59,6 @@ public class System {
   private final LazyPlugin<TelemetryServer> telemetryServer;
   private final LazyPlugin<Transponder> transponder;
   private final LazyPlugin<Tune> tune;
-  private final LazyPlugin<MavlinkDirect> mavlinkDirect;
 
   /**
    * Create a System object. The plugins are initialized lazily, when the corresponding
@@ -91,6 +91,7 @@ public System(@NonNull String host, int port) {
     info = LazyPlugin.from(() -> new Info(host, port));
     logFiles = LazyPlugin.from(() -> new LogFiles(host, port));
     manualControl = LazyPlugin.from(() -> new ManualControl(host, port));
+    mavlinkDirect = LazyPlugin.from(() -> new MavlinkDirect(host, port));
     mission = LazyPlugin.from(() -> new Mission(host, port));
     missionRaw = LazyPlugin.from(() -> new MissionRaw(host, port));
     missionRawServer = LazyPlugin.from(() -> new MissionRawServer(host, port));
@@ -104,7 +105,6 @@ public System(@NonNull String host, int port) {
     telemetryServer = LazyPlugin.from(() -> new TelemetryServer(host, port));
     transponder = LazyPlugin.from(() -> new Transponder(host, port));
     tune = LazyPlugin.from(() -> new Tune(host, port));
-    mavlinkDirect = LazyPlugin.from(() -> new MavlinkDirect(host, port));
   }
 
   @NonNull
@@ -172,6 +172,11 @@ public ManualControl getManualControl() {
     return manualControl.get();
   }
 
+  @NonNull
+  public MavlinkDirect getMavlinkDirect() {
+    return mavlinkDirect.get();
+  }
+
   @NonNull
   public Mission getMission() {
     return mission.get();
@@ -238,9 +243,6 @@ public Tune getTune() {
     return tune.get();
   }
 
-  @NonNull
-  public MavlinkDirect getMavlinkDirect() { return mavlinkDirect.get(); }
-
   /**
    * Dispose of all the plugins.
    */
@@ -258,6 +260,7 @@ public void dispose() {
     info.dispose();
     logFiles.dispose();
     manualControl.dispose();
+    mavlinkDirect.dispose();
     mission.dispose();
     missionRaw.dispose();
     missionRawServer.dispose();
@@ -271,6 +274,5 @@ public void dispose() {
     telemetryServer.dispose();
     transponder.dispose();
     tune.dispose();
-    mavlinkDirect.dispose();
   }
 }