From 5e595de98485ba20cf6fd048b333720f743ac62f Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Mon, 11 May 2020 17:17:35 +0200 Subject: [PATCH] Update examples to use 0.3.1 --- examples/android-client/app/build.gradle | 4 ++-- examples/java-client/build.gradle | 2 +- .../src/main/java/io/mavsdk/example/RunMission.java | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/examples/android-client/app/build.gradle b/examples/android-client/app/build.gradle index 1b0d216..7480ab7 100644 --- a/examples/android-client/app/build.gradle +++ b/examples/android-client/app/build.gradle @@ -59,8 +59,8 @@ dependencies { implementation 'com.google.android.material:material:1.1.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v8:0.7.0' implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:8.2.1' - implementation 'io.mavsdk:mavsdk:0.3.0' - implementation 'io.mavsdk:mavsdk-server:0.3.0' + implementation 'io.mavsdk:mavsdk:0.3.1' + implementation 'io.mavsdk:mavsdk-server:0.3.1' implementation 'org.slf4j:slf4j-api:1.7.28' testImplementation 'junit:junit:4.12' diff --git a/examples/java-client/build.gradle b/examples/java-client/build.gradle index a25c107..211bb8b 100644 --- a/examples/java-client/build.gradle +++ b/examples/java-client/build.gradle @@ -72,7 +72,7 @@ idea { dependencies { checkstyleClasspath 'com.puppycrawl.tools:checkstyle:8.5' - implementation 'io.mavsdk:mavsdk:0.2.0' + implementation 'io.mavsdk:mavsdk:0.3.1' implementation 'ch.qos.logback:logback-core:1.2.3' implementation 'ch.qos.logback:logback-classic:1.2.3' diff --git a/examples/java-client/src/main/java/io/mavsdk/example/RunMission.java b/examples/java-client/src/main/java/io/mavsdk/example/RunMission.java index 4a439ca..1206934 100644 --- a/examples/java-client/src/main/java/io/mavsdk/example/RunMission.java +++ b/examples/java-client/src/main/java/io/mavsdk/example/RunMission.java @@ -20,11 +20,13 @@ public static void main(String[] args) { missionItems.add(generateMissionItem(47.397825620791885, 8.5450092830163271)); missionItems.add(generateMissionItem(47.397832880000003, 8.5455939999999995)); + Mission.MissionPlan missionPlan = new Mission.MissionPlan(missionItems); + System drone = new System(); drone.getMission() .setReturnToLaunchAfterMission(true) - .andThen(drone.getMission().uploadMission(missionItems) + .andThen(drone.getMission().uploadMission(missionPlan) .doOnComplete(() -> logger.debug("Upload succeeded"))) .andThen(drone.getAction().arm()) .andThen(drone.getMission().startMission() @@ -34,7 +36,7 @@ public static void main(String[] args) { CountDownLatch latch = new CountDownLatch(1); drone.getMission() .getMissionProgress() - .filter(progress -> progress.getCurrentItemIndex() == progress.getMissionCount()) + .filter(progress -> progress.getCurrent() == progress.getTotal()) .take(1) .subscribe(ignored -> latch.countDown());