Update mavsdk_server and protos

mavlink · Sep 5, 2021 · c3c8134 · c3c8134
1 parent 77f606e
commit c3c8134
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/examples/android-client/app/src/main/java/io/mavsdk/androidclient/MapsViewModel.java b/examples/android-client/app/src/main/java/io/mavsdk/androidclient/MapsViewModel.java
@@ -52,7 +52,9 @@ void startMission(System drone) {
             Float.NaN,
             Mission.MissionItem.CameraAction.NONE,
             Float.NaN,
-            1.0);
+            1.0,
+            Float.NaN,
+            Float.NaN);
         missionItems.add(missionItem);
       }
 

diff --git a/examples/android-client/settings.gradle b/examples/android-client/settings.gradle
@@ -1,7 +1,7 @@
 include ':app'
 
 // Uncomment the following line to use the SDK built from sources.
-// This will require `protoc-gen-dcsdk` to be in your PATH. See
+// This will require `protoc-gen-mavsdk` to be in your PATH. See
 // the README in ../../sdk for more instructions about building
 // from sources.
 //includeBuild '../../sdk'

diff --git a/mavsdk_server/build.gradle b/mavsdk_server/build.gradle
@@ -19,7 +19,7 @@ allprojects {
         jcenter()
     }
 
-    def mavsdk_server_release = "v0.40.0"
+    def mavsdk_server_release = "v0.43.0"
 
     task extractMavsdkServer(type: Copy) {
         mkdir project.buildDir.getAbsolutePath() + "/tmp"
@@ -132,7 +132,7 @@ android {
         archivesBaseName = 'mavsdk-server'
         group = 'io.mavsdk'
         versionCode 1
-        version '0.9.1'
+        version '0.10.0'
 
         ndk {
             abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'

diff --git a/sdk/README.md b/sdk/README.md
@@ -8,7 +8,7 @@ Because it is deployed on Maven Central, adding MAVSDK-Java to your project is a
 
 ```groovy
 dependencies {
-    implementation 'io.mavsdk:mavsdk:0.9.0'
+    implementation 'io.mavsdk:mavsdk:0.10.0'
 }
 ```
 

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -17,7 +17,7 @@ subprojects {
 
     group = 'io.mavsdk'
     archivesBaseName = 'mavsdk'
-    version = '0.9.0'
+    version = '0.10.0'
 
     repositories {
         jcenter()

diff --git a/sdk/proto b/sdk/proto
diff --git a/sdk/templates/stream.j2 b/sdk/templates/stream.j2
@@ -39,7 +39,11 @@ private Flowable<{% if return_type.is_primitive %}{{ return_type.name }}{% elif
                 emitter.onNext(value.get{{ return_name.upper_camel_case }}List().stream().map({{ return_type.inner_name }}::translateFromRpc).collect(Collectors.toList()));
                     {%- endif %}
                 {%- else %}
+                    {%- if return_type.is_primitive %}
+                emitter.onNext(value.get{{ return_name.upper_camel_case }}());
+                    {%- else %}
                 emitter.onNext({{ return_type.name }}.translateFromRpc(value.get{{ return_name.upper_camel_case }}()));
+                    {%- endif %}
                 {%- endif %}
                 break;
               default: