Merge pull request mavlink#150 from mavlink/java-fixes

minor fixes for MAVSDK-Java autogen
dlech · May 8, 2020 · 6dfc909 · 6dfc909
2 parents 131b267 + 1666f95
commit 6dfc909
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pb_plugins/protoc_gen_dcsdk/autogen.py b/pb_plugins/protoc_gen_dcsdk/autogen.py
@@ -32,7 +32,7 @@ def generate_reactive(request):
             plugin_name, plugin_dir = AutoGen.extract_plugin_name_and_dir(
                 proto_file.name, package, is_java)
 
-            if package.startswith("google") or package == "mavsdk.options":
+            if package.startswith("google") or package == "mavsdk.options" or package.startswith("com.google") or package == "options.mavsdk":
                 continue
 
             docs = Docs.collect_docs(proto_file.source_code_info)

diff --git a/protos/log_files/log_files.proto b/protos/log_files/log_files.proto
@@ -21,7 +21,7 @@ service LogFilesService {
 
 message GetEntriesRequest {}
 message GetEntriesResponse {
-    LogFileResult log_file_result = 1;
+    LogFilesResult log_files_result = 1;
     repeated Entry entries = 2; // List of entries
 }
 
@@ -30,7 +30,7 @@ message SubscribeDownloadLogFileRequest {
     string path = 2; // Path of where to download log file to.
 }
 message DownloadLogFileResponse {
-    LogFileResult log_file_result = 1;
+    LogFilesResult log_files_result = 1;
     ProgressData progress = 2; // Progress if result is progress
 }
 
@@ -49,12 +49,12 @@ message Entry {
 }
 
 // Result type.
-message LogFileResult {
+message LogFilesResult {
     // Possible results returned for calibration commands
     enum Result {
         RESULT_UNKNOWN = 0; // Unknown result
         RESULT_SUCCESS = 1; // Request succeeded
-        RESULT_PROGRESS = 2; // Progress update
+        RESULT_NEXT = 2; // Progress update
         RESULT_NO_LOGFILES = 3; // No log files found
         RESULT_TIMEOUT = 4; // A timeout happened
         RESULT_INVALID_ARGUMENT = 5; // Invalid argument