Skip to content

Commit 811f1fe

Browse files
Merge pull request #216 from earocorn/mavlink-direct
Add MAVLink direct plugin and update proto submodule commit
2 parents 21db659 + b999f3d commit 811f1fe

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

sdk/proto

Submodule proto updated from 20aa335 to 61b1b1a

sdk/src/main/java/io/mavsdk/System.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import io.mavsdk.internal.LazyPlugin;
1515
import io.mavsdk.log_files.LogFiles;
1616
import io.mavsdk.manual_control.ManualControl;
17+
import io.mavsdk.mavlink_direct.MavlinkDirect;
1718
import io.mavsdk.mission.Mission;
1819
import io.mavsdk.mission_raw.MissionRaw;
1920
import io.mavsdk.mission_raw_server.MissionRawServer;
@@ -44,6 +45,7 @@ public class System {
4445
private final LazyPlugin<Info> info;
4546
private final LazyPlugin<LogFiles> logFiles;
4647
private final LazyPlugin<ManualControl> manualControl;
48+
private final LazyPlugin<MavlinkDirect> mavlinkDirect;
4749
private final LazyPlugin<Mission> mission;
4850
private final LazyPlugin<MissionRaw> missionRaw;
4951
private final LazyPlugin<MissionRawServer> missionRawServer;
@@ -89,6 +91,7 @@ public System(@NonNull String host, int port) {
8991
info = LazyPlugin.from(() -> new Info(host, port));
9092
logFiles = LazyPlugin.from(() -> new LogFiles(host, port));
9193
manualControl = LazyPlugin.from(() -> new ManualControl(host, port));
94+
mavlinkDirect = LazyPlugin.from(() -> new MavlinkDirect(host, port));
9295
mission = LazyPlugin.from(() -> new Mission(host, port));
9396
missionRaw = LazyPlugin.from(() -> new MissionRaw(host, port));
9497
missionRawServer = LazyPlugin.from(() -> new MissionRawServer(host, port));
@@ -169,6 +172,11 @@ public ManualControl getManualControl() {
169172
return manualControl.get();
170173
}
171174

175+
@NonNull
176+
public MavlinkDirect getMavlinkDirect() {
177+
return mavlinkDirect.get();
178+
}
179+
172180
@NonNull
173181
public Mission getMission() {
174182
return mission.get();
@@ -252,6 +260,7 @@ public void dispose() {
252260
info.dispose();
253261
logFiles.dispose();
254262
manualControl.dispose();
263+
mavlinkDirect.dispose();
255264
mission.dispose();
256265
missionRaw.dispose();
257266
missionRawServer.dispose();

0 commit comments

Comments
 (0)